郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 7dd8f76f3dc2405c95770213c2ee6aae53de2fa4 1 个父辈 9b38401c
1 个管道 的构建 通过 耗费 10 秒

修改家政公司服务类目

内嵌 并排对比
正在显示 10 个修改的文件 包含 505 行增加 和 304 行删除
@@ -2,8 +2,16 @@ @@ -2,8 +2,16 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SeverController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
7 </list> 15 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 17 <option name="TRACKING_ENABLED" value="true" />
@@ -25,86 +33,65 @@ @@ -25,86 +33,65 @@
25 </component> 33 </component>
26 <component name="FileEditorManager"> 34 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 36 + <file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="false">
  37 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
30 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="982">  
32 - <caret line="803" column="23" lean-forward="false" selection-start-line="803" selection-start-column="12" selection-end-line="803" selection-end-column="23" /> 39 + <state relative-caret-position="28">
  40 + <caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
33 <folding> 41 <folding>
34 - <element signature="e#345#694#0#PHP" expanded="false" />  
35 - <element signature="e#699#1464#0#PHP" expanded="false" />  
36 - <element signature="e#1470#1699#0#PHP" expanded="false" />  
37 - <element signature="e#1704#3337#0#PHP" expanded="false" />  
38 - <element signature="e#3343#3583#0#PHP" expanded="false" />  
39 - <element signature="e#3588#3836#0#PHP" expanded="false" />  
40 - <element signature="e#3842#4189#0#PHP" expanded="false" />  
41 - <element signature="e#4194#4640#0#PHP" expanded="false" />  
42 - <element signature="e#4646#4906#0#PHP" expanded="false" />  
43 - <element signature="e#4911#5112#0#PHP" expanded="false" />  
44 - <element signature="e#5118#5380#0#PHP" expanded="false" />  
45 - <element signature="e#5385#5590#0#PHP" expanded="false" />  
46 - <element signature="e#5596#6038#0#PHP" expanded="false" />  
47 - <element signature="e#6043#7271#0#PHP" expanded="false" />  
48 - <element signature="e#7294#7839#0#PHP" expanded="false" />  
49 - <element signature="e#7845#8126#0#PHP" expanded="false" />  
50 - <element signature="e#8131#8523#0#PHP" expanded="false" />  
51 - <element signature="e#8529#9078#0#PHP" expanded="false" />  
52 - <element signature="e#9083#10282#0#PHP" expanded="false" />  
53 - <element signature="e#10288#10745#0#PHP" expanded="false" />  
54 - <element signature="e#10750#12013#0#PHP" expanded="false" />  
55 - <element signature="e#12036#12388#0#PHP" expanded="false" />  
56 - <element signature="e#12394#13078#0#PHP" expanded="false" />  
57 - <element signature="e#13083#14342#0#PHP" expanded="false" />  
58 - <element signature="e#14348#14810#0#PHP" expanded="false" />  
59 - <element signature="e#14815#17020#0#PHP" expanded="false" />  
60 - <element signature="e#17026#17635#0#PHP" expanded="false" />  
61 - <element signature="e#17640#18973#0#PHP" expanded="false" />  
62 - <element signature="e#18979#19336#0#PHP" expanded="false" />  
63 - <element signature="e#19341#20222#0#PHP" expanded="false" />  
64 - <element signature="e#20228#20580#0#PHP" expanded="false" />  
65 - <element signature="e#20585#21662#0#PHP" expanded="false" />  
66 - <element signature="e#21668#22023#0#PHP" expanded="false" />  
67 - <element signature="e#22028#23108#0#PHP" expanded="false" />  
68 - <element signature="e#23114#23538#0#PHP" expanded="false" />  
69 - <element signature="e#23543#24154#0#PHP" expanded="false" />  
70 - <element signature="e#26229#27093#0#PHP" expanded="false" />  
71 - <element signature="e#27120#27520#0#PHP" expanded="false" />  
72 - <element signature="e#27544#28117#0#PHP" expanded="false" />  
73 - <element signature="e#28140#28950#0#PHP" expanded="false" /> 42 + <element signature="e#265#1638#0#PHP" expanded="false" />
  43 + <element signature="e#2662#3553#0#PHP" expanded="false" />
74 </folding> 44 </folding>
75 </state> 45 </state>
76 </provider> 46 </provider>
77 </entry> 47 </entry>
78 </file> 48 </file>
79 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">  
80 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 49 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
  50 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
81 <provider selected="true" editor-type-id="text-editor"> 51 <provider selected="true" editor-type-id="text-editor">
82 - <state relative-caret-position="257">  
83 - <caret line="319" column="54" lean-forward="true" selection-start-line="319" selection-start-column="54" selection-end-line="319" selection-end-column="54" /> 52 + <state relative-caret-position="1114">
  53 + <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
  54 + <folding />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  60 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
  61 + <provider selected="true" editor-type-id="text-editor">
  62 + <state relative-caret-position="703">
  63 + <caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
84 <folding> 64 <folding>
85 - <element signature="e#411#604#0#PHP" expanded="false" />  
86 - <element signature="e#609#825#0#PHP" expanded="false" />  
87 - <element signature="e#831#1329#0#PHP" expanded="false" />  
88 - <element signature="e#1334#2102#0#PHP" expanded="false" />  
89 - <element signature="e#2108#2326#0#PHP" expanded="false" />  
90 - <element signature="e#2331#2539#0#PHP" expanded="false" />  
91 - <element signature="e#2545#3052#0#PHP" expanded="false" />  
92 - <element signature="e#3057#3575#0#PHP" expanded="false" />  
93 - <element signature="e#3581#4093#0#PHP" expanded="false" />  
94 - <element signature="e#4098#4661#0#PHP" expanded="false" />  
95 - <element signature="e#4667#5257#0#PHP" expanded="false" />  
96 - <element signature="e#5262#6260#0#PHP" expanded="false" />  
97 - <element signature="e#6266#6584#0#PHP" expanded="false" />  
98 - <element signature="e#6589#6965#0#PHP" expanded="false" />  
99 - <element signature="e#6971#7326#0#PHP" expanded="false" />  
100 - <element signature="e#7331#7740#0#PHP" expanded="false" />  
101 - <element signature="e#7746#8131#0#PHP" expanded="false" />  
102 - <element signature="e#8136#8807#0#PHP" expanded="false" />  
103 - <element signature="e#9264#10115#0#PHP" expanded="false" />  
104 - <element signature="e#10121#10391#0#PHP" expanded="false" />  
105 - <element signature="e#10396#10872#0#PHP" expanded="false" />  
106 - <element signature="e#10878#11508#0#PHP" expanded="false" />  
107 - <element signature="e#11513#12865#0#PHP" expanded="false" /> 65 + <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
  66 + </folding>
  67 + </state>
  68 + </provider>
  69 + </entry>
  70 + </file>
  71 + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
  72 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  73 + <provider selected="true" editor-type-id="text-editor">
  74 + <state relative-caret-position="353">
  75 + <caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
  76 + <folding>
  77 + <element signature="e#896#1112#0#PHP" expanded="false" />
  78 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  79 + <element signature="e#2126#2608#0#PHP" expanded="false" />
  80 + <element signature="e#2613#3118#0#PHP" expanded="false" />
  81 + <element signature="e#3124#3625#0#PHP" expanded="false" />
  82 + <element signature="e#3630#4459#0#PHP" expanded="false" />
  83 + <element signature="e#4465#4778#0#PHP" expanded="false" />
  84 + <element signature="e#4783#5158#0#PHP" expanded="false" />
  85 + <element signature="e#5164#5521#0#PHP" expanded="false" />
  86 + <element signature="e#5526#5934#0#PHP" expanded="false" />
  87 + <element signature="e#5940#6322#0#PHP" expanded="false" />
  88 + <element signature="e#6327#6997#0#PHP" expanded="false" />
  89 + <element signature="e#7003#7446#0#PHP" expanded="false" />
  90 + <element signature="e#7451#8301#0#PHP" expanded="false" />
  91 + <element signature="e#8307#8574#0#PHP" expanded="false" />
  92 + <element signature="e#8579#9054#0#PHP" expanded="false" />
  93 + <element signature="e#9060#9560#0#PHP" expanded="false" />
  94 + <element signature="e#9565#10354#0#PHP" expanded="false" />
108 </folding> 95 </folding>
109 </state> 96 </state>
110 </provider> 97 </provider>
@@ -130,10 +117,6 @@ @@ -130,10 +117,6 @@
130 <component name="IdeDocumentHistory"> 117 <component name="IdeDocumentHistory">
131 <option name="CHANGED_PATHS"> 118 <option name="CHANGED_PATHS">
132 <list> 119 <list>
133 - <option value="$PROJECT_DIR$/app/index/controller/UserController.php" />  
134 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />  
135 - <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />  
136 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />  
137 <option value="$PROJECT_DIR$/app/extra/wechat.php" /> 120 <option value="$PROJECT_DIR$/app/extra/wechat.php" />
138 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" /> 121 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
139 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" /> 122 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
@@ -162,14 +145,10 @@ @@ -162,14 +145,10 @@
162 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" /> 145 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
163 <option value="$PROJECT_DIR$/api/config.php" /> 146 <option value="$PROJECT_DIR$/api/config.php" />
164 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 147 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
165 - <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
166 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 148 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
167 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 149 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
168 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" /> 150 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
169 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 151 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
170 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />  
171 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />  
172 - <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
173 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 152 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
174 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 153 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
175 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" /> 154 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
@@ -179,8 +158,16 @@ @@ -179,8 +158,16 @@
179 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 158 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
180 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 159 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
181 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 160 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
182 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
183 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 161 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  162 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  163 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
  164 + <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  165 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
  166 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
  167 + <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
  168 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
  169 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
  170 + <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
184 </list> 171 </list>
185 </option> 172 </option>
186 </component> 173 </component>
@@ -199,10 +186,10 @@ @@ -199,10 +186,10 @@
199 </component> 186 </component>
200 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 187 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
201 <component name="ProjectFrameBounds" extendedState="1"> 188 <component name="ProjectFrameBounds" extendedState="1">
202 - <option name="x" value="255" />  
203 - <option name="y" value="92" /> 189 + <option name="x" value="11" />
  190 + <option name="y" value="119" />
204 <option name="width" value="1582" /> 191 <option name="width" value="1582" />
205 - <option name="height" value="969" /> 192 + <option name="height" value="965" />
206 </component> 193 </component>
207 <component name="ProjectView"> 194 <component name="ProjectView">
208 <navigator currentView="ProjectPane" proportions="" version="1"> 195 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -231,19 +218,19 @@ @@ -231,19 +218,19 @@
231 <path> 218 <path>
232 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 219 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
233 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 220 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
234 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 221 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
235 </path> 222 </path>
236 <path> 223 <path>
237 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 224 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
238 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 225 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
239 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
240 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 226 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  227 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
241 </path> 228 </path>
242 <path> 229 <path>
243 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 230 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
244 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 231 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
245 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
246 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 232 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  233 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
247 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 234 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
248 </path> 235 </path>
249 <path> 236 <path>
@@ -255,7 +242,40 @@ @@ -255,7 +242,40 @@
255 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 242 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
256 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 243 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
257 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 244 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
258 - <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> 245 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  246 + </path>
  247 + <path>
  248 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  249 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  250 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  251 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  252 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  253 + </path>
  254 + <path>
  255 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  256 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  257 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  258 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  259 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  260 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  261 + </path>
  262 + <path>
  263 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  264 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  265 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  266 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  267 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  268 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  269 + <item name="sever" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + </path>
  271 + <path>
  272 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  273 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  274 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  275 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  276 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  277 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  278 + <item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />
259 </path> 279 </path>
260 </expand> 280 </expand>
261 <select /> 281 <select />
@@ -265,7 +285,7 @@ @@ -265,7 +285,7 @@
265 </component> 285 </component>
266 <component name="PropertiesComponent"> 286 <component name="PropertiesComponent">
267 <property name="WebServerToolWindowFactoryState" value="false" /> 287 <property name="WebServerToolWindowFactoryState" value="false" />
268 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" /> 288 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
269 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 289 <property name="DefaultHtmlFileTemplate" value="HTML File" />
270 </component> 290 </component>
271 <component name="RecentsManager"> 291 <component name="RecentsManager">
@@ -353,15 +373,15 @@ @@ -353,15 +373,15 @@
353 <workItem from="1575016153150" duration="3315000" /> 373 <workItem from="1575016153150" duration="3315000" />
354 <workItem from="1575246616478" duration="21722000" /> 374 <workItem from="1575246616478" duration="21722000" />
355 <workItem from="1575278769037" duration="7395000" /> 375 <workItem from="1575278769037" duration="7395000" />
356 - <workItem from="1575332430854" duration="9615000" /> 376 + <workItem from="1575332430854" duration="20170000" />
357 </task> 377 </task>
358 <servers /> 378 <servers />
359 </component> 379 </component>
360 <component name="TimeTrackingManager"> 380 <component name="TimeTrackingManager">
361 - <option name="totallyTimeSpent" value="420073000" /> 381 + <option name="totallyTimeSpent" value="430628000" />
362 </component> 382 </component>
363 <component name="ToolWindowManager"> 383 <component name="ToolWindowManager">
364 - <frame x="255" y="92" width="1582" height="969" extended-state="1" /> 384 + <frame x="11" y="119" width="1582" height="965" extended-state="1" />
365 <editor active="true" /> 385 <editor active="true" />
366 <layout> 386 <layout>
367 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 387 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -415,76 +435,6 @@ @@ -415,76 +435,6 @@
415 <watches-manager /> 435 <watches-manager />
416 </component> 436 </component>
417 <component name="editorHistoryManager"> 437 <component name="editorHistoryManager">
418 - <entry file="file://$PROJECT_DIR$/app/admin/controller/PicController.php">  
419 - <provider selected="true" editor-type-id="text-editor">  
420 - <state relative-caret-position="107">  
421 - <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />  
422 - </state>  
423 - </provider>  
424 - </entry>  
425 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">  
426 - <provider selected="true" editor-type-id="text-editor">  
427 - <state relative-caret-position="234">  
428 - <caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />  
429 - </state>  
430 - </provider>  
431 - </entry>  
432 - <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">  
433 - <provider selected="true" editor-type-id="text-editor">  
434 - <state relative-caret-position="0">  
435 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
436 - </state>  
437 - </provider>  
438 - </entry>  
439 - <entry file="file://$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem">  
440 - <provider selected="true" editor-type-id="text-editor">  
441 - <state relative-caret-position="0">  
442 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
443 - </state>  
444 - </provider>  
445 - </entry>  
446 - <entry file="file://$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem">  
447 - <provider selected="true" editor-type-id="text-editor">  
448 - <state relative-caret-position="0">  
449 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
450 - </state>  
451 - </provider>  
452 - </entry>  
453 - <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">  
454 - <provider selected="true" editor-type-id="text-editor">  
455 - <state relative-caret-position="275">  
456 - <caret line="16" column="40" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="40" />  
457 - </state>  
458 - </provider>  
459 - </entry>  
460 - <entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="500">  
463 - <caret line="20" column="12" lean-forward="false" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />  
464 - </state>  
465 - </provider>  
466 - </entry>  
467 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html">  
468 - <provider selected="true" editor-type-id="text-editor">  
469 - <state relative-caret-position="1300">  
470 - <caret line="52" column="21" lean-forward="false" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />  
471 - </state>  
472 - </provider>  
473 - </entry>  
474 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">  
475 - <provider selected="true" editor-type-id="text-editor">  
476 - <state relative-caret-position="-600">  
477 - <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="52" selection-end-column="21" />  
478 - </state>  
479 - </provider>  
480 - </entry>  
481 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html">  
482 - <provider selected="true" editor-type-id="text-editor">  
483 - <state relative-caret-position="686">  
484 - <caret line="75" column="17" lean-forward="false" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" />  
485 - </state>  
486 - </provider>  
487 - </entry>  
488 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php"> 438 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
489 <provider selected="true" editor-type-id="text-editor"> 439 <provider selected="true" editor-type-id="text-editor">
490 <state relative-caret-position="361"> 440 <state relative-caret-position="361">
@@ -534,20 +484,6 @@ @@ -534,20 +484,6 @@
534 </state> 484 </state>
535 </provider> 485 </provider>
536 </entry> 486 </entry>
537 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
538 - <provider selected="true" editor-type-id="text-editor">  
539 - <state relative-caret-position="117">  
540 - <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />  
541 - </state>  
542 - </provider>  
543 - </entry>  
544 - <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">  
545 - <provider selected="true" editor-type-id="text-editor">  
546 - <state relative-caret-position="118">  
547 - <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
548 - </state>  
549 - </provider>  
550 - </entry>  
551 <entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php"> 487 <entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
552 <provider selected="true" editor-type-id="text-editor"> 488 <provider selected="true" editor-type-id="text-editor">
553 <state relative-caret-position="273"> 489 <state relative-caret-position="273">
@@ -562,13 +498,6 @@ @@ -562,13 +498,6 @@
562 </state> 498 </state>
563 </provider> 499 </provider>
564 </entry> 500 </entry>
565 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
566 - <provider selected="true" editor-type-id="text-editor">  
567 - <state relative-caret-position="170">  
568 - <caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />  
569 - </state>  
570 - </provider>  
571 - </entry>  
572 <entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc"> 501 <entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">
573 <provider selected="true" editor-type-id="text-editor"> 502 <provider selected="true" editor-type-id="text-editor">
574 <state relative-caret-position="273"> 503 <state relative-caret-position="273">
@@ -580,6 +509,7 @@ @@ -580,6 +509,7 @@
580 <provider selected="true" editor-type-id="text-editor"> 509 <provider selected="true" editor-type-id="text-editor">
581 <state relative-caret-position="0"> 510 <state relative-caret-position="0">
582 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 511 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  512 + <folding />
583 </state> 513 </state>
584 </provider> 514 </provider>
585 </entry> 515 </entry>
@@ -608,6 +538,16 @@ @@ -608,6 +538,16 @@
608 <provider selected="true" editor-type-id="text-editor"> 538 <provider selected="true" editor-type-id="text-editor">
609 <state relative-caret-position="180"> 539 <state relative-caret-position="180">
610 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 540 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
  541 + <folding>
  542 + <element signature="e#264#877#0#PHP" expanded="false" />
  543 + <element signature="e#891#1678#0#PHP" expanded="false" />
  544 + <element signature="e#1692#2973#0#PHP" expanded="false" />
  545 + <element signature="e#2987#3712#0#PHP" expanded="false" />
  546 + <element signature="e#3731#4694#0#PHP" expanded="false" />
  547 + <element signature="e#4711#5355#0#PHP" expanded="false" />
  548 + <element signature="e#5372#6399#0#PHP" expanded="false" />
  549 + <element signature="e#6416#7236#0#PHP" expanded="false" />
  550 + </folding>
611 </state> 551 </state>
612 </provider> 552 </provider>
613 </entry> 553 </entry>
@@ -632,13 +572,6 @@ @@ -632,13 +572,6 @@
632 </state> 572 </state>
633 </provider> 573 </provider>
634 </entry> 574 </entry>
635 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">  
636 - <provider selected="true" editor-type-id="text-editor">  
637 - <state relative-caret-position="475">  
638 - <caret line="70" column="35" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />  
639 - </state>  
640 - </provider>  
641 - </entry>  
642 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shop_pic/edit.html"> 575 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shop_pic/edit.html">
643 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
644 <state relative-caret-position="475"> 577 <state relative-caret-position="475">
@@ -646,13 +579,6 @@ @@ -646,13 +579,6 @@
646 </state> 579 </state>
647 </provider> 580 </provider>
648 </entry> 581 </entry>
649 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
650 - <provider selected="true" editor-type-id="text-editor">  
651 - <state relative-caret-position="639">  
652 - <caret line="108" column="17" lean-forward="true" selection-start-line="108" selection-start-column="17" selection-end-line="108" selection-end-column="17" />  
653 - </state>  
654 - </provider>  
655 - </entry>  
656 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html"> 582 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
657 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
658 <state relative-caret-position="150"> 584 <state relative-caret-position="150">
@@ -678,20 +604,7 @@ @@ -678,20 +604,7 @@
678 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
679 <state relative-caret-position="0"> 605 <state relative-caret-position="0">
680 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 606 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
681 - </state>  
682 - </provider>  
683 - </entry>  
684 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
685 - <provider selected="true" editor-type-id="text-editor">  
686 - <state relative-caret-position="250">  
687 - <caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="99" selection-end-column="5" />  
688 - </state>  
689 - </provider>  
690 - </entry>  
691 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">  
692 - <provider selected="true" editor-type-id="text-editor">  
693 - <state relative-caret-position="289">  
694 - <caret line="46" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="69" selection-end-column="7" /> 607 + <folding />
695 </state> 608 </state>
696 </provider> 609 </provider>
697 </entry> 610 </entry>
@@ -722,6 +635,7 @@ @@ -722,6 +635,7 @@
722 <provider selected="true" editor-type-id="text-editor"> 635 <provider selected="true" editor-type-id="text-editor">
723 <state relative-caret-position="200"> 636 <state relative-caret-position="200">
724 <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" /> 637 <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
  638 + <folding />
725 </state> 639 </state>
726 </provider> 640 </provider>
727 </entry> 641 </entry>
@@ -733,36 +647,33 @@ @@ -733,36 +647,33 @@
733 </state> 647 </state>
734 </provider> 648 </provider>
735 </entry> 649 </entry>
736 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 650 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
737 <provider selected="true" editor-type-id="text-editor"> 651 <provider selected="true" editor-type-id="text-editor">
738 - <state relative-caret-position="-194">  
739 - <caret line="37" column="28" lean-forward="false" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />  
740 - <folding>  
741 - <element signature="e#342#596#0#PHP" expanded="false" />  
742 - <element signature="e#601#886#0#PHP" expanded="false" />  
743 - <element signature="e#892#1227#0#PHP" expanded="false" />  
744 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
745 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
746 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
747 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
748 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
749 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
750 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
751 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
752 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
753 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
754 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
755 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
756 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
757 - </folding> 652 + <state relative-caret-position="556">
  653 + <caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
  654 + <folding />
  655 + </state>
  656 + </provider>
  657 + </entry>
  658 + <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
  659 + <provider selected="true" editor-type-id="images">
  660 + <state />
  661 + </provider>
  662 + </entry>
  663 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  664 + <provider selected="true" editor-type-id="text-editor">
  665 + <state relative-caret-position="117">
  666 + <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
  667 + <folding />
758 </state> 668 </state>
759 </provider> 669 </provider>
760 </entry> 670 </entry>
761 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 671 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
762 <provider selected="true" editor-type-id="text-editor"> 672 <provider selected="true" editor-type-id="text-editor">
763 <state relative-caret-position="407"> 673 <state relative-caret-position="407">
764 - <caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" /> 674 + <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
765 <folding> 675 <folding>
  676 + <element signature="e#305#577#0#PHP" expanded="false" />
766 <element signature="e#583#854#0#PHP" expanded="false" /> 677 <element signature="e#583#854#0#PHP" expanded="false" />
767 <element signature="e#859#1113#0#PHP" expanded="false" /> 678 <element signature="e#859#1113#0#PHP" expanded="false" />
768 <element signature="e#1119#1594#0#PHP" expanded="false" /> 679 <element signature="e#1119#1594#0#PHP" expanded="false" />
@@ -770,71 +681,15 @@ @@ -770,71 +681,15 @@
770 <element signature="e#2497#2911#0#PHP" expanded="false" /> 681 <element signature="e#2497#2911#0#PHP" expanded="false" />
771 <element signature="e#2916#3386#0#PHP" expanded="false" /> 682 <element signature="e#2916#3386#0#PHP" expanded="false" />
772 <element signature="e#3393#3889#0#PHP" expanded="false" /> 683 <element signature="e#3393#3889#0#PHP" expanded="false" />
773 - </folding>  
774 - </state>  
775 - </provider>  
776 - </entry>  
777 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">  
778 - <provider selected="true" editor-type-id="text-editor">  
779 - <state relative-caret-position="556">  
780 - <caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />  
781 - <folding />  
782 - </state>  
783 - </provider>  
784 - </entry>  
785 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
786 - <provider selected="true" editor-type-id="text-editor">  
787 - <state relative-caret-position="982">  
788 - <caret line="803" column="23" lean-forward="false" selection-start-line="803" selection-start-column="12" selection-end-line="803" selection-end-column="23" />  
789 - <folding>  
790 - <element signature="e#345#694#0#PHP" expanded="false" />  
791 - <element signature="e#699#1464#0#PHP" expanded="false" />  
792 - <element signature="e#1470#1699#0#PHP" expanded="false" />  
793 - <element signature="e#1704#3337#0#PHP" expanded="false" />  
794 - <element signature="e#3343#3583#0#PHP" expanded="false" />  
795 - <element signature="e#3588#3836#0#PHP" expanded="false" />  
796 - <element signature="e#3842#4189#0#PHP" expanded="false" />  
797 - <element signature="e#4194#4640#0#PHP" expanded="false" />  
798 - <element signature="e#4646#4906#0#PHP" expanded="false" />  
799 - <element signature="e#4911#5112#0#PHP" expanded="false" />  
800 - <element signature="e#5118#5380#0#PHP" expanded="false" />  
801 - <element signature="e#5385#5590#0#PHP" expanded="false" />  
802 - <element signature="e#5596#6038#0#PHP" expanded="false" />  
803 - <element signature="e#6043#7271#0#PHP" expanded="false" />  
804 - <element signature="e#7294#7839#0#PHP" expanded="false" />  
805 - <element signature="e#7845#8126#0#PHP" expanded="false" />  
806 - <element signature="e#8131#8523#0#PHP" expanded="false" />  
807 - <element signature="e#8529#9078#0#PHP" expanded="false" />  
808 - <element signature="e#9083#10282#0#PHP" expanded="false" />  
809 - <element signature="e#10288#10745#0#PHP" expanded="false" />  
810 - <element signature="e#10750#12013#0#PHP" expanded="false" />  
811 - <element signature="e#12036#12388#0#PHP" expanded="false" />  
812 - <element signature="e#12394#13078#0#PHP" expanded="false" />  
813 - <element signature="e#13083#14342#0#PHP" expanded="false" />  
814 - <element signature="e#14348#14810#0#PHP" expanded="false" />  
815 - <element signature="e#14815#17020#0#PHP" expanded="false" />  
816 - <element signature="e#17026#17635#0#PHP" expanded="false" />  
817 - <element signature="e#17640#18973#0#PHP" expanded="false" />  
818 - <element signature="e#18979#19336#0#PHP" expanded="false" />  
819 - <element signature="e#19341#20222#0#PHP" expanded="false" />  
820 - <element signature="e#20228#20580#0#PHP" expanded="false" />  
821 - <element signature="e#20585#21662#0#PHP" expanded="false" />  
822 - <element signature="e#21668#22023#0#PHP" expanded="false" />  
823 - <element signature="e#22028#23108#0#PHP" expanded="false" />  
824 - <element signature="e#23114#23538#0#PHP" expanded="false" />  
825 - <element signature="e#23543#24154#0#PHP" expanded="false" />  
826 - <element signature="e#26229#27093#0#PHP" expanded="false" />  
827 - <element signature="e#27120#27520#0#PHP" expanded="false" />  
828 - <element signature="e#27544#28117#0#PHP" expanded="false" />  
829 - <element signature="e#28140#28950#0#PHP" expanded="false" /> 684 + <element signature="e#3894#4897#0#PHP" expanded="false" />
830 </folding> 685 </folding>
831 </state> 686 </state>
832 </provider> 687 </provider>
833 </entry> 688 </entry>
834 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 689 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
835 <provider selected="true" editor-type-id="text-editor"> 690 <provider selected="true" editor-type-id="text-editor">
836 - <state relative-caret-position="257">  
837 - <caret line="319" column="54" lean-forward="true" selection-start-line="319" selection-start-column="54" selection-end-line="319" selection-end-column="54" /> 691 + <state relative-caret-position="525">
  692 + <caret line="307" column="7" lean-forward="false" selection-start-line="307" selection-start-column="7" selection-end-line="307" selection-end-column="7" />
838 <folding> 693 <folding>
839 <element signature="e#411#604#0#PHP" expanded="false" /> 694 <element signature="e#411#604#0#PHP" expanded="false" />
840 <element signature="e#609#825#0#PHP" expanded="false" /> 695 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -854,6 +709,7 @@ @@ -854,6 +709,7 @@
854 <element signature="e#7331#7740#0#PHP" expanded="false" /> 709 <element signature="e#7331#7740#0#PHP" expanded="false" />
855 <element signature="e#7746#8131#0#PHP" expanded="false" /> 710 <element signature="e#7746#8131#0#PHP" expanded="false" />
856 <element signature="e#8136#8807#0#PHP" expanded="false" /> 711 <element signature="e#8136#8807#0#PHP" expanded="false" />
  712 + <element signature="e#8813#9259#0#PHP" expanded="false" />
857 <element signature="e#9264#10115#0#PHP" expanded="false" /> 713 <element signature="e#9264#10115#0#PHP" expanded="false" />
858 <element signature="e#10121#10391#0#PHP" expanded="false" /> 714 <element signature="e#10121#10391#0#PHP" expanded="false" />
859 <element signature="e#10396#10872#0#PHP" expanded="false" /> 715 <element signature="e#10396#10872#0#PHP" expanded="false" />
@@ -863,5 +719,247 @@ @@ -863,5 +719,247 @@
863 </state> 719 </state>
864 </provider> 720 </provider>
865 </entry> 721 </entry>
  722 + <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
  723 + <provider selected="true" editor-type-id="text-editor">
  724 + <state relative-caret-position="-2045">
  725 + <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
  726 + <folding />
  727 + </state>
  728 + </provider>
  729 + </entry>
  730 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
  731 + <provider selected="true" editor-type-id="text-editor">
  732 + <state relative-caret-position="268">
  733 + <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
  734 + <folding />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
  739 + <provider selected="true" editor-type-id="images">
  740 + <state />
  741 + </provider>
  742 + </entry>
  743 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  744 + <provider selected="true" editor-type-id="text-editor">
  745 + <state relative-caret-position="335">
  746 + <caret line="488" column="120" lean-forward="true" selection-start-line="488" selection-start-column="16" selection-end-line="488" selection-end-column="120" />
  747 + <folding>
  748 + <element signature="e#131#169#0#PHP" expanded="true" />
  749 + <element signature="e#342#596#0#PHP" expanded="false" />
  750 + <element signature="e#601#886#0#PHP" expanded="false" />
  751 + <element signature="e#892#1227#0#PHP" expanded="false" />
  752 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  753 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  754 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  755 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  756 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  757 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  758 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  759 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  760 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  761 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  762 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  763 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  764 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  765 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  766 + <element signature="e#5850#6416#0#PHP" expanded="false" />
  767 + <element signature="e#6422#6765#0#PHP" expanded="false" />
  768 + <element signature="e#6770#7251#0#PHP" expanded="false" />
  769 + <element signature="e#7257#7548#0#PHP" expanded="false" />
  770 + <element signature="e#7553#7904#0#PHP" expanded="false" />
  771 + <element signature="e#7910#8263#0#PHP" expanded="false" />
  772 + <element signature="e#8268#8673#0#PHP" expanded="false" />
  773 + <element signature="e#8679#9062#0#PHP" expanded="false" />
  774 + <element signature="e#9067#9734#0#PHP" expanded="false" />
  775 + <element signature="e#9740#10184#0#PHP" expanded="false" />
  776 + <element signature="e#10189#11036#0#PHP" expanded="false" />
  777 + <element signature="e#11042#11310#0#PHP" expanded="false" />
  778 + <element signature="e#11315#11787#0#PHP" expanded="false" />
  779 + <element signature="e#11793#12099#0#PHP" expanded="false" />
  780 + <element signature="e#13768#14087#0#PHP" expanded="false" />
  781 + </folding>
  782 + </state>
  783 + </provider>
  784 + </entry>
  785 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  786 + <provider selected="true" editor-type-id="text-editor">
  787 + <state relative-caret-position="59">
  788 + <caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />
  789 + <folding>
  790 + <element signature="e#131#169#0#PHP" expanded="true" />
  791 + <element signature="e#366#715#0#PHP" expanded="false" />
  792 + <element signature="e#720#1485#0#PHP" expanded="false" />
  793 + <element signature="e#1491#1720#0#PHP" expanded="false" />
  794 + <element signature="e#1725#3358#0#PHP" expanded="false" />
  795 + <element signature="e#3364#3604#0#PHP" expanded="false" />
  796 + <element signature="e#3609#3857#0#PHP" expanded="false" />
  797 + <element signature="e#3863#4210#0#PHP" expanded="false" />
  798 + <element signature="e#4215#4661#0#PHP" expanded="false" />
  799 + <element signature="e#4667#4927#0#PHP" expanded="false" />
  800 + <element signature="e#4932#5133#0#PHP" expanded="false" />
  801 + <element signature="e#5139#5401#0#PHP" expanded="false" />
  802 + <element signature="e#5406#5611#0#PHP" expanded="false" />
  803 + <element signature="e#5617#6059#0#PHP" expanded="false" />
  804 + <element signature="e#6064#7292#0#PHP" expanded="false" />
  805 + <element signature="e#7315#7860#0#PHP" expanded="false" />
  806 + <element signature="e#7866#8147#0#PHP" expanded="false" />
  807 + <element signature="e#8152#8544#0#PHP" expanded="false" />
  808 + <element signature="e#8550#9099#0#PHP" expanded="false" />
  809 + <element signature="e#9104#10303#0#PHP" expanded="false" />
  810 + <element signature="e#10309#10766#0#PHP" expanded="false" />
  811 + <element signature="e#10771#12034#0#PHP" expanded="false" />
  812 + <element signature="e#12057#12409#0#PHP" expanded="false" />
  813 + <element signature="e#12415#13099#0#PHP" expanded="false" />
  814 + <element signature="e#13104#14363#0#PHP" expanded="false" />
  815 + <element signature="e#14369#14831#0#PHP" expanded="false" />
  816 + <element signature="e#14836#17041#0#PHP" expanded="false" />
  817 + <element signature="e#17047#17656#0#PHP" expanded="false" />
  818 + <element signature="e#17661#18994#0#PHP" expanded="false" />
  819 + <element signature="e#19000#19357#0#PHP" expanded="false" />
  820 + <element signature="e#19362#20243#0#PHP" expanded="false" />
  821 + <element signature="e#20249#20601#0#PHP" expanded="false" />
  822 + <element signature="e#20606#21683#0#PHP" expanded="false" />
  823 + <element signature="e#21689#22044#0#PHP" expanded="false" />
  824 + <element signature="e#22049#23129#0#PHP" expanded="false" />
  825 + <element signature="e#23135#23559#0#PHP" expanded="false" />
  826 + <element signature="e#23564#24175#0#PHP" expanded="false" />
  827 + <element signature="e#25069#25388#0#PHP" expanded="false" />
  828 + <element signature="e#25394#25802#0#PHP" expanded="false" />
  829 + <element signature="e#25808#26567#0#PHP" expanded="false" />
  830 + <element signature="e#26587#27451#0#PHP" expanded="false" />
  831 + <element signature="e#27478#27878#0#PHP" expanded="false" />
  832 + <element signature="e#27902#28475#0#PHP" expanded="false" />
  833 + <element signature="e#28498#29308#0#PHP" expanded="false" />
  834 + </folding>
  835 + </state>
  836 + </provider>
  837 + </entry>
  838 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
  839 + <provider selected="true" editor-type-id="text-editor">
  840 + <state relative-caret-position="1114">
  841 + <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
  842 + <folding />
  843 + </state>
  844 + </provider>
  845 + </entry>
  846 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  847 + <provider selected="true" editor-type-id="text-editor">
  848 + <state relative-caret-position="28">
  849 + <caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
  850 + <folding>
  851 + <element signature="e#265#1638#0#PHP" expanded="false" />
  852 + <element signature="e#2662#3553#0#PHP" expanded="false" />
  853 + </folding>
  854 + </state>
  855 + </provider>
  856 + </entry>
  857 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
  858 + <provider selected="true" editor-type-id="text-editor">
  859 + <state relative-caret-position="703">
  860 + <caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
  861 + <folding>
  862 + <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
  863 + </folding>
  864 + </state>
  865 + </provider>
  866 + </entry>
  867 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
  868 + <provider selected="true" editor-type-id="text-editor">
  869 + <state relative-caret-position="-450">
  870 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  871 + <folding />
  872 + </state>
  873 + </provider>
  874 + </entry>
  875 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
  876 + <provider selected="true" editor-type-id="text-editor">
  877 + <state relative-caret-position="125">
  878 + <caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="44" selection-end-column="21" />
  879 + <folding />
  880 + </state>
  881 + </provider>
  882 + </entry>
  883 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
  884 + <provider selected="true" editor-type-id="text-editor">
  885 + <state relative-caret-position="225">
  886 + <caret line="36" column="20" lean-forward="true" selection-start-line="36" selection-start-column="20" selection-end-line="43" selection-end-column="25" />
  887 + <folding />
  888 + </state>
  889 + </provider>
  890 + </entry>
  891 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state relative-caret-position="750">
  894 + <caret line="30" column="20" lean-forward="true" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
  895 + <folding />
  896 + </state>
  897 + </provider>
  898 + </entry>
  899 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html">
  900 + <provider selected="true" editor-type-id="text-editor">
  901 + <state relative-caret-position="178">
  902 + <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
  903 + <folding>
  904 + <element signature="n#style#0;n#div#0;n#td#0;n#tr#1;n#table#0;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
  905 + </folding>
  906 + </state>
  907 + </provider>
  908 + </entry>
  909 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
  910 + <provider selected="true" editor-type-id="text-editor">
  911 + <state relative-caret-position="100">
  912 + <caret line="31" column="12" lean-forward="false" selection-start-line="31" selection-start-column="12" selection-end-line="51" selection-end-column="17" />
  913 + <folding />
  914 + </state>
  915 + </provider>
  916 + </entry>
  917 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html">
  918 + <provider selected="true" editor-type-id="text-editor">
  919 + <state relative-caret-position="78">
  920 + <caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
  921 + <folding />
  922 + </state>
  923 + </provider>
  924 + </entry>
  925 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SeverController.php">
  926 + <provider selected="true" editor-type-id="text-editor">
  927 + <state relative-caret-position="603">
  928 + <caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
  929 + <folding>
  930 + <element signature="e#1001#1862#0#PHP" expanded="false" />
  931 + <element signature="e#1877#3304#0#PHP" expanded="false" />
  932 + <element signature="e#3319#3787#0#PHP" expanded="false" />
  933 + </folding>
  934 + </state>
  935 + </provider>
  936 + </entry>
  937 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  938 + <provider selected="true" editor-type-id="text-editor">
  939 + <state relative-caret-position="353">
  940 + <caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
  941 + <folding>
  942 + <element signature="e#896#1112#0#PHP" expanded="false" />
  943 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  944 + <element signature="e#2126#2608#0#PHP" expanded="false" />
  945 + <element signature="e#2613#3118#0#PHP" expanded="false" />
  946 + <element signature="e#3124#3625#0#PHP" expanded="false" />
  947 + <element signature="e#3630#4459#0#PHP" expanded="false" />
  948 + <element signature="e#4465#4778#0#PHP" expanded="false" />
  949 + <element signature="e#4783#5158#0#PHP" expanded="false" />
  950 + <element signature="e#5164#5521#0#PHP" expanded="false" />
  951 + <element signature="e#5526#5934#0#PHP" expanded="false" />
  952 + <element signature="e#5940#6322#0#PHP" expanded="false" />
  953 + <element signature="e#6327#6997#0#PHP" expanded="false" />
  954 + <element signature="e#7003#7446#0#PHP" expanded="false" />
  955 + <element signature="e#7451#8301#0#PHP" expanded="false" />
  956 + <element signature="e#8307#8574#0#PHP" expanded="false" />
  957 + <element signature="e#8579#9054#0#PHP" expanded="false" />
  958 + <element signature="e#9060#9560#0#PHP" expanded="false" />
  959 + <element signature="e#9565#10354#0#PHP" expanded="false" />
  960 + </folding>
  961 + </state>
  962 + </provider>
  963 + </entry>
866 </component> 964 </component>
867 </project> 965 </project>
@@ -70,6 +70,32 @@ class HomeController extends RestBaseController @@ -70,6 +70,32 @@ class HomeController extends RestBaseController
70 } 70 }
71 71
72 /** 72 /**
  73 + * @title 家政服务列表
  74 + * @description
  75 + * @author GuoSheng
  76 + * @url /index/Home/sever
  77 + * @method GET
  78 + *
  79 + * @return id:ID
  80 + * @return sever_name:服务名称
  81 + * @return thumbnail:缩略图
  82 + *
  83 + */
  84 + public function sever(){
  85 + $where['delete_time'] = ['eq',0];
  86 + $data = Db::name('service')
  87 + ->where($where)
  88 + ->field('id,sever_name,thumbnail')
  89 + ->order('id desc')
  90 + ->select();
  91 + foreach ($data as &$v){
  92 + $v['thumbnail'] = cmf_get_image_url($v['thumbnail']);
  93 + }
  94 + $this->success('SUCCESS',$data);
  95 + }
  96 +
  97 +
  98 + /**
73 * @title 家政公司详情 99 * @title 家政公司详情
74 * @description 家政公司详情 100 * @description 家政公司详情
75 * @author GuoSheng 101 * @author GuoSheng
@@ -14,6 +14,7 @@ use think\Cache; @@ -14,6 +14,7 @@ use think\Cache;
14 use think\cache\driver\Redis; 14 use think\cache\driver\Redis;
15 use think\Validate; 15 use think\Validate;
16 use think\Db; 16 use think\Db;
  17 +use cmf\lib\Storage;
17 18
18 /** 19 /**
19 * @title 个人中心 20 * @title 个人中心
@@ -806,6 +807,21 @@ class UserController extends RestBaseController @@ -806,6 +807,21 @@ class UserController extends RestBaseController
806 }else{ 807 }else{
807 $code = "qrcode/code_$user_id.jpg"; 808 $code = "qrcode/code_$user_id.jpg";
808 } 809 }
  810 + $this->success('SUCCESS',$code);
  811 + }
  812 +
  813 + //判断当前操作系统
  814 + public function getOperateSys(){
  815 + $os_name = php_uname('s');
  816 + //判断
  817 + if(strpos($os_name,"Linux")!==false){
  818 + $os_str="Linux";
  819 + }else if(strpos($os_name,"Windows")!==false){
  820 + $os_str="Windows";
  821 + }else{
  822 + $os_str='';
  823 + }
  824 + return $os_str;
809 } 825 }
810 826
811 public function getusercode($user_id,$url){ 827 public function getusercode($user_id,$url){
@@ -824,7 +840,6 @@ class UserController extends RestBaseController @@ -824,7 +840,6 @@ class UserController extends RestBaseController
824 $url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token; 840 $url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token;
825 $post['path'] = $path; 841 $post['path'] = $path;
826 $post['width'] = 280; 842 $post['width'] = 280;
827 - $post['is_hyaline'] = true;  
828 $result = $this->curl($url, json_encode($post)); 843 $result = $this->curl($url, json_encode($post));
829 $array = json_decode($result, true); 844 $array = json_decode($result, true);
830 if($array['errmsg']) { 845 if($array['errmsg']) {
@@ -834,7 +849,7 @@ class UserController extends RestBaseController @@ -834,7 +849,7 @@ class UserController extends RestBaseController
834 if (!file_exists(ROOT_PATH . 'public' . DS . 'upload/qrcode/')) { 849 if (!file_exists(ROOT_PATH . 'public' . DS . 'upload/qrcode/')) {
835 mkdir(ROOT_PATH . 'public' . DS . 'upload/qrcode/', 0777, true); 850 mkdir(ROOT_PATH . 'public' . DS . 'upload/qrcode/', 0777, true);
836 } 851 }
837 - $filename = "code_".$user_id."_$job_id.jpg"; 852 + $filename = "code_".$user_id.".jpg";
838 $furl = ROOT_PATH . 'public' . DS . 'upload/qrcode/'.$filename; 853 $furl = ROOT_PATH . 'public' . DS . 'upload/qrcode/'.$filename;
839 file_put_contents($furl, $result); 854 file_put_contents($furl, $result);
840 return "qrcode/".$filename; 855 return "qrcode/".$filename;
@@ -48,10 +48,12 @@ class SeverController extends AdminBaseController @@ -48,10 +48,12 @@ class SeverController extends AdminBaseController
48 $validate = new Validate([ 48 $validate = new Validate([
49 'sever_name'=>'require', 49 'sever_name'=>'require',
50 'home_id'=>'require', 50 'home_id'=>'require',
  51 + 'thumbnail'=>'require',
51 'price'=>'require', 52 'price'=>'require',
52 ]); 53 ]);
53 $validate->message([ 54 $validate->message([
54 'sever_name'=>'服务类目名称不能为空', 55 'sever_name'=>'服务类目名称不能为空',
  56 + 'thumbnail'=>'缩略图不能为空',
55 'home_id'=>'所属公司不能为空', 57 'home_id'=>'所属公司不能为空',
56 'price'=>'所需积分不能为空', 58 'price'=>'所需积分不能为空',
57 ]); 59 ]);
@@ -75,11 +77,13 @@ class SeverController extends AdminBaseController @@ -75,11 +77,13 @@ class SeverController extends AdminBaseController
75 $param=$this->request->param(); 77 $param=$this->request->param();
76 $validate = new Validate([ 78 $validate = new Validate([
77 'sever_name'=>'require', 79 'sever_name'=>'require',
  80 + 'thumbnail'=>'require',
78 'home_id'=>'require', 81 'home_id'=>'require',
79 'price'=>'require', 82 'price'=>'require',
80 ]); 83 ]);
81 $validate->message([ 84 $validate->message([
82 'sever_name'=>'服务类目名称不能为空', 85 'sever_name'=>'服务类目名称不能为空',
  86 + 'thumbnail'=>'缩略图不能为空',
83 'home_id'=>'所属公司不能为空', 87 'home_id'=>'所属公司不能为空',
84 'price'=>'所需积分不能为空', 88 'price'=>'所需积分不能为空',
85 ]); 89 ]);
@@ -55,10 +55,8 @@ class ShoporderController extends AdminBaseController @@ -55,10 +55,8 @@ class ShoporderController extends AdminBaseController
55 $id = $this->request->param('id'); 55 $id = $this->request->param('id');
56 if($this->request->isPost()){ 56 if($this->request->isPost()){
57 $param = $this->request->param(); 57 $param = $this->request->param();
58 - if($param['status'] == 2){  
59 - if(empty($param['express_num'])){  
60 - $this->error('请填写快递单号');  
61 - } 58 + if($param['status'] == 2 && empty($param['express_num'])){
  59 + $this->error('请填写快递单号');
62 } 60 }
63 if(!empty($param['express_num'])){ 61 if(!empty($param['express_num'])){
64 if(empty($param['status'] == 1)){ 62 if(empty($param['status'] == 1)){
@@ -88,7 +86,7 @@ class ShoporderController extends AdminBaseController @@ -88,7 +86,7 @@ class ShoporderController extends AdminBaseController
88 ->field('a.*,r.goods_name,r.price,r.freight,u.user_nickname') 86 ->field('a.*,r.goods_name,r.price,r.freight,u.user_nickname')
89 ->where('a.id',$id) 87 ->where('a.id',$id)
90 ->find(); 88 ->find();
91 - $address = Db::name('shoprecycle')->where('id',$data['recycle_id'])->find(); 89 + $address = Db::name('shoprecycle')->where('id',$data['shoprecycle_id'])->find();
92 $data['name'] = $address['name']; 90 $data['name'] = $address['name'];
93 $data['phone'] = $address['phone']; 91 $data['phone'] = $address['phone'];
94 $data['address'] = $address['address']; 92 $data['address'] = $address['address'];
@@ -28,6 +28,20 @@ @@ -28,6 +28,20 @@
28 </td> 28 </td>
29 </tr> 29 </tr>
30 <tr> 30 <tr>
  31 + <th>缩略图</th>
  32 + <td>
  33 + <div style="text-align: center;">
  34 + <input type="hidden" name="thumbnail" id="thumbnail" value="">
  35 + <a href="javascript:uploadOneImage('图片上传','#thumbnail');">
  36 + <img src="__TMPL__/public/assets/images/default-thumbnail.png"
  37 + id="thumbnail-preview"
  38 + width="135" style="cursor: pointer"/>
  39 + </a>
  40 + <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
  41 + </div>
  42 + </td>
  43 + </tr>
  44 + <tr>
31 <th width="100">所属家政公司</th> 45 <th width="100">所属家政公司</th>
32 <td> 46 <td>
33 <input class="form-control" type="text" style="width:400px;" 47 <input class="form-control" type="text" style="width:400px;"
@@ -29,6 +29,27 @@ @@ -29,6 +29,27 @@
29 </td> 29 </td>
30 </tr> 30 </tr>
31 <tr> 31 <tr>
  32 + <td>缩略图</td>
  33 + <td>
  34 + <input type="hidden" name="id" value="{$data.id}">
  35 + <input type="hidden" name="thumbnail" id="thumbnail"
  36 + value="{$data.thumbnail|default=''}">
  37 + <a href="javascript:uploadOneImage('image upload','#thumbnail');">
  38 + <if condition="empty($data['thumbnail'])">
  39 + <img src="__TMPL__/public/assets/images/default-thumbnail.png"
  40 + id="thumbnail-preview"
  41 + width="135" style="cursor: pointer"/>
  42 + <else/>
  43 + <img src="{:cmf_get_image_url($data.thumbnail)}"
  44 + id="thumbnail-preview"
  45 + width="135" style="cursor: pointer"/>
  46 + </if>
  47 + </a>
  48 + <input type="button" class="btn btn-sm btn-cancel-thumbnail"
  49 + value="取消图片">
  50 + </td>
  51 + </tr>
  52 + <tr>
32 <th width="100">所属家政公司</th> 53 <th width="100">所属家政公司</th>
33 <td> 54 <td>
34 <input class="form-control" type="text" style="width:400px;" 55 <input class="form-control" type="text" style="width:400px;"
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <tr> 23 <tr>
24 <th>ID</th> 24 <th>ID</th>
25 <th>服务类型名称</th> 25 <th>服务类型名称</th>
  26 + <th>缩略图</th>
26 <th>所属公司</th> 27 <th>所属公司</th>
27 <th>所需积分</th> 28 <th>所需积分</th>
28 <th>操作</th> 29 <th>操作</th>
@@ -33,6 +34,14 @@ @@ -33,6 +34,14 @@
33 <tr> 34 <tr>
34 <td>{$vo.id}</td> 35 <td>{$vo.id}</td>
35 <td>{$vo.sever_name}</td> 36 <td>{$vo.sever_name}</td>
  37 + <td>
  38 + <notempty name="$vo.thumbnail">
  39 + <img id="photo2-{$key}-preview"
  40 + src="{:cmf_get_image_preview_url($vo['thumbnail'])}"
  41 + style="height:36px;width: 36px;"
  42 + onclick="parent.imagePreviewDialog(this.src);">
  43 + </notempty>
  44 + </td>
36 <td>{$vo.home_name}</td> 45 <td>{$vo.home_name}</td>
37 <td>{$vo.price}</td> 46 <td>{$vo.price}</td>
38 <td> 47 <td>
@@ -94,12 +94,12 @@ @@ -94,12 +94,12 @@
94 <label><input type="radio" class="status" name="status" value="1" id="status" 94 <label><input type="radio" class="status" name="status" value="1" id="status"
95 <eq name="$data.status" value="1">checked</eq> 95 <eq name="$data.status" value="1">checked</eq>
96 />未发货</label> 96 />未发货</label>
97 - <label><input type="radio" class="status" name="status" value="0" id="status" 97 + <label><input type="radio" class="status" name="status" value="2" id="status"
98 <eq name="$data.status" value="2">checked</eq> 98 <eq name="$data.status" value="2">checked</eq>
99 />已发货 </label> 99 />已发货 </label>
100 </td> 100 </td>
101 </tr> 101 </tr>
102 - <tr> 102 + <tr class="status" style="<if condition='$data.status neq 1'>display: none;</if>">
103 <th width="100">快递单号<span class="form-required">*</span></th> 103 <th width="100">快递单号<span class="form-required">*</span></th>
104 <td> 104 <td>
105 <input class="form-control" type="text" name="express_num" 105 <input class="form-control" type="text" name="express_num"
@@ -136,6 +136,22 @@ @@ -136,6 +136,22 @@
136 <script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script> 136 <script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
137 <script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script> 137 <script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
138 <script type="text/javascript"> 138 <script type="text/javascript">
  139 +
  140 + status();
  141 + $('.status').click(function () {
  142 + status();
  143 + });
  144 +
  145 + function status() {
  146 + var status = $('.status:radio:checked').val();
  147 + if (status == '2') {
  148 + $('.status').show();
  149 + } else {
  150 + $('.status').hide();
  151 + }
  152 + }
  153 +
  154 +
139 $(function () { 155 $(function () {
140 156
141 editorcontent = new baidu.editor.ui.Editor(); 157 editorcontent = new baidu.editor.ui.Editor();
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <td>已取消</td> 56 <td>已取消</td>
57 </if> 57 </if>
58 <td> 58 <td>
59 - <a href='{:url("shoporder/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>| 59 + <a href='{:url("shoporder/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>
60 </td> 60 </td>
61 </tr> 61 </tr>
62 </foreach> 62 </foreach>