郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 7c0a3d9e1787c9c681c4dde9408e1fb32f07447c 1 个父辈 84767325
1 个管道 的构建 通过 耗费 4 秒

家政预约订单修改

内嵌 并排对比
正在显示 4 个修改的文件 包含 177 行增加 和 208 行删除
@@ -2,7 +2,10 @@ @@ -2,7 +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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <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/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" />
6 </list> 9 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -24,46 +27,11 @@ @@ -24,46 +27,11 @@
24 </component> 27 </component>
25 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 - <file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="false">  
28 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
29 - <provider selected="true" editor-type-id="text-editor">  
30 - <state relative-caret-position="475">  
31 - <caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />  
32 - <folding>  
33 - <element signature="e#265#1638#0#PHP" expanded="false" />  
34 - <element signature="e#2662#3553#0#PHP" expanded="false" />  
35 - </folding>  
36 - </state>  
37 - </provider>  
38 - </entry>  
39 - </file>  
40 - <file leaf-file-name="index.html" pinned="false" current-in-tab="false">  
41 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">  
42 - <provider selected="true" editor-type-id="text-editor">  
43 - <state relative-caret-position="1450">  
44 - <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />  
45 - <folding />  
46 - </state>  
47 - </provider>  
48 - </entry>  
49 - </file>  
50 - <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">  
51 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
52 - <provider selected="true" editor-type-id="text-editor">  
53 - <state relative-caret-position="2300">  
54 - <caret line="92" column="20" lean-forward="false" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />  
55 - <folding>  
56 - <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />  
57 - </folding>  
58 - </state>  
59 - </provider>  
60 - </entry>  
61 - </file>  
62 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> 30 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 31 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
64 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="553">  
66 - <caret line="164" column="34" lean-forward="true" selection-start-line="164" selection-start-column="34" selection-end-line="164" selection-end-column="34" /> 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" />
67 <folding> 35 <folding>
68 <element signature="e#329#544#0#PHP" expanded="false" /> 36 <element signature="e#329#544#0#PHP" expanded="false" />
69 <element signature="e#549#890#0#PHP" expanded="false" /> 37 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -73,6 +41,8 @@ @@ -73,6 +41,8 @@
73 <element signature="e#1731#2119#0#PHP" expanded="false" /> 41 <element signature="e#1731#2119#0#PHP" expanded="false" />
74 <element signature="e#2126#2643#0#PHP" expanded="false" /> 42 <element signature="e#2126#2643#0#PHP" expanded="false" />
75 <element signature="e#2648#3163#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" />
76 <element signature="e#4546#4859#0#PHP" expanded="false" /> 46 <element signature="e#4546#4859#0#PHP" expanded="false" />
77 <element signature="e#4864#5239#0#PHP" expanded="false" /> 47 <element signature="e#4864#5239#0#PHP" expanded="false" />
78 <element signature="e#5245#5602#0#PHP" expanded="false" /> 48 <element signature="e#5245#5602#0#PHP" expanded="false" />
@@ -84,7 +54,9 @@ @@ -84,7 +54,9 @@
84 <element signature="e#8388#8655#0#PHP" expanded="false" /> 54 <element signature="e#8388#8655#0#PHP" expanded="false" />
85 <element signature="e#8660#9135#0#PHP" expanded="false" /> 55 <element signature="e#8660#9135#0#PHP" expanded="false" />
86 <element signature="e#9141#9641#0#PHP" expanded="false" /> 56 <element signature="e#9141#9641#0#PHP" expanded="false" />
87 - <element signature="e#9646#10435#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" />
88 </folding> 60 </folding>
89 </state> 61 </state>
90 </provider> 62 </provider>
@@ -154,12 +126,12 @@ @@ -154,12 +126,12 @@
154 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 126 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
155 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 127 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
156 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" /> 128 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
157 - <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
158 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" /> 129 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
159 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" /> 130 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
160 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" /> 131 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
161 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" /> 132 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
162 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 133 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
  134 + <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
163 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 135 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
164 </list> 136 </list>
165 </option> 137 </option>
@@ -179,8 +151,8 @@ @@ -179,8 +151,8 @@
179 </component> 151 </component>
180 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 152 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
181 <component name="ProjectFrameBounds"> 153 <component name="ProjectFrameBounds">
182 - <option name="x" value="342" />  
183 - <option name="y" value="48" /> 154 + <option name="x" value="404" />
  155 + <option name="y" value="87" />
184 <option name="width" value="1582" /> 156 <option name="width" value="1582" />
185 <option name="height" value="965" /> 157 <option name="height" value="965" />
186 </component> 158 </component>
@@ -224,50 +196,6 @@ @@ -224,50 +196,6 @@
224 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 196 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
225 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 197 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
226 </path> 198 </path>
227 - <path>  
228 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
229 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
230 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
231 - </path>  
232 - <path>  
233 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
234 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
235 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
236 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
237 - </path>  
238 - <path>  
239 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
240 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
241 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
242 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
243 - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
244 - </path>  
245 - <path>  
246 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
247 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
248 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
249 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
250 - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
251 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
252 - </path>  
253 - <path>  
254 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
255 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
256 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
257 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
258 - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
259 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
260 - <item name="sever" 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="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />  
270 - </path>  
271 </expand> 199 </expand>
272 <select /> 200 <select />
273 </subPane> 201 </subPane>
@@ -367,15 +295,15 @@ @@ -367,15 +295,15 @@
367 <workItem from="1575246616478" duration="21722000" /> 295 <workItem from="1575246616478" duration="21722000" />
368 <workItem from="1575278769037" duration="7395000" /> 296 <workItem from="1575278769037" duration="7395000" />
369 <workItem from="1575332430854" duration="21245000" /> 297 <workItem from="1575332430854" duration="21245000" />
370 - <workItem from="1575359408189" duration="480000" /> 298 + <workItem from="1575359408189" duration="3289000" />
371 </task> 299 </task>
372 <servers /> 300 <servers />
373 </component> 301 </component>
374 <component name="TimeTrackingManager"> 302 <component name="TimeTrackingManager">
375 - <option name="totallyTimeSpent" value="432183000" /> 303 + <option name="totallyTimeSpent" value="434992000" />
376 </component> 304 </component>
377 <component name="ToolWindowManager"> 305 <component name="ToolWindowManager">
378 - <frame x="342" y="48" width="1582" height="965" extended-state="0" /> 306 + <frame x="404" y="87" width="1582" height="965" extended-state="0" />
379 <editor active="true" /> 307 <editor active="true" />
380 <layout> 308 <layout>
381 <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" /> 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" />
@@ -640,32 +568,6 @@ @@ -640,32 +568,6 @@
640 <state /> 568 <state />
641 </provider> 569 </provider>
642 </entry> 570 </entry>
643 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
644 - <provider selected="true" editor-type-id="text-editor">  
645 - <state relative-caret-position="117">  
646 - <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />  
647 - <folding />  
648 - </state>  
649 - </provider>  
650 - </entry>  
651 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
652 - <provider selected="true" editor-type-id="text-editor">  
653 - <state relative-caret-position="407">  
654 - <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />  
655 - <folding>  
656 - <element signature="e#305#577#0#PHP" expanded="false" />  
657 - <element signature="e#583#854#0#PHP" expanded="false" />  
658 - <element signature="e#859#1113#0#PHP" expanded="false" />  
659 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
660 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
661 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
662 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
663 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
664 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
665 - </folding>  
666 - </state>  
667 - </provider>  
668 - </entry>  
669 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 571 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
670 <provider selected="true" editor-type-id="text-editor"> 572 <provider selected="true" editor-type-id="text-editor">
671 <state relative-caret-position="525"> 573 <state relative-caret-position="525">
@@ -699,14 +601,6 @@ @@ -699,14 +601,6 @@
699 </state> 601 </state>
700 </provider> 602 </provider>
701 </entry> 603 </entry>
702 - <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">  
703 - <provider selected="true" editor-type-id="text-editor">  
704 - <state relative-caret-position="-2045">  
705 - <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
706 - <folding />  
707 - </state>  
708 - </provider>  
709 - </entry>  
710 <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php"> 604 <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
711 <provider selected="true" editor-type-id="text-editor"> 605 <provider selected="true" editor-type-id="text-editor">
712 <state relative-caret-position="268"> 606 <state relative-caret-position="268">
@@ -761,78 +655,6 @@ @@ -761,78 +655,6 @@
761 </state> 655 </state>
762 </provider> 656 </provider>
763 </entry> 657 </entry>
764 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
765 - <provider selected="true" editor-type-id="text-editor">  
766 - <state relative-caret-position="59">  
767 - <caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />  
768 - <folding>  
769 - <element signature="e#131#169#0#PHP" expanded="true" />  
770 - <element signature="e#366#715#0#PHP" expanded="false" />  
771 - <element signature="e#720#1485#0#PHP" expanded="false" />  
772 - <element signature="e#1491#1720#0#PHP" expanded="false" />  
773 - <element signature="e#1725#3358#0#PHP" expanded="false" />  
774 - <element signature="e#3364#3604#0#PHP" expanded="false" />  
775 - <element signature="e#3609#3857#0#PHP" expanded="false" />  
776 - <element signature="e#3863#4210#0#PHP" expanded="false" />  
777 - <element signature="e#4215#4661#0#PHP" expanded="false" />  
778 - <element signature="e#4667#4927#0#PHP" expanded="false" />  
779 - <element signature="e#4932#5133#0#PHP" expanded="false" />  
780 - <element signature="e#5139#5401#0#PHP" expanded="false" />  
781 - <element signature="e#5406#5611#0#PHP" expanded="false" />  
782 - <element signature="e#5617#6059#0#PHP" expanded="false" />  
783 - <element signature="e#6064#7292#0#PHP" expanded="false" />  
784 - <element signature="e#7315#7860#0#PHP" expanded="false" />  
785 - <element signature="e#7866#8147#0#PHP" expanded="false" />  
786 - <element signature="e#8152#8544#0#PHP" expanded="false" />  
787 - <element signature="e#8550#9099#0#PHP" expanded="false" />  
788 - <element signature="e#9104#10303#0#PHP" expanded="false" />  
789 - <element signature="e#10309#10766#0#PHP" expanded="false" />  
790 - <element signature="e#10771#12034#0#PHP" expanded="false" />  
791 - <element signature="e#12057#12409#0#PHP" expanded="false" />  
792 - <element signature="e#12415#13099#0#PHP" expanded="false" />  
793 - <element signature="e#13104#14363#0#PHP" expanded="false" />  
794 - <element signature="e#14369#14831#0#PHP" expanded="false" />  
795 - <element signature="e#14836#17041#0#PHP" expanded="false" />  
796 - <element signature="e#17047#17656#0#PHP" expanded="false" />  
797 - <element signature="e#17661#18994#0#PHP" expanded="false" />  
798 - <element signature="e#19000#19357#0#PHP" expanded="false" />  
799 - <element signature="e#19362#20243#0#PHP" expanded="false" />  
800 - <element signature="e#20249#20601#0#PHP" expanded="false" />  
801 - <element signature="e#20606#21683#0#PHP" expanded="false" />  
802 - <element signature="e#21689#22044#0#PHP" expanded="false" />  
803 - <element signature="e#22049#23129#0#PHP" expanded="false" />  
804 - <element signature="e#23135#23559#0#PHP" expanded="false" />  
805 - <element signature="e#23564#24175#0#PHP" expanded="false" />  
806 - <element signature="e#25069#25388#0#PHP" expanded="false" />  
807 - <element signature="e#25394#25802#0#PHP" expanded="false" />  
808 - <element signature="e#25808#26567#0#PHP" expanded="false" />  
809 - <element signature="e#26587#27451#0#PHP" expanded="false" />  
810 - <element signature="e#27478#27878#0#PHP" expanded="false" />  
811 - <element signature="e#27902#28475#0#PHP" expanded="false" />  
812 - <element signature="e#28498#29308#0#PHP" expanded="false" />  
813 - </folding>  
814 - </state>  
815 - </provider>  
816 - </entry>  
817 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">  
818 - <provider selected="true" editor-type-id="text-editor">  
819 - <state relative-caret-position="1450">  
820 - <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />  
821 - <folding />  
822 - </state>  
823 - </provider>  
824 - </entry>  
825 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
826 - <provider selected="true" editor-type-id="text-editor">  
827 - <state relative-caret-position="475">  
828 - <caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />  
829 - <folding>  
830 - <element signature="e#265#1638#0#PHP" expanded="false" />  
831 - <element signature="e#2662#3553#0#PHP" expanded="false" />  
832 - </folding>  
833 - </state>  
834 - </provider>  
835 - </entry>  
836 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html"> 658 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
837 <provider selected="true" editor-type-id="text-editor"> 659 <provider selected="true" editor-type-id="text-editor">
838 <state relative-caret-position="-450"> 660 <state relative-caret-position="-450">
@@ -891,18 +713,126 @@ @@ -891,18 +713,126 @@
891 </entry> 713 </entry>
892 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html"> 714 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
893 <provider selected="true" editor-type-id="text-editor"> 715 <provider selected="true" editor-type-id="text-editor">
894 - <state relative-caret-position="2300">  
895 - <caret line="92" column="20" lean-forward="false" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" /> 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" />
896 <folding> 718 <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" /> 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" />
898 </folding> 720 </folding>
899 </state> 721 </state>
900 </provider> 722 </provider>
901 </entry> 723 </entry>
  724 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  725 + <provider selected="true" editor-type-id="text-editor">
  726 + <state relative-caret-position="325">
  727 + <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
  728 + <folding>
  729 + <element signature="e#265#1638#0#PHP" expanded="false" />
  730 + <element signature="e#1655#3478#0#PHP" expanded="false" />
  731 + <element signature="e#2581#3472#0#PHP" expanded="false" />
  732 + </folding>
  733 + </state>
  734 + </provider>
  735 + </entry>
  736 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
  737 + <provider selected="true" editor-type-id="text-editor">
  738 + <state relative-caret-position="353">
  739 + <caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
  740 + <folding />
  741 + </state>
  742 + </provider>
  743 + </entry>
  744 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  745 + <provider selected="true" editor-type-id="text-editor">
  746 + <state relative-caret-position="-783">
  747 + <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
  748 + <folding />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state relative-caret-position="575">
  755 + <caret line="89" column="5" lean-forward="false" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="58" />
  756 + <folding />
  757 + </state>
  758 + </provider>
  759 + </entry>
  760 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  761 + <provider selected="true" editor-type-id="text-editor">
  762 + <state relative-caret-position="353">
  763 + <caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />
  764 + <folding>
  765 + <element signature="e#131#169#0#PHP" expanded="true" />
  766 + <element signature="e#366#715#0#PHP" expanded="false" />
  767 + <element signature="e#720#1485#0#PHP" expanded="false" />
  768 + <element signature="e#1491#1720#0#PHP" expanded="false" />
  769 + <element signature="e#1725#3358#0#PHP" expanded="false" />
  770 + <element signature="e#3364#3604#0#PHP" expanded="false" />
  771 + <element signature="e#3609#3857#0#PHP" expanded="false" />
  772 + <element signature="e#3863#4210#0#PHP" expanded="false" />
  773 + <element signature="e#4215#4661#0#PHP" expanded="false" />
  774 + <element signature="e#4667#4927#0#PHP" expanded="false" />
  775 + <element signature="e#4932#5133#0#PHP" expanded="false" />
  776 + <element signature="e#5139#5401#0#PHP" expanded="false" />
  777 + <element signature="e#5406#5611#0#PHP" expanded="false" />
  778 + <element signature="e#5617#6059#0#PHP" expanded="false" />
  779 + <element signature="e#6064#7292#0#PHP" expanded="false" />
  780 + <element signature="e#7315#7860#0#PHP" expanded="false" />
  781 + <element signature="e#7866#8147#0#PHP" expanded="false" />
  782 + <element signature="e#8152#8544#0#PHP" expanded="false" />
  783 + <element signature="e#8550#9099#0#PHP" expanded="false" />
  784 + <element signature="e#9104#10303#0#PHP" expanded="false" />
  785 + <element signature="e#10309#10766#0#PHP" expanded="false" />
  786 + <element signature="e#10771#12034#0#PHP" expanded="false" />
  787 + <element signature="e#12057#12409#0#PHP" expanded="false" />
  788 + <element signature="e#12415#13099#0#PHP" expanded="false" />
  789 + <element signature="e#13104#14363#0#PHP" expanded="false" />
  790 + <element signature="e#14369#14831#0#PHP" expanded="false" />
  791 + <element signature="e#14836#17041#0#PHP" expanded="false" />
  792 + <element signature="e#17047#17656#0#PHP" expanded="false" />
  793 + <element signature="e#17661#18994#0#PHP" expanded="false" />
  794 + <element signature="e#19000#19357#0#PHP" expanded="false" />
  795 + <element signature="e#19362#20243#0#PHP" expanded="false" />
  796 + <element signature="e#20249#20601#0#PHP" expanded="false" />
  797 + <element signature="e#20606#21683#0#PHP" expanded="false" />
  798 + <element signature="e#21689#22044#0#PHP" expanded="false" />
  799 + <element signature="e#22049#23129#0#PHP" expanded="false" />
  800 + <element signature="e#23135#23559#0#PHP" expanded="false" />
  801 + <element signature="e#23564#24175#0#PHP" expanded="false" />
  802 + <element signature="e#24181#24465#0#PHP" expanded="false" />
  803 + <element signature="e#24470#25048#0#PHP" expanded="false" />
  804 + <element signature="e#25069#25388#0#PHP" expanded="false" />
  805 + <element signature="e#25394#25802#0#PHP" expanded="false" />
  806 + <element signature="e#25808#26567#0#PHP" expanded="false" />
  807 + <element signature="e#26587#27451#0#PHP" expanded="false" />
  808 + <element signature="e#27478#27878#0#PHP" expanded="false" />
  809 + <element signature="e#27902#28475#0#PHP" expanded="false" />
  810 + <element signature="e#28498#29308#0#PHP" expanded="false" />
  811 + </folding>
  812 + </state>
  813 + </provider>
  814 + </entry>
  815 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  816 + <provider selected="true" editor-type-id="text-editor">
  817 + <state relative-caret-position="407">
  818 + <caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" />
  819 + <folding>
  820 + <element signature="e#305#577#0#PHP" expanded="false" />
  821 + <element signature="e#583#854#0#PHP" expanded="false" />
  822 + <element signature="e#859#1113#0#PHP" expanded="false" />
  823 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  824 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  825 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  826 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  827 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  828 + </folding>
  829 + </state>
  830 + </provider>
  831 + </entry>
902 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 832 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
903 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
904 - <state relative-caret-position="553">  
905 - <caret line="164" column="34" lean-forward="true" selection-start-line="164" selection-start-column="34" selection-end-line="164" selection-end-column="34" /> 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" />
906 <folding> 836 <folding>
907 <element signature="e#329#544#0#PHP" expanded="false" /> 837 <element signature="e#329#544#0#PHP" expanded="false" />
908 <element signature="e#549#890#0#PHP" expanded="false" /> 838 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -912,6 +842,8 @@ @@ -912,6 +842,8 @@
912 <element signature="e#1731#2119#0#PHP" expanded="false" /> 842 <element signature="e#1731#2119#0#PHP" expanded="false" />
913 <element signature="e#2126#2643#0#PHP" expanded="false" /> 843 <element signature="e#2126#2643#0#PHP" expanded="false" />
914 <element signature="e#2648#3163#0#PHP" expanded="false" /> 844 <element signature="e#2648#3163#0#PHP" expanded="false" />
  845 + <element signature="e#3169#3697#0#PHP" expanded="false" />
  846 + <element signature="e#3702#4540#0#PHP" expanded="false" />
915 <element signature="e#4546#4859#0#PHP" expanded="false" /> 847 <element signature="e#4546#4859#0#PHP" expanded="false" />
916 <element signature="e#4864#5239#0#PHP" expanded="false" /> 848 <element signature="e#4864#5239#0#PHP" expanded="false" />
917 <element signature="e#5245#5602#0#PHP" expanded="false" /> 849 <element signature="e#5245#5602#0#PHP" expanded="false" />
@@ -923,7 +855,9 @@ @@ -923,7 +855,9 @@
923 <element signature="e#8388#8655#0#PHP" expanded="false" /> 855 <element signature="e#8388#8655#0#PHP" expanded="false" />
924 <element signature="e#8660#9135#0#PHP" expanded="false" /> 856 <element signature="e#8660#9135#0#PHP" expanded="false" />
925 <element signature="e#9141#9641#0#PHP" expanded="false" /> 857 <element signature="e#9141#9641#0#PHP" expanded="false" />
926 - <element signature="e#9646#10435#0#PHP" expanded="false" /> 858 + <element signature="e#9646#10659#0#PHP" expanded="false" />
  859 + <element signature="e#10665#11032#0#PHP" expanded="false" />
  860 + <element signature="e#11037#11477#0#PHP" expanded="false" />
927 </folding> 861 </folding>
928 </state> 862 </state>
929 </provider> 863 </provider>
@@ -366,6 +366,13 @@ class HomeController extends RestBaseController @@ -366,6 +366,13 @@ class HomeController extends RestBaseController
366 'sub_time'=>'require', 366 'sub_time'=>'require',
367 'content'=>'require' 367 'content'=>'require'
368 ]); 368 ]);
  369 + $validate->message([
  370 + 'address_id'=>'预约家政地址不能为空',
  371 + 'home_id'=>'家政公司不能为空',
  372 + 'service_id'=>'服务类目不能为空',
  373 + 'sub_time'=>'预约时间不能为空',
  374 + 'content'=>'留言备注不能为空'
  375 + ]);
369 if (!$validate->check($param)) { 376 if (!$validate->check($param)) {
370 $this->error(['code'=>40005,'msg'=>$validate->getError()]); 377 $this->error(['code'=>40005,'msg'=>$validate->getError()]);
371 } 378 }
@@ -378,5 +385,35 @@ class HomeController extends RestBaseController @@ -378,5 +385,35 @@ class HomeController extends RestBaseController
378 $this->success('SUCCESS'); 385 $this->success('SUCCESS');
379 } 386 }
380 387
  388 + /**
  389 + * @title 通过家政公司获取其服务列表
  390 + * @description 通过家政公司获取其服务列表
  391 + * @author GuoSheng
  392 + * @url /index/Home/getsever
  393 + * @method GET
  394 + *
  395 + * @header name:XX-Token require:1 default: desc:token
  396 + *
  397 + * @param name:id require:1 default: desc:家政公司ID
  398 + *
  399 + * @return id:ID
  400 + * @return sever_name:服务名称
  401 + * @return price:所需积分
  402 + *
  403 + */
  404 + public function getsever()
  405 + {
  406 + $user_id = $this->getUserId();
  407 + $home_id = $this->request->param('id');
  408 + if(empty($home_id)){
  409 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  410 + }
  411 + $data = Db::name('service')
  412 + ->where('home_id',$home_id)
  413 + ->where('delete_time',0)
  414 + ->field('id,sever_name,price')
  415 + ->select();
  416 + $this->success('SUCCESS',$data);
  417 + }
381 418
382 } 419 }
@@ -55,15 +55,13 @@ class ShoporderController extends AdminBaseController @@ -55,15 +55,13 @@ 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'] == 1){
  59 + $this->success('更新成功!');
  60 + }
58 if($param['status'] == 2 && empty($param['express_num'])){ 61 if($param['status'] == 2 && empty($param['express_num'])){
59 $this->error('请填写快递单号'); 62 $this->error('请填写快递单号');
60 } 63 }
61 - if(!empty($param['express_num'])){  
62 - if(empty($param['status'] == 1)){  
63 - $this->error('请正确填写发货状态');  
64 - }  
65 - }  
66 - if($param['status'] == 2 && empty($param['express_num'])){ 64 + if($param['status'] == 2 && !empty($param['express_num'])){
67 Db::name('shoporder') 65 Db::name('shoporder')
68 ->where('id',$id) 66 ->where('id',$id)
69 ->update($param); 67 ->update($param);
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 />已发货 </label> 99 />已发货 </label>
100 </td> 100 </td>
101 </tr> 101 </tr>
102 - <tr class="status" style="<if condition='$data.status neq 1'>display: none;</if>"> 102 + <tr class="is_status" style="<if condition='$data.status neq 2'>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"
@@ -145,9 +145,9 @@ @@ -145,9 +145,9 @@
145 function status() { 145 function status() {
146 var status = $('.status:radio:checked').val(); 146 var status = $('.status:radio:checked').val();
147 if (status == '2') { 147 if (status == '2') {
148 - $('.status').show(); 148 + $('.is_status').show();
149 } else { 149 } else {
150 - $('.status').hide(); 150 + $('.is_status').hide();
151 } 151 }
152 } 152 }
153 153