郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 96928507798ae7d9f4f4372dc794de98eba65b1d 1 个父辈 e46d47ef
1 个管道 的构建 通过 耗费 10 秒

修改下订单留言备注非必填

内嵌 并排对比
正在显示 5 个修改的文件 包含 281 行增加 和 134 行删除
@@ -2,7 +2,11 @@ @@ -2,7 +2,11 @@
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/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
6 </list> 10 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -24,21 +28,149 @@ @@ -24,21 +28,149 @@
24 </component> 28 </component>
25 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">  
28 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 31 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
  32 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  33 + <provider selected="true" editor-type-id="text-editor">
  34 + <state relative-caret-position="911">
  35 + <caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
  36 + <folding>
  37 + <element signature="e#131#169#0#PHP" expanded="true" />
  38 + <element signature="e#366#791#0#PHP" expanded="false" />
  39 + <element signature="e#796#1608#0#PHP" expanded="false" />
  40 + <element signature="e#1614#1872#0#PHP" expanded="false" />
  41 + <element signature="e#1877#2260#0#PHP" expanded="false" />
  42 + <element signature="e#2266#2495#0#PHP" expanded="false" />
  43 + <element signature="e#2500#4135#0#PHP" expanded="false" />
  44 + <element signature="e#4141#4381#0#PHP" expanded="false" />
  45 + <element signature="e#4386#4621#0#PHP" expanded="false" />
  46 + <element signature="e#4627#4974#0#PHP" expanded="false" />
  47 + <element signature="e#4979#5425#0#PHP" expanded="false" />
  48 + <element signature="e#5431#5691#0#PHP" expanded="false" />
  49 + <element signature="e#5696#5897#0#PHP" expanded="false" />
  50 + <element signature="e#5903#6165#0#PHP" expanded="false" />
  51 + <element signature="e#6170#6375#0#PHP" expanded="false" />
  52 + <element signature="e#6381#6860#0#PHP" expanded="false" />
  53 + <element signature="e#6865#9088#0#PHP" expanded="false" />
  54 + <element signature="e#9111#9642#0#PHP" expanded="false" />
  55 + <element signature="e#9648#9928#0#PHP" expanded="false" />
  56 + <element signature="e#9933#10325#0#PHP" expanded="false" />
  57 + <element signature="e#10331#10615#0#PHP" expanded="false" />
  58 + <element signature="e#10620#11565#0#PHP" expanded="false" />
  59 + <element signature="e#11571#11859#0#PHP" expanded="false" />
  60 + <element signature="e#11864#12803#0#PHP" expanded="false" />
  61 + <element signature="e#12809#13390#0#PHP" expanded="false" />
  62 + <element signature="e#13395#14945#0#PHP" expanded="false" />
  63 + <element signature="e#14951#15407#0#PHP" expanded="false" />
  64 + <element signature="e#15412#17480#0#PHP" expanded="false" />
  65 + <element signature="e#17503#17858#0#PHP" expanded="false" />
  66 + <element signature="e#17864#18605#0#PHP" expanded="false" />
  67 + <element signature="e#18610#20063#0#PHP" expanded="false" />
  68 + <element signature="e#20069#20530#0#PHP" expanded="false" />
  69 + <element signature="e#20535#23662#0#PHP" expanded="false" />
  70 + <element signature="e#23668#24277#0#PHP" expanded="false" />
  71 + <element signature="e#24282#25567#0#PHP" expanded="false" />
  72 + <element signature="e#25573#25930#0#PHP" expanded="false" />
  73 + <element signature="e#25935#26918#0#PHP" expanded="false" />
  74 + <element signature="e#26924#27276#0#PHP" expanded="false" />
  75 + <element signature="e#27281#28390#0#PHP" expanded="false" />
  76 + <element signature="e#28396#28751#0#PHP" expanded="false" />
  77 + <element signature="e#28756#30183#0#PHP" expanded="false" />
  78 + <element signature="e#30189#30613#0#PHP" expanded="false" />
  79 + <element signature="e#30618#31229#0#PHP" expanded="false" />
  80 + <element signature="e#31235#31731#0#PHP" expanded="false" />
  81 + <element signature="e#31736#35394#0#PHP" expanded="false" />
  82 + <element signature="e#32548#33675#0#PHP" expanded="false" />
  83 + <element signature="e#35400#35684#0#PHP" expanded="false" />
  84 + <element signature="e#35689#36368#0#PHP" expanded="false" />
  85 + <element signature="e#36389#36708#0#PHP" expanded="false" />
  86 + <element signature="e#36714#37122#0#PHP" expanded="false" />
  87 + <element signature="e#37128#37887#0#PHP" expanded="false" />
  88 + <element signature="e#37906#38770#0#PHP" expanded="false" />
  89 + <element signature="e#38796#39196#0#PHP" expanded="false" />
  90 + <element signature="e#39219#39792#0#PHP" expanded="false" />
  91 + <element signature="e#39815#40625#0#PHP" expanded="false" />
  92 + <element signature="e#40631#41230#0#PHP" expanded="false" />
  93 + <element signature="e#41235#42199#0#PHP" expanded="false" />
  94 + <element signature="e#42205#42872#0#PHP" expanded="false" />
  95 + <element signature="e#42877#43918#0#PHP" expanded="false" />
  96 + <element signature="e#43924#44587#0#PHP" expanded="false" />
  97 + <element signature="e#44592#45619#0#PHP" expanded="false" />
  98 + <element signature="e#45626#46057#0#PHP" expanded="false" />
  99 + <element signature="e#46062#46640#0#PHP" expanded="false" />
  100 + <element signature="e#46646#47075#0#PHP" expanded="false" />
  101 + <element signature="e#47080#47682#0#PHP" expanded="false" />
  102 + <element signature="e#47688#48115#0#PHP" expanded="false" />
  103 + <element signature="e#48120#48686#0#PHP" expanded="false" />
  104 + </folding>
  105 + </state>
  106 + </provider>
  107 + </entry>
  108 + </file>
  109 + <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
  110 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
29 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="509">  
31 - <caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" /> 112 + <state relative-caret-position="525">
  113 + <caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
32 <folding> 114 <folding>
33 - <element signature="e#336#608#0#PHP" expanded="false" />  
34 - <element signature="e#614#976#0#PHP" expanded="false" />  
35 - <element signature="e#981#2020#0#PHP" expanded="false" />  
36 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
37 - <element signature="e#2268#3049#0#PHP" expanded="false" />  
38 - <element signature="e#3055#3364#0#PHP" expanded="false" />  
39 - <element signature="e#3369#5259#0#PHP" expanded="false" />  
40 - <element signature="e#5267#5746#0#PHP" expanded="false" />  
41 - <element signature="e#6355#6608#0#PHP" expanded="false" /> 115 + <element signature="e#305#577#0#PHP" expanded="false" />
  116 + <element signature="e#583#854#0#PHP" expanded="false" />
  117 + <element signature="e#859#1113#0#PHP" expanded="false" />
  118 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  119 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  120 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  121 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  122 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  123 + <element signature="e#3894#4961#0#PHP" expanded="false" />
  124 + </folding>
  125 + </state>
  126 + </provider>
  127 + </entry>
  128 + </file>
  129 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
  130 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  131 + <provider selected="true" editor-type-id="text-editor">
  132 + <state relative-caret-position="630">
  133 + <caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
  134 + <folding>
  135 + <element signature="e#411#604#0#PHP" expanded="false" />
  136 + <element signature="e#609#825#0#PHP" expanded="false" />
  137 + <element signature="e#831#1329#0#PHP" expanded="false" />
  138 + <element signature="e#1334#2093#0#PHP" expanded="false" />
  139 + <element signature="e#2099#2317#0#PHP" expanded="false" />
  140 + <element signature="e#2322#2530#0#PHP" expanded="false" />
  141 + <element signature="e#2536#3043#0#PHP" expanded="false" />
  142 + <element signature="e#3048#3566#0#PHP" expanded="false" />
  143 + <element signature="e#3572#4084#0#PHP" expanded="false" />
  144 + <element signature="e#4089#4652#0#PHP" expanded="false" />
  145 + <element signature="e#4658#5248#0#PHP" expanded="false" />
  146 + <element signature="e#5253#6299#0#PHP" expanded="false" />
  147 + <element signature="e#6305#6623#0#PHP" expanded="false" />
  148 + <element signature="e#6628#7004#0#PHP" expanded="false" />
  149 + <element signature="e#7010#7365#0#PHP" expanded="false" />
  150 + <element signature="e#7370#7779#0#PHP" expanded="false" />
  151 + <element signature="e#7785#8170#0#PHP" expanded="false" />
  152 + <element signature="e#8175#8846#0#PHP" expanded="false" />
  153 + <element signature="e#8852#9298#0#PHP" expanded="false" />
  154 + <element signature="e#9303#10154#0#PHP" expanded="false" />
  155 + <element signature="e#10160#10430#0#PHP" expanded="false" />
  156 + <element signature="e#10435#10911#0#PHP" expanded="false" />
  157 + <element signature="e#10917#11547#0#PHP" expanded="false" />
  158 + <element signature="e#11552#13417#0#PHP" expanded="false" />
  159 + </folding>
  160 + </state>
  161 + </provider>
  162 + </entry>
  163 + </file>
  164 + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
  165 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  166 + <provider selected="true" editor-type-id="text-editor">
  167 + <state relative-caret-position="249">
  168 + <caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
  169 + <folding>
  170 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  171 + <element signature="e#3701#4697#0#PHP" expanded="false" />
  172 + <element signature="e#4703#5016#0#PHP" expanded="false" />
  173 + <element signature="e#5021#5396#0#PHP" expanded="false" />
42 </folding> 174 </folding>
43 </state> 175 </state>
44 </provider> 176 </provider>
@@ -101,8 +233,6 @@ @@ -101,8 +233,6 @@
101 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" /> 233 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
102 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 234 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
103 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 235 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
104 - <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
105 - <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />  
106 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 236 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
107 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 237 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
108 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" /> 238 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
@@ -112,9 +242,11 @@ @@ -112,9 +242,11 @@
112 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 242 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
113 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 243 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
114 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" /> 244 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
115 - <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />  
116 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
117 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 245 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  246 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  247 + <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
  248 + <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  249 + <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
118 </list> 250 </list>
119 </option> 251 </option>
120 </component> 252 </component>
@@ -133,10 +265,10 @@ @@ -133,10 +265,10 @@
133 </component> 265 </component>
134 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 266 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
135 <component name="ProjectFrameBounds" extendedState="1"> 267 <component name="ProjectFrameBounds" extendedState="1">
136 - <option name="x" value="108" />  
137 - <option name="y" value="79" /> 268 + <option name="x" value="210" />
  269 + <option name="y" value="58" />
138 <option name="width" value="1618" /> 270 <option name="width" value="1618" />
139 - <option name="height" value="1096" /> 271 + <option name="height" value="1092" />
140 </component> 272 </component>
141 <component name="ProjectView"> 273 <component name="ProjectView">
142 <navigator currentView="ProjectPane" proportions="" version="1"> 274 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -153,6 +285,7 @@ @@ -153,6 +285,7 @@
153 <foldersAlwaysOnTop value="true" /> 285 <foldersAlwaysOnTop value="true" />
154 </navigator> 286 </navigator>
155 <panes> 287 <panes>
  288 + <pane id="Scope" />
156 <pane id="ProjectPane"> 289 <pane id="ProjectPane">
157 <subPane> 290 <subPane>
158 <expand> 291 <expand>
@@ -182,7 +315,6 @@ @@ -182,7 +315,6 @@
182 <select /> 315 <select />
183 </subPane> 316 </subPane>
184 </pane> 317 </pane>
185 - <pane id="Scope" />  
186 <pane id="Scratches" /> 318 <pane id="Scratches" />
187 </panes> 319 </panes>
188 </component> 320 </component>
@@ -301,18 +433,22 @@ @@ -301,18 +433,22 @@
301 <workItem from="1576298110450" duration="8414000" /> 433 <workItem from="1576298110450" duration="8414000" />
302 <workItem from="1576455946584" duration="1141000" /> 434 <workItem from="1576455946584" duration="1141000" />
303 <workItem from="1576459063836" duration="389000" /> 435 <workItem from="1576459063836" duration="389000" />
304 - <workItem from="1576463908857" duration="1749000" /> 436 + <workItem from="1576463908857" duration="1900000" />
  437 + <workItem from="1576498945104" duration="2021000" />
  438 + <workItem from="1576501257741" duration="90000" />
  439 + <workItem from="1576549607137" duration="1339000" />
  440 + <workItem from="1576722212421" duration="195000" />
305 </task> 441 </task>
306 <servers /> 442 <servers />
307 </component> 443 </component>
308 <component name="TimeTrackingManager"> 444 <component name="TimeTrackingManager">
309 - <option name="totallyTimeSpent" value="575781000" /> 445 + <option name="totallyTimeSpent" value="579577000" />
310 </component> 446 </component>
311 <component name="ToolWindowManager"> 447 <component name="ToolWindowManager">
312 - <frame x="108" y="79" width="1618" height="1096" extended-state="1" /> 448 + <frame x="210" y="58" width="1618" height="1092" extended-state="1" />
313 <editor active="true" /> 449 <editor active="true" />
314 <layout> 450 <layout>
315 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19640565" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 451 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20667523" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
316 <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" /> 452 <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" />
317 <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" /> 453 <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" />
318 <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" /> 454 <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" />
@@ -358,18 +494,11 @@ @@ -358,18 +494,11 @@
358 </component> 494 </component>
359 <component name="XDebuggerManager"> 495 <component name="XDebuggerManager">
360 <breakpoint-manager> 496 <breakpoint-manager>
361 - <option name="time" value="15" /> 497 + <option name="time" value="18" />
362 </breakpoint-manager> 498 </breakpoint-manager>
363 <watches-manager /> 499 <watches-manager />
364 </component> 500 </component>
365 <component name="editorHistoryManager"> 501 <component name="editorHistoryManager">
366 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">  
367 - <provider selected="true" editor-type-id="text-editor">  
368 - <state relative-caret-position="0">  
369 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
370 - </state>  
371 - </provider>  
372 - </entry>  
373 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html"> 502 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
374 <provider selected="true" editor-type-id="text-editor"> 503 <provider selected="true" editor-type-id="text-editor">
375 <state relative-caret-position="302"> 504 <state relative-caret-position="302">
@@ -468,13 +597,6 @@ @@ -468,13 +597,6 @@
468 </state> 597 </state>
469 </provider> 598 </provider>
470 </entry> 599 </entry>
471 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
472 - <provider selected="true" editor-type-id="text-editor">  
473 - <state relative-caret-position="-689">  
474 - <caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />  
475 - </state>  
476 - </provider>  
477 - </entry>  
478 <entry file="file://$PROJECT_DIR$/api/config.php"> 600 <entry file="file://$PROJECT_DIR$/api/config.php">
479 <provider selected="true" editor-type-id="text-editor"> 601 <provider selected="true" editor-type-id="text-editor">
480 <state relative-caret-position="686"> 602 <state relative-caret-position="686">
@@ -545,20 +667,6 @@ @@ -545,20 +667,6 @@
545 </state> 667 </state>
546 </provider> 668 </provider>
547 </entry> 669 </entry>
548 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
549 - <provider selected="true" editor-type-id="text-editor">  
550 - <state relative-caret-position="139">  
551 - <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />  
552 - </state>  
553 - </provider>  
554 - </entry>  
555 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
556 - <provider selected="true" editor-type-id="text-editor">  
557 - <state relative-caret-position="690">  
558 - <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />  
559 - </state>  
560 - </provider>  
561 - </entry>  
562 <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php"> 670 <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
563 <provider selected="true" editor-type-id="text-editor"> 671 <provider selected="true" editor-type-id="text-editor">
564 <state relative-caret-position="425"> 672 <state relative-caret-position="425">
@@ -689,63 +797,61 @@ @@ -689,63 +797,61 @@
689 <provider selected="true" editor-type-id="text-editor"> 797 <provider selected="true" editor-type-id="text-editor">
690 <state relative-caret-position="500"> 798 <state relative-caret-position="500">
691 <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" /> 799 <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
692 - <folding>  
693 - <element signature="e#324#941#0#PHP" expanded="false" />  
694 - <element signature="e#947#1011#0#PHP" expanded="false" />  
695 - <element signature="e#1016#1849#0#PHP" expanded="false" />  
696 - <element signature="e#1855#1936#0#PHP" expanded="false" />  
697 - <element signature="e#1941#3993#0#PHP" expanded="false" />  
698 - <element signature="e#4000#4023#0#PHP" expanded="false" />  
699 - <element signature="e#4028#4287#0#PHP" expanded="false" />  
700 - <element signature="e#4294#4343#0#PHP" expanded="false" />  
701 - <element signature="e#4348#4776#0#PHP" expanded="false" />  
702 - <element signature="e#4783#4847#0#PHP" expanded="false" />  
703 - <element signature="e#4852#5588#0#PHP" expanded="false" />  
704 - </folding>  
705 </state> 800 </state>
706 </provider> 801 </provider>
707 </entry> 802 </entry>
708 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 803 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
709 <provider selected="true" editor-type-id="text-editor"> 804 <provider selected="true" editor-type-id="text-editor">
710 - <state relative-caret-position="-804">  
711 - <caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />  
712 - <folding>  
713 - <element signature="e#831#1329#0#PHP" expanded="false" />  
714 - <element signature="e#1334#2093#0#PHP" expanded="false" />  
715 - <element signature="e#2099#2317#0#PHP" expanded="false" />  
716 - <element signature="e#2322#2530#0#PHP" expanded="false" />  
717 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
718 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
719 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
720 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
721 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
722 - </folding> 805 + <state relative-caret-position="400">
  806 + <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
723 </state> 807 </state>
724 </provider> 808 </provider>
725 </entry> 809 </entry>
726 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 810 + <entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
  811 + <provider selected="true" editor-type-id="text-editor">
  812 + <state relative-caret-position="175">
  813 + <caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
  814 + </state>
  815 + </provider>
  816 + </entry>
  817 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  818 + <provider selected="true" editor-type-id="text-editor">
  819 + <state relative-caret-position="301">
  820 + <caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
  821 + <folding />
  822 + </state>
  823 + </provider>
  824 + </entry>
  825 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
727 <provider selected="true" editor-type-id="text-editor"> 826 <provider selected="true" editor-type-id="text-editor">
728 - <state relative-caret-position="125">  
729 - <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> 827 + <state relative-caret-position="556">
  828 + <caret line="456" column="5" lean-forward="false" selection-start-line="456" selection-start-column="5" selection-end-line="456" selection-end-column="5" />
730 <folding> 829 <folding>
731 - <element signature="e#305#577#0#PHP" expanded="false" />  
732 - <element signature="e#583#854#0#PHP" expanded="false" />  
733 - <element signature="e#859#1113#0#PHP" expanded="false" />  
734 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
735 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
736 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
737 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
738 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
739 - <element signature="e#3894#5028#0#PHP" expanded="false" /> 830 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  831 + <element signature="e#5784#6508#0#PHP" expanded="false" />
  832 + <element signature="e#6514#6857#0#PHP" expanded="false" />
  833 + <element signature="e#6862#7343#0#PHP" expanded="false" />
  834 + <element signature="e#7349#7640#0#PHP" expanded="false" />
  835 + <element signature="e#7645#7996#0#PHP" expanded="false" />
  836 + <element signature="e#8002#8355#0#PHP" expanded="false" />
  837 + <element signature="e#8360#8765#0#PHP" expanded="false" />
  838 + <element signature="e#8771#9154#0#PHP" expanded="false" />
  839 + <element signature="e#9159#9826#0#PHP" expanded="false" />
  840 + <element signature="e#9832#10276#0#PHP" expanded="false" />
  841 + <element signature="e#10281#11128#0#PHP" expanded="false" />
  842 + <element signature="e#11134#11402#0#PHP" expanded="false" />
  843 + <element signature="e#11407#11879#0#PHP" expanded="false" />
  844 + <element signature="e#11885#12191#0#PHP" expanded="false" />
740 </folding> 845 </folding>
741 </state> 846 </state>
742 </provider> 847 </provider>
743 </entry> 848 </entry>
744 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 849 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
745 <provider selected="true" editor-type-id="text-editor"> 850 <provider selected="true" editor-type-id="text-editor">
746 - <state relative-caret-position="930">  
747 - <caret line="987" column="5" lean-forward="true" selection-start-line="987" selection-start-column="5" selection-end-line="987" selection-end-column="5" /> 851 + <state relative-caret-position="911">
  852 + <caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
748 <folding> 853 <folding>
  854 + <element signature="e#131#169#0#PHP" expanded="true" />
749 <element signature="e#366#791#0#PHP" expanded="false" /> 855 <element signature="e#366#791#0#PHP" expanded="false" />
750 <element signature="e#796#1608#0#PHP" expanded="false" /> 856 <element signature="e#796#1608#0#PHP" expanded="false" />
751 <element signature="e#1614#1872#0#PHP" expanded="false" /> 857 <element signature="e#1614#1872#0#PHP" expanded="false" />
@@ -792,44 +898,90 @@ @@ -792,44 +898,90 @@
792 <element signature="e#31736#35394#0#PHP" expanded="false" /> 898 <element signature="e#31736#35394#0#PHP" expanded="false" />
793 <element signature="e#32548#33675#0#PHP" expanded="false" /> 899 <element signature="e#32548#33675#0#PHP" expanded="false" />
794 <element signature="e#35400#35684#0#PHP" expanded="false" /> 900 <element signature="e#35400#35684#0#PHP" expanded="false" />
795 - <element signature="e#35689#36325#0#PHP" expanded="false" />  
796 - <element signature="e#36346#36665#0#PHP" expanded="false" />  
797 - <element signature="e#36671#37079#0#PHP" expanded="false" />  
798 - <element signature="e#37085#37844#0#PHP" expanded="false" />  
799 - <element signature="e#37863#38727#0#PHP" expanded="false" />  
800 - <element signature="e#38753#39153#0#PHP" expanded="false" />  
801 - <element signature="e#39176#39749#0#PHP" expanded="false" />  
802 - <element signature="e#39772#40582#0#PHP" expanded="false" />  
803 - <element signature="e#40588#41187#0#PHP" expanded="false" />  
804 - <element signature="e#41192#42156#0#PHP" expanded="false" />  
805 - <element signature="e#42162#42829#0#PHP" expanded="false" />  
806 - <element signature="e#42834#43875#0#PHP" expanded="false" />  
807 - <element signature="e#43881#44544#0#PHP" expanded="false" />  
808 - <element signature="e#44549#45576#0#PHP" expanded="false" />  
809 - <element signature="e#45583#46014#0#PHP" expanded="false" />  
810 - <element signature="e#46019#46597#0#PHP" expanded="false" />  
811 - <element signature="e#46603#47032#0#PHP" expanded="false" />  
812 - <element signature="e#47037#47639#0#PHP" expanded="false" />  
813 - <element signature="e#47645#48072#0#PHP" expanded="false" />  
814 - <element signature="e#48077#48643#0#PHP" expanded="false" /> 901 + <element signature="e#35689#36368#0#PHP" expanded="false" />
  902 + <element signature="e#36389#36708#0#PHP" expanded="false" />
  903 + <element signature="e#36714#37122#0#PHP" expanded="false" />
  904 + <element signature="e#37128#37887#0#PHP" expanded="false" />
  905 + <element signature="e#37906#38770#0#PHP" expanded="false" />
  906 + <element signature="e#38796#39196#0#PHP" expanded="false" />
  907 + <element signature="e#39219#39792#0#PHP" expanded="false" />
  908 + <element signature="e#39815#40625#0#PHP" expanded="false" />
  909 + <element signature="e#40631#41230#0#PHP" expanded="false" />
  910 + <element signature="e#41235#42199#0#PHP" expanded="false" />
  911 + <element signature="e#42205#42872#0#PHP" expanded="false" />
  912 + <element signature="e#42877#43918#0#PHP" expanded="false" />
  913 + <element signature="e#43924#44587#0#PHP" expanded="false" />
  914 + <element signature="e#44592#45619#0#PHP" expanded="false" />
  915 + <element signature="e#45626#46057#0#PHP" expanded="false" />
  916 + <element signature="e#46062#46640#0#PHP" expanded="false" />
  917 + <element signature="e#46646#47075#0#PHP" expanded="false" />
  918 + <element signature="e#47080#47682#0#PHP" expanded="false" />
  919 + <element signature="e#47688#48115#0#PHP" expanded="false" />
  920 + <element signature="e#48120#48686#0#PHP" expanded="false" />
815 </folding> 921 </folding>
816 </state> 922 </state>
817 </provider> 923 </provider>
818 </entry> 924 </entry>
819 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 925 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  926 + <provider selected="true" editor-type-id="text-editor">
  927 + <state relative-caret-position="525">
  928 + <caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
  929 + <folding>
  930 + <element signature="e#305#577#0#PHP" expanded="false" />
  931 + <element signature="e#583#854#0#PHP" expanded="false" />
  932 + <element signature="e#859#1113#0#PHP" expanded="false" />
  933 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  934 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  935 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  936 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  937 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  938 + <element signature="e#3894#4961#0#PHP" expanded="false" />
  939 + </folding>
  940 + </state>
  941 + </provider>
  942 + </entry>
  943 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  944 + <provider selected="true" editor-type-id="text-editor">
  945 + <state relative-caret-position="630">
  946 + <caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
  947 + <folding>
  948 + <element signature="e#411#604#0#PHP" expanded="false" />
  949 + <element signature="e#609#825#0#PHP" expanded="false" />
  950 + <element signature="e#831#1329#0#PHP" expanded="false" />
  951 + <element signature="e#1334#2093#0#PHP" expanded="false" />
  952 + <element signature="e#2099#2317#0#PHP" expanded="false" />
  953 + <element signature="e#2322#2530#0#PHP" expanded="false" />
  954 + <element signature="e#2536#3043#0#PHP" expanded="false" />
  955 + <element signature="e#3048#3566#0#PHP" expanded="false" />
  956 + <element signature="e#3572#4084#0#PHP" expanded="false" />
  957 + <element signature="e#4089#4652#0#PHP" expanded="false" />
  958 + <element signature="e#4658#5248#0#PHP" expanded="false" />
  959 + <element signature="e#5253#6299#0#PHP" expanded="false" />
  960 + <element signature="e#6305#6623#0#PHP" expanded="false" />
  961 + <element signature="e#6628#7004#0#PHP" expanded="false" />
  962 + <element signature="e#7010#7365#0#PHP" expanded="false" />
  963 + <element signature="e#7370#7779#0#PHP" expanded="false" />
  964 + <element signature="e#7785#8170#0#PHP" expanded="false" />
  965 + <element signature="e#8175#8846#0#PHP" expanded="false" />
  966 + <element signature="e#8852#9298#0#PHP" expanded="false" />
  967 + <element signature="e#9303#10154#0#PHP" expanded="false" />
  968 + <element signature="e#10160#10430#0#PHP" expanded="false" />
  969 + <element signature="e#10435#10911#0#PHP" expanded="false" />
  970 + <element signature="e#10917#11547#0#PHP" expanded="false" />
  971 + <element signature="e#11552#13417#0#PHP" expanded="false" />
  972 + </folding>
  973 + </state>
  974 + </provider>
  975 + </entry>
  976 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
820 <provider selected="true" editor-type-id="text-editor"> 977 <provider selected="true" editor-type-id="text-editor">
821 - <state relative-caret-position="509">  
822 - <caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" /> 978 + <state relative-caret-position="249">
  979 + <caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
823 <folding> 980 <folding>
824 - <element signature="e#336#608#0#PHP" expanded="false" />  
825 - <element signature="e#614#976#0#PHP" expanded="false" />  
826 - <element signature="e#981#2020#0#PHP" expanded="false" />  
827 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
828 - <element signature="e#2268#3049#0#PHP" expanded="false" />  
829 - <element signature="e#3055#3364#0#PHP" expanded="false" />  
830 - <element signature="e#3369#5259#0#PHP" expanded="false" />  
831 - <element signature="e#5267#5746#0#PHP" expanded="false" />  
832 - <element signature="e#6355#6608#0#PHP" expanded="false" /> 981 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  982 + <element signature="e#3701#4697#0#PHP" expanded="false" />
  983 + <element signature="e#4703#5016#0#PHP" expanded="false" />
  984 + <element signature="e#5021#5396#0#PHP" expanded="false" />
833 </folding> 985 </folding>
834 </state> 986 </state>
835 </provider> 987 </provider>
@@ -373,7 +373,6 @@ class HomeController extends RestBaseController @@ -373,7 +373,6 @@ class HomeController extends RestBaseController
373 'service_id'=>'require', 373 'service_id'=>'require',
374 'total'=>'require', 374 'total'=>'require',
375 'sub_time'=>'require', 375 'sub_time'=>'require',
376 - 'content'=>'require'  
377 ]); 376 ]);
378 $validate->message([ 377 $validate->message([
379 'homeaddress_id'=>'预约家政地址不能为空', 378 'homeaddress_id'=>'预约家政地址不能为空',
@@ -381,7 +380,6 @@ class HomeController extends RestBaseController @@ -381,7 +380,6 @@ class HomeController extends RestBaseController
381 'service_id'=>'服务类目不能为空', 380 'service_id'=>'服务类目不能为空',
382 'total'=>'所需积分不能为空', 381 'total'=>'所需积分不能为空',
383 'sub_time'=>'预约时间不能为空', 382 'sub_time'=>'预约时间不能为空',
384 - 'content'=>'留言备注不能为空'  
385 ]); 383 ]);
386 if (!$validate->check($param)) { 384 if (!$validate->check($param)) {
387 $this->error(['code'=>40005,'msg'=>$validate->getError()]); 385 $this->error(['code'=>40005,'msg'=>$validate->getError()]);
@@ -414,7 +414,6 @@ class ShopgoodsController extends RestBaseController @@ -414,7 +414,6 @@ class ShopgoodsController extends RestBaseController
414 'total'=>'require', 414 'total'=>'require',
415 'goods_money'=>'require', 415 'goods_money'=>'require',
416 'express'=>'require', 416 'express'=>'require',
417 - 'content'=>'require'  
418 ]); 417 ]);
419 $validate->message([ 418 $validate->message([
420 'shoprecycle_id'=>'收货地址不能为空', 419 'shoprecycle_id'=>'收货地址不能为空',
@@ -423,7 +422,6 @@ class ShopgoodsController extends RestBaseController @@ -423,7 +422,6 @@ class ShopgoodsController extends RestBaseController
423 'goods_money'=>'商品金额不能为空', 422 'goods_money'=>'商品金额不能为空',
424 'total'=>'总价不能为空', 423 'total'=>'总价不能为空',
425 'express'=>'配送方式不能为空', 424 'express'=>'配送方式不能为空',
426 - 'content'=>'留言备注不能为空'  
427 ]); 425 ]);
428 if (!$validate->check($param)) { 426 if (!$validate->check($param)) {
429 $this->error(['code'=>40005,'msg'=>$validate->getError()]); 427 $this->error(['code'=>40005,'msg'=>$validate->getError()]);
@@ -163,14 +163,12 @@ class SubscribeController extends RestBaseController @@ -163,14 +163,12 @@ class SubscribeController extends RestBaseController
163 'image' => 'require', 163 'image' => 'require',
164 'attr_id'=>'require', 164 'attr_id'=>'require',
165 'sub_time'=>'require', 165 'sub_time'=>'require',
166 - 'content'=>'require'  
167 ]); 166 ]);
168 $validate->message([ 167 $validate->message([
169 'recycle_id'=>'上门回收地址不能为空', 168 'recycle_id'=>'上门回收地址不能为空',
170 'image'=>'图片不能为空', 169 'image'=>'图片不能为空',
171 'attr_id'=>'回收商品不能为空', 170 'attr_id'=>'回收商品不能为空',
172 'sub_time'=>'预约时间不能为空', 171 'sub_time'=>'预约时间不能为空',
173 - 'content'=>'留言备注不能为空'  
174 ]); 172 ]);
175 if (!$validate->check($param)) { 173 if (!$validate->check($param)) {
176 $this->error(['code'=>40005,'msg'=>$validate->getError()]); 174 $this->error(['code'=>40005,'msg'=>$validate->getError()]);
@@ -1124,6 +1124,7 @@ class UserController extends RestBaseController @@ -1124,6 +1124,7 @@ class UserController extends RestBaseController
1124 { 1124 {
1125 $user_id = $this->getUserId(); 1125 $user_id = $this->getUserId();
1126 $url = $this->request->param('route'); 1126 $url = $this->request->param('route');
  1127 + $url .= $url.'?user_id='.$user_id;
1127 if(empty($url)){ 1128 if(empty($url)){
1128 $this->error(['code'=>40005,'msg'=>'缺少必要参数']); 1129 $this->error(['code'=>40005,'msg'=>'缺少必要参数']);
1129 } 1130 }