郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 c02c971ff15e46bed9cabae4e0181418bf6364ea 1 个父辈 5145ba31
1 个管道 的构建 通过 耗费 6 秒

修改回收首页评价

内嵌 并排对比
正在显示 4 个修改的文件 包含 610 行增加 和 219 行删除
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
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" /> 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/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
7 </list> 8 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -28,35 +29,141 @@ @@ -28,35 +29,141 @@
28 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> 29 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 30 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
30 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="1343">  
32 - <caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" /> 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" />
33 <folding> 34 <folding>
34 <element signature="e#131#161#0#PHP" expanded="true" /> 35 <element signature="e#131#161#0#PHP" expanded="true" />
35 - <element signature="e#309#524#0#PHP" expanded="false" />  
36 - <element signature="e#529#870#0#PHP" expanded="false" />  
37 - <element signature="e#876#1092#0#PHP" expanded="false" />  
38 - <element signature="e#1097#1480#0#PHP" expanded="false" />  
39 - <element signature="e#1486#1968#0#PHP" expanded="false" />  
40 - <element signature="e#1973#2478#0#PHP" expanded="false" /> 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#1988#0#PHP" expanded="false" />
  41 + <element signature="e#1993#2498#0#PHP" expanded="false" />
  42 + <element signature="e#2504#3005#0#PHP" expanded="false" />
  43 + <element signature="e#3010#3839#0#PHP" expanded="false" />
  44 + <element signature="e#3845#4158#0#PHP" expanded="false" />
  45 + <element signature="e#4163#4538#0#PHP" expanded="false" />
  46 + <element signature="e#4544#4901#0#PHP" expanded="false" />
  47 + <element signature="e#4906#5314#0#PHP" expanded="false" />
  48 + <element signature="e#5320#5702#0#PHP" expanded="false" />
  49 + <element signature="e#5707#6377#0#PHP" expanded="false" />
  50 + <element signature="e#6383#6826#0#PHP" expanded="false" />
  51 + <element signature="e#6831#7681#0#PHP" expanded="false" />
  52 + <element signature="e#7687#7954#0#PHP" expanded="false" />
  53 + <element signature="e#7959#8434#0#PHP" expanded="false" />
  54 + <element signature="e#8440#8940#0#PHP" expanded="false" />
  55 + <element signature="e#8945#9734#0#PHP" expanded="false" />
41 </folding> 56 </folding>
42 </state> 57 </state>
43 </provider> 58 </provider>
44 </entry> 59 </entry>
45 </file> 60 </file>
46 - <file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">  
47 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"> 61 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
  62 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
48 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="293">  
50 - <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> 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" />
51 <folding> 66 <folding>
52 - <element signature="e#602#906#0#PHP" expanded="false" />  
53 - <element signature="e#911#1805#0#PHP" expanded="false" />  
54 - <element signature="e#1811#2278#0#PHP" expanded="false" />  
55 - <element signature="e#2283#5971#0#PHP" expanded="false" />  
56 - <element signature="e#5977#6278#0#PHP" expanded="false" />  
57 - <element signature="e#6283#7591#0#PHP" expanded="false" />  
58 - <element signature="e#7598#8002#0#PHP" expanded="false" />  
59 - <element signature="e#8007#8590#0#PHP" expanded="false" /> 67 + <element signature="e#411#604#0#PHP" expanded="false" />
  68 + <element signature="e#609#825#0#PHP" expanded="false" />
  69 + <element signature="e#831#1300#0#PHP" expanded="false" />
  70 + <element signature="e#1305#2073#0#PHP" expanded="false" />
  71 + <element signature="e#2079#2297#0#PHP" expanded="false" />
  72 + <element signature="e#2302#2510#0#PHP" expanded="false" />
  73 + <element signature="e#2516#2992#0#PHP" expanded="false" />
  74 + <element signature="e#2997#3515#0#PHP" expanded="false" />
  75 + <element signature="e#3521#4033#0#PHP" expanded="false" />
  76 + <element signature="e#4038#4601#0#PHP" expanded="false" />
  77 + <element signature="e#4607#5104#0#PHP" expanded="false" />
  78 + <element signature="e#5109#5949#0#PHP" expanded="false" />
  79 + <element signature="e#5955#6273#0#PHP" expanded="false" />
  80 + <element signature="e#6278#6654#0#PHP" expanded="false" />
  81 + <element signature="e#6660#7015#0#PHP" expanded="false" />
  82 + <element signature="e#7020#7429#0#PHP" expanded="false" />
  83 + <element signature="e#7435#7820#0#PHP" expanded="false" />
  84 + <element signature="e#7825#8496#0#PHP" expanded="false" />
  85 + <element signature="e#8502#8948#0#PHP" expanded="false" />
  86 + <element signature="e#8953#9804#0#PHP" expanded="false" />
  87 + <element signature="e#9810#10080#0#PHP" expanded="false" />
  88 + <element signature="e#10085#10561#0#PHP" expanded="false" />
  89 + <element signature="e#10567#11127#0#PHP" expanded="false" />
  90 + <element signature="e#11132#11959#0#PHP" expanded="false" />
  91 + </folding>
  92 + </state>
  93 + </provider>
  94 + </entry>
  95 + </file>
  96 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
  97 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  98 + <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" />
  101 + <folding>
  102 + <element signature="e#345#694#0#PHP" expanded="false" />
  103 + <element signature="e#699#1464#0#PHP" expanded="false" />
  104 + <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" />
  107 + <element signature="e#3687#4133#0#PHP" expanded="false" />
  108 + <element signature="e#4139#4399#0#PHP" expanded="false" />
  109 + <element signature="e#4404#4605#0#PHP" expanded="false" />
  110 + <element signature="e#4611#4873#0#PHP" expanded="false" />
  111 + <element signature="e#4878#5083#0#PHP" expanded="false" />
  112 + <element signature="e#5089#5531#0#PHP" expanded="false" />
  113 + <element signature="e#5536#6764#0#PHP" expanded="false" />
  114 + <element signature="e#6787#7332#0#PHP" expanded="false" />
  115 + <element signature="e#7338#7619#0#PHP" expanded="false" />
  116 + <element signature="e#7624#8016#0#PHP" expanded="false" />
  117 + <element signature="e#8022#8574#0#PHP" expanded="false" />
  118 + <element signature="e#8579#9937#0#PHP" expanded="false" />
  119 + <element signature="e#9943#10400#0#PHP" expanded="false" />
  120 + <element signature="e#10405#11668#0#PHP" expanded="false" />
  121 + <element signature="e#11691#12043#0#PHP" expanded="false" />
  122 + <element signature="e#12049#12733#0#PHP" expanded="false" />
  123 + <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" />
60 </folding> 167 </folding>
61 </state> 168 </state>
62 </provider> 169 </provider>
@@ -123,16 +230,16 @@ @@ -123,16 +230,16 @@
123 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 230 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
124 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 231 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
125 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 232 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
126 - <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />  
127 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
128 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" /> 233 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
129 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" /> 234 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
130 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" /> 235 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
131 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" /> 236 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
132 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" /> 237 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
133 <option value="$PROJECT_DIR$/api/config.php" /> 238 <option value="$PROJECT_DIR$/api/config.php" />
134 - <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
135 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 239 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
  240 + <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" />
136 </list> 243 </list>
137 </option> 244 </option>
138 </component> 245 </component>
@@ -150,9 +257,9 @@ @@ -150,9 +257,9 @@
150 <sorting>DEFINITION_ORDER</sorting> 257 <sorting>DEFINITION_ORDER</sorting>
151 </component> 258 </component>
152 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 259 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
153 - <component name="ProjectFrameBounds" extendedState="1">  
154 - <option name="x" value="86" />  
155 - <option name="y" value="62" /> 260 + <component name="ProjectFrameBounds">
  261 + <option name="x" value="377" />
  262 + <option name="y" value="65" />
156 <option name="width" value="1582" /> 263 <option name="width" value="1582" />
157 <option name="height" value="930" /> 264 <option name="height" value="930" />
158 </component> 265 </component>
@@ -187,13 +294,13 @@ @@ -187,13 +294,13 @@
187 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 294 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
188 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 295 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
189 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 296 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
190 - <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" /> 297 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
191 </path> 298 </path>
192 <path> 299 <path>
193 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 300 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
194 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 301 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
195 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 302 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
196 - <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" /> 303 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
197 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 304 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
198 </path> 305 </path>
199 </expand> 306 </expand>
@@ -288,18 +395,18 @@ @@ -288,18 +395,18 @@
288 <workItem from="1574763377500" duration="4019000" /> 395 <workItem from="1574763377500" duration="4019000" />
289 <workItem from="1574815992559" duration="11623000" /> 396 <workItem from="1574815992559" duration="11623000" />
290 <workItem from="1574837405404" duration="1203000" /> 397 <workItem from="1574837405404" duration="1203000" />
291 - <workItem from="1574903328460" duration="7264000" /> 398 + <workItem from="1574903328460" duration="15512000" />
292 </task> 399 </task>
293 <servers /> 400 <servers />
294 </component> 401 </component>
295 <component name="TimeTrackingManager"> 402 <component name="TimeTrackingManager">
296 - <option name="totallyTimeSpent" value="339744000" /> 403 + <option name="totallyTimeSpent" value="347992000" />
297 </component> 404 </component>
298 <component name="ToolWindowManager"> 405 <component name="ToolWindowManager">
299 - <frame x="86" y="62" width="1582" height="930" extended-state="1" /> 406 + <frame x="377" y="65" width="1582" height="930" extended-state="0" />
300 <editor active="true" /> 407 <editor active="true" />
301 <layout> 408 <layout>
302 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20367937" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 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" />
303 <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" /> 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" />
304 <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" /> 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" />
305 <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" /> 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" />
@@ -507,13 +614,6 @@ @@ -507,13 +614,6 @@
507 </state> 614 </state>
508 </provider> 615 </provider>
509 </entry> 616 </entry>
510 - <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">  
511 - <provider selected="true" editor-type-id="text-editor">  
512 - <state relative-caret-position="81">  
513 - <caret line="99" column="8" lean-forward="false" selection-start-line="99" selection-start-column="8" selection-end-line="117" selection-end-column="34" />  
514 - </state>  
515 - </provider>  
516 - </entry>  
517 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 617 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
518 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
519 <state relative-caret-position="235"> 619 <state relative-caret-position="235">
@@ -558,43 +658,6 @@ @@ -558,43 +658,6 @@
558 </state> 658 </state>
559 </provider> 659 </provider>
560 </entry> 660 </entry>
561 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
562 - <provider selected="true" editor-type-id="text-editor">  
563 - <state relative-caret-position="281">  
564 - <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />  
565 - <folding>  
566 - <element signature="e#861#925#0#PHP" expanded="false" />  
567 - <element signature="e#930#1766#0#PHP" expanded="false" />  
568 - <element signature="e#1772#1853#0#PHP" expanded="false" />  
569 - <element signature="e#1858#3932#0#PHP" expanded="false" />  
570 - <element signature="e#3939#3962#0#PHP" expanded="false" />  
571 - <element signature="e#3967#4226#0#PHP" expanded="false" />  
572 - <element signature="e#4233#4282#0#PHP" expanded="false" />  
573 - <element signature="e#4287#4715#0#PHP" expanded="false" />  
574 - <element signature="e#4721#4785#0#PHP" expanded="false" />  
575 - <element signature="e#4790#5664#0#PHP" expanded="false" />  
576 - </folding>  
577 - </state>  
578 - </provider>  
579 - </entry>  
580 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
581 - <provider selected="true" editor-type-id="text-editor">  
582 - <state relative-caret-position="530">  
583 - <caret line="138" column="4" lean-forward="false" selection-start-line="138" selection-start-column="4" selection-end-line="177" selection-end-column="5" />  
584 - <folding>  
585 - <element signature="e#305#577#0#PHP" expanded="false" />  
586 - <element signature="e#583#854#0#PHP" expanded="false" />  
587 - <element signature="e#859#1113#0#PHP" expanded="false" />  
588 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
589 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
590 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
591 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
592 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
593 - <element signature="e#3894#4680#0#PHP" expanded="false" />  
594 - </folding>  
595 - </state>  
596 - </provider>  
597 - </entry>  
598 <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php"> 661 <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
599 <provider selected="true" editor-type-id="text-editor"> 662 <provider selected="true" editor-type-id="text-editor">
600 <state relative-caret-position="275"> 663 <state relative-caret-position="275">
@@ -603,79 +666,6 @@ @@ -603,79 +666,6 @@
603 </state> 666 </state>
604 </provider> 667 </provider>
605 </entry> 668 </entry>
606 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
607 - <provider selected="true" editor-type-id="text-editor">  
608 - <state relative-caret-position="614">  
609 - <caret line="401" column="0" lean-forward="true" selection-start-line="401" selection-start-column="0" selection-end-line="401" selection-end-column="0" />  
610 - <folding>  
611 - <element signature="e#345#694#0#PHP" expanded="false" />  
612 - <element signature="e#699#1464#0#PHP" expanded="false" />  
613 - <element signature="e#1470#1699#0#PHP" expanded="false" />  
614 - <element signature="e#1704#3329#0#PHP" expanded="false" />  
615 - <element signature="e#3335#3682#0#PHP" expanded="false" />  
616 - <element signature="e#3687#4133#0#PHP" expanded="false" />  
617 - <element signature="e#4139#4399#0#PHP" expanded="false" />  
618 - <element signature="e#4404#4605#0#PHP" expanded="false" />  
619 - <element signature="e#4611#4873#0#PHP" expanded="false" />  
620 - <element signature="e#4878#5083#0#PHP" expanded="false" />  
621 - <element signature="e#5089#5531#0#PHP" expanded="false" />  
622 - <element signature="e#5536#6764#0#PHP" expanded="false" />  
623 - <element signature="e#6787#7332#0#PHP" expanded="false" />  
624 - <element signature="e#7338#7619#0#PHP" expanded="false" />  
625 - <element signature="e#7624#8016#0#PHP" expanded="false" />  
626 - <element signature="e#8023#8575#0#PHP" expanded="false" />  
627 - <element signature="e#8580#9938#0#PHP" expanded="false" />  
628 - <element signature="e#9944#10401#0#PHP" expanded="false" />  
629 - <element signature="e#10406#11669#0#PHP" expanded="false" />  
630 - <element signature="e#11692#12044#0#PHP" expanded="false" />  
631 - <element signature="e#12050#12734#0#PHP" expanded="false" />  
632 - <element signature="e#12739#13998#0#PHP" expanded="false" />  
633 - </folding>  
634 - </state>  
635 - </provider>  
636 - </entry>  
637 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
638 - <provider selected="true" editor-type-id="text-editor">  
639 - <state relative-caret-position="614">  
640 - <caret line="523" column="5" lean-forward="false" selection-start-line="523" selection-start-column="5" selection-end-line="523" selection-end-column="5" />  
641 - <folding>  
642 - <element signature="e#342#596#0#PHP" expanded="false" />  
643 - <element signature="e#601#886#0#PHP" expanded="false" />  
644 - <element signature="e#892#1227#0#PHP" expanded="false" />  
645 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
646 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
647 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
648 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
649 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
650 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
651 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
652 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
653 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
654 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
655 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
656 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
657 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
658 - <element signature="e#5390#5818#0#PHP" expanded="false" />  
659 - <element signature="e#5823#6380#0#PHP" expanded="false" />  
660 - <element signature="e#6386#6729#0#PHP" expanded="false" />  
661 - <element signature="e#6734#7215#0#PHP" expanded="false" />  
662 - <element signature="e#7221#7512#0#PHP" expanded="false" />  
663 - <element signature="e#7517#7868#0#PHP" expanded="false" />  
664 - <element signature="e#7874#8227#0#PHP" expanded="false" />  
665 - <element signature="e#8232#8637#0#PHP" expanded="false" />  
666 - <element signature="e#8643#9026#0#PHP" expanded="false" />  
667 - <element signature="e#9031#9698#0#PHP" expanded="false" />  
668 - <element signature="e#9704#10148#0#PHP" expanded="false" />  
669 - <element signature="e#10153#11000#0#PHP" expanded="false" />  
670 - <element signature="e#11006#11274#0#PHP" expanded="false" />  
671 - <element signature="e#11279#11751#0#PHP" expanded="false" />  
672 - <element signature="e#11757#12063#0#PHP" expanded="false" />  
673 - <element signature="e#12068#13711#0#PHP" expanded="false" />  
674 - <element signature="e#13732#14051#0#PHP" expanded="false" />  
675 - </folding>  
676 - </state>  
677 - </provider>  
678 - </entry>  
679 <entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php"> 669 <entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
680 <provider selected="true" editor-type-id="text-editor"> 670 <provider selected="true" editor-type-id="text-editor">
681 <state relative-caret-position="500"> 671 <state relative-caret-position="500">
@@ -683,24 +673,6 @@ @@ -683,24 +673,6 @@
683 </state> 673 </state>
684 </provider> 674 </provider>
685 </entry> 675 </entry>
686 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
687 - <provider selected="true" editor-type-id="text-editor">  
688 - <state relative-caret-position="463">  
689 - <caret line="41" column="5" lean-forward="false" selection-start-line="41" selection-start-column="5" selection-end-line="43" selection-end-column="61" />  
690 - <folding>  
691 - <element signature="e#330#602#0#PHP" expanded="false" />  
692 - <element signature="e#975#1863#0#PHP" expanded="false" />  
693 - <element signature="e#1869#2106#0#PHP" expanded="false" />  
694 - <element signature="e#2111#2809#0#PHP" expanded="false" />  
695 - <element signature="e#2815#3057#0#PHP" expanded="false" />  
696 - <element signature="e#3063#3300#0#PHP" expanded="false" />  
697 - <element signature="e#3305#3377#0#PHP" expanded="false" />  
698 - <element signature="e#3383#3830#0#PHP" expanded="false" />  
699 - <element signature="e#3835#4378#0#PHP" expanded="false" />  
700 - </folding>  
701 - </state>  
702 - </provider>  
703 - </entry>  
704 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html"> 676 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html">
705 <provider selected="true" editor-type-id="text-editor"> 677 <provider selected="true" editor-type-id="text-editor">
706 <state relative-caret-position="1300"> 678 <state relative-caret-position="1300">
@@ -775,10 +747,155 @@ @@ -775,10 +747,155 @@
775 </state> 747 </state>
776 </provider> 748 </provider>
777 </entry> 749 </entry>
  750 + <entry file="file://$PROJECT_DIR$/api/config.php">
  751 + <provider selected="true" editor-type-id="text-editor">
  752 + <state relative-caret-position="418">
  753 + <caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />
  754 + <folding />
  755 + </state>
  756 + </provider>
  757 + </entry>
  758 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
  759 + <provider selected="true" editor-type-id="text-editor">
  760 + <state relative-caret-position="-2200">
  761 + <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
  762 + <folding />
  763 + </state>
  764 + </provider>
  765 + </entry>
  766 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
  767 + <provider selected="true" editor-type-id="text-editor">
  768 + <state relative-caret-position="280">
  769 + <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
  770 + <folding />
  771 + </state>
  772 + </provider>
  773 + </entry>
  774 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
  775 + <provider selected="true" editor-type-id="text-editor">
  776 + <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" />
  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>
  789 + </provider>
  790 + </entry>
  791 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  792 + <provider selected="true" editor-type-id="text-editor">
  793 + <state relative-caret-position="567">
  794 + <caret line="138" column="4" lean-forward="true" selection-start-line="138" selection-start-column="4" selection-end-line="177" selection-end-column="5" />
  795 + <folding>
  796 + <element signature="e#305#577#0#PHP" expanded="false" />
  797 + <element signature="e#583#854#0#PHP" expanded="false" />
  798 + <element signature="e#859#1113#0#PHP" expanded="false" />
  799 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  800 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  801 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  802 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  803 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  804 + <element signature="e#3894#4680#0#PHP" expanded="false" />
  805 + </folding>
  806 + </state>
  807 + </provider>
  808 + </entry>
  809 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state relative-caret-position="242">
  812 + <caret line="34" column="7" lean-forward="false" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
  813 + <folding>
  814 + <element signature="e#330#602#0#PHP" expanded="false" />
  815 + <element signature="e#608#970#0#PHP" expanded="false" />
  816 + <element signature="e#975#1863#0#PHP" expanded="false" />
  817 + <element signature="e#1869#2106#0#PHP" expanded="false" />
  818 + <element signature="e#2111#2809#0#PHP" expanded="false" />
  819 + <element signature="e#2815#3057#0#PHP" expanded="false" />
  820 + <element signature="e#3063#3300#0#PHP" expanded="false" />
  821 + <element signature="e#3305#3377#0#PHP" expanded="false" />
  822 + <element signature="e#3383#3830#0#PHP" expanded="false" />
  823 + <element signature="e#3835#4378#0#PHP" expanded="false" />
  824 + </folding>
  825 + </state>
  826 + </provider>
  827 + </entry>
  828 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  829 + <provider selected="true" editor-type-id="text-editor">
  830 + <state relative-caret-position="117">
  831 + <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
  832 + <folding>
  833 + <element signature="e#324#855#0#PHP" expanded="false" />
  834 + <element signature="e#861#925#0#PHP" expanded="false" />
  835 + <element signature="e#930#1766#0#PHP" expanded="false" />
  836 + <element signature="e#1772#1853#0#PHP" expanded="false" />
  837 + <element signature="e#1858#3932#0#PHP" expanded="false" />
  838 + <element signature="e#3939#3962#0#PHP" expanded="false" />
  839 + <element signature="e#3967#4226#0#PHP" expanded="false" />
  840 + <element signature="e#4233#4282#0#PHP" expanded="false" />
  841 + <element signature="e#4287#4715#0#PHP" expanded="false" />
  842 + <element signature="e#4721#4785#0#PHP" expanded="false" />
  843 + <element signature="e#4790#5664#0#PHP" expanded="false" />
  844 + </folding>
  845 + </state>
  846 + </provider>
  847 + </entry>
  848 + <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
  849 + <provider selected="true" editor-type-id="text-editor">
  850 + <state relative-caret-position="118">
  851 + <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
  852 + <folding>
  853 + <element signature="e#300#521#0#PHP" expanded="false" />
  854 + <element signature="e#526#900#0#PHP" expanded="false" />
  855 + <element signature="e#906#1097#0#PHP" expanded="false" />
  856 + <element signature="e#1102#1395#0#PHP" expanded="false" />
  857 + <element signature="e#1401#1589#0#PHP" expanded="false" />
  858 + <element signature="e#1594#1885#0#PHP" expanded="false" />
  859 + <element signature="e#1891#2348#0#PHP" expanded="false" />
  860 + <element signature="e#2353#3050#0#PHP" expanded="false" />
  861 + </folding>
  862 + </state>
  863 + </provider>
  864 + </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>
778 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 895 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
779 <provider selected="true" editor-type-id="text-editor"> 896 <provider selected="true" editor-type-id="text-editor">
780 - <state relative-caret-position="368">  
781 - <caret line="165" column="4" lean-forward="false" selection-start-line="165" selection-start-column="4" selection-end-line="204" selection-end-column="5" /> 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" />
782 <folding> 899 <folding>
783 <element signature="e#411#604#0#PHP" expanded="false" /> 900 <element signature="e#411#604#0#PHP" expanded="false" />
784 <element signature="e#609#825#0#PHP" expanded="false" /> 901 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -808,59 +925,74 @@ @@ -808,59 +925,74 @@
808 </state> 925 </state>
809 </provider> 926 </provider>
810 </entry> 927 </entry>
811 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 928 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
812 <provider selected="true" editor-type-id="text-editor"> 929 <provider selected="true" editor-type-id="text-editor">
813 - <state relative-caret-position="1343">  
814 - <caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" /> 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" />
815 <folding> 932 <folding>
816 - <element signature="e#131#161#0#PHP" expanded="true" />  
817 - <element signature="e#309#524#0#PHP" expanded="false" />  
818 - <element signature="e#529#870#0#PHP" expanded="false" />  
819 - <element signature="e#876#1092#0#PHP" expanded="false" />  
820 - <element signature="e#1097#1480#0#PHP" expanded="false" />  
821 - <element signature="e#1486#1968#0#PHP" expanded="false" />  
822 - <element signature="e#1973#2478#0#PHP" expanded="false" /> 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" />
823 </folding> 956 </folding>
824 </state> 957 </state>
825 </provider> 958 </provider>
826 </entry> 959 </entry>
827 - <entry file="file://$PROJECT_DIR$/api/config.php">  
828 - <provider selected="true" editor-type-id="text-editor">  
829 - <state relative-caret-position="418">  
830 - <caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />  
831 - <folding />  
832 - </state>  
833 - </provider>  
834 - </entry>  
835 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">  
836 - <provider selected="true" editor-type-id="text-editor">  
837 - <state relative-caret-position="-2200">  
838 - <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />  
839 - <folding />  
840 - </state>  
841 - </provider>  
842 - </entry>  
843 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">  
844 - <provider selected="true" editor-type-id="text-editor">  
845 - <state relative-caret-position="280">  
846 - <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />  
847 - <folding />  
848 - </state>  
849 - </provider>  
850 - </entry>  
851 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"> 960 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
852 <provider selected="true" editor-type-id="text-editor"> 961 <provider selected="true" editor-type-id="text-editor">
853 - <state relative-caret-position="293">  
854 - <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> 962 + <state relative-caret-position="542">
  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" />
855 <folding> 964 <folding>
856 - <element signature="e#602#906#0#PHP" expanded="false" />  
857 - <element signature="e#911#1805#0#PHP" expanded="false" />  
858 - <element signature="e#1811#2278#0#PHP" expanded="false" />  
859 - <element signature="e#2283#5971#0#PHP" expanded="false" />  
860 - <element signature="e#5977#6278#0#PHP" expanded="false" />  
861 - <element signature="e#6283#7591#0#PHP" expanded="false" />  
862 - <element signature="e#7598#8002#0#PHP" expanded="false" />  
863 - <element signature="e#8007#8590#0#PHP" expanded="false" /> 965 + <element signature="e#342#596#0#PHP" expanded="false" />
  966 + <element signature="e#601#886#0#PHP" expanded="false" />
  967 + <element signature="e#892#1227#0#PHP" expanded="false" />
  968 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  969 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  970 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  971 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  972 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  973 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  974 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  975 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  976 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  977 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  978 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  979 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  980 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  981 + <element signature="e#6422#6765#0#PHP" expanded="false" />
  982 + <element signature="e#6770#7251#0#PHP" expanded="false" />
  983 + <element signature="e#7257#7548#0#PHP" expanded="false" />
  984 + <element signature="e#7553#7904#0#PHP" expanded="false" />
  985 + <element signature="e#7910#8263#0#PHP" expanded="false" />
  986 + <element signature="e#8268#8673#0#PHP" expanded="false" />
  987 + <element signature="e#8679#9062#0#PHP" expanded="false" />
  988 + <element signature="e#9067#9734#0#PHP" expanded="false" />
  989 + <element signature="e#9740#10184#0#PHP" expanded="false" />
  990 + <element signature="e#10189#11036#0#PHP" expanded="false" />
  991 + <element signature="e#11042#11310#0#PHP" expanded="false" />
  992 + <element signature="e#11315#11787#0#PHP" expanded="false" />
  993 + <element signature="e#11793#12099#0#PHP" expanded="false" />
  994 + <element signature="e#12104#13747#0#PHP" expanded="false" />
  995 + <element signature="e#13768#14087#0#PHP" expanded="false" />
864 </folding> 996 </folding>
865 </state> 997 </state>
866 </provider> 998 </provider>
@@ -12,6 +12,7 @@ namespace api\index\controller; @@ -12,6 +12,7 @@ namespace api\index\controller;
12 use api\index\model\HomeModel; 12 use api\index\model\HomeModel;
13 use cmf\controller\RestBaseController; 13 use cmf\controller\RestBaseController;
14 use think\Db; 14 use think\Db;
  15 +use think\Validate;
15 16
16 /** 17 /**
17 * @title 家政服务 18 * @title 家政服务
@@ -128,11 +129,11 @@ class HomeController extends RestBaseController @@ -128,11 +129,11 @@ class HomeController extends RestBaseController
128 } 129 }
129 $page = $this->request->param('page',1,'intval'); 130 $page = $this->request->param('page',1,'intval');
130 $pageNum = $this->request->param('pageNum',10,'intval'); 131 $pageNum = $this->request->param('pageNum',10,'intval');
131 - $res = Db::name('shopcomment') 132 + $res = Db::name('homecomment')
132 ->alias('a') 133 ->alias('a')
133 ->join('user b','a.user_id = b.id') 134 ->join('user b','a.user_id = b.id')
134 ->field('a.*,b.user_nickname') 135 ->field('a.*,b.user_nickname')
135 - ->where('shopgood_id',$home_id) 136 + ->where('home_id',$home_id)
136 ->page($page,$pageNum) 137 ->page($page,$pageNum)
137 ->select() 138 ->select()
138 ->toArray(); 139 ->toArray();
@@ -143,5 +144,211 @@ class HomeController extends RestBaseController @@ -143,5 +144,211 @@ class HomeController extends RestBaseController
143 $this->success('SUCCESS',$res); 144 $this->success('SUCCESS',$res);
144 } 145 }
145 146
  147 + /**
  148 + * @title 预约家政服务地址列表
  149 + * @description
  150 + * @author GuoSheng
  151 + * @url /index/Home/recycleList
  152 + * @method GET
  153 + *
  154 + * @header name:XX-Token require:1 default: desc:token
  155 + *
  156 + * @return id:地址ID
  157 + * @return name:姓名
  158 + * @return phone:电话
  159 + * @return address:详细地址
  160 + *
  161 + */
  162 + public function recycleList()
  163 + {
  164 + $user_id = $this->getUserId();
  165 + $where['user_id'] = ['eq',$user_id];
  166 + $where['delete_time'] = ['eq',0];
  167 + $data = Db::name('homeadress')
  168 + ->field('id,name,phone,address')
  169 + ->where($where)
  170 + ->order('id desc')
  171 + ->select();
  172 + $this->success('SUCCESS',$data);
  173 + }
  174 +
  175 + /**
  176 + * @title 预约家政服务地址详情
  177 + * @description
  178 + * @author GuoSheng
  179 + * @url /index/Shopgoods/recycleDetail
  180 + * @method GET
  181 + *
  182 + * @header name:XX-Token require:1 default: desc:token
  183 + *
  184 + * @param name:id require:1 default: desc:回收地址ID
  185 + *
  186 + * @return name:姓名
  187 + * @return phone:电话
  188 + * @return address:详细地址
  189 + *
  190 + */
  191 + public function recycleDetail()
  192 + {
  193 + $user_id = $this->getUserId();
  194 + $id = $this->request->param('id',0,'intval');
  195 + if(empty($id)){
  196 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  197 + }
  198 + $data = Db::name('homeadress')
  199 + ->where('id',$id)
  200 + ->field('id,name,phone,address')
  201 + ->find();
  202 + $this->success('SUCCESS',$data);
  203 + }
  204 +
  205 + /**
  206 + * @title 添加预约家政服务地址
  207 + * @description
  208 + * @author GuoSheng
  209 + * @url /index/Home/addrecycle
  210 + * @method GET
  211 + *
  212 + * @header name:XX-Token require:1 default: desc:token
  213 + *
  214 + * @param name:name require:1 default: desc:联系人姓名
  215 + * @param name:phone require:1 default: desc:联系人电话
  216 + * @param name:address require:1 default: desc:联系人详细地址
  217 + *
  218 + */
  219 + public function addrecycle()
  220 + {
  221 + $user_id = $this->getUserId();
  222 + $param = $this->request->param();
  223 + $param['user_id'] = $user_id;
  224 + $param['create_time'] = time();
  225 + $validate = new Validate([
  226 + 'name' => 'require',
  227 + 'phone' => 'require',
  228 + 'address'=>'require',
  229 + ]);
  230 + if (!$validate->check($param)) {
  231 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  232 + }
  233 + $data = Db::name('homeadress')
  234 + ->insert($param);
  235 + if(empty($data)){
  236 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  237 + }
  238 + $this->success('SUCCESS');
  239 + }
  240 +
  241 + /**
  242 + * @title 修改预约家政服务地址
  243 + * @description
  244 + * @author GuoSheng
  245 + * @url /index/Home/editrecycle
  246 + * @method GET
  247 + *
  248 + * @header name:XX-Token require:1 default: desc:token
  249 + *
  250 + * @param name:id require:1 default: desc:回收地址ID
  251 + *
  252 + * @param name:name require:1 default: desc:联系人姓名
  253 + * @param name:phone require:1 default: desc:联系人电话
  254 + * @param name:address require:1 default: desc:联系人详细地址
  255 + *
  256 + */
  257 + public function editrecycle()
  258 + {
  259 + $user_id = $this->getUserId();
  260 + $id = $this->request->param('id',0,'intval');
  261 + if(empty($id)){
  262 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  263 + }
  264 + $param = $this->request->param();
  265 + $param['user_id'] = $user_id;
  266 + $param['update_time'] = time();
  267 + $validate = new Validate([
  268 + 'name' => 'require',
  269 + 'phone' => 'require',
  270 + 'address'=>'require',
  271 + ]);
  272 + if (!$validate->check($param)) {
  273 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  274 + }
  275 + $data = Db::name('homeadress')
  276 + ->where('id',$id)
  277 + ->update($param);
  278 + if(empty($data)){
  279 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  280 + }
  281 + $this->success('SUCCESS');
  282 + }
  283 +
  284 + /**
  285 + * @title 删除预约家政服务地址
  286 + * @description
  287 + * @author GuoSheng
  288 + * @url /index/Home/delrecycle
  289 + * @method GET
  290 + *
  291 + * @header name:XX-Token require:1 default: desc:token
  292 + *
  293 + * @param name:id require:1 default: desc:回收地址ID
  294 + *
  295 + */
  296 + public function delrecycle()
  297 + {
  298 + $user_id = $this->getUserId();
  299 + $id = $this->request->param('id',0,'intval');
  300 + if(empty($id)){
  301 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  302 + }
  303 + $data = Db::name('homeadress')
  304 + ->where('id',$id)
  305 + ->update(['delete_time'=>time()]);
  306 + if(empty($data)){
  307 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  308 + }
  309 + $this->success('SUCCESS');
  310 + }
  311 +
  312 + /**
  313 + * @title 家政服务预约订单
  314 + * @description
  315 + * @author GuoSheng
  316 + * @url /index/Home/subscribe
  317 + * @method GET
  318 + *
  319 + * @header name:XX-Token require:1 default: desc:token
  320 + *
  321 + * @param name:address_id require:1 other: desc: 预约家政服务地址ID
  322 + * @param name:home_id require:1 other: desc: 家政公司ID
  323 + * @param name:service_id require:1 other desc: 服务类目ID
  324 + * @param name:sub_time require:1 other desc: 预约时间
  325 + * @param name:content require:1 other desc: 留言备注
  326 + *
  327 + */
  328 + public function subscribe()
  329 + {
  330 + $user_id = $this->getUserId();
  331 + $param = $this->request->param();
  332 + $param['user_id'] = $user_id;
  333 + $param['create_time'] = time();
  334 + $validate = new Validate([
  335 + 'address_id' => 'require',
  336 + 'home_id' => 'require',
  337 + 'service_id'=>'require',
  338 + 'sub_time'=>'require',
  339 + 'content'=>'require'
  340 + ]);
  341 + if (!$validate->check($param)) {
  342 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  343 + }
  344 + $param['num'] = cmf_get_order_sn();
  345 + $data = Db::name('subhome')
  346 + ->insert($param);
  347 + if(empty($data)){
  348 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  349 + }
  350 + $this->success('SUCCESS');
  351 + }
  352 +
146 353
147 } 354 }
@@ -237,6 +237,7 @@ class RecycleController extends RestBaseController @@ -237,6 +237,7 @@ class RecycleController extends RestBaseController
237 * @return id:评价id 237 * @return id:评价id
238 * @return user_id:用户ID 238 * @return user_id:用户ID
239 * @return user_nickname:用户名 239 * @return user_nickname:用户名
  240 + * @return avatar:用户头像
240 * @return num:评价星数 241 * @return num:评价星数
241 * @return content:评价内容 242 * @return content:评价内容
242 * 243 *
@@ -248,7 +249,7 @@ class RecycleController extends RestBaseController @@ -248,7 +249,7 @@ class RecycleController extends RestBaseController
248 $res = Db::name('recyclecomment') 249 $res = Db::name('recyclecomment')
249 ->alias('a') 250 ->alias('a')
250 ->join('user b','a.user_id = b.id') 251 ->join('user b','a.user_id = b.id')
251 - ->field('a.*,b.user_nickname') 252 + ->field('a.*,b.user_nickname,b.avatar')
252 ->page($page,$pageNum) 253 ->page($page,$pageNum)
253 ->select() 254 ->select()
254 ->toArray(); 255 ->toArray();
@@ -290,7 +290,6 @@ class UserController extends RestBaseController @@ -290,7 +290,6 @@ class UserController extends RestBaseController
290 } 290 }
291 } 291 }
292 292
293 -  
294 /** 293 /**
295 * @title 回收订单详情 294 * @title 回收订单详情
296 * @description 295 * @description
@@ -467,6 +466,58 @@ class UserController extends RestBaseController @@ -467,6 +466,58 @@ class UserController extends RestBaseController
467 $this->success('SUCCESS',$data); 466 $this->success('SUCCESS',$data);
468 } 467 }
469 468
  469 + /**
  470 + * @title 我的家政预约订单
  471 + * @description 我的家政预约订单
  472 + * @author Guosheng
  473 + * @url /index/User/subhomeorder
  474 + * @method POST
  475 + *
  476 + * @header name:XX-Token require:1 default: desc:token
  477 + *
  478 + * @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成)
  479 + *
  480 + * @return id:订单ID
  481 + * @return num:订单号
  482 + * @return rgoods_name:商品名称
  483 + * @return create_time:创建时间
  484 + * @return sub_time:预约时间
  485 + *
  486 + */
  487 + public function subhomeorder()
  488 + {
  489 + $user_id = $this->getUserId();
  490 + $status = $this->request->param('status',0,'intval');
  491 + if(empty($status) || $status == 0){
  492 + //已预约的回收订单
  493 + $data = Db::name('subscribe')
  494 + ->where('user_id',$user_id)
  495 + ->where('status',0)
  496 + ->field('id,num,create_time,sub_time,attr_id')
  497 + ->select();
  498 + $res = $this->r_foreach($data);
  499 + $this->success('SUCCESS',$res);
  500 + }elseif ($status == 1){
  501 + //已接单的回收订单
  502 + $data = Db::name('subscribe')
  503 + ->where('user_id',$user_id)
  504 + ->where('status',1)
  505 + ->field('id,num,create_time,sub_time,attr_id')
  506 + ->select();
  507 + $res = $this->r_foreach($data);
  508 + $this->success('SUCCESS',$res);
  509 + }elseif ($status == 2){
  510 + //已完成的回收订单
  511 + $data = Db::name('subscribe')
  512 + ->where('user_id',$user_id)
  513 + ->where('status',2)
  514 + ->field('id,num,create_time,sub_time,attr_id')
  515 + ->select();
  516 + $res = $this->r_foreach($data);
  517 + $this->success('SUCCESS',$res);
  518 + }
  519 + }
  520 +
470 521
471 522
472 523