郭盛 / scrap · 提交

转到一个项目

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

修改后台坐标问题

内嵌 并排对比
正在显示 4 个修改的文件 包含 216 行增加 和 231 行删除
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
7 </list> 9 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -25,98 +27,15 @@ @@ -25,98 +27,15 @@
25 </component> 27 </component>
26 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 30 + <file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="true">
  31 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
30 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="25">  
32 - <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 33 + <state relative-caret-position="400">
  34 + <caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
33 <folding> 35 <folding>
34 - <element signature="e#305#577#0#PHP" expanded="false" />  
35 - <element signature="e#583#854#0#PHP" expanded="false" />  
36 - <element signature="e#859#1113#0#PHP" expanded="false" />  
37 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
38 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
39 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
40 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
41 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
42 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
43 - </folding>  
44 - </state>  
45 - </provider>  
46 - </entry>  
47 - </file>  
48 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">  
49 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
50 - <provider selected="true" editor-type-id="text-editor">  
51 - <state relative-caret-position="210">  
52 - <caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" />  
53 - <folding>  
54 - <element signature="e#366#791#0#PHP" expanded="false" />  
55 - <element signature="e#796#1608#0#PHP" expanded="false" />  
56 - <element signature="e#1614#1872#0#PHP" expanded="false" />  
57 - <element signature="e#1877#2260#0#PHP" expanded="false" />  
58 - <element signature="e#2266#2495#0#PHP" expanded="false" />  
59 - <element signature="e#2500#4135#0#PHP" expanded="false" />  
60 - <element signature="e#4141#4381#0#PHP" expanded="false" />  
61 - <element signature="e#4386#4621#0#PHP" expanded="false" />  
62 - <element signature="e#4627#4974#0#PHP" expanded="false" />  
63 - <element signature="e#4979#5425#0#PHP" expanded="false" />  
64 - <element signature="e#5431#5691#0#PHP" expanded="false" />  
65 - <element signature="e#5696#5897#0#PHP" expanded="false" />  
66 - <element signature="e#5903#6165#0#PHP" expanded="false" />  
67 - <element signature="e#6170#6375#0#PHP" expanded="false" />  
68 - <element signature="e#6381#6860#0#PHP" expanded="false" />  
69 - <element signature="e#6865#8984#0#PHP" expanded="false" />  
70 - <element signature="e#9007#9538#0#PHP" expanded="false" />  
71 - <element signature="e#9544#9824#0#PHP" expanded="false" />  
72 - <element signature="e#9829#10221#0#PHP" expanded="false" />  
73 - <element signature="e#10227#10511#0#PHP" expanded="false" />  
74 - <element signature="e#10516#11555#0#PHP" expanded="false" />  
75 - <element signature="e#11561#11849#0#PHP" expanded="false" />  
76 - <element signature="e#11854#12889#0#PHP" expanded="false" />  
77 - <element signature="e#12895#13476#0#PHP" expanded="false" />  
78 - <element signature="e#13481#14869#0#PHP" expanded="false" />  
79 - <element signature="e#14875#15331#0#PHP" expanded="false" />  
80 - <element signature="e#15336#17299#0#PHP" expanded="false" />  
81 - <element signature="e#17322#17677#0#PHP" expanded="false" />  
82 - <element signature="e#17683#18396#0#PHP" expanded="false" />  
83 - <element signature="e#18401#19858#0#PHP" expanded="false" />  
84 - <element signature="e#19864#20325#0#PHP" expanded="false" />  
85 - <element signature="e#20330#23352#0#PHP" expanded="false" />  
86 - <element signature="e#23358#23967#0#PHP" expanded="false" />  
87 - <element signature="e#23972#25257#0#PHP" expanded="false" />  
88 - <element signature="e#25263#25620#0#PHP" expanded="false" />  
89 - <element signature="e#25625#26506#0#PHP" expanded="false" />  
90 - <element signature="e#26512#26864#0#PHP" expanded="false" />  
91 - <element signature="e#26869#27947#0#PHP" expanded="false" />  
92 - <element signature="e#27953#28308#0#PHP" expanded="false" />  
93 - <element signature="e#28313#29709#0#PHP" expanded="false" />  
94 - <element signature="e#29715#30139#0#PHP" expanded="false" />  
95 - <element signature="e#30144#30755#0#PHP" expanded="false" />  
96 - <element signature="e#30761#31257#0#PHP" expanded="false" />  
97 - <element signature="e#31262#34624#0#PHP" expanded="false" />  
98 - <element signature="e#32064#33191#0#PHP" expanded="false" />  
99 - <element signature="e#34630#34914#0#PHP" expanded="false" />  
100 - <element signature="e#34919#35555#0#PHP" expanded="false" />  
101 - <element signature="e#35576#35895#0#PHP" expanded="false" />  
102 - <element signature="e#35901#36309#0#PHP" expanded="false" />  
103 - <element signature="e#36315#37074#0#PHP" expanded="false" />  
104 - <element signature="e#37093#37957#0#PHP" expanded="false" />  
105 - <element signature="e#37983#38383#0#PHP" expanded="false" />  
106 - <element signature="e#38406#38979#0#PHP" expanded="false" />  
107 - <element signature="e#39002#39812#0#PHP" expanded="false" />  
108 - <element signature="e#39818#40417#0#PHP" expanded="false" />  
109 - <element signature="e#40422#41386#0#PHP" expanded="false" />  
110 - <element signature="e#41392#42059#0#PHP" expanded="false" />  
111 - <element signature="e#42064#43105#0#PHP" expanded="false" />  
112 - <element signature="e#43111#43774#0#PHP" expanded="false" />  
113 - <element signature="e#43779#44806#0#PHP" expanded="false" />  
114 - <element signature="e#44813#45244#0#PHP" expanded="false" />  
115 - <element signature="e#45249#45827#0#PHP" expanded="false" />  
116 - <element signature="e#45833#46262#0#PHP" expanded="false" />  
117 - <element signature="e#46267#46869#0#PHP" expanded="false" />  
118 - <element signature="e#46875#47302#0#PHP" expanded="false" />  
119 - <element signature="e#47307#47873#0#PHP" expanded="false" /> 36 + <element signature="e#265#1638#0#PHP" expanded="false" />
  37 + <element signature="e#1655#3619#0#PHP" expanded="false" />
  38 + <element signature="e#3640#4059#0#PHP" expanded="false" />
120 </folding> 39 </folding>
121 </state> 40 </state>
122 </provider> 41 </provider>
@@ -177,7 +96,6 @@ @@ -177,7 +96,6 @@
177 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 96 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
178 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 97 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
179 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 98 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
180 - <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
181 <option value="$PROJECT_DIR$/api/config.php" /> 99 <option value="$PROJECT_DIR$/api/config.php" />
182 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 100 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
183 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" /> 101 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
@@ -188,11 +106,12 @@ @@ -188,11 +106,12 @@
188 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" /> 106 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
189 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 107 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
190 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 108 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
191 - <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />  
192 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 109 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
193 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 110 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
194 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 111 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
195 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 112 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  113 + <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
  114 + <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
196 </list> 115 </list>
197 </option> 116 </option>
198 </component> 117 </component>
@@ -210,11 +129,11 @@ @@ -210,11 +129,11 @@
210 <sorting>DEFINITION_ORDER</sorting> 129 <sorting>DEFINITION_ORDER</sorting>
211 </component> 130 </component>
212 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 131 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
213 - <component name="ProjectFrameBounds">  
214 - <option name="x" value="483" />  
215 - <option name="y" value="69" /> 132 + <component name="ProjectFrameBounds" extendedState="1">
  133 + <option name="x" value="237" />
  134 + <option name="y" value="72" />
216 <option name="width" value="1618" /> 135 <option name="width" value="1618" />
217 - <option name="height" value="1024" /> 136 + <option name="height" value="1008" />
218 </component> 137 </component>
219 <component name="ProjectView"> 138 <component name="ProjectView">
220 <navigator currentView="ProjectPane" proportions="" version="1"> 139 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -231,6 +150,7 @@ @@ -231,6 +150,7 @@
231 <foldersAlwaysOnTop value="true" /> 150 <foldersAlwaysOnTop value="true" />
232 </navigator> 151 </navigator>
233 <panes> 152 <panes>
  153 + <pane id="Scope" />
234 <pane id="Scratches" /> 154 <pane id="Scratches" />
235 <pane id="ProjectPane"> 155 <pane id="ProjectPane">
236 <subPane> 156 <subPane>
@@ -239,29 +159,10 @@ @@ -239,29 +159,10 @@
239 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 159 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
240 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 160 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
241 </path> 161 </path>
242 - <path>  
243 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
244 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
245 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
246 - </path>  
247 - <path>  
248 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
249 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
250 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
251 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
252 - </path>  
253 - <path>  
254 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
255 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
256 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
257 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
258 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />  
259 - </path>  
260 </expand> 162 </expand>
261 <select /> 163 <select />
262 </subPane> 164 </subPane>
263 </pane> 165 </pane>
264 - <pane id="Scope" />  
265 </panes> 166 </panes>
266 </component> 167 </component>
267 <component name="PropertiesComponent"> 168 <component name="PropertiesComponent">
@@ -372,18 +273,17 @@ @@ -372,18 +273,17 @@
372 <workItem from="1576027263250" duration="3000" /> 273 <workItem from="1576027263250" duration="3000" />
373 <workItem from="1576049946357" duration="1233000" /> 274 <workItem from="1576049946357" duration="1233000" />
374 <workItem from="1576056936489" duration="7947000" /> 275 <workItem from="1576056936489" duration="7947000" />
375 - <workItem from="1576066696521" duration="71000" /> 276 + <workItem from="1576066696521" duration="5462000" />
376 </task> 277 </task>
377 <servers /> 278 <servers />
378 </component> 279 </component>
379 <component name="TimeTrackingManager"> 280 <component name="TimeTrackingManager">
380 - <option name="totallyTimeSpent" value="537884000" /> 281 + <option name="totallyTimeSpent" value="543275000" />
381 </component> 282 </component>
382 <component name="ToolWindowManager"> 283 <component name="ToolWindowManager">
383 - <frame x="483" y="69" width="1618" height="1024" extended-state="0" />  
384 - <editor active="true" /> 284 + <frame x="237" y="72" width="1618" height="1008" extended-state="1" />
385 <layout> 285 <layout>
386 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18292683" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 286 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18292683" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
387 <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" /> 287 <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" />
388 <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" /> 288 <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" />
389 <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" /> 289 <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" />
@@ -429,7 +329,7 @@ @@ -429,7 +329,7 @@
429 </component> 329 </component>
430 <component name="XDebuggerManager"> 330 <component name="XDebuggerManager">
431 <breakpoint-manager> 331 <breakpoint-manager>
432 - <option name="time" value="12" /> 332 + <option name="time" value="13" />
433 </breakpoint-manager> 333 </breakpoint-manager>
434 <watches-manager /> 334 <watches-manager />
435 </component> 335 </component>
@@ -535,13 +435,6 @@ @@ -535,13 +435,6 @@
535 </state> 435 </state>
536 </provider> 436 </provider>
537 </entry> 437 </entry>
538 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">  
539 - <provider selected="true" editor-type-id="text-editor">  
540 - <state relative-caret-position="0">  
541 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
542 - </state>  
543 - </provider>  
544 - </entry>  
545 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php"> 438 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
546 <provider selected="true" editor-type-id="text-editor"> 439 <provider selected="true" editor-type-id="text-editor">
547 <state relative-caret-position="0"> 440 <state relative-caret-position="0">
@@ -584,13 +477,6 @@ @@ -584,13 +477,6 @@
584 </state> 477 </state>
585 </provider> 478 </provider>
586 </entry> 479 </entry>
587 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
588 - <provider selected="true" editor-type-id="text-editor">  
589 - <state relative-caret-position="725">  
590 - <caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />  
591 - </state>  
592 - </provider>  
593 - </entry>  
594 <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt"> 480 <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
595 <provider selected="true" editor-type-id="text-editor"> 481 <provider selected="true" editor-type-id="text-editor">
596 <state relative-caret-position="0"> 482 <state relative-caret-position="0">
@@ -675,24 +561,11 @@ @@ -675,24 +561,11 @@
675 </state> 561 </state>
676 </provider> 562 </provider>
677 </entry> 563 </entry>
678 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
679 - <provider selected="true" editor-type-id="text-editor">  
680 - <state relative-caret-position="229">  
681 - <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />  
682 - </state>  
683 - </provider>  
684 - </entry>  
685 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
686 - <provider selected="true" editor-type-id="text-editor">  
687 - <state relative-caret-position="479">  
688 - <caret line="125" column="29" lean-forward="false" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />  
689 - </state>  
690 - </provider>  
691 - </entry>  
692 <entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php"> 564 <entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php">
693 <provider selected="true" editor-type-id="text-editor"> 565 <provider selected="true" editor-type-id="text-editor">
694 <state relative-caret-position="400"> 566 <state relative-caret-position="400">
695 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> 567 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
  568 + <folding />
696 </state> 569 </state>
697 </provider> 570 </provider>
698 </entry> 571 </entry>
@@ -714,6 +587,10 @@ @@ -714,6 +587,10 @@
714 <provider selected="true" editor-type-id="text-editor"> 587 <provider selected="true" editor-type-id="text-editor">
715 <state relative-caret-position="300"> 588 <state relative-caret-position="300">
716 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 589 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
  590 + <folding>
  591 + <element signature="e#130#169#0#PHP" expanded="false" />
  592 + <element signature="e#262#1148#0#PHP" expanded="false" />
  593 + </folding>
717 </state> 594 </state>
718 </provider> 595 </provider>
719 </entry> 596 </entry>
@@ -745,17 +622,24 @@ @@ -745,17 +622,24 @@
745 </state> 622 </state>
746 </provider> 623 </provider>
747 </entry> 624 </entry>
748 - <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">  
749 - <provider selected="true" editor-type-id="text-editor">  
750 - <state relative-caret-position="325">  
751 - <caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="62" selection-end-column="31" />  
752 - </state>  
753 - </provider>  
754 - </entry>  
755 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 625 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
756 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
757 <state relative-caret-position="139"> 627 <state relative-caret-position="139">
758 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" /> 628 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
  629 + <folding>
  630 + <element signature="e#4855#5051#0#PHP" expanded="false" />
  631 + <element signature="e#5056#5318#0#PHP" expanded="false" />
  632 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  633 + <element signature="e#5784#6508#0#PHP" expanded="false" />
  634 + <element signature="e#6514#6857#0#PHP" expanded="false" />
  635 + <element signature="e#6862#7343#0#PHP" expanded="false" />
  636 + <element signature="e#7349#7640#0#PHP" expanded="false" />
  637 + <element signature="e#7645#7996#0#PHP" expanded="false" />
  638 + <element signature="e#8002#8355#0#PHP" expanded="false" />
  639 + <element signature="e#8360#8765#0#PHP" expanded="false" />
  640 + <element signature="e#8771#9154#0#PHP" expanded="false" />
  641 + <element signature="e#9159#9826#0#PHP" expanded="false" />
  642 + </folding>
759 </state> 643 </state>
760 </provider> 644 </provider>
761 </entry> 645 </entry>
@@ -763,6 +647,9 @@ @@ -763,6 +647,9 @@
763 <provider selected="true" editor-type-id="text-editor"> 647 <provider selected="true" editor-type-id="text-editor">
764 <state relative-caret-position="690"> 648 <state relative-caret-position="690">
765 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" /> 649 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
  650 + <folding>
  651 + <element signature="e#3168#3696#0#PHP" expanded="false" />
  652 + </folding>
766 </state> 653 </state>
767 </provider> 654 </provider>
768 </entry> 655 </entry>
@@ -770,6 +657,30 @@ @@ -770,6 +657,30 @@
770 <provider selected="true" editor-type-id="text-editor"> 657 <provider selected="true" editor-type-id="text-editor">
771 <state relative-caret-position="360"> 658 <state relative-caret-position="360">
772 <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> 659 <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
  660 + <folding>
  661 + <element signature="e#411#604#0#PHP" expanded="false" />
  662 + <element signature="e#609#825#0#PHP" expanded="false" />
  663 + <element signature="e#2099#2317#0#PHP" expanded="false" />
  664 + <element signature="e#2322#2530#0#PHP" expanded="false" />
  665 + <element signature="e#2536#3043#0#PHP" expanded="false" />
  666 + <element signature="e#3048#3566#0#PHP" expanded="false" />
  667 + <element signature="e#3572#4084#0#PHP" expanded="false" />
  668 + <element signature="e#4089#4652#0#PHP" expanded="false" />
  669 + <element signature="e#4658#5248#0#PHP" expanded="false" />
  670 + <element signature="e#5253#6299#0#PHP" expanded="false" />
  671 + <element signature="e#6305#6623#0#PHP" expanded="false" />
  672 + <element signature="e#6628#7004#0#PHP" expanded="false" />
  673 + <element signature="e#7010#7365#0#PHP" expanded="false" />
  674 + <element signature="e#7370#7779#0#PHP" expanded="false" />
  675 + <element signature="e#7785#8170#0#PHP" expanded="false" />
  676 + <element signature="e#8175#8846#0#PHP" expanded="false" />
  677 + <element signature="e#8852#9298#0#PHP" expanded="false" />
  678 + <element signature="e#9303#10154#0#PHP" expanded="false" />
  679 + <element signature="e#10160#10430#0#PHP" expanded="false" />
  680 + <element signature="e#10435#10911#0#PHP" expanded="false" />
  681 + <element signature="e#10917#11547#0#PHP" expanded="false" />
  682 + <element signature="e#11552#13484#0#PHP" expanded="false" />
  683 + </folding>
773 </state> 684 </state>
774 </provider> 685 </provider>
775 </entry> 686 </entry>
@@ -791,10 +702,40 @@ @@ -791,10 +702,40 @@
791 </state> 702 </state>
792 </provider> 703 </provider>
793 </entry> 704 </entry>
  705 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  706 + <provider selected="true" editor-type-id="text-editor">
  707 + <state relative-caret-position="1259">
  708 + <caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
  709 + <folding>
  710 + <element signature="e#947#1011#0#PHP" expanded="false" />
  711 + <element signature="e#1016#1849#0#PHP" expanded="false" />
  712 + </folding>
  713 + </state>
  714 + </provider>
  715 + </entry>
  716 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  717 + <provider selected="true" editor-type-id="text-editor">
  718 + <state relative-caret-position="525">
  719 + <caret line="91" column="26" lean-forward="false" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
  720 + <folding>
  721 + <element signature="e#336#608#0#PHP" expanded="false" />
  722 + <element signature="e#614#976#0#PHP" expanded="false" />
  723 + <element signature="e#981#2020#0#PHP" expanded="false" />
  724 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  725 + <element signature="e#2268#3059#0#PHP" expanded="false" />
  726 + <element signature="e#3065#3374#0#PHP" expanded="false" />
  727 + <element signature="e#3379#5269#0#PHP" expanded="false" />
  728 + <element signature="e#5277#5756#0#PHP" expanded="false" />
  729 + <element signature="e#5761#6328#0#PHP" expanded="false" />
  730 + <element signature="e#6334#6587#0#PHP" expanded="false" />
  731 + </folding>
  732 + </state>
  733 + </provider>
  734 + </entry>
794 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 735 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
795 <provider selected="true" editor-type-id="text-editor"> 736 <provider selected="true" editor-type-id="text-editor">
796 - <state relative-caret-position="210">  
797 - <caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" /> 737 + <state relative-caret-position="268">
  738 + <caret line="595" column="0" lean-forward="true" selection-start-line="595" selection-start-column="0" selection-end-line="595" selection-end-column="0" />
798 <folding> 739 <folding>
799 <element signature="e#366#791#0#PHP" expanded="false" /> 740 <element signature="e#366#791#0#PHP" expanded="false" />
800 <element signature="e#796#1608#0#PHP" expanded="false" /> 741 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -811,57 +752,94 @@ @@ -811,57 +752,94 @@
811 <element signature="e#5903#6165#0#PHP" expanded="false" /> 752 <element signature="e#5903#6165#0#PHP" expanded="false" />
812 <element signature="e#6170#6375#0#PHP" expanded="false" /> 753 <element signature="e#6170#6375#0#PHP" expanded="false" />
813 <element signature="e#6381#6860#0#PHP" expanded="false" /> 754 <element signature="e#6381#6860#0#PHP" expanded="false" />
814 - <element signature="e#6865#8984#0#PHP" expanded="false" />  
815 - <element signature="e#9007#9538#0#PHP" expanded="false" />  
816 - <element signature="e#9544#9824#0#PHP" expanded="false" />  
817 - <element signature="e#9829#10221#0#PHP" expanded="false" />  
818 - <element signature="e#10227#10511#0#PHP" expanded="false" />  
819 - <element signature="e#10516#11555#0#PHP" expanded="false" />  
820 - <element signature="e#11561#11849#0#PHP" expanded="false" />  
821 - <element signature="e#11854#12889#0#PHP" expanded="false" />  
822 - <element signature="e#12895#13476#0#PHP" expanded="false" />  
823 - <element signature="e#13481#14869#0#PHP" expanded="false" />  
824 - <element signature="e#14875#15331#0#PHP" expanded="false" />  
825 - <element signature="e#15336#17299#0#PHP" expanded="false" />  
826 - <element signature="e#17322#17677#0#PHP" expanded="false" />  
827 - <element signature="e#17683#18396#0#PHP" expanded="false" />  
828 - <element signature="e#18401#19858#0#PHP" expanded="false" />  
829 - <element signature="e#19864#20325#0#PHP" expanded="false" />  
830 - <element signature="e#20330#23352#0#PHP" expanded="false" />  
831 - <element signature="e#23358#23967#0#PHP" expanded="false" />  
832 - <element signature="e#23972#25257#0#PHP" expanded="false" />  
833 - <element signature="e#25263#25620#0#PHP" expanded="false" />  
834 - <element signature="e#25625#26506#0#PHP" expanded="false" />  
835 - <element signature="e#26512#26864#0#PHP" expanded="false" />  
836 - <element signature="e#26869#27947#0#PHP" expanded="false" />  
837 - <element signature="e#27953#28308#0#PHP" expanded="false" />  
838 - <element signature="e#28313#29709#0#PHP" expanded="false" />  
839 - <element signature="e#29715#30139#0#PHP" expanded="false" />  
840 - <element signature="e#30144#30755#0#PHP" expanded="false" />  
841 - <element signature="e#30761#31257#0#PHP" expanded="false" />  
842 - <element signature="e#31262#34624#0#PHP" expanded="false" />  
843 - <element signature="e#32064#33191#0#PHP" expanded="false" />  
844 - <element signature="e#34630#34914#0#PHP" expanded="false" />  
845 - <element signature="e#34919#35555#0#PHP" expanded="false" />  
846 - <element signature="e#35576#35895#0#PHP" expanded="false" />  
847 - <element signature="e#35901#36309#0#PHP" expanded="false" />  
848 - <element signature="e#36315#37074#0#PHP" expanded="false" />  
849 - <element signature="e#37093#37957#0#PHP" expanded="false" />  
850 - <element signature="e#37983#38383#0#PHP" expanded="false" />  
851 - <element signature="e#38406#38979#0#PHP" expanded="false" />  
852 - <element signature="e#39002#39812#0#PHP" expanded="false" />  
853 - <element signature="e#39818#40417#0#PHP" expanded="false" />  
854 - <element signature="e#40422#41386#0#PHP" expanded="false" />  
855 - <element signature="e#41392#42059#0#PHP" expanded="false" />  
856 - <element signature="e#42064#43105#0#PHP" expanded="false" />  
857 - <element signature="e#43111#43774#0#PHP" expanded="false" />  
858 - <element signature="e#43779#44806#0#PHP" expanded="false" />  
859 - <element signature="e#44813#45244#0#PHP" expanded="false" />  
860 - <element signature="e#45249#45827#0#PHP" expanded="false" />  
861 - <element signature="e#45833#46262#0#PHP" expanded="false" />  
862 - <element signature="e#46267#46869#0#PHP" expanded="false" />  
863 - <element signature="e#46875#47302#0#PHP" expanded="false" />  
864 - <element signature="e#47307#47873#0#PHP" expanded="false" /> 755 + <element signature="e#6865#9088#0#PHP" expanded="false" />
  756 + <element signature="e#9111#9642#0#PHP" expanded="false" />
  757 + <element signature="e#9648#9928#0#PHP" expanded="false" />
  758 + <element signature="e#9933#10325#0#PHP" expanded="false" />
  759 + <element signature="e#10331#10615#0#PHP" expanded="false" />
  760 + <element signature="e#10620#11565#0#PHP" expanded="false" />
  761 + <element signature="e#11571#11859#0#PHP" expanded="false" />
  762 + <element signature="e#11864#12803#0#PHP" expanded="false" />
  763 + <element signature="e#12809#13390#0#PHP" expanded="false" />
  764 + <element signature="e#13395#15027#0#PHP" expanded="false" />
  765 + <element signature="e#15033#15489#0#PHP" expanded="false" />
  766 + <element signature="e#15494#17562#0#PHP" expanded="false" />
  767 + <element signature="e#17585#17940#0#PHP" expanded="false" />
  768 + <element signature="e#17946#18659#0#PHP" expanded="false" />
  769 + <element signature="e#18664#20121#0#PHP" expanded="false" />
  770 + <element signature="e#20127#20588#0#PHP" expanded="false" />
  771 + <element signature="e#20593#23720#0#PHP" expanded="false" />
  772 + <element signature="e#23726#24335#0#PHP" expanded="false" />
  773 + <element signature="e#24340#25625#0#PHP" expanded="false" />
  774 + <element signature="e#25631#25988#0#PHP" expanded="false" />
  775 + <element signature="e#25993#26905#0#PHP" expanded="false" />
  776 + <element signature="e#26911#27263#0#PHP" expanded="false" />
  777 + <element signature="e#27268#28377#0#PHP" expanded="false" />
  778 + <element signature="e#28383#28738#0#PHP" expanded="false" />
  779 + <element signature="e#28743#30170#0#PHP" expanded="false" />
  780 + <element signature="e#30176#30600#0#PHP" expanded="false" />
  781 + <element signature="e#30605#31216#0#PHP" expanded="false" />
  782 + <element signature="e#31222#31718#0#PHP" expanded="false" />
  783 + <element signature="e#31723#35085#0#PHP" expanded="false" />
  784 + <element signature="e#32525#33652#0#PHP" expanded="false" />
  785 + <element signature="e#35091#35375#0#PHP" expanded="false" />
  786 + <element signature="e#35380#36016#0#PHP" expanded="false" />
  787 + <element signature="e#36037#36356#0#PHP" expanded="false" />
  788 + <element signature="e#36362#36770#0#PHP" expanded="false" />
  789 + <element signature="e#36776#37535#0#PHP" expanded="false" />
  790 + <element signature="e#37554#38418#0#PHP" expanded="false" />
  791 + <element signature="e#38444#38844#0#PHP" expanded="false" />
  792 + <element signature="e#38867#39440#0#PHP" expanded="false" />
  793 + <element signature="e#39463#40273#0#PHP" expanded="false" />
  794 + <element signature="e#40279#40878#0#PHP" expanded="false" />
  795 + <element signature="e#40883#41847#0#PHP" expanded="false" />
  796 + <element signature="e#41853#42520#0#PHP" expanded="false" />
  797 + <element signature="e#42525#43566#0#PHP" expanded="false" />
  798 + <element signature="e#43572#44235#0#PHP" expanded="false" />
  799 + <element signature="e#44240#45267#0#PHP" expanded="false" />
  800 + <element signature="e#45274#45705#0#PHP" expanded="false" />
  801 + <element signature="e#45710#46288#0#PHP" expanded="false" />
  802 + <element signature="e#46294#46723#0#PHP" expanded="false" />
  803 + <element signature="e#46728#47330#0#PHP" expanded="false" />
  804 + <element signature="e#47336#47763#0#PHP" expanded="false" />
  805 + <element signature="e#47768#48334#0#PHP" expanded="false" />
  806 + </folding>
  807 + </state>
  808 + </provider>
  809 + </entry>
  810 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
  811 + <provider selected="true" editor-type-id="text-editor">
  812 + <state relative-caret-position="425">
  813 + <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
  814 + <folding>
  815 + <element signature="e#262#867#0#PHP" expanded="false" />
  816 + <element signature="e#2065#2422#0#PHP" expanded="false" />
  817 + <element signature="e#4089#4555#0#PHP" expanded="false" />
  818 + </folding>
  819 + </state>
  820 + </provider>
  821 + </entry>
  822 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
  823 + <provider selected="true" editor-type-id="text-editor">
  824 + <state relative-caret-position="0">
  825 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  826 + <folding>
  827 + <element signature="e#266#1001#0#PHP" expanded="false" />
  828 + <element signature="e#1016#2171#0#PHP" expanded="false" />
  829 + <element signature="e#2186#3928#0#PHP" expanded="false" />
  830 + <element signature="e#3943#4413#0#PHP" expanded="false" />
  831 + </folding>
  832 + </state>
  833 + </provider>
  834 + </entry>
  835 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  836 + <provider selected="true" editor-type-id="text-editor">
  837 + <state relative-caret-position="400">
  838 + <caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
  839 + <folding>
  840 + <element signature="e#265#1638#0#PHP" expanded="false" />
  841 + <element signature="e#1655#3619#0#PHP" expanded="false" />
  842 + <element signature="e#3640#4059#0#PHP" expanded="false" />
865 </folding> 843 </folding>
866 </state> 844 </state>
867 </provider> 845 </provider>
@@ -271,6 +271,7 @@ class UserController extends RestBaseController @@ -271,6 +271,7 @@ class UserController extends RestBaseController
271 ->where('user_id',$user_id) 271 ->where('user_id',$user_id)
272 ->where('status',0) 272 ->where('status',0)
273 ->field('id,num,create_time,sub_time,attr_id') 273 ->field('id,num,create_time,sub_time,attr_id')
  274 + ->order('id desc')
274 ->select() 275 ->select()
275 ->toArray(); 276 ->toArray();
276 $res = $this->r_foreach($data); 277 $res = $this->r_foreach($data);
@@ -281,6 +282,7 @@ class UserController extends RestBaseController @@ -281,6 +282,7 @@ class UserController extends RestBaseController
281 ->where('user_id',$user_id) 282 ->where('user_id',$user_id)
282 ->where('status',1) 283 ->where('status',1)
283 ->field('id,num,create_time,sub_time,attr_id') 284 ->field('id,num,create_time,sub_time,attr_id')
  285 + ->order('id desc')
284 ->select() 286 ->select()
285 ->toArray(); 287 ->toArray();
286 $res = $this->r_foreach($data); 288 $res = $this->r_foreach($data);
@@ -291,6 +293,7 @@ class UserController extends RestBaseController @@ -291,6 +293,7 @@ class UserController extends RestBaseController
291 ->where('user_id',$user_id) 293 ->where('user_id',$user_id)
292 ->where('status',2) 294 ->where('status',2)
293 ->field('id,num,create_time,sub_time,attr_id') 295 ->field('id,num,create_time,sub_time,attr_id')
  296 + ->order('id desc')
294 ->select() 297 ->select()
295 ->toArray(); 298 ->toArray();
296 foreach ($data as &$v){ 299 foreach ($data as &$v){
@@ -385,6 +388,7 @@ class UserController extends RestBaseController @@ -385,6 +388,7 @@ class UserController extends RestBaseController
385 $list = Db::name('shoporder') 388 $list = Db::name('shoporder')
386 ->where('id',$id) 389 ->where('id',$id)
387 ->find(); 390 ->find();
  391 +
388 $info['total'] = $list['total']; 392 $info['total'] = $list['total'];
389 $info['type'] = 7; 393 $info['type'] = 7;
390 $info['create_time'] = time(); 394 $info['create_time'] = time();
@@ -396,14 +400,10 @@ class UserController extends RestBaseController @@ -396,14 +400,10 @@ class UserController extends RestBaseController
396 $now_integral = $login['now_integral'] + $list['total']; 400 $now_integral = $login['now_integral'] + $list['total'];
397 $update_time = time(); 401 $update_time = time();
398 Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]); 402 Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
399 - $data = Db::name('shoporder') 403 + Db::name('shoporder')
400 ->where('id',$id) 404 ->where('id',$id)
401 ->delete(); 405 ->delete();
402 - if($data){  
403 - $this->success('SUCCESS');  
404 - }else{  
405 - $this->error('sql语句执行失败');  
406 - } 406 + $this->success('SUCCESS');
407 } 407 }
408 408
409 /** 409 /**
@@ -439,14 +439,10 @@ class UserController extends RestBaseController @@ -439,14 +439,10 @@ class UserController extends RestBaseController
439 $now_integral = $login['now_integral'] + $list['total']; 439 $now_integral = $login['now_integral'] + $list['total'];
440 $update_time = time(); 440 $update_time = time();
441 Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]); 441 Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
442 - $data = Db::name('subhome') 442 + Db::name('subhome')
443 ->where('id',$id) 443 ->where('id',$id)
444 ->delete(); 444 ->delete();
445 - if($data){  
446 - $this->success('SUCCESS');  
447 - }else{  
448 - $this->error('sql语句执行失败');  
449 - } 445 + $this->success('SUCCESS');
450 } 446 }
451 447
452 /** 448 /**
@@ -476,14 +472,15 @@ class UserController extends RestBaseController @@ -476,14 +472,15 @@ class UserController extends RestBaseController
476 $user_id = $this->getUserId(); 472 $user_id = $this->getUserId();
477 //接收订单ID 473 //接收订单ID
478 $id = $this->request->param('order_id'); 474 $id = $this->request->param('order_id');
479 -  
480 if(empty($id)){ 475 if(empty($id)){
481 $this->error(['code'=>41006,'msg'=>'缺少必要参数']); 476 $this->error(['code'=>41006,'msg'=>'缺少必要参数']);
482 } 477 }
483 $res = Db::name('subscribe') 478 $res = Db::name('subscribe')
484 ->where('id',$id) 479 ->where('id',$id)
485 ->find(); 480 ->find();
486 - $data['status'] = $res['status']; 481 + if(empty($res)){
  482 + $this->error(['code'=>2,'msg'=>'数据错误']);
  483 + }
487 $data['num'] = $res['num']; 484 $data['num'] = $res['num'];
488 $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']); 485 $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
489 $recycle_id = Db::name('recycle')->where('id',$res['recycle_id'])->field('address')->find(); 486 $recycle_id = Db::name('recycle')->where('id',$res['recycle_id'])->field('address')->find();
@@ -502,7 +499,12 @@ class UserController extends RestBaseController @@ -502,7 +499,12 @@ class UserController extends RestBaseController
502 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content'])); 499 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
503 $data['get_integral'] = $res['get_integral']; 500 $data['get_integral'] = $res['get_integral'];
504 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find(); 501 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
505 - $data['serve'] = $serve['fee']; 502 + $data['status'] = $res['status'];
  503 + if($data['status'] == 1 || $data['status'] == 0){
  504 + $data['serve'] = $serve['fee']."%";
  505 + }else{
  506 + $data['serve'] = ceil($data['get_integral']*(5/100));
  507 + }
506 $this->success('SUCCESS',$data); 508 $this->success('SUCCESS',$data);
507 } 509 }
508 510
@@ -535,6 +537,7 @@ class UserController extends RestBaseController @@ -535,6 +537,7 @@ class UserController extends RestBaseController
535 ->where('user_id',$user_id) 537 ->where('user_id',$user_id)
536 ->where('orderstatus',1) 538 ->where('orderstatus',1)
537 ->field('id,number,create_time,num,shopgoods_id') 539 ->field('id,number,create_time,num,shopgoods_id')
  540 + ->order('id desc')
538 ->select() 541 ->select()
539 ->toArray(); 542 ->toArray();
540 $data = $this->s_foreach($data); 543 $data = $this->s_foreach($data);
@@ -545,6 +548,7 @@ class UserController extends RestBaseController @@ -545,6 +548,7 @@ class UserController extends RestBaseController
545 ->where('user_id',$user_id) 548 ->where('user_id',$user_id)
546 ->where('orderstatus',2) 549 ->where('orderstatus',2)
547 ->field('id,number,create_time,num,shopgoods_id') 550 ->field('id,number,create_time,num,shopgoods_id')
  551 + ->order('id desc')
548 ->select() 552 ->select()
549 ->toArray(); 553 ->toArray();
550 $data = $this->s_foreach($data); 554 $data = $this->s_foreach($data);
@@ -555,6 +559,7 @@ class UserController extends RestBaseController @@ -555,6 +559,7 @@ class UserController extends RestBaseController
555 ->where('user_id',$user_id) 559 ->where('user_id',$user_id)
556 ->where('orderstatus',3) 560 ->where('orderstatus',3)
557 ->field('id,number,create_time,num,shopgoods_id') 561 ->field('id,number,create_time,num,shopgoods_id')
  562 + ->order('id desc')
558 ->select() 563 ->select()
559 ->toArray(); 564 ->toArray();
560 foreach ($data as &$v){ 565 foreach ($data as &$v){
@@ -678,6 +683,7 @@ class UserController extends RestBaseController @@ -678,6 +683,7 @@ class UserController extends RestBaseController
678 ->where('user_id',$user_id) 683 ->where('user_id',$user_id)
679 ->where('status',1) 684 ->where('status',1)
680 ->field('id,num,create_time,sub_time,home_id,service_id') 685 ->field('id,num,create_time,sub_time,home_id,service_id')
  686 + ->order('id desc')
681 ->select() 687 ->select()
682 ->toArray(); 688 ->toArray();
683 foreach ($data as &$v){ 689 foreach ($data as &$v){
@@ -695,6 +701,7 @@ class UserController extends RestBaseController @@ -695,6 +701,7 @@ class UserController extends RestBaseController
695 ->where('user_id',$user_id) 701 ->where('user_id',$user_id)
696 ->where('status',2) 702 ->where('status',2)
697 ->field('id,num,create_time,sub_time,home_id,service_id') 703 ->field('id,num,create_time,sub_time,home_id,service_id')
  704 + ->order('id desc')
698 ->select() 705 ->select()
699 ->toArray(); 706 ->toArray();
700 foreach ($data as &$v){ 707 foreach ($data as &$v){
@@ -712,6 +719,7 @@ class UserController extends RestBaseController @@ -712,6 +719,7 @@ class UserController extends RestBaseController
712 ->where('user_id',$user_id) 719 ->where('user_id',$user_id)
713 ->where('status',3) 720 ->where('status',3)
714 ->field('id,num,create_time,sub_time,home_id,service_id') 721 ->field('id,num,create_time,sub_time,home_id,service_id')
  722 + ->order('id desc')
715 ->select() 723 ->select()
716 ->toArray(); 724 ->toArray();
717 foreach ($data as &$v){ 725 foreach ($data as &$v){
@@ -809,6 +817,7 @@ class UserController extends RestBaseController @@ -809,6 +817,7 @@ class UserController extends RestBaseController
809 $data = Db::name('subscribe') 817 $data = Db::name('subscribe')
810 ->where($where) 818 ->where($where)
811 ->field('id,num,create_time,sub_time,attr_id') 819 ->field('id,num,create_time,sub_time,attr_id')
  820 + ->order('id desc')
812 ->select() 821 ->select()
813 ->toArray(); 822 ->toArray();
814 foreach ($data as &$v){ 823 foreach ($data as &$v){
@@ -850,6 +859,7 @@ class UserController extends RestBaseController @@ -850,6 +859,7 @@ class UserController extends RestBaseController
850 $list = Db::name('collector') 859 $list = Db::name('collector')
851 ->where('user_id',$user_id) 860 ->where('user_id',$user_id)
852 ->where('status',1) 861 ->where('status',1)
  862 + ->order('id desc')
853 ->column('order_id'); 863 ->column('order_id');
854 foreach ($list as &$val){ 864 foreach ($list as &$val){
855 $val = Db::name('subscribe') 865 $val = Db::name('subscribe')
@@ -898,6 +908,7 @@ class UserController extends RestBaseController @@ -898,6 +908,7 @@ class UserController extends RestBaseController
898 $list = Db::name('collector') 908 $list = Db::name('collector')
899 ->where('user_id',$user_id) 909 ->where('user_id',$user_id)
900 ->where('status',2) 910 ->where('status',2)
  911 + ->order('id desc')
901 ->column('order_id'); 912 ->column('order_id');
902 913
903 foreach ($list as &$val){ 914 foreach ($list as &$val){
@@ -56,16 +56,15 @@ class PointController extends AdminBaseController @@ -56,16 +56,15 @@ class PointController extends AdminBaseController
56 $this->error($validate->getError()); 56 $this->error($validate->getError());
57 } 57 }
58 //获取经纬度 58 //获取经纬度
59 - $url = 'https://apis.map.qq.com/ws/geocoder/v1/?address='.$param['address'].'&key=LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH'; 59 + $url = "https://apis.map.qq.com/ws/geocoder/v1/?address=$param[address]&key=GUNBZ-MJZCU-NRTVH-2JYRC-4HFAH-44FWM";
60 60
61 $result=file_get_contents($url); 61 $result=file_get_contents($url);
62 $res=json_decode($result,true); 62 $res=json_decode($result,true);
63 - print_r($res);exit; 63 +
64 //经度 64 //经度
65 $param['lng']= $res['result']['location']['lng']; 65 $param['lng']= $res['result']['location']['lng'];
66 //纬度 66 //纬度
67 $param['lat']= $res['result']['location']['lat']; 67 $param['lat']= $res['result']['location']['lat'];
68 -  
69 Db::name('point') 68 Db::name('point')
70 ->insert($param); 69 ->insert($param);
71 $this->success('添加成功！','index'); 70 $this->success('添加成功！','index');
@@ -74,8 +73,6 @@ class PointController extends AdminBaseController @@ -74,8 +73,6 @@ class PointController extends AdminBaseController
74 return $this->fetch(); 73 return $this->fetch();
75 } 74 }
76 } 75 }
77 -  
78 -  
79 public function map() 76 public function map()
80 { 77 {
81 $location = $this->request->param('location'); 78 $location = $this->request->param('location');
@@ -107,7 +104,7 @@ class PointController extends AdminBaseController @@ -107,7 +104,7 @@ class PointController extends AdminBaseController
107 $this->error($validate->getError()); 104 $this->error($validate->getError());
108 } 105 }
109 //获取经纬度 106 //获取经纬度
110 - $url='http://api.map.baidu.com/geocoder/v2/?address='.$param['address'].'&output=json&ak=cIGo3zYrN4WOEnMDSbxynUi9M20i9IgY'; 107 + $url = "https://apis.map.qq.com/ws/geocoder/v1/?address=$param[address]&key=GUNBZ-MJZCU-NRTVH-2JYRC-4HFAH-44FWM";
111 $result=file_get_contents($url); 108 $result=file_get_contents($url);
112 $res=json_decode($result,true); 109 $res=json_decode($result,true);
113 //经度 110 //经度
@@ -115,5 +115,4 @@ class ShoporderController extends AdminBaseController @@ -115,5 +115,4 @@ class ShoporderController extends AdminBaseController
115 } 115 }
116 } 116 }
117 } 117 }
118 -  
119 } 118 }