郭盛 / scrap · 提交

转到一个项目

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

修改后台

内嵌 并排对比
正在显示 4 个修改的文件 包含 261 行增加 和 338 行删除
@@ -2,10 +2,9 @@ @@ -2,10 +2,9 @@
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/config.php" afterPath="$PROJECT_DIR$/api/config.php" />
6 <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" /> 7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
9 </list> 8 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -101,138 +100,32 @@ @@ -101,138 +100,32 @@
101 </provider> 100 </provider>
102 </entry> 101 </entry>
103 </file> 102 </file>
104 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">  
105 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 103 + <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
  104 + <entry file="file://$PROJECT_DIR$/app/config.php">
106 <provider selected="true" editor-type-id="text-editor"> 105 <provider selected="true" editor-type-id="text-editor">
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" />  
109 - <folding>  
110 - <element signature="e#330#602#0#PHP" expanded="false" />  
111 - <element signature="e#608#970#0#PHP" expanded="false" />  
112 - <element signature="e#975#1835#0#PHP" expanded="false" />  
113 - <element signature="e#1841#2078#0#PHP" expanded="false" />  
114 - <element signature="e#2083#2781#0#PHP" expanded="false" />  
115 - <element signature="e#2787#3029#0#PHP" expanded="false" />  
116 - <element signature="e#3035#3272#0#PHP" expanded="false" />  
117 - <element signature="e#3277#3349#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> 106 + <state relative-caret-position="1351">
  107 + <caret line="235" column="11" lean-forward="true" selection-start-line="235" selection-start-column="11" selection-end-line="235" selection-end-column="11" />
  108 + <folding />
165 </state> 109 </state>
166 </provider> 110 </provider>
167 </entry> 111 </entry>
168 </file> 112 </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"> 113 + <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
  114 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
171 <provider selected="true" editor-type-id="text-editor"> 115 <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" /> 116 + <state relative-caret-position="400">
  117 + <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="46" selection-end-line="25" selection-end-column="46" />
174 <folding> 118 <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" /> 119 + <element signature="e#861#925#0#PHP" expanded="false" />
  120 + <element signature="e#930#1766#0#PHP" expanded="false" />
  121 + <element signature="e#1772#1853#0#PHP" expanded="false" />
  122 + <element signature="e#1858#3848#0#PHP" expanded="false" />
  123 + <element signature="e#3855#3878#0#PHP" expanded="false" />
  124 + <element signature="e#3883#4142#0#PHP" expanded="false" />
  125 + <element signature="e#4149#4198#0#PHP" expanded="false" />
  126 + <element signature="e#4203#4631#0#PHP" expanded="false" />
  127 + <element signature="e#4637#4701#0#PHP" expanded="false" />
  128 + <element signature="e#4706#5580#0#PHP" expanded="false" />
236 </folding> 129 </folding>
237 </state> 130 </state>
238 </provider> 131 </provider>
@@ -281,7 +174,6 @@ @@ -281,7 +174,6 @@
281 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" /> 174 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
282 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" /> 175 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
283 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" /> 176 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
284 - <option value="$PROJECT_DIR$/api/config.php" />  
285 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" /> 177 <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
286 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 178 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
287 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 179 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
@@ -303,12 +195,13 @@ @@ -303,12 +195,13 @@
303 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 195 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
304 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 196 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
305 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 197 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
306 - <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
307 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 198 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
308 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
309 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 199 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
310 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 200 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
311 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 201 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  202 + <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  203 + <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  204 + <option value="$PROJECT_DIR$/api/config.php" />
312 </list> 205 </list>
313 </option> 206 </option>
314 </component> 207 </component>
@@ -326,11 +219,11 @@ @@ -326,11 +219,11 @@
326 <sorting>DEFINITION_ORDER</sorting> 219 <sorting>DEFINITION_ORDER</sorting>
327 </component> 220 </component>
328 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 221 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
329 - <component name="ProjectFrameBounds">  
330 - <option name="x" value="294" />  
331 - <option name="y" value="56" /> 222 + <component name="ProjectFrameBounds" extendedState="1">
  223 + <option name="x" value="155" />
  224 + <option name="y" value="77" />
332 <option name="width" value="1700" /> 225 <option name="width" value="1700" />
333 - <option name="height" value="1040" /> 226 + <option name="height" value="1038" />
334 </component> 227 </component>
335 <component name="ProjectView"> 228 <component name="ProjectView">
336 <navigator currentView="ProjectPane" proportions="" version="1"> 229 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -362,22 +255,25 @@ @@ -362,22 +255,25 @@
362 <path> 255 <path>
363 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 256 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
364 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 257 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
365 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
366 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 258 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
367 </path> 259 </path>
368 <path> 260 <path>
369 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 261 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
370 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 262 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
371 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
372 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
373 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 263 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  264 + <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
374 </path> 265 </path>
375 <path> 266 <path>
376 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 267 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
377 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 268 <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" /> 269 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
  271 + <item name="cert" type="2a2b976b:PhpTreeStructureProvider$1" />
  272 + </path>
  273 + <path>
  274 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  275 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  276 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
381 </path> 277 </path>
382 </expand> 278 </expand>
383 <select /> 279 <select />
@@ -393,15 +289,15 @@ @@ -393,15 +289,15 @@
393 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 289 <property name="DefaultHtmlFileTemplate" value="HTML File" />
394 </component> 290 </component>
395 <component name="RecentsManager"> 291 <component name="RecentsManager">
396 - <key name="MoveFile.RECENT_KEYS">  
397 - <recent name="D:\htdocs\scrap1\scrap\public\static\js" />  
398 - </key>  
399 <key name="CopyFile.RECENT_KEYS"> 292 <key name="CopyFile.RECENT_KEYS">
400 <recent name="D:\htdocs\scrap1\scrap\api\index\model" /> 293 <recent name="D:\htdocs\scrap1\scrap\api\index\model" />
401 <recent name="D:\htdocs\scrap1\scrap\api\index\controller" /> 294 <recent name="D:\htdocs\scrap1\scrap\api\index\controller" />
402 <recent name="D:\htdocs\scrap1\scrap\public\static" /> 295 <recent name="D:\htdocs\scrap1\scrap\public\static" />
403 <recent name="D:\htdocs\scrap1\scrap" /> 296 <recent name="D:\htdocs\scrap1\scrap" />
404 </key> 297 </key>
  298 + <key name="MoveFile.RECENT_KEYS">
  299 + <recent name="D:\htdocs\scrap1\scrap\public\static\js" />
  300 + </key>
405 </component> 301 </component>
406 <component name="RunDashboard"> 302 <component name="RunDashboard">
407 <option name="ruleStates"> 303 <option name="ruleStates">
@@ -485,18 +381,17 @@ @@ -485,18 +381,17 @@
485 <workItem from="1575444399653" duration="12810000" /> 381 <workItem from="1575444399653" duration="12810000" />
486 <workItem from="1575462840839" duration="250000" /> 382 <workItem from="1575462840839" duration="250000" />
487 <workItem from="1575506248144" duration="15103000" /> 383 <workItem from="1575506248144" duration="15103000" />
488 - <workItem from="1575527294268" duration="1927000" /> 384 + <workItem from="1575527294268" duration="3424000" />
489 </task> 385 </task>
490 <servers /> 386 <servers />
491 </component> 387 </component>
492 <component name="TimeTrackingManager"> 388 <component name="TimeTrackingManager">
493 - <option name="totallyTimeSpent" value="483739000" /> 389 + <option name="totallyTimeSpent" value="485236000" />
494 </component> 390 </component>
495 <component name="ToolWindowManager"> 391 <component name="ToolWindowManager">
496 - <frame x="294" y="56" width="1700" height="1040" extended-state="0" />  
497 - <editor active="true" /> 392 + <frame x="155" y="77" width="1700" height="1038" extended-state="1" />
498 <layout> 393 <layout>
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" /> 394 + <window_info id="Project" active="true" 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" />
500 <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" /> 395 <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" />
501 <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" /> 396 <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" />
502 <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" /> 397 <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" />
@@ -547,34 +442,6 @@ @@ -547,34 +442,6 @@
547 <watches-manager /> 442 <watches-manager />
548 </component> 443 </component>
549 <component name="editorHistoryManager"> 444 <component name="editorHistoryManager">
550 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">  
551 - <provider selected="true" editor-type-id="text-editor">  
552 - <state relative-caret-position="543">  
553 - <caret line="253" column="0" lean-forward="true" selection-start-line="253" selection-start-column="0" selection-end-line="253" selection-end-column="0" />  
554 - </state>  
555 - </provider>  
556 - </entry>  
557 - <entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">  
558 - <provider selected="true" editor-type-id="text-editor">  
559 - <state relative-caret-position="273">  
560 - <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />  
561 - </state>  
562 - </provider>  
563 - </entry>  
564 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
565 - <provider selected="true" editor-type-id="text-editor">  
566 - <state relative-caret-position="423">  
567 - <caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />  
568 - </state>  
569 - </provider>  
570 - </entry>  
571 - <entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">  
572 - <provider selected="true" editor-type-id="text-editor">  
573 - <state relative-caret-position="273">  
574 - <caret line="123" column="16" lean-forward="false" selection-start-line="123" selection-start-column="16" selection-end-line="123" selection-end-column="16" />  
575 - </state>  
576 - </provider>  
577 - </entry>  
578 <entry file="file://$PROJECT_DIR$/app/admin/controller/IndexController.php"> 445 <entry file="file://$PROJECT_DIR$/app/admin/controller/IndexController.php">
579 <provider selected="true" editor-type-id="text-editor"> 446 <provider selected="true" editor-type-id="text-editor">
580 <state relative-caret-position="0"> 447 <state relative-caret-position="0">
@@ -786,6 +653,12 @@ @@ -786,6 +653,12 @@
786 <provider selected="true" editor-type-id="text-editor"> 653 <provider selected="true" editor-type-id="text-editor">
787 <state relative-caret-position="0"> 654 <state relative-caret-position="0">
788 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 655 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  656 + <folding>
  657 + <element signature="e#266#1001#0#PHP" expanded="false" />
  658 + <element signature="e#1016#2171#0#PHP" expanded="false" />
  659 + <element signature="e#2186#3928#0#PHP" expanded="false" />
  660 + <element signature="e#3943#4413#0#PHP" expanded="false" />
  661 + </folding>
789 </state> 662 </state>
790 </provider> 663 </provider>
791 </entry> 664 </entry>
@@ -813,30 +686,11 @@ @@ -813,30 +686,11 @@
813 </state> 686 </state>
814 </provider> 687 </provider>
815 </entry> 688 </entry>
816 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
817 - <provider selected="true" editor-type-id="text-editor">  
818 - <state relative-caret-position="314">  
819 - <caret line="61" column="0" lean-forward="true" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />  
820 - <folding>  
821 - <element signature="e#324#855#0#PHP" expanded="false" />  
822 - <element signature="e#861#925#0#PHP" expanded="false" />  
823 - <element signature="e#930#1766#0#PHP" expanded="false" />  
824 - <element signature="e#1772#1853#0#PHP" expanded="false" />  
825 - <element signature="e#1858#3848#0#PHP" expanded="false" />  
826 - <element signature="e#3855#3878#0#PHP" expanded="false" />  
827 - <element signature="e#3883#4142#0#PHP" expanded="false" />  
828 - <element signature="e#4149#4198#0#PHP" expanded="false" />  
829 - <element signature="e#4203#4631#0#PHP" expanded="false" />  
830 - <element signature="e#4637#4701#0#PHP" expanded="false" />  
831 - <element signature="e#4706#5580#0#PHP" expanded="false" />  
832 - </folding>  
833 - </state>  
834 - </provider>  
835 - </entry>  
836 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php"> 689 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
837 <provider selected="true" editor-type-id="text-editor"> 690 <provider selected="true" editor-type-id="text-editor">
838 <state relative-caret-position="0"> 691 <state relative-caret-position="0">
839 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 692 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  693 + <folding />
840 </state> 694 </state>
841 </provider> 695 </provider>
842 </entry> 696 </entry>
@@ -854,17 +708,178 @@ @@ -854,17 +708,178 @@
854 </state> 708 </state>
855 </provider> 709 </provider>
856 </entry> 710 </entry>
857 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php"> 711 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
858 <provider selected="true" editor-type-id="text-editor"> 712 <provider selected="true" editor-type-id="text-editor">
859 <state relative-caret-position="325"> 713 <state relative-caret-position="325">
860 <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" /> 714 <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
  715 + <folding>
  716 + <element signature="e#243#1652#0#PHP" expanded="false" />
  717 + <element signature="e#1669#3046#0#PHP" expanded="false" />
  718 + </folding>
861 </state> 719 </state>
862 </provider> 720 </provider>
863 </entry> 721 </entry>
864 - <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php"> 722 + <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
865 <provider selected="true" editor-type-id="text-editor"> 723 <provider selected="true" editor-type-id="text-editor">
866 <state relative-caret-position="325"> 724 <state relative-caret-position="325">
867 - <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" /> 725 + <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
  726 + <folding />
  727 + </state>
  728 + </provider>
  729 + </entry>
  730 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
  731 + <provider selected="true" editor-type-id="text-editor">
  732 + <state relative-caret-position="158">
  733 + <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
  734 + <folding />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
  739 + <provider selected="true" editor-type-id="text-editor">
  740 + <state relative-caret-position="300">
  741 + <caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
  742 + <folding>
  743 + <element signature="e#329#544#0#PHP" expanded="false" />
  744 + <element signature="e#549#890#0#PHP" expanded="false" />
  745 + <element signature="e#896#1112#0#PHP" expanded="false" />
  746 + <element signature="e#1117#1500#0#PHP" expanded="false" />
  747 + <element signature="e#1506#1726#0#PHP" expanded="false" />
  748 + <element signature="e#1731#2119#0#PHP" expanded="false" />
  749 + <element signature="e#2125#2642#0#PHP" expanded="false" />
  750 + <element signature="e#2647#3162#0#PHP" expanded="false" />
  751 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  752 + <element signature="e#3701#4637#0#PHP" expanded="false" />
  753 + <element signature="e#4643#4956#0#PHP" expanded="false" />
  754 + <element signature="e#4961#5336#0#PHP" expanded="false" />
  755 + <element signature="e#5342#5694#0#PHP" expanded="false" />
  756 + <element signature="e#5699#6107#0#PHP" expanded="false" />
  757 + <element signature="e#6113#6495#0#PHP" expanded="false" />
  758 + <element signature="e#6500#7170#0#PHP" expanded="false" />
  759 + <element signature="e#7176#7619#0#PHP" expanded="false" />
  760 + <element signature="e#7624#8474#0#PHP" expanded="false" />
  761 + <element signature="e#8480#8747#0#PHP" expanded="false" />
  762 + <element signature="e#8752#9227#0#PHP" expanded="false" />
  763 + <element signature="e#9233#9783#0#PHP" expanded="false" />
  764 + <element signature="e#9788#11648#0#PHP" expanded="false" />
  765 + <element signature="e#10208#10435#1#PHP" expanded="false" />
  766 + <element signature="e#10465#10696#1#PHP" expanded="false" />
  767 + <element signature="e#11654#12021#0#PHP" expanded="false" />
  768 + <element signature="e#12026#12466#0#PHP" expanded="false" />
  769 + </folding>
  770 + </state>
  771 + </provider>
  772 + </entry>
  773 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  774 + <provider selected="true" editor-type-id="text-editor">
  775 + <state relative-caret-position="128">
  776 + <caret line="188" column="29" lean-forward="false" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
  777 + <folding>
  778 + <element signature="e#411#604#0#PHP" expanded="false" />
  779 + <element signature="e#609#825#0#PHP" expanded="false" />
  780 + <element signature="e#831#1329#0#PHP" expanded="false" />
  781 + <element signature="e#1334#2102#0#PHP" expanded="false" />
  782 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  783 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  784 + <element signature="e#2545#3052#0#PHP" expanded="false" />
  785 + <element signature="e#3057#3575#0#PHP" expanded="false" />
  786 + <element signature="e#3581#4093#0#PHP" expanded="false" />
  787 + <element signature="e#4098#4661#0#PHP" expanded="false" />
  788 + <element signature="e#4667#5257#0#PHP" expanded="false" />
  789 + <element signature="e#5262#6248#0#PHP" expanded="false" />
  790 + <element signature="e#6254#6572#0#PHP" expanded="false" />
  791 + <element signature="e#6577#6953#0#PHP" expanded="false" />
  792 + <element signature="e#6959#7314#0#PHP" expanded="false" />
  793 + <element signature="e#7319#7728#0#PHP" expanded="false" />
  794 + <element signature="e#7734#8119#0#PHP" expanded="false" />
  795 + <element signature="e#8124#8795#0#PHP" expanded="false" />
  796 + <element signature="e#8801#9247#0#PHP" expanded="false" />
  797 + <element signature="e#9252#10103#0#PHP" expanded="false" />
  798 + <element signature="e#10109#10379#0#PHP" expanded="false" />
  799 + <element signature="e#10384#10860#0#PHP" expanded="false" />
  800 + <element signature="e#10866#11496#0#PHP" expanded="false" />
  801 + <element signature="e#11501#13433#0#PHP" expanded="false" />
  802 + </folding>
  803 + </state>
  804 + </provider>
  805 + </entry>
  806 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  807 + <provider selected="true" editor-type-id="text-editor">
  808 + <state relative-caret-position="102">
  809 + <caret line="244" column="29" lean-forward="false" selection-start-line="244" selection-start-column="29" selection-end-line="244" selection-end-column="29" />
  810 + <folding>
  811 + <element signature="e#342#596#0#PHP" expanded="false" />
  812 + <element signature="e#601#886#0#PHP" expanded="false" />
  813 + <element signature="e#892#1227#0#PHP" expanded="false" />
  814 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  815 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  816 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  817 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  818 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  819 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  820 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  821 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  822 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  823 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  824 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  825 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  826 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  827 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  828 + <element signature="e#5850#6514#0#PHP" expanded="false" />
  829 + <element signature="e#6520#6863#0#PHP" expanded="false" />
  830 + <element signature="e#6868#7349#0#PHP" expanded="false" />
  831 + <element signature="e#7355#7646#0#PHP" expanded="false" />
  832 + <element signature="e#7651#8002#0#PHP" expanded="false" />
  833 + <element signature="e#8008#8361#0#PHP" expanded="false" />
  834 + <element signature="e#8366#8771#0#PHP" expanded="false" />
  835 + <element signature="e#8777#9160#0#PHP" expanded="false" />
  836 + <element signature="e#9165#9832#0#PHP" expanded="false" />
  837 + <element signature="e#9838#10282#0#PHP" expanded="false" />
  838 + <element signature="e#10287#11134#0#PHP" expanded="false" />
  839 + <element signature="e#11140#11408#0#PHP" expanded="false" />
  840 + <element signature="e#11413#11885#0#PHP" expanded="false" />
  841 + <element signature="e#11891#12197#0#PHP" expanded="false" />
  842 + <element signature="e#12202#13845#0#PHP" expanded="false" />
  843 + <element signature="e#13866#14185#0#PHP" expanded="false" />
  844 + </folding>
  845 + </state>
  846 + </provider>
  847 + </entry>
  848 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  849 + <provider selected="true" editor-type-id="text-editor">
  850 + <state relative-caret-position="725">
  851 + <caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
  852 + <folding>
  853 + <element signature="e#265#1638#0#PHP" expanded="false" />
  854 + <element signature="e#1655#3619#0#PHP" expanded="false" />
  855 + </folding>
  856 + </state>
  857 + </provider>
  858 + </entry>
  859 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  860 + <provider selected="true" editor-type-id="text-editor">
  861 + <state relative-caret-position="676">
  862 + <caret line="161" column="5" lean-forward="false" selection-start-line="161" selection-start-column="5" selection-end-line="161" selection-end-column="5" />
  863 + <folding>
  864 + <element signature="e#330#602#0#PHP" expanded="false" />
  865 + <element signature="e#608#970#0#PHP" expanded="false" />
  866 + <element signature="e#975#1835#0#PHP" expanded="false" />
  867 + <element signature="e#1841#2078#0#PHP" expanded="false" />
  868 + <element signature="e#2083#2781#0#PHP" expanded="false" />
  869 + <element signature="e#2787#3029#0#PHP" expanded="false" />
  870 + <element signature="e#3035#3272#0#PHP" expanded="false" />
  871 + <element signature="e#3277#3349#0#PHP" expanded="false" />
  872 + <element signature="e#3355#3834#0#PHP" expanded="false" />
  873 + <element signature="e#3839#4406#0#PHP" expanded="false" />
  874 + </folding>
  875 + </state>
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/api/config.php">
  879 + <provider selected="true" editor-type-id="text-editor">
  880 + <state relative-caret-position="551">
  881 + <caret line="259" column="35" lean-forward="true" selection-start-line="259" selection-start-column="35" selection-end-line="259" selection-end-column="35" />
  882 + <folding />
868 </state> 883 </state>
869 </provider> 884 </provider>
870 </entry> 885 </entry>
@@ -940,147 +955,45 @@ @@ -940,147 +955,45 @@
940 </state> 955 </state>
941 </provider> 956 </provider>
942 </entry> 957 </entry>
943 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
944 - <provider selected="true" editor-type-id="text-editor">  
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" />  
947 - <folding>  
948 - <element signature="e#330#602#0#PHP" expanded="false" />  
949 - <element signature="e#608#970#0#PHP" expanded="false" />  
950 - <element signature="e#975#1835#0#PHP" expanded="false" />  
951 - <element signature="e#1841#2078#0#PHP" expanded="false" />  
952 - <element signature="e#2083#2781#0#PHP" expanded="false" />  
953 - <element signature="e#2787#3029#0#PHP" expanded="false" />  
954 - <element signature="e#3035#3272#0#PHP" expanded="false" />  
955 - <element signature="e#3277#3349#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"> 958 + <entry file="file://$PROJECT_DIR$/app/config.php">
963 <provider selected="true" editor-type-id="text-editor"> 959 <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" /> 960 + <state relative-caret-position="1351">
  961 + <caret line="235" column="11" lean-forward="true" selection-start-line="235" selection-start-column="11" selection-end-line="235" selection-end-column="11" />
966 <folding /> 962 <folding />
967 </state> 963 </state>
968 </provider> 964 </provider>
969 </entry> 965 </entry>
970 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php"> 966 + <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
971 <provider selected="true" editor-type-id="text-editor"> 967 <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" /> 968 + <state relative-caret-position="0">
  969 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
974 <folding /> 970 <folding />
975 </state> 971 </state>
976 </provider> 972 </provider>
977 </entry> 973 </entry>
978 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 974 + <entry file="file://$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem">
979 <provider selected="true" editor-type-id="text-editor"> 975 <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> 976 + <state relative-caret-position="0">
  977 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  978 + <folding />
1050 </state> 979 </state>
1051 </provider> 980 </provider>
1052 </entry> 981 </entry>
1053 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 982 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
1054 <provider selected="true" editor-type-id="text-editor"> 983 <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" /> 984 + <state relative-caret-position="400">
  985 + <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="46" selection-end-line="25" selection-end-column="46" />
1057 <folding> 986 <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" /> 987 + <element signature="e#861#925#0#PHP" expanded="false" />
  988 + <element signature="e#930#1766#0#PHP" expanded="false" />
  989 + <element signature="e#1772#1853#0#PHP" expanded="false" />
  990 + <element signature="e#1858#3848#0#PHP" expanded="false" />
  991 + <element signature="e#3855#3878#0#PHP" expanded="false" />
  992 + <element signature="e#3883#4142#0#PHP" expanded="false" />
  993 + <element signature="e#4149#4198#0#PHP" expanded="false" />
  994 + <element signature="e#4203#4631#0#PHP" expanded="false" />
  995 + <element signature="e#4637#4701#0#PHP" expanded="false" />
  996 + <element signature="e#4706#5580#0#PHP" expanded="false" />
1084 </folding> 997 </folding>
1085 </state> 998 </state>
1086 </provider> 999 </provider>
@@ -257,8 +257,8 @@ return [ @@ -257,8 +257,8 @@ return [
257 'cmf_admin_default_theme' => 'simpleboot3', 257 'cmf_admin_default_theme' => 'simpleboot3',
258 258
259 //小程序配置 259 //小程序配置
260 - 'app_id'=>'wxd4445f65df16adca',  
261 - 'app_secret'=>'7d3ae6aa7dc7f11571830f4afaec4c5f', 260 + 'app_id'=>'wxd7010deb3b696146',
  261 + 'app_secret'=>'282f4cc8536523076c9d16af6331ffb6',
262 'wx_mch_id' => '1563087351', 262 'wx_mch_id' => '1563087351',
263 'wx_pay_key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS', 263 'wx_pay_key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS',
264 264
@@ -160,12 +160,4 @@ class OrderController extends RestBaseController @@ -160,12 +160,4 @@ class OrderController extends RestBaseController
160 } 160 }
161 $this->success('SUCCESS',$list); 161 $this->success('SUCCESS',$list);
162 } 162 }
163 -  
164 - //自动修改订单状态  
165 - public function update()  
166 - {  
167 -  
168 - }  
169 -  
170 -  
171 } 163 }
@@ -70,7 +70,7 @@ class ShoporderController extends AdminBaseController @@ -70,7 +70,7 @@ class ShoporderController extends AdminBaseController
70 ->update($param); 70 ->update($param);
71 Db::name('shoporder') 71 Db::name('shoporder')
72 ->where('id',$id) 72 ->where('id',$id)
73 - ->update(['orderstatus'=>2,'fa_time'=>time()]); 73 + ->update(['orderstatus'=>2,'fa_time'=>time(),'guo_time'=>time()+15*86400]);
74 $this->success('更新成功!'); 74 $this->success('更新成功!');
75 }else{ 75 }else{
76 Db::name('shoporder') 76 Db::name('shoporder')
@@ -98,4 +98,22 @@ class ShoporderController extends AdminBaseController @@ -98,4 +98,22 @@ class ShoporderController extends AdminBaseController
98 } 98 }
99 } 99 }
100 100
  101 + //自动修改订单状态
  102 + public function update()
  103 + {
  104 + $data = Db::name('shoporder')
  105 + ->where('orderstatus',2)
  106 + ->select()
  107 + ->toArray();
  108 + foreach ($data as &$v){
  109 + if($v['guo_time']<time()){
  110 + Db::name('shoporder')
  111 + ->where('id',$v['id'])
  112 + ->update(['orderstatus'=>3]);
  113 + }else{
  114 + true;
  115 + }
  116 + }
  117 + }
  118 +
101 } 119 }