郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 2eb9fbdba833c4457eece9acc19ca9750feba1b3 1 个父辈 7c0a3d9e
1 个管道 的构建 通过 耗费 3 秒

后台家政订单管理

内嵌 并排对比
正在显示 4 个修改的文件 包含 346 行增加 和 105 行删除
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 6 <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" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
8 - <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" /> 7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
9 </list> 9 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -27,41 +27,38 @@ @@ -27,41 +27,38 @@
27 </component> 27 </component>
28 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">  
31 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 30 + <file leaf-file-name="SubhomeController.php" pinned="false" current-in-tab="true">
  31 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
32 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="278">  
34 - <caret line="266" column="5" lean-forward="true" selection-start-line="266" selection-start-column="5" selection-end-line="266" selection-end-column="5" /> 33 + <state relative-caret-position="875">
  34 + <caret line="74" column="25" lean-forward="true" selection-start-line="74" selection-start-column="25" selection-end-line="74" selection-end-column="25" />
35 <folding> 35 <folding>
36 - <element signature="e#329#544#0#PHP" expanded="false" />  
37 - <element signature="e#549#890#0#PHP" expanded="false" />  
38 - <element signature="e#896#1112#0#PHP" expanded="false" />  
39 - <element signature="e#1117#1500#0#PHP" expanded="false" />  
40 - <element signature="e#1506#1726#0#PHP" expanded="false" />  
41 - <element signature="e#1731#2119#0#PHP" expanded="false" />  
42 - <element signature="e#2126#2643#0#PHP" expanded="false" />  
43 - <element signature="e#2648#3163#0#PHP" expanded="false" />  
44 - <element signature="e#3169#3697#0#PHP" expanded="false" />  
45 - <element signature="e#3702#4540#0#PHP" expanded="false" />  
46 - <element signature="e#4546#4859#0#PHP" expanded="false" />  
47 - <element signature="e#4864#5239#0#PHP" expanded="false" />  
48 - <element signature="e#5245#5602#0#PHP" expanded="false" />  
49 - <element signature="e#5607#6015#0#PHP" expanded="false" />  
50 - <element signature="e#6021#6403#0#PHP" expanded="false" />  
51 - <element signature="e#6408#7078#0#PHP" expanded="false" />  
52 - <element signature="e#7084#7527#0#PHP" expanded="false" />  
53 - <element signature="e#7532#8382#0#PHP" expanded="false" />  
54 - <element signature="e#8388#8655#0#PHP" expanded="false" />  
55 - <element signature="e#8660#9135#0#PHP" expanded="false" />  
56 - <element signature="e#9141#9641#0#PHP" expanded="false" />  
57 - <element signature="e#9646#10659#0#PHP" expanded="false" />  
58 - <element signature="e#10665#11032#0#PHP" expanded="false" />  
59 - <element signature="e#11037#11477#0#PHP" expanded="false" /> 36 + <element signature="e#243#1652#0#PHP" expanded="false" />
60 </folding> 37 </folding>
61 </state> 38 </state>
62 </provider> 39 </provider>
63 </entry> 40 </entry>
64 </file> 41 </file>
  42 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
  43 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
  44 + <provider selected="true" editor-type-id="text-editor">
  45 + <state relative-caret-position="-6">
  46 + <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
  47 + <folding />
  48 + </state>
  49 + </provider>
  50 + </entry>
  51 + </file>
  52 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  53 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
  54 + <provider selected="true" editor-type-id="text-editor">
  55 + <state relative-caret-position="2228">
  56 + <caret line="114" column="63" lean-forward="false" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
  57 + <folding />
  58 + </state>
  59 + </provider>
  60 + </entry>
  61 + </file>
65 </leaf> 62 </leaf>
66 </component> 63 </component>
67 <component name="FileTemplateManagerImpl"> 64 <component name="FileTemplateManagerImpl">
@@ -82,7 +79,6 @@ @@ -82,7 +79,6 @@
82 <component name="IdeDocumentHistory"> 79 <component name="IdeDocumentHistory">
83 <option name="CHANGED_PATHS"> 80 <option name="CHANGED_PATHS">
84 <list> 81 <list>
85 - <option value="$PROJECT_DIR$/app/extra/wechat.php" />  
86 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" /> 82 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
87 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" /> 83 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
88 <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" /> 84 <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
@@ -117,8 +113,6 @@ @@ -117,8 +113,6 @@
117 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 113 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
118 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 114 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
119 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" /> 115 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
120 - <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />  
121 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />  
122 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" /> 116 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
123 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 117 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
124 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 118 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
@@ -133,6 +127,9 @@ @@ -133,6 +127,9 @@
133 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 127 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
134 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 128 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
135 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 129 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  130 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
  131 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
  132 + <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
136 </list> 133 </list>
137 </option> 134 </option>
138 </component> 135 </component>
@@ -151,8 +148,7 @@ @@ -151,8 +148,7 @@
151 </component> 148 </component>
152 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 149 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
153 <component name="ProjectFrameBounds"> 150 <component name="ProjectFrameBounds">
154 - <option name="x" value="404" />  
155 - <option name="y" value="87" /> 151 + <option name="x" value="393" />
156 <option name="width" value="1582" /> 152 <option name="width" value="1582" />
157 <option name="height" value="965" /> 153 <option name="height" value="965" />
158 </component> 154 </component>
@@ -181,21 +177,65 @@ @@ -181,21 +177,65 @@
181 <path> 177 <path>
182 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 178 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
183 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 179 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
184 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 180 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
185 </path> 181 </path>
186 <path> 182 <path>
187 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 183 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
188 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 184 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
189 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
190 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 185 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  186 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
191 </path> 187 </path>
192 <path> 188 <path>
193 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 189 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
194 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 190 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
195 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
196 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 191 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  192 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
197 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 193 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
198 </path> 194 </path>
  195 + <path>
  196 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  197 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  198 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  199 + </path>
  200 + <path>
  201 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  202 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  204 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  205 + </path>
  206 + <path>
  207 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  208 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  209 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  210 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  212 + </path>
  213 + <path>
  214 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  215 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  216 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  217 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  220 + </path>
  221 + <path>
  222 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  223 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  224 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  225 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  226 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  227 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  228 + <item name="shoporder" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + </path>
  230 + <path>
  231 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  232 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  233 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  234 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + <item name="subhome" type="2a2b976b:PhpTreeStructureProvider$1" />
  238 + </path>
199 </expand> 239 </expand>
200 <select /> 240 <select />
201 </subPane> 241 </subPane>
@@ -295,18 +335,18 @@ @@ -295,18 +335,18 @@
295 <workItem from="1575246616478" duration="21722000" /> 335 <workItem from="1575246616478" duration="21722000" />
296 <workItem from="1575278769037" duration="7395000" /> 336 <workItem from="1575278769037" duration="7395000" />
297 <workItem from="1575332430854" duration="21245000" /> 337 <workItem from="1575332430854" duration="21245000" />
298 - <workItem from="1575359408189" duration="3289000" /> 338 + <workItem from="1575359408189" duration="6370000" />
299 </task> 339 </task>
300 <servers /> 340 <servers />
301 </component> 341 </component>
302 <component name="TimeTrackingManager"> 342 <component name="TimeTrackingManager">
303 - <option name="totallyTimeSpent" value="434992000" /> 343 + <option name="totallyTimeSpent" value="438073000" />
304 </component> 344 </component>
305 <component name="ToolWindowManager"> 345 <component name="ToolWindowManager">
306 - <frame x="404" y="87" width="1582" height="965" extended-state="0" /> 346 + <frame x="393" y="0" width="1582" height="965" extended-state="0" />
307 <editor active="true" /> 347 <editor active="true" />
308 <layout> 348 <layout>
309 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1977661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 349 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1977661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
310 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 350 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
311 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 351 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
312 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 352 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -357,13 +397,6 @@ @@ -357,13 +397,6 @@
357 <watches-manager /> 397 <watches-manager />
358 </component> 398 </component>
359 <component name="editorHistoryManager"> 399 <component name="editorHistoryManager">
360 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">  
361 - <provider selected="true" editor-type-id="text-editor">  
362 - <state relative-caret-position="361">  
363 - <caret line="69" column="61" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="61" />  
364 - </state>  
365 - </provider>  
366 - </entry>  
367 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php"> 400 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
368 <provider selected="true" editor-type-id="text-editor"> 401 <provider selected="true" editor-type-id="text-editor">
369 <state relative-caret-position="326"> 402 <state relative-caret-position="326">
@@ -431,6 +464,7 @@ @@ -431,6 +464,7 @@
431 <provider selected="true" editor-type-id="text-editor"> 464 <provider selected="true" editor-type-id="text-editor">
432 <state relative-caret-position="0"> 465 <state relative-caret-position="0">
433 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 466 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  467 + <folding />
434 </state> 468 </state>
435 </provider> 469 </provider>
436 </entry> 470 </entry>
@@ -459,6 +493,16 @@ @@ -459,6 +493,16 @@
459 <provider selected="true" editor-type-id="text-editor"> 493 <provider selected="true" editor-type-id="text-editor">
460 <state relative-caret-position="180"> 494 <state relative-caret-position="180">
461 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 495 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
  496 + <folding>
  497 + <element signature="e#264#877#0#PHP" expanded="false" />
  498 + <element signature="e#891#1678#0#PHP" expanded="false" />
  499 + <element signature="e#1692#2973#0#PHP" expanded="false" />
  500 + <element signature="e#2987#3712#0#PHP" expanded="false" />
  501 + <element signature="e#3731#4694#0#PHP" expanded="false" />
  502 + <element signature="e#4711#5355#0#PHP" expanded="false" />
  503 + <element signature="e#5372#6399#0#PHP" expanded="false" />
  504 + <element signature="e#6416#7236#0#PHP" expanded="false" />
  505 + </folding>
462 </state> 506 </state>
463 </provider> 507 </provider>
464 </entry> 508 </entry>
@@ -515,20 +559,7 @@ @@ -515,20 +559,7 @@
515 <provider selected="true" editor-type-id="text-editor"> 559 <provider selected="true" editor-type-id="text-editor">
516 <state relative-caret-position="0"> 560 <state relative-caret-position="0">
517 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 561 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
518 - </state>  
519 - </provider>  
520 - </entry>  
521 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">  
522 - <provider selected="true" editor-type-id="text-editor">  
523 - <state relative-caret-position="100">  
524 - <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />  
525 - </state>  
526 - </provider>  
527 - </entry>  
528 - <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">  
529 - <provider selected="true" editor-type-id="text-editor">  
530 - <state relative-caret-position="332">  
531 - <caret line="37" column="49" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="49" /> 562 + <folding />
532 </state> 563 </state>
533 </provider> 564 </provider>
534 </entry> 565 </entry>
@@ -545,6 +576,7 @@ @@ -545,6 +576,7 @@
545 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
546 <state relative-caret-position="200"> 577 <state relative-caret-position="200">
547 <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" /> 578 <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
  579 + <folding />
548 </state> 580 </state>
549 </provider> 581 </provider>
550 </entry> 582 </entry>
@@ -708,15 +740,10 @@ @@ -708,15 +740,10 @@
708 <provider selected="true" editor-type-id="text-editor"> 740 <provider selected="true" editor-type-id="text-editor">
709 <state relative-caret-position="603"> 741 <state relative-caret-position="603">
710 <caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" /> 742 <caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
711 - </state>  
712 - </provider>  
713 - </entry>  
714 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
715 - <provider selected="true" editor-type-id="text-editor">  
716 - <state relative-caret-position="1200">  
717 - <caret line="142" column="7" lean-forward="true" selection-start-line="142" selection-start-column="7" selection-end-line="142" selection-end-column="7" />  
718 <folding> 743 <folding>
719 - <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" /> 744 + <element signature="e#1001#1862#0#PHP" expanded="false" />
  745 + <element signature="e#1877#3304#0#PHP" expanded="false" />
  746 + <element signature="e#3319#3787#0#PHP" expanded="false" />
720 </folding> 747 </folding>
721 </state> 748 </state>
722 </provider> 749 </provider>
@@ -831,8 +858,8 @@ @@ -831,8 +858,8 @@
831 </entry> 858 </entry>
832 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 859 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
833 <provider selected="true" editor-type-id="text-editor"> 860 <provider selected="true" editor-type-id="text-editor">
834 - <state relative-caret-position="278">  
835 - <caret line="266" column="5" lean-forward="true" selection-start-line="266" selection-start-column="5" selection-end-line="266" selection-end-column="5" /> 861 + <state relative-caret-position="578">
  862 + <caret line="385" column="5" lean-forward="true" selection-start-line="385" selection-start-column="5" selection-end-line="385" selection-end-column="5" />
836 <folding> 863 <folding>
837 <element signature="e#329#544#0#PHP" expanded="false" /> 864 <element signature="e#329#544#0#PHP" expanded="false" />
838 <element signature="e#549#890#0#PHP" expanded="false" /> 865 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -862,5 +889,41 @@ @@ -862,5 +889,41 @@
862 </state> 889 </state>
863 </provider> 890 </provider>
864 </entry> 891 </entry>
  892 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
  893 + <provider selected="true" editor-type-id="text-editor">
  894 + <state relative-caret-position="402">
  895 + <caret line="128" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="204" selection-end-column="0" />
  896 + <folding>
  897 + <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
  898 + </folding>
  899 + </state>
  900 + </provider>
  901 + </entry>
  902 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
  903 + <provider selected="true" editor-type-id="text-editor">
  904 + <state relative-caret-position="2228">
  905 + <caret line="114" column="63" lean-forward="false" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
  906 + <folding />
  907 + </state>
  908 + </provider>
  909 + </entry>
  910 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
  911 + <provider selected="true" editor-type-id="text-editor">
  912 + <state relative-caret-position="-6">
  913 + <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
  914 + <folding />
  915 + </state>
  916 + </provider>
  917 + </entry>
  918 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
  919 + <provider selected="true" editor-type-id="text-editor">
  920 + <state relative-caret-position="875">
  921 + <caret line="74" column="25" lean-forward="true" selection-start-line="74" selection-start-column="25" selection-end-line="74" selection-end-column="25" />
  922 + <folding>
  923 + <element signature="e#243#1652#0#PHP" expanded="false" />
  924 + </folding>
  925 + </state>
  926 + </provider>
  927 + </entry>
865 </component> 928 </component>
866 </project> 929 </project>
@@ -55,40 +55,25 @@ class SubhomeController extends AdminBaseController @@ -55,40 +55,25 @@ class SubhomeController 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 - }  
62 - }  
63 - if(!empty($param['express_num'])){  
64 - if(empty($param['status'] == 1)){  
65 - $this->error('请正确填写发货状态');  
66 - }  
67 - }  
68 - if($param['status'] == 2 && empty($param['express_num'])){  
69 - Db::name('shoporder')  
70 - ->where('id',$id)  
71 - ->update($param);  
72 - Db::name('shoporder')  
73 - ->where('id',$id)  
74 - ->update(['orderstatus'=>2]); 58 + $data = Db::name('subhome')
  59 + ->where('id',$id)
  60 + ->update($param);
  61 + if($data){
75 $this->success('更新成功!'); 62 $this->success('更新成功!');
76 }else{ 63 }else{
77 - Db::name('shoporder')  
78 - ->where('id',$id)  
79 - ->update($param);  
80 - $this->success('更新成功!'); 64 + $this->error('sql运行失败');
81 } 65 }
82 }else{ 66 }else{
83 $param = $this->request->param(); 67 $param = $this->request->param();
84 - $data = Db::name('shoporder') 68 + $data = Db::name('subhome')
85 ->alias('a') 69 ->alias('a')
86 - ->join('shopgoods r','a.shopgoods_id = r.id') 70 + ->join('home h','a.home_id = h.id')
  71 + ->join('service s','a.service_id = s.id')
87 ->join('user u','a.user_id = u.id') 72 ->join('user u','a.user_id = u.id')
88 - ->field('a.*,r.goods_name,r.price,r.freight,u.user_nickname') 73 + ->field('a.*,h.home_name,u.user_nickname,s.sever_name')
89 ->where('a.id',$id) 74 ->where('a.id',$id)
90 ->find(); 75 ->find();
91 - $address = Db::name('shoprecycle')->where('id',$data['recycle_id'])->find(); 76 + $address = Db::name('homeadress')->where('id',$data['homeaddress_id'])->find();
92 $data['name'] = $address['name']; 77 $data['name'] = $address['name'];
93 $data['phone'] = $address['phone']; 78 $data['phone'] = $address['phone'];
94 $data['address'] = $address['address']; 79 $data['address'] = $address['address'];
  1 +<include file="public@header"/>
  2 +</head>
  3 +<body>
  4 +<script type="text/html" id="photos-item-tpl">
  5 + <li id="saved-image{id}">
  6 + <input id="photo-{id}" type="hidden" name="images[]" value="{filepath}">
  7 + <img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"
  8 + onclick="imagePreviewDialog(this.src);">
  9 + <a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>
  10 + <a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>
  11 + </li>
  12 +</script>
  13 +<!--<script type="text/html" id="photos-item-tpl">-->
  14 +<!--<li id="saved-image{id}">-->
  15 +<!--<input id="photo-{id}" type="hidden" name="photo_urls[]" value="{filepath}">-->
  16 +<!--<input class="form-control" id="photo-{id}-name" type="text" name="photo_names[]" value="{name}"-->
  17 +<!--style="width: 200px;" title="图片名称">-->
  18 +<!--<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"-->
  19 +<!--onclick="imagePreviewDialog(this.src);">-->
  20 +<!--<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>-->
  21 +<!--<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>-->
  22 +<!--</li>-->
  23 +<!--</script>-->
  24 +<div class="wrap js-check-wrap">
  25 + <ul class="nav nav-tabs">
  26 + <li><a href="{:url('subhome/index')}">家政预约订单列表</a></li>
  27 + <li class="active"><a href="#">订单详情信息</a></li>
  28 + </ul>
  29 + <form action="{:url('subhome/edit')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
  30 + <table class="table table-bordered">
  31 + <tr>
  32 + <th width="100">订单ID</th>
  33 + <td>
  34 + {$data.id}
  35 + </td>
  36 + </tr>
  37 + <tr>
  38 + <th width="100">订单号</th>
  39 + <td>
  40 + {$data.num}
  41 + </td>
  42 + </tr>
  43 + <tr>
  44 + <th width="100">用户昵称</th>
  45 + <td>
  46 + {$data.user_nickname}
  47 + </td>
  48 + </tr>
  49 + <tr>
  50 + <th width="100">预约人姓名</th>
  51 + <td>
  52 + {$data.name}
  53 + </td>
  54 + </tr>
  55 + <tr>
  56 + <th width="100">预约人手机号码</th>
  57 + <td>
  58 + {$data.phone}
  59 + </td>
  60 + </tr>
  61 + <tr>
  62 + <th width="100">预约人地址</th>
  63 + <td>
  64 + {$data.address}
  65 + </td>
  66 + </tr>
  67 + <tr>
  68 + <th width="100">预约家政公司名称</th>
  69 + <td>
  70 + {$data.home_name}
  71 + </td>
  72 + </tr>
  73 + <tr>
  74 + <th width="100">预约服务类目名称</th>
  75 + <td>
  76 + {$data.sever_name}
  77 + </td>
  78 + </tr>
  79 + <tr>
  80 + <th width="100">预约时间</th>
  81 + <td>
  82 + {$data.sub_time}
  83 + </td>
  84 + </tr>
  85 + <tr>
  86 + <th width="100">订单状态</th>
  87 + <td>
  88 + <label><input type="radio" class="status" name="status" value="1" id="status"
  89 + <eq name="$data.status" value="1">checked</eq>
  90 + />已下单</label>
  91 + <label><input type="radio" class="status" name="status" value="2" id="status"
  92 + <eq name="$data.status" value="2">checked</eq>
  93 + />订单进行中 </label>
  94 + <label><input type="radio" class="status" name="status" value="3" id="status"
  95 + <eq name="$data.status" value="3">checked</eq>
  96 + />已完成 </label>
  97 + </td>
  98 + </tr>
  99 + <tr>
  100 + <th width="100">创建时间</th>
  101 + <td>
  102 + {:date('Y-m-d H:i:s',$data.create_time)}
  103 + </td>
  104 + </tr>
  105 + <tr>
  106 + <th width="100">留言备注<span class="form-required">*</span></th>
  107 + <td>
  108 + {:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}
  109 + </td>
  110 + </tr>
  111 + </table>
  112 + <div class="form-group">
  113 + <div class="col-sm-offset-2 col-sm-10">
  114 + <button type="submit" class="btn btn-primary js-ajax-submit">{:lang('SAVE')}</button>
  115 + <a class="btn btn-default" href="{:url('subhome/index',array('start_time'=>$start_time,'end_time'=>$end_time))}">{:lang('BACK')}</a>
  116 + </div>
  117 + </div>
  118 + </form>
  119 +</div>
  120 +<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
  121 +<script type="text/javascript">
  122 + //编辑器路径定义
  123 + var editorURL = GV.WEB_ROOT;
  124 +</script>
  125 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
  126 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
  127 +<script type="text/javascript">
  128 +
  129 + status();
  130 + $('.status').click(function () {
  131 + status();
  132 + });
  133 +
  134 + function status() {
  135 + var status = $('.status:radio:checked').val();
  136 + if (status == '2') {
  137 + $('.is_status').show();
  138 + } else {
  139 + $('.is_status').hide();
  140 + }
  141 + }
  142 +
  143 +
  144 + $(function () {
  145 +
  146 + editorcontent = new baidu.editor.ui.Editor();
  147 + editorcontent.render('content');
  148 + try {
  149 + editorcontent.sync();
  150 + } catch (err) {
  151 + }
  152 +
  153 + $('.btn-cancel-thumbnail').click(function () {
  154 + $('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  155 + $('#thumbnail').val('');
  156 + });
  157 +
  158 + $('.btn-cancel-thumbnail1').click(function () {
  159 + $('#thumbnail-preview1').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  160 + $('#thumbnail1').val('');
  161 + });
  162 +
  163 +
  164 + });
  165 +
  166 +
  167 + function rtype() {
  168 + var selectedCategoriesId = $('#js-categories-id-input').val();
  169 +
  170 + openIframeLayer("{:url('shoptype/select')}?ids=" + selectedCategoriesId, '请选择分类', {
  171 + area: ['80%', '80%'],
  172 + btn: ['确定', '取消'],
  173 + yes: function (index, layero) {
  174 + //do something
  175 + var iframeWin = window[layero.find('iframe')[0]['id']];
  176 + var selectedCategories = iframeWin.confirm();
  177 + if (selectedCategories.selectedCategoriesId.length == 0) {
  178 + layer.msg('请选择所属分类');
  179 + return;
  180 + }else if(selectedCategories.selectedCategoriesId.length >= 2){
  181 + layer.msg('只能选择一个分类');
  182 + return;
  183 + }
  184 + $('#js-categories-id-input').val(selectedCategories.selectedCategoriesId.join(','));
  185 + $('#js-categories-name-input').val(selectedCategories.selectedCategoriesName.join(','));
  186 + //console.log(layer.getFrameIndex(index));
  187 + layer.close(index); //如果设定了yes回调，需进行手工关闭
  188 + }
  189 + });
  190 + }
  191 +</script>
  192 +</body>
  193 +</html>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <th>预约的服务类目名称</th> 32 <th>预约的服务类目名称</th>
33 <th>预约时间</th> 33 <th>预约时间</th>
34 <th>订单状态</th> 34 <th>订单状态</th>
35 - <!--<th>操作</th>--> 35 + <th>操作</th>
36 </tr> 36 </tr>
37 </thead> 37 </thead>
38 <tbody> 38 <tbody>
@@ -53,9 +53,9 @@ @@ -53,9 +53,9 @@
53 <else /> 53 <else />
54 <td>已取消</td> 54 <td>已取消</td>
55 </if> 55 </if>
56 - <!--<td>-->  
57 - <!--<a href='{:url("subhome/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>-->  
58 - <!--</td>--> 56 + <td>
  57 + <a href='{:url("subhome/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>
  58 + </td>
59 </tr> 59 </tr>
60 </foreach> 60 </foreach>
61 </tbody> 61 </tbody>