郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 1d21f44156ec9ca0e2daec1a43161a61ce62d022 1 个父辈 dbd5b712
1 个管道 的构建 通过 耗费 0 秒

修改评价内容

内嵌 并排对比
正在显示 5 个修改的文件 包含 278 行增加 和 138 行删除
@@ -2,7 +2,10 @@ @@ -2,7 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
6 </list> 9 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -98,20 +101,138 @@ @@ -98,20 +101,138 @@
98 </provider> 101 </provider>
99 </entry> 102 </entry>
100 </file> 103 </file>
101 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true"> 104 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 105 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
103 <provider selected="true" editor-type-id="text-editor"> 106 <provider selected="true" editor-type-id="text-editor">
104 - <state relative-caret-position="578">  
105 - <caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" /> 107 + <state relative-caret-position="753">
  108 + <caret line="166" column="0" lean-forward="false" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
106 <folding> 109 <folding>
107 <element signature="e#330#602#0#PHP" expanded="false" /> 110 <element signature="e#330#602#0#PHP" expanded="false" />
108 <element signature="e#608#970#0#PHP" expanded="false" /> 111 <element signature="e#608#970#0#PHP" expanded="false" />
109 <element signature="e#975#1835#0#PHP" expanded="false" /> 112 <element signature="e#975#1835#0#PHP" expanded="false" />
  113 + <element signature="e#1841#2078#0#PHP" expanded="false" />
110 <element signature="e#2083#2781#0#PHP" expanded="false" /> 114 <element signature="e#2083#2781#0#PHP" expanded="false" />
111 <element signature="e#2787#3029#0#PHP" expanded="false" /> 115 <element signature="e#2787#3029#0#PHP" expanded="false" />
112 <element signature="e#3035#3272#0#PHP" expanded="false" /> 116 <element signature="e#3035#3272#0#PHP" expanded="false" />
113 <element signature="e#3277#3349#0#PHP" expanded="false" /> 117 <element signature="e#3277#3349#0#PHP" expanded="false" />
114 <element signature="e#3355#3834#0#PHP" expanded="false" /> 118 <element signature="e#3355#3834#0#PHP" expanded="false" />
  119 + <element signature="e#3839#4406#0#PHP" expanded="false" />
  120 + </folding>
  121 + </state>
  122 + </provider>
  123 + </entry>
  124 + </file>
  125 + <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
  126 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  127 + <provider selected="true" editor-type-id="text-editor">
  128 + <state relative-caret-position="102">
  129 + <caret line="244" column="29" lean-forward="false" selection-start-line="244" selection-start-column="29" selection-end-line="244" selection-end-column="29" />
  130 + <folding>
  131 + <element signature="e#342#596#0#PHP" expanded="false" />
  132 + <element signature="e#601#886#0#PHP" expanded="false" />
  133 + <element signature="e#892#1227#0#PHP" expanded="false" />
  134 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  135 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  136 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  137 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  138 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  139 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  140 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  141 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  142 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  143 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  144 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  145 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  146 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  147 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  148 + <element signature="e#5850#6514#0#PHP" expanded="false" />
  149 + <element signature="e#6520#6863#0#PHP" expanded="false" />
  150 + <element signature="e#6868#7349#0#PHP" expanded="false" />
  151 + <element signature="e#7355#7646#0#PHP" expanded="false" />
  152 + <element signature="e#7651#8002#0#PHP" expanded="false" />
  153 + <element signature="e#8008#8361#0#PHP" expanded="false" />
  154 + <element signature="e#8366#8771#0#PHP" expanded="false" />
  155 + <element signature="e#8777#9160#0#PHP" expanded="false" />
  156 + <element signature="e#9165#9832#0#PHP" expanded="false" />
  157 + <element signature="e#9838#10282#0#PHP" expanded="false" />
  158 + <element signature="e#10287#11134#0#PHP" expanded="false" />
  159 + <element signature="e#11140#11408#0#PHP" expanded="false" />
  160 + <element signature="e#11413#11885#0#PHP" expanded="false" />
  161 + <element signature="e#11891#12197#0#PHP" expanded="false" />
  162 + <element signature="e#12202#13845#0#PHP" expanded="false" />
  163 + <element signature="e#13866#14185#0#PHP" expanded="false" />
  164 + </folding>
  165 + </state>
  166 + </provider>
  167 + </entry>
  168 + </file>
  169 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
  170 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  171 + <provider selected="true" editor-type-id="text-editor">
  172 + <state relative-caret-position="128">
  173 + <caret line="188" column="29" lean-forward="false" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
  174 + <folding>
  175 + <element signature="e#411#604#0#PHP" expanded="false" />
  176 + <element signature="e#609#825#0#PHP" expanded="false" />
  177 + <element signature="e#831#1329#0#PHP" expanded="false" />
  178 + <element signature="e#1334#2102#0#PHP" expanded="false" />
  179 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  180 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  181 + <element signature="e#2545#3052#0#PHP" expanded="false" />
  182 + <element signature="e#3057#3575#0#PHP" expanded="false" />
  183 + <element signature="e#3581#4093#0#PHP" expanded="false" />
  184 + <element signature="e#4098#4661#0#PHP" expanded="false" />
  185 + <element signature="e#4667#5257#0#PHP" expanded="false" />
  186 + <element signature="e#5262#6248#0#PHP" expanded="false" />
  187 + <element signature="e#6254#6572#0#PHP" expanded="false" />
  188 + <element signature="e#6577#6953#0#PHP" expanded="false" />
  189 + <element signature="e#6959#7314#0#PHP" expanded="false" />
  190 + <element signature="e#7319#7728#0#PHP" expanded="false" />
  191 + <element signature="e#7734#8119#0#PHP" expanded="false" />
  192 + <element signature="e#8124#8795#0#PHP" expanded="false" />
  193 + <element signature="e#8801#9247#0#PHP" expanded="false" />
  194 + <element signature="e#9252#10103#0#PHP" expanded="false" />
  195 + <element signature="e#10109#10379#0#PHP" expanded="false" />
  196 + <element signature="e#10384#10860#0#PHP" expanded="false" />
  197 + <element signature="e#10866#11496#0#PHP" expanded="false" />
  198 + <element signature="e#11501#13433#0#PHP" expanded="false" />
  199 + </folding>
  200 + </state>
  201 + </provider>
  202 + </entry>
  203 + </file>
  204 + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
  205 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  206 + <provider selected="true" editor-type-id="text-editor">
  207 + <state relative-caret-position="300">
  208 + <caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
  209 + <folding>
  210 + <element signature="e#329#544#0#PHP" expanded="false" />
  211 + <element signature="e#549#890#0#PHP" expanded="false" />
  212 + <element signature="e#896#1112#0#PHP" expanded="false" />
  213 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  214 + <element signature="e#1506#1726#0#PHP" expanded="false" />
  215 + <element signature="e#1731#2119#0#PHP" expanded="false" />
  216 + <element signature="e#2125#2642#0#PHP" expanded="false" />
  217 + <element signature="e#2647#3162#0#PHP" expanded="false" />
  218 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  219 + <element signature="e#3701#4637#0#PHP" expanded="false" />
  220 + <element signature="e#4643#4956#0#PHP" expanded="false" />
  221 + <element signature="e#4961#5336#0#PHP" expanded="false" />
  222 + <element signature="e#5342#5694#0#PHP" expanded="false" />
  223 + <element signature="e#5699#6107#0#PHP" expanded="false" />
  224 + <element signature="e#6113#6495#0#PHP" expanded="false" />
  225 + <element signature="e#6500#7170#0#PHP" expanded="false" />
  226 + <element signature="e#7176#7619#0#PHP" expanded="false" />
  227 + <element signature="e#7624#8474#0#PHP" expanded="false" />
  228 + <element signature="e#8480#8747#0#PHP" expanded="false" />
  229 + <element signature="e#8752#9227#0#PHP" expanded="false" />
  230 + <element signature="e#9233#9783#0#PHP" expanded="false" />
  231 + <element signature="e#9788#11648#0#PHP" expanded="false" />
  232 + <element signature="e#10208#10435#1#PHP" expanded="false" />
  233 + <element signature="e#10465#10696#1#PHP" expanded="false" />
  234 + <element signature="e#11654#12021#0#PHP" expanded="false" />
  235 + <element signature="e#12026#12466#0#PHP" expanded="false" />
115 </folding> 236 </folding>
116 </state> 237 </state>
117 </provider> 238 </provider>
@@ -165,7 +286,6 @@ @@ -165,7 +286,6 @@
165 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 286 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
166 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 287 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
167 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" /> 288 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
168 - <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />  
169 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 289 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
170 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 290 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
171 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" /> 291 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
@@ -180,14 +300,15 @@ @@ -180,14 +300,15 @@
180 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 300 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
181 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" /> 301 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
182 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 302 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
183 - <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />  
184 - <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
185 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 303 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
186 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 304 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
187 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 305 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
188 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 306 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
189 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 307 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
190 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 308 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  309 + <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  310 + <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  311 + <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
191 </list> 312 </list>
192 </option> 313 </option>
193 </component> 314 </component>
@@ -206,8 +327,8 @@ @@ -206,8 +327,8 @@
206 </component> 327 </component>
207 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 328 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
208 <component name="ProjectFrameBounds"> 329 <component name="ProjectFrameBounds">
209 - <option name="x" value="267" />  
210 - <option name="y" value="75" /> 330 + <option name="x" value="294" />
  331 + <option name="y" value="56" />
211 <option name="width" value="1700" /> 332 <option name="width" value="1700" />
212 <option name="height" value="1040" /> 333 <option name="height" value="1040" />
213 </component> 334 </component>
@@ -251,6 +372,13 @@ @@ -251,6 +372,13 @@
251 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 372 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
252 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 373 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
253 </path> 374 </path>
  375 + <path>
  376 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  377 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  378 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  379 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  380 + <item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
  381 + </path>
254 </expand> 382 </expand>
255 <select /> 383 <select />
256 </subPane> 384 </subPane>
@@ -357,15 +485,15 @@ @@ -357,15 +485,15 @@
357 <workItem from="1575444399653" duration="12810000" /> 485 <workItem from="1575444399653" duration="12810000" />
358 <workItem from="1575462840839" duration="250000" /> 486 <workItem from="1575462840839" duration="250000" />
359 <workItem from="1575506248144" duration="15103000" /> 487 <workItem from="1575506248144" duration="15103000" />
360 - <workItem from="1575527294268" duration="1104000" /> 488 + <workItem from="1575527294268" duration="1927000" />
361 </task> 489 </task>
362 <servers /> 490 <servers />
363 </component> 491 </component>
364 <component name="TimeTrackingManager"> 492 <component name="TimeTrackingManager">
365 - <option name="totallyTimeSpent" value="482916000" /> 493 + <option name="totallyTimeSpent" value="483739000" />
366 </component> 494 </component>
367 <component name="ToolWindowManager"> 495 <component name="ToolWindowManager">
368 - <frame x="267" y="75" width="1700" height="1040" extended-state="0" /> 496 + <frame x="294" y="56" width="1700" height="1040" extended-state="0" />
369 <editor active="true" /> 497 <editor active="true" />
370 <layout> 498 <layout>
371 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 499 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -647,13 +775,6 @@ @@ -647,13 +775,6 @@
647 <state /> 775 <state />
648 </provider> 776 </provider>
649 </entry> 777 </entry>
650 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">  
651 - <provider selected="true" editor-type-id="text-editor">  
652 - <state relative-caret-position="158">  
653 - <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />  
654 - </state>  
655 - </provider>  
656 - </entry>  
657 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php"> 778 <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
658 <provider selected="true" editor-type-id="text-editor"> 779 <provider selected="true" editor-type-id="text-editor">
659 <state relative-caret-position="0"> 780 <state relative-caret-position="0">
@@ -668,48 +789,6 @@ @@ -668,48 +789,6 @@
668 </state> 789 </state>
669 </provider> 790 </provider>
670 </entry> 791 </entry>
671 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
672 - <provider selected="true" editor-type-id="text-editor">  
673 - <state relative-caret-position="450">  
674 - <caret line="78" column="0" lean-forward="false" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />  
675 - <folding>  
676 - <element signature="e#342#596#0#PHP" expanded="false" />  
677 - <element signature="e#601#886#0#PHP" expanded="false" />  
678 - <element signature="e#892#1227#0#PHP" expanded="false" />  
679 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
680 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
681 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
682 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
683 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
684 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
685 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
686 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
687 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
688 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
689 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
690 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
691 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
692 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
693 - <element signature="e#5850#6416#0#PHP" expanded="false" />  
694 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
695 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
696 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
697 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
698 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
699 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
700 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
701 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
702 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
703 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
704 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
705 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
706 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
707 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
708 - <element signature="e#13768#14087#0#PHP" expanded="false" />  
709 - </folding>  
710 - </state>  
711 - </provider>  
712 - </entry>  
713 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 792 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
714 <provider selected="true" editor-type-id="text-editor"> 793 <provider selected="true" editor-type-id="text-editor">
715 <state relative-caret-position="669"> 794 <state relative-caret-position="669">
@@ -726,81 +805,6 @@ @@ -726,81 +805,6 @@
726 </state> 805 </state>
727 </provider> 806 </provider>
728 </entry> 807 </entry>
729 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
730 - <provider selected="true" editor-type-id="text-editor">  
731 - <state relative-caret-position="344">  
732 - <caret line="244" column="7" lean-forward="true" selection-start-line="244" selection-start-column="7" selection-end-line="244" selection-end-column="7" />  
733 - <folding>  
734 - <element signature="e#329#544#0#PHP" expanded="false" />  
735 - <element signature="e#549#890#0#PHP" expanded="false" />  
736 - <element signature="e#896#1112#0#PHP" expanded="false" />  
737 - <element signature="e#1117#1500#0#PHP" expanded="false" />  
738 - <element signature="e#1506#1726#0#PHP" expanded="false" />  
739 - <element signature="e#1731#2119#0#PHP" expanded="false" />  
740 - <element signature="e#2125#2642#0#PHP" expanded="false" />  
741 - <element signature="e#2647#3162#0#PHP" expanded="false" />  
742 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
743 - <element signature="e#3701#4539#0#PHP" expanded="false" />  
744 - <element signature="e#4545#4858#0#PHP" expanded="false" />  
745 - <element signature="e#4863#5238#0#PHP" expanded="false" />  
746 - <element signature="e#5244#5596#0#PHP" expanded="false" />  
747 - <element signature="e#5601#6009#0#PHP" expanded="false" />  
748 - <element signature="e#6015#6397#0#PHP" expanded="false" />  
749 - <element signature="e#6402#7072#0#PHP" expanded="false" />  
750 - <element signature="e#7078#7521#0#PHP" expanded="false" />  
751 - <element signature="e#7526#8376#0#PHP" expanded="false" />  
752 - <element signature="e#8382#8649#0#PHP" expanded="false" />  
753 - <element signature="e#8654#9129#0#PHP" expanded="false" />  
754 - <element signature="e#9135#9685#0#PHP" expanded="false" />  
755 - <element signature="e#9690#11550#0#PHP" expanded="false" />  
756 - <element signature="e#10110#10337#1#PHP" expanded="false" />  
757 - <element signature="e#10367#10598#1#PHP" expanded="false" />  
758 - <element signature="e#11556#11923#0#PHP" expanded="false" />  
759 - <element signature="e#11928#12368#0#PHP" expanded="false" />  
760 - </folding>  
761 - </state>  
762 - </provider>  
763 - </entry>  
764 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">  
765 - <provider selected="true" editor-type-id="text-editor">  
766 - <state relative-caret-position="419">  
767 - <caret line="434" column="129" lean-forward="false" selection-start-line="432" selection-start-column="12" selection-end-line="434" selection-end-column="129" />  
768 - <folding>  
769 - <element signature="e#411#604#0#PHP" expanded="false" />  
770 - <element signature="e#609#825#0#PHP" expanded="false" />  
771 - <element signature="e#831#1329#0#PHP" expanded="false" />  
772 - <element signature="e#1334#2102#0#PHP" expanded="false" />  
773 - <element signature="e#2108#2326#0#PHP" expanded="false" />  
774 - <element signature="e#2331#2539#0#PHP" expanded="false" />  
775 - <element signature="e#2545#3052#0#PHP" expanded="false" />  
776 - <element signature="e#3057#3575#0#PHP" expanded="false" />  
777 - <element signature="e#3581#4093#0#PHP" expanded="false" />  
778 - <element signature="e#4098#4661#0#PHP" expanded="false" />  
779 - <element signature="e#4667#5257#0#PHP" expanded="false" />  
780 - <element signature="e#5262#6260#0#PHP" expanded="false" />  
781 - <element signature="e#6266#6584#0#PHP" expanded="false" />  
782 - <element signature="e#6589#6965#0#PHP" expanded="false" />  
783 - <element signature="e#6971#7326#0#PHP" expanded="false" />  
784 - <element signature="e#7331#7740#0#PHP" expanded="false" />  
785 - <element signature="e#7746#8131#0#PHP" expanded="false" />  
786 - <element signature="e#8136#8807#0#PHP" expanded="false" />  
787 - <element signature="e#8813#9259#0#PHP" expanded="false" />  
788 - <element signature="e#9264#10115#0#PHP" expanded="false" />  
789 - <element signature="e#10121#10391#0#PHP" expanded="false" />  
790 - <element signature="e#10396#10872#0#PHP" expanded="false" />  
791 - <element signature="e#10878#11508#0#PHP" expanded="false" />  
792 - </folding>  
793 - </state>  
794 - </provider>  
795 - </entry>  
796 - <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">  
797 - <provider selected="true" editor-type-id="text-editor">  
798 - <state relative-caret-position="325">  
799 - <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />  
800 - <folding />  
801 - </state>  
802 - </provider>  
803 - </entry>  
804 <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"> 808 <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
805 <provider selected="true" editor-type-id="text-editor"> 809 <provider selected="true" editor-type-id="text-editor">
806 <state relative-caret-position="-529"> 810 <state relative-caret-position="-529">
@@ -938,17 +942,145 @@ @@ -938,17 +942,145 @@
938 </entry> 942 </entry>
939 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 943 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
940 <provider selected="true" editor-type-id="text-editor"> 944 <provider selected="true" editor-type-id="text-editor">
941 - <state relative-caret-position="578">  
942 - <caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" /> 945 + <state relative-caret-position="753">
  946 + <caret line="166" column="0" lean-forward="false" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
943 <folding> 947 <folding>
944 <element signature="e#330#602#0#PHP" expanded="false" /> 948 <element signature="e#330#602#0#PHP" expanded="false" />
945 <element signature="e#608#970#0#PHP" expanded="false" /> 949 <element signature="e#608#970#0#PHP" expanded="false" />
946 <element signature="e#975#1835#0#PHP" expanded="false" /> 950 <element signature="e#975#1835#0#PHP" expanded="false" />
  951 + <element signature="e#1841#2078#0#PHP" expanded="false" />
947 <element signature="e#2083#2781#0#PHP" expanded="false" /> 952 <element signature="e#2083#2781#0#PHP" expanded="false" />
948 <element signature="e#2787#3029#0#PHP" expanded="false" /> 953 <element signature="e#2787#3029#0#PHP" expanded="false" />
949 <element signature="e#3035#3272#0#PHP" expanded="false" /> 954 <element signature="e#3035#3272#0#PHP" expanded="false" />
950 <element signature="e#3277#3349#0#PHP" expanded="false" /> 955 <element signature="e#3277#3349#0#PHP" expanded="false" />
951 <element signature="e#3355#3834#0#PHP" expanded="false" /> 956 <element signature="e#3355#3834#0#PHP" expanded="false" />
  957 + <element signature="e#3839#4406#0#PHP" expanded="false" />
  958 + </folding>
  959 + </state>
  960 + </provider>
  961 + </entry>
  962 + <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
  963 + <provider selected="true" editor-type-id="text-editor">
  964 + <state relative-caret-position="325">
  965 + <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
  966 + <folding />
  967 + </state>
  968 + </provider>
  969 + </entry>
  970 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
  971 + <provider selected="true" editor-type-id="text-editor">
  972 + <state relative-caret-position="158">
  973 + <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
  974 + <folding />
  975 + </state>
  976 + </provider>
  977 + </entry>
  978 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  979 + <provider selected="true" editor-type-id="text-editor">
  980 + <state relative-caret-position="102">
  981 + <caret line="244" column="29" lean-forward="false" selection-start-line="244" selection-start-column="29" selection-end-line="244" selection-end-column="29" />
  982 + <folding>
  983 + <element signature="e#342#596#0#PHP" expanded="false" />
  984 + <element signature="e#601#886#0#PHP" expanded="false" />
  985 + <element signature="e#892#1227#0#PHP" expanded="false" />
  986 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  987 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  988 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  989 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  990 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  991 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  992 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  993 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  994 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  995 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  996 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  997 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  998 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  999 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  1000 + <element signature="e#5850#6514#0#PHP" expanded="false" />
  1001 + <element signature="e#6520#6863#0#PHP" expanded="false" />
  1002 + <element signature="e#6868#7349#0#PHP" expanded="false" />
  1003 + <element signature="e#7355#7646#0#PHP" expanded="false" />
  1004 + <element signature="e#7651#8002#0#PHP" expanded="false" />
  1005 + <element signature="e#8008#8361#0#PHP" expanded="false" />
  1006 + <element signature="e#8366#8771#0#PHP" expanded="false" />
  1007 + <element signature="e#8777#9160#0#PHP" expanded="false" />
  1008 + <element signature="e#9165#9832#0#PHP" expanded="false" />
  1009 + <element signature="e#9838#10282#0#PHP" expanded="false" />
  1010 + <element signature="e#10287#11134#0#PHP" expanded="false" />
  1011 + <element signature="e#11140#11408#0#PHP" expanded="false" />
  1012 + <element signature="e#11413#11885#0#PHP" expanded="false" />
  1013 + <element signature="e#11891#12197#0#PHP" expanded="false" />
  1014 + <element signature="e#12202#13845#0#PHP" expanded="false" />
  1015 + <element signature="e#13866#14185#0#PHP" expanded="false" />
  1016 + </folding>
  1017 + </state>
  1018 + </provider>
  1019 + </entry>
  1020 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  1021 + <provider selected="true" editor-type-id="text-editor">
  1022 + <state relative-caret-position="128">
  1023 + <caret line="188" column="29" lean-forward="false" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
  1024 + <folding>
  1025 + <element signature="e#411#604#0#PHP" expanded="false" />
  1026 + <element signature="e#609#825#0#PHP" expanded="false" />
  1027 + <element signature="e#831#1329#0#PHP" expanded="false" />
  1028 + <element signature="e#1334#2102#0#PHP" expanded="false" />
  1029 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  1030 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  1031 + <element signature="e#2545#3052#0#PHP" expanded="false" />
  1032 + <element signature="e#3057#3575#0#PHP" expanded="false" />
  1033 + <element signature="e#3581#4093#0#PHP" expanded="false" />
  1034 + <element signature="e#4098#4661#0#PHP" expanded="false" />
  1035 + <element signature="e#4667#5257#0#PHP" expanded="false" />
  1036 + <element signature="e#5262#6248#0#PHP" expanded="false" />
  1037 + <element signature="e#6254#6572#0#PHP" expanded="false" />
  1038 + <element signature="e#6577#6953#0#PHP" expanded="false" />
  1039 + <element signature="e#6959#7314#0#PHP" expanded="false" />
  1040 + <element signature="e#7319#7728#0#PHP" expanded="false" />
  1041 + <element signature="e#7734#8119#0#PHP" expanded="false" />
  1042 + <element signature="e#8124#8795#0#PHP" expanded="false" />
  1043 + <element signature="e#8801#9247#0#PHP" expanded="false" />
  1044 + <element signature="e#9252#10103#0#PHP" expanded="false" />
  1045 + <element signature="e#10109#10379#0#PHP" expanded="false" />
  1046 + <element signature="e#10384#10860#0#PHP" expanded="false" />
  1047 + <element signature="e#10866#11496#0#PHP" expanded="false" />
  1048 + <element signature="e#11501#13433#0#PHP" expanded="false" />
  1049 + </folding>
  1050 + </state>
  1051 + </provider>
  1052 + </entry>
  1053 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  1054 + <provider selected="true" editor-type-id="text-editor">
  1055 + <state relative-caret-position="300">
  1056 + <caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
  1057 + <folding>
  1058 + <element signature="e#329#544#0#PHP" expanded="false" />
  1059 + <element signature="e#549#890#0#PHP" expanded="false" />
  1060 + <element signature="e#896#1112#0#PHP" expanded="false" />
  1061 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  1062 + <element signature="e#1506#1726#0#PHP" expanded="false" />
  1063 + <element signature="e#1731#2119#0#PHP" expanded="false" />
  1064 + <element signature="e#2125#2642#0#PHP" expanded="false" />
  1065 + <element signature="e#2647#3162#0#PHP" expanded="false" />
  1066 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  1067 + <element signature="e#3701#4637#0#PHP" expanded="false" />
  1068 + <element signature="e#4643#4956#0#PHP" expanded="false" />
  1069 + <element signature="e#4961#5336#0#PHP" expanded="false" />
  1070 + <element signature="e#5342#5694#0#PHP" expanded="false" />
  1071 + <element signature="e#5699#6107#0#PHP" expanded="false" />
  1072 + <element signature="e#6113#6495#0#PHP" expanded="false" />
  1073 + <element signature="e#6500#7170#0#PHP" expanded="false" />
  1074 + <element signature="e#7176#7619#0#PHP" expanded="false" />
  1075 + <element signature="e#7624#8474#0#PHP" expanded="false" />
  1076 + <element signature="e#8480#8747#0#PHP" expanded="false" />
  1077 + <element signature="e#8752#9227#0#PHP" expanded="false" />
  1078 + <element signature="e#9233#9783#0#PHP" expanded="false" />
  1079 + <element signature="e#9788#11648#0#PHP" expanded="false" />
  1080 + <element signature="e#10208#10435#1#PHP" expanded="false" />
  1081 + <element signature="e#10465#10696#1#PHP" expanded="false" />
  1082 + <element signature="e#11654#12021#0#PHP" expanded="false" />
  1083 + <element signature="e#12026#12466#0#PHP" expanded="false" />
952 </folding> 1084 </folding>
953 </state> 1085 </state>
954 </provider> 1086 </provider>
@@ -165,6 +165,7 @@ class HomeController extends RestBaseController @@ -165,6 +165,7 @@ class HomeController extends RestBaseController
165 ->select() 165 ->select()
166 ->toArray(); 166 ->toArray();
167 foreach ($res as &$v){ 167 foreach ($res as &$v){
  168 + $v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
168 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3); 169 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
169 $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); 170 $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
170 } 171 }
@@ -161,5 +161,11 @@ class OrderController extends RestBaseController @@ -161,5 +161,11 @@ class OrderController extends RestBaseController
161 $this->success('SUCCESS',$list); 161 $this->success('SUCCESS',$list);
162 } 162 }
163 163
  164 + //自动修改订单状态
  165 + public function update()
  166 + {
  167 +
  168 + }
  169 +
164 170
165 } 171 }
@@ -254,6 +254,7 @@ class RecycleController extends RestBaseController @@ -254,6 +254,7 @@ class RecycleController extends RestBaseController
254 ->select() 254 ->select()
255 ->toArray(); 255 ->toArray();
256 foreach ($res as &$v){ 256 foreach ($res as &$v){
  257 + $v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
257 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3); 258 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
258 } 259 }
259 $this->success('SUCCESS',$res); 260 $this->success('SUCCESS',$res);
@@ -204,7 +204,7 @@ class ShopgoodsController extends RestBaseController @@ -204,7 +204,7 @@ class ShopgoodsController extends RestBaseController
204 ->select() 204 ->select()
205 ->toArray(); 205 ->toArray();
206 foreach ($res as &$v){ 206 foreach ($res as &$v){
207 - $v['content'] = strip_tags(cmf_replace_content_file_url(htmlspecialchars_decode($v['content']))); 207 + $v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
208 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3); 208 $v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
209 $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); 209 $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
210 } 210 }