郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 cd79a669101adf1c6c88aba43522eece24d21efe 1 个父辈 c02c971f
1 个管道 的构建 通过 耗费 11 秒

家政模块

内嵌 并排对比
正在显示 2 个修改的文件 包含 186 行增加 和 190 行删除
@@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
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/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
8 </list> 7 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,8 +28,8 @@ @@ -29,8 +28,8 @@
29 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> 28 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
30 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
31 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
32 - <state relative-caret-position="519">  
33 - <caret line="350" column="5" lean-forward="true" selection-start-line="350" selection-start-column="5" selection-end-line="350" selection-end-column="5" /> 31 + <state relative-caret-position="170">
  32 + <caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
34 <folding> 33 <folding>
35 <element signature="e#131#161#0#PHP" expanded="true" /> 34 <element signature="e#131#161#0#PHP" expanded="true" />
36 <element signature="e#329#544#0#PHP" expanded="false" /> 35 <element signature="e#329#544#0#PHP" expanded="false" />
@@ -61,8 +60,8 @@ @@ -61,8 +60,8 @@
61 <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false"> 60 <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
62 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 61 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
63 <provider selected="true" editor-type-id="text-editor"> 62 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="618">  
65 - <caret line="204" column="5" lean-forward="true" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" /> 63 + <state relative-caret-position="775">
  64 + <caret line="204" column="5" lean-forward="false" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
66 <folding> 65 <folding>
67 <element signature="e#411#604#0#PHP" expanded="false" /> 66 <element signature="e#411#604#0#PHP" expanded="false" />
68 <element signature="e#609#825#0#PHP" expanded="false" /> 67 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -93,16 +92,15 @@ @@ -93,16 +92,15 @@
93 </provider> 92 </provider>
94 </entry> 93 </entry>
95 </file> 94 </file>
96 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 95 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
97 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 96 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
98 <provider selected="true" editor-type-id="text-editor"> 97 <provider selected="true" editor-type-id="text-editor">
99 - <state relative-caret-position="743">  
100 - <caret line="486" column="32" lean-forward="false" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" /> 98 + <state relative-caret-position="624">
  99 + <caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
101 <folding> 100 <folding>
102 <element signature="e#345#694#0#PHP" expanded="false" /> 101 <element signature="e#345#694#0#PHP" expanded="false" />
103 <element signature="e#699#1464#0#PHP" expanded="false" /> 102 <element signature="e#699#1464#0#PHP" expanded="false" />
104 <element signature="e#1470#1699#0#PHP" expanded="false" /> 103 <element signature="e#1470#1699#0#PHP" expanded="false" />
105 - <element signature="e#1704#3329#0#PHP" expanded="false" />  
106 <element signature="e#3335#3682#0#PHP" expanded="false" /> 104 <element signature="e#3335#3682#0#PHP" expanded="false" />
107 <element signature="e#3687#4133#0#PHP" expanded="false" /> 105 <element signature="e#3687#4133#0#PHP" expanded="false" />
108 <element signature="e#4139#4399#0#PHP" expanded="false" /> 106 <element signature="e#4139#4399#0#PHP" expanded="false" />
@@ -121,49 +119,8 @@ @@ -121,49 +119,8 @@
121 <element signature="e#11691#12043#0#PHP" expanded="false" /> 119 <element signature="e#11691#12043#0#PHP" expanded="false" />
122 <element signature="e#12049#12733#0#PHP" expanded="false" /> 120 <element signature="e#12049#12733#0#PHP" expanded="false" />
123 <element signature="e#12738#13997#0#PHP" expanded="false" /> 121 <element signature="e#12738#13997#0#PHP" expanded="false" />
124 - <element signature="e#14454#15687#0#PHP" expanded="false" />  
125 - </folding>  
126 - </state>  
127 - </provider>  
128 - </entry>  
129 - </file>  
130 - <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">  
131 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
132 - <provider selected="true" editor-type-id="text-editor">  
133 - <state relative-caret-position="542">  
134 - <caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />  
135 - <folding>  
136 - <element signature="e#342#596#0#PHP" expanded="false" />  
137 - <element signature="e#601#886#0#PHP" expanded="false" />  
138 - <element signature="e#892#1227#0#PHP" expanded="false" />  
139 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
140 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
141 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
142 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
143 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
144 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
145 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
146 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
147 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
148 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
149 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
150 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
151 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
152 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
153 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
154 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
155 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
156 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
157 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
158 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
159 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
160 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
161 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
162 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
163 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
164 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
165 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
166 - <element signature="e#13768#14087#0#PHP" expanded="false" /> 122 + <element signature="e#14003#14465#0#PHP" expanded="false" />
  123 + <element signature="e#14470#16675#0#PHP" expanded="false" />
167 </folding> 124 </folding>
168 </state> 125 </state>
169 </provider> 126 </provider>
@@ -238,8 +195,8 @@ @@ -238,8 +195,8 @@
238 <option value="$PROJECT_DIR$/api/config.php" /> 195 <option value="$PROJECT_DIR$/api/config.php" />
239 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 196 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
240 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 197 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
241 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
242 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 198 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  199 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
243 </list> 200 </list>
244 </option> 201 </option>
245 </component> 202 </component>
@@ -258,10 +215,10 @@ @@ -258,10 +215,10 @@
258 </component> 215 </component>
259 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 216 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
260 <component name="ProjectFrameBounds"> 217 <component name="ProjectFrameBounds">
261 - <option name="x" value="377" />  
262 - <option name="y" value="65" /> 218 + <option name="x" value="417" />
  219 + <option name="y" value="82" />
263 <option name="width" value="1582" /> 220 <option name="width" value="1582" />
264 - <option name="height" value="930" /> 221 + <option name="height" value="982" />
265 </component> 222 </component>
266 <component name="ProjectView"> 223 <component name="ProjectView">
267 <navigator currentView="ProjectPane" proportions="" version="1"> 224 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -278,6 +235,8 @@ @@ -278,6 +235,8 @@
278 <foldersAlwaysOnTop value="true" /> 235 <foldersAlwaysOnTop value="true" />
279 </navigator> 236 </navigator>
280 <panes> 237 <panes>
  238 + <pane id="Scope" />
  239 + <pane id="Scratches" />
281 <pane id="ProjectPane"> 240 <pane id="ProjectPane">
282 <subPane> 241 <subPane>
283 <expand> 242 <expand>
@@ -307,8 +266,6 @@ @@ -307,8 +266,6 @@
307 <select /> 266 <select />
308 </subPane> 267 </subPane>
309 </pane> 268 </pane>
310 - <pane id="Scratches" />  
311 - <pane id="Scope" />  
312 </panes> 269 </panes>
313 </component> 270 </component>
314 <component name="PropertiesComponent"> 271 <component name="PropertiesComponent">
@@ -396,17 +353,18 @@ @@ -396,17 +353,18 @@
396 <workItem from="1574815992559" duration="11623000" /> 353 <workItem from="1574815992559" duration="11623000" />
397 <workItem from="1574837405404" duration="1203000" /> 354 <workItem from="1574837405404" duration="1203000" />
398 <workItem from="1574903328460" duration="15512000" /> 355 <workItem from="1574903328460" duration="15512000" />
  356 + <workItem from="1574930017327" duration="7063000" />
399 </task> 357 </task>
400 <servers /> 358 <servers />
401 </component> 359 </component>
402 <component name="TimeTrackingManager"> 360 <component name="TimeTrackingManager">
403 - <option name="totallyTimeSpent" value="347992000" /> 361 + <option name="totallyTimeSpent" value="355055000" />
404 </component> 362 </component>
405 <component name="ToolWindowManager"> 363 <component name="ToolWindowManager">
406 - <frame x="377" y="65" width="1582" height="930" extended-state="0" /> 364 + <frame x="417" y="82" width="1582" height="982" extended-state="0" />
407 <editor active="true" /> 365 <editor active="true" />
408 <layout> 366 <layout>
409 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18068331" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 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.1826544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
410 <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" /> 368 <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" />
411 <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" /> 369 <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" />
412 <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" /> 370 <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" />
@@ -457,13 +415,6 @@ @@ -457,13 +415,6 @@
457 <watches-manager /> 415 <watches-manager />
458 </component> 416 </component>
459 <component name="editorHistoryManager"> 417 <component name="editorHistoryManager">
460 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="250">  
463 - <caret line="25" column="17" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="67" selection-end-column="0" />  
464 - </state>  
465 - </provider>  
466 - </entry>  
467 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html"> 418 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html">
468 <provider selected="true" editor-type-id="text-editor"> 419 <provider selected="true" editor-type-id="text-editor">
469 <state relative-caret-position="200"> 420 <state relative-caret-position="200">
@@ -496,7 +447,6 @@ @@ -496,7 +447,6 @@
496 <provider selected="true" editor-type-id="text-editor"> 447 <provider selected="true" editor-type-id="text-editor">
497 <state relative-caret-position="325"> 448 <state relative-caret-position="325">
498 <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" /> 449 <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
499 - <folding />  
500 </state> 450 </state>
501 </provider> 451 </provider>
502 </entry> 452 </entry>
@@ -614,14 +564,6 @@ @@ -614,14 +564,6 @@
614 </state> 564 </state>
615 </provider> 565 </provider>
616 </entry> 566 </entry>
617 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
618 - <provider selected="true" editor-type-id="text-editor">  
619 - <state relative-caret-position="235">  
620 - <caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />  
621 - <folding />  
622 - </state>  
623 - </provider>  
624 - </entry>  
625 <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"> 567 <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
626 <provider selected="true" editor-type-id="text-editor"> 568 <provider selected="true" editor-type-id="text-editor">
627 <state relative-caret-position="234"> 569 <state relative-caret-position="234">
@@ -662,7 +604,6 @@ @@ -662,7 +604,6 @@
662 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
663 <state relative-caret-position="275"> 605 <state relative-caret-position="275">
664 <caret line="16" column="40" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="40" /> 606 <caret line="16" column="40" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="40" />
665 - <folding />  
666 </state> 607 </state>
667 </provider> 608 </provider>
668 </entry> 609 </entry>
@@ -677,7 +618,6 @@ @@ -677,7 +618,6 @@
677 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
678 <state relative-caret-position="1300"> 619 <state relative-caret-position="1300">
679 <caret line="52" column="21" lean-forward="false" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" /> 620 <caret line="52" column="21" lean-forward="false" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
680 - <folding />  
681 </state> 621 </state>
682 </provider> 622 </provider>
683 </entry> 623 </entry>
@@ -685,7 +625,6 @@ @@ -685,7 +625,6 @@
685 <provider selected="true" editor-type-id="text-editor"> 625 <provider selected="true" editor-type-id="text-editor">
686 <state relative-caret-position="-600"> 626 <state relative-caret-position="-600">
687 <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="52" selection-end-column="21" /> 627 <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="52" selection-end-column="21" />
688 - <folding />  
689 </state> 628 </state>
690 </provider> 629 </provider>
691 </entry> 630 </entry>
@@ -693,7 +632,6 @@ @@ -693,7 +632,6 @@
693 <provider selected="true" editor-type-id="text-editor"> 632 <provider selected="true" editor-type-id="text-editor">
694 <state relative-caret-position="25"> 633 <state relative-caret-position="25">
695 <caret line="52" column="16" lean-forward="true" selection-start-line="52" selection-start-column="16" selection-end-line="52" selection-end-column="16" /> 634 <caret line="52" column="16" lean-forward="true" selection-start-line="52" selection-start-column="16" selection-end-line="52" selection-end-column="16" />
696 - <folding />  
697 </state> 635 </state>
698 </provider> 636 </provider>
699 </entry> 637 </entry>
@@ -701,7 +639,6 @@ @@ -701,7 +639,6 @@
701 <provider selected="true" editor-type-id="text-editor"> 639 <provider selected="true" editor-type-id="text-editor">
702 <state relative-caret-position="686"> 640 <state relative-caret-position="686">
703 <caret line="75" column="17" lean-forward="false" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" /> 641 <caret line="75" column="17" lean-forward="false" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" />
704 - <folding />  
705 </state> 642 </state>
706 </provider> 643 </provider>
707 </entry> 644 </entry>
@@ -709,10 +646,6 @@ @@ -709,10 +646,6 @@
709 <provider selected="true" editor-type-id="text-editor"> 646 <provider selected="true" editor-type-id="text-editor">
710 <state relative-caret-position="361"> 647 <state relative-caret-position="361">
711 <caret line="69" column="61" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="61" /> 648 <caret line="69" column="61" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="61" />
712 - <folding>  
713 - <element signature="e#266#1001#0#PHP" expanded="false" />  
714 - <element signature="e#2186#3928#0#PHP" expanded="false" />  
715 - </folding>  
716 </state> 649 </state>
717 </provider> 650 </provider>
718 </entry> 651 </entry>
@@ -720,12 +653,6 @@ @@ -720,12 +653,6 @@
720 <provider selected="true" editor-type-id="text-editor"> 653 <provider selected="true" editor-type-id="text-editor">
721 <state relative-caret-position="326"> 654 <state relative-caret-position="326">
722 <caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" /> 655 <caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
723 - <folding>  
724 - <element signature="e#259#862#0#PHP" expanded="false" />  
725 - <element signature="e#877#2030#0#PHP" expanded="false" />  
726 - <element signature="e#2045#3651#0#PHP" expanded="false" />  
727 - <element signature="e#3666#4131#0#PHP" expanded="false" />  
728 - </folding>  
729 </state> 656 </state>
730 </provider> 657 </provider>
731 </entry> 658 </entry>
@@ -733,9 +660,6 @@ @@ -733,9 +660,6 @@
733 <provider selected="true" editor-type-id="text-editor"> 660 <provider selected="true" editor-type-id="text-editor">
734 <state relative-caret-position="300"> 661 <state relative-caret-position="300">
735 <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> 662 <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
736 - <folding>  
737 - <element signature="e#963#1070#0#PHP" expanded="false" />  
738 - </folding>  
739 </state> 663 </state>
740 </provider> 664 </provider>
741 </entry> 665 </entry>
@@ -775,16 +699,6 @@ @@ -775,16 +699,6 @@
775 <provider selected="true" editor-type-id="text-editor"> 699 <provider selected="true" editor-type-id="text-editor">
776 <state relative-caret-position="543"> 700 <state relative-caret-position="543">
777 <caret line="253" column="0" lean-forward="true" selection-start-line="253" selection-start-column="0" selection-end-line="253" selection-end-column="0" /> 701 <caret line="253" column="0" lean-forward="true" selection-start-line="253" selection-start-column="0" selection-end-line="253" selection-end-column="0" />
778 - <folding>  
779 - <element signature="e#602#906#0#PHP" expanded="false" />  
780 - <element signature="e#911#1805#0#PHP" expanded="false" />  
781 - <element signature="e#1811#2278#0#PHP" expanded="false" />  
782 - <element signature="e#2283#5971#0#PHP" expanded="false" />  
783 - <element signature="e#5977#6278#0#PHP" expanded="false" />  
784 - <element signature="e#6283#7591#0#PHP" expanded="false" />  
785 - <element signature="e#7598#8002#0#PHP" expanded="false" />  
786 - <element signature="e#8007#8590#0#PHP" expanded="false" />  
787 - </folding>  
788 </state> 702 </state>
789 </provider> 703 </provider>
790 </entry> 704 </entry>
@@ -862,40 +776,10 @@ @@ -862,40 +776,10 @@
862 </state> 776 </state>
863 </provider> 777 </provider>
864 </entry> 778 </entry>
865 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
866 - <provider selected="true" editor-type-id="text-editor">  
867 - <state relative-caret-position="519">  
868 - <caret line="350" column="5" lean-forward="true" selection-start-line="350" selection-start-column="5" selection-end-line="350" selection-end-column="5" />  
869 - <folding>  
870 - <element signature="e#131#161#0#PHP" expanded="true" />  
871 - <element signature="e#329#544#0#PHP" expanded="false" />  
872 - <element signature="e#549#890#0#PHP" expanded="false" />  
873 - <element signature="e#896#1112#0#PHP" expanded="false" />  
874 - <element signature="e#1117#1500#0#PHP" expanded="false" />  
875 - <element signature="e#1506#1988#0#PHP" expanded="false" />  
876 - <element signature="e#1993#2498#0#PHP" expanded="false" />  
877 - <element signature="e#2504#3005#0#PHP" expanded="false" />  
878 - <element signature="e#3010#3839#0#PHP" expanded="false" />  
879 - <element signature="e#3845#4158#0#PHP" expanded="false" />  
880 - <element signature="e#4163#4538#0#PHP" expanded="false" />  
881 - <element signature="e#4544#4901#0#PHP" expanded="false" />  
882 - <element signature="e#4906#5314#0#PHP" expanded="false" />  
883 - <element signature="e#5320#5702#0#PHP" expanded="false" />  
884 - <element signature="e#5707#6377#0#PHP" expanded="false" />  
885 - <element signature="e#6383#6826#0#PHP" expanded="false" />  
886 - <element signature="e#6831#7681#0#PHP" expanded="false" />  
887 - <element signature="e#7687#7954#0#PHP" expanded="false" />  
888 - <element signature="e#7959#8434#0#PHP" expanded="false" />  
889 - <element signature="e#8440#8940#0#PHP" expanded="false" />  
890 - <element signature="e#8945#9734#0#PHP" expanded="false" />  
891 - </folding>  
892 - </state>  
893 - </provider>  
894 - </entry>  
895 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 779 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
896 <provider selected="true" editor-type-id="text-editor"> 780 <provider selected="true" editor-type-id="text-editor">
897 - <state relative-caret-position="618">  
898 - <caret line="204" column="5" lean-forward="true" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" /> 781 + <state relative-caret-position="775">
  782 + <caret line="204" column="5" lean-forward="false" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
899 <folding> 783 <folding>
900 <element signature="e#411#604#0#PHP" expanded="false" /> 784 <element signature="e#411#604#0#PHP" expanded="false" />
901 <element signature="e#609#825#0#PHP" expanded="false" /> 785 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -925,41 +809,9 @@ @@ -925,41 +809,9 @@
925 </state> 809 </state>
926 </provider> 810 </provider>
927 </entry> 811 </entry>
928 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
929 - <provider selected="true" editor-type-id="text-editor">  
930 - <state relative-caret-position="743">  
931 - <caret line="486" column="32" lean-forward="false" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" />  
932 - <folding>  
933 - <element signature="e#345#694#0#PHP" expanded="false" />  
934 - <element signature="e#699#1464#0#PHP" expanded="false" />  
935 - <element signature="e#1470#1699#0#PHP" expanded="false" />  
936 - <element signature="e#1704#3329#0#PHP" expanded="false" />  
937 - <element signature="e#3335#3682#0#PHP" expanded="false" />  
938 - <element signature="e#3687#4133#0#PHP" expanded="false" />  
939 - <element signature="e#4139#4399#0#PHP" expanded="false" />  
940 - <element signature="e#4404#4605#0#PHP" expanded="false" />  
941 - <element signature="e#4611#4873#0#PHP" expanded="false" />  
942 - <element signature="e#4878#5083#0#PHP" expanded="false" />  
943 - <element signature="e#5089#5531#0#PHP" expanded="false" />  
944 - <element signature="e#5536#6764#0#PHP" expanded="false" />  
945 - <element signature="e#6787#7332#0#PHP" expanded="false" />  
946 - <element signature="e#7338#7619#0#PHP" expanded="false" />  
947 - <element signature="e#7624#8016#0#PHP" expanded="false" />  
948 - <element signature="e#8022#8574#0#PHP" expanded="false" />  
949 - <element signature="e#8579#9937#0#PHP" expanded="false" />  
950 - <element signature="e#9943#10400#0#PHP" expanded="false" />  
951 - <element signature="e#10405#11668#0#PHP" expanded="false" />  
952 - <element signature="e#11691#12043#0#PHP" expanded="false" />  
953 - <element signature="e#12049#12733#0#PHP" expanded="false" />  
954 - <element signature="e#12738#13997#0#PHP" expanded="false" />  
955 - <element signature="e#14454#15687#0#PHP" expanded="false" />  
956 - </folding>  
957 - </state>  
958 - </provider>  
959 - </entry>  
960 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 812 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
961 <provider selected="true" editor-type-id="text-editor"> 813 <provider selected="true" editor-type-id="text-editor">
962 - <state relative-caret-position="542"> 814 + <state relative-caret-position="842">
963 <caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" /> 815 <caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
964 <folding> 816 <folding>
965 <element signature="e#342#596#0#PHP" expanded="false" /> 817 <element signature="e#342#596#0#PHP" expanded="false" />
@@ -997,5 +849,85 @@ @@ -997,5 +849,85 @@
997 </state> 849 </state>
998 </provider> 850 </provider>
999 </entry> 851 </entry>
  852 + <entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
  853 + <provider selected="true" editor-type-id="text-editor">
  854 + <state relative-caret-position="273">
  855 + <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
  856 + <folding />
  857 + </state>
  858 + </provider>
  859 + </entry>
  860 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  861 + <provider selected="true" editor-type-id="text-editor">
  862 + <state relative-caret-position="423">
  863 + <caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
  864 + <folding>
  865 + <element signature="n#generateCode#0;n#!!top" expanded="false" />
  866 + </folding>
  867 + </state>
  868 + </provider>
  869 + </entry>
  870 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  871 + <provider selected="true" editor-type-id="text-editor">
  872 + <state relative-caret-position="170">
  873 + <caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
  874 + <folding>
  875 + <element signature="e#131#161#0#PHP" expanded="true" />
  876 + <element signature="e#329#544#0#PHP" expanded="false" />
  877 + <element signature="e#549#890#0#PHP" expanded="false" />
  878 + <element signature="e#896#1112#0#PHP" expanded="false" />
  879 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  880 + <element signature="e#1506#1988#0#PHP" expanded="false" />
  881 + <element signature="e#1993#2498#0#PHP" expanded="false" />
  882 + <element signature="e#2504#3005#0#PHP" expanded="false" />
  883 + <element signature="e#3010#3839#0#PHP" expanded="false" />
  884 + <element signature="e#3845#4158#0#PHP" expanded="false" />
  885 + <element signature="e#4163#4538#0#PHP" expanded="false" />
  886 + <element signature="e#4544#4901#0#PHP" expanded="false" />
  887 + <element signature="e#4906#5314#0#PHP" expanded="false" />
  888 + <element signature="e#5320#5702#0#PHP" expanded="false" />
  889 + <element signature="e#5707#6377#0#PHP" expanded="false" />
  890 + <element signature="e#6383#6826#0#PHP" expanded="false" />
  891 + <element signature="e#6831#7681#0#PHP" expanded="false" />
  892 + <element signature="e#7687#7954#0#PHP" expanded="false" />
  893 + <element signature="e#7959#8434#0#PHP" expanded="false" />
  894 + <element signature="e#8440#8940#0#PHP" expanded="false" />
  895 + <element signature="e#8945#9734#0#PHP" expanded="false" />
  896 + </folding>
  897 + </state>
  898 + </provider>
  899 + </entry>
  900 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  901 + <provider selected="true" editor-type-id="text-editor">
  902 + <state relative-caret-position="624">
  903 + <caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
  904 + <folding>
  905 + <element signature="e#345#694#0#PHP" expanded="false" />
  906 + <element signature="e#699#1464#0#PHP" expanded="false" />
  907 + <element signature="e#1470#1699#0#PHP" expanded="false" />
  908 + <element signature="e#3335#3682#0#PHP" expanded="false" />
  909 + <element signature="e#3687#4133#0#PHP" expanded="false" />
  910 + <element signature="e#4139#4399#0#PHP" expanded="false" />
  911 + <element signature="e#4404#4605#0#PHP" expanded="false" />
  912 + <element signature="e#4611#4873#0#PHP" expanded="false" />
  913 + <element signature="e#4878#5083#0#PHP" expanded="false" />
  914 + <element signature="e#5089#5531#0#PHP" expanded="false" />
  915 + <element signature="e#5536#6764#0#PHP" expanded="false" />
  916 + <element signature="e#6787#7332#0#PHP" expanded="false" />
  917 + <element signature="e#7338#7619#0#PHP" expanded="false" />
  918 + <element signature="e#7624#8016#0#PHP" expanded="false" />
  919 + <element signature="e#8022#8574#0#PHP" expanded="false" />
  920 + <element signature="e#8579#9937#0#PHP" expanded="false" />
  921 + <element signature="e#9943#10400#0#PHP" expanded="false" />
  922 + <element signature="e#10405#11668#0#PHP" expanded="false" />
  923 + <element signature="e#11691#12043#0#PHP" expanded="false" />
  924 + <element signature="e#12049#12733#0#PHP" expanded="false" />
  925 + <element signature="e#12738#13997#0#PHP" expanded="false" />
  926 + <element signature="e#14003#14465#0#PHP" expanded="false" />
  927 + <element signature="e#14470#16675#0#PHP" expanded="false" />
  928 + </folding>
  929 + </state>
  930 + </provider>
  931 + </entry>
1000 </component> 932 </component>
1001 </project> 933 </project>
@@ -475,12 +475,13 @@ class UserController extends RestBaseController @@ -475,12 +475,13 @@ class UserController extends RestBaseController
475 * 475 *
476 * @header name:XX-Token require:1 default: desc:token 476 * @header name:XX-Token require:1 default: desc:token
477 * 477 *
478 - * @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成) 478 + * @param name:status require:1 other desc: 订单状态(1已预约，2已接单，3已完成)
479 * 479 *
480 * @return id:订单ID 480 * @return id:订单ID
481 * @return num:订单号 481 * @return num:订单号
482 - * @return rgoods_name:商品名称  
483 - * @return create_time:创建时间 482 + * @return home_id:家政公司名称
  483 + * @return service_id:服务项目名称
  484 + * @return price:价格
484 * @return sub_time:预约时间 485 * @return sub_time:预约时间
485 * 486 *
486 */ 487 */
@@ -488,34 +489,97 @@ class UserController extends RestBaseController @@ -488,34 +489,97 @@ class UserController extends RestBaseController
488 { 489 {
489 $user_id = $this->getUserId(); 490 $user_id = $this->getUserId();
490 $status = $this->request->param('status',0,'intval'); 491 $status = $this->request->param('status',0,'intval');
491 - if(empty($status) || $status == 0){ 492 + if(empty($status) || $status == 1){
492 //已预约的回收订单 493 //已预约的回收订单
493 - $data = Db::name('subscribe') 494 + $data = Db::name('subhome')
494 ->where('user_id',$user_id) 495 ->where('user_id',$user_id)
495 - ->where('status',0)  
496 - ->field('id,num,create_time,sub_time,attr_id') 496 + ->where('status',1)
  497 + ->field('id,num,create_time,sub_time,home_id,service_id')
497 ->select(); 498 ->select();
498 - $res = $this->r_foreach($data);  
499 - $this->success('SUCCESS',$res); 499 + $home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
  500 + $service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
  501 + $data['service_id'] = $service['sever_name'];
  502 + $data['price'] = $service['price'];
  503 + $data['home_id'] = $home['home_name'];
  504 + $this->success('SUCCESS',$data);
500 }elseif ($status == 1){ 505 }elseif ($status == 1){
501 //已接单的回收订单 506 //已接单的回收订单
502 - $data = Db::name('subscribe') 507 + $data = Db::name('subhome')
503 ->where('user_id',$user_id) 508 ->where('user_id',$user_id)
504 - ->where('status',1)  
505 - ->field('id,num,create_time,sub_time,attr_id') 509 + ->where('status',2)
  510 + ->field('id,num,create_time,sub_time,home_id,service_id')
506 ->select(); 511 ->select();
507 - $res = $this->r_foreach($data);  
508 - $this->success('SUCCESS',$res); 512 + $home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
  513 + $service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
  514 + $data['service_id'] = $service['sever_name'];
  515 + $data['price'] = $service['price'];
  516 + $data['home_id'] = $home['home_name'];
  517 + $this->success('SUCCESS',$data);
509 }elseif ($status == 2){ 518 }elseif ($status == 2){
510 //已完成的回收订单 519 //已完成的回收订单
511 - $data = Db::name('subscribe') 520 + $data = Db::name('subhome')
512 ->where('user_id',$user_id) 521 ->where('user_id',$user_id)
513 - ->where('status',2)  
514 - ->field('id,num,create_time,sub_time,attr_id') 522 + ->where('status',3)
  523 + ->field('id,num,create_time,sub_time,home_id,service_id')
515 ->select(); 524 ->select();
516 - $res = $this->r_foreach($data);  
517 - $this->success('SUCCESS',$res); 525 + $home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
  526 + $service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
  527 + $data['service_id'] = $service['sever_name'];
  528 + $data['price'] = $service['price'];
  529 + $data['home_id'] = $home['home_name'];
  530 + $this->success('SUCCESS',$data);
  531 + }
518 } 532 }
  533 +
  534 + /**
  535 + * @title 家政预约订单详情
  536 + * @description 家政预约订单详情
  537 + * @author GuoSheng
  538 + * @url /index/User/homeOrderDetail
  539 + * @method GET
  540 + *
  541 + * @header name:XX-Token require:1 default: desc:token
  542 + *
  543 + * @param name:order_id type:int require:1 default: desc:家政预约订单ID
  544 + *
  545 + * @return status:状态(1已预约，2已接单，3已完成)
  546 + * @return num:订单号
  547 + * @return create_time:下单时间
  548 + * @return sub_time:预约时间
  549 + * @return homeaddress_id:预约地址
  550 + * @return home_id:家政公司名称
  551 + * @return thumbnail:家政公司缩略图
  552 + * @return price:价格
  553 + * @return service_id:服务名称
  554 + * @return content:留言备注
  555 + *
  556 + */
  557 + public function homeOrderDetail()
  558 + {
  559 + $user_id = $this->getUserId();
  560 + //接收订单ID
  561 + $id = $this->request->param('order_id');
  562 + if(empty($id)){
  563 + $this->error(['code'=>41006,'msg'=>'缺少必要参数']);
  564 + }
  565 + $res = Db::name('subhome')
  566 + ->where('id',$id)
  567 + ->find();
  568 + $data['status'] = $res['status'];
  569 + $data['num'] = $res['num'];
  570 + $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
  571 + $data['sub_time'] = date('Y-m-d H:i:s',$res['sub_time']);
  572 + $homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->column('name');
  573 + $data['homeaddress_id'] = $homeaddress_id['name'];
  574 + $home = Db::name('home')->where('id',$data['home_id'])->field('id,home_name,thumbnail')->find();
  575 + $service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
  576 + $data['thumbnail'] = $home['thumbnail'];
  577 + $data['service_id'] = $service['sever_name'];
  578 + $data['price'] = $service['price'];
  579 + $data['home_id'] = $home['home_name'];
  580 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
  581 + $data['serve'] = Db::name('recyclefee')->where('id',1)->column('fee');
  582 + $this->success('SUCCESS',$data);
519 } 583 }
520 584
521 585