郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 54ee924644c61b12a561258edcc689fb8b65bf30 1 个父辈 aece1585
1 个管道 的构建 通过 耗费 8 秒

修改评价图片不显示问题

内嵌 并排对比
正在显示 5 个修改的文件 包含 204 行增加 和 242 行删除
@@ -2,8 +2,11 @@ @@ -2,8 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
7 </list> 10 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -25,11 +28,11 @@ @@ -25,11 +28,11 @@
25 </component> 28 </component>
26 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 31 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 32 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 33 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="652">  
32 - <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" /> 34 + <state relative-caret-position="188">
  35 + <caret line="1043" column="14" lean-forward="true" selection-start-line="1043" selection-start-column="14" selection-end-line="1043" selection-end-column="14" />
33 <folding> 36 <folding>
34 <element signature="e#366#715#0#PHP" expanded="false" /> 37 <element signature="e#366#715#0#PHP" expanded="false" />
35 <element signature="e#720#1485#0#PHP" expanded="false" /> 38 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -72,103 +75,28 @@ @@ -72,103 +75,28 @@
72 <element signature="e#28636#29060#0#PHP" expanded="false" /> 75 <element signature="e#28636#29060#0#PHP" expanded="false" />
73 <element signature="e#29065#29676#0#PHP" expanded="false" /> 76 <element signature="e#29065#29676#0#PHP" expanded="false" />
74 <element signature="e#29682#30178#0#PHP" expanded="false" /> 77 <element signature="e#29682#30178#0#PHP" expanded="false" />
75 - <element signature="e#30183#31481#0#PHP" expanded="false" />  
76 - <element signature="e#31487#31771#0#PHP" expanded="false" />  
77 - <element signature="e#31776#32412#0#PHP" expanded="false" />  
78 - <element signature="e#32433#32752#0#PHP" expanded="false" />  
79 - <element signature="e#32758#33166#0#PHP" expanded="false" />  
80 - <element signature="e#33172#33931#0#PHP" expanded="false" />  
81 - <element signature="e#33950#34814#0#PHP" expanded="false" />  
82 - <element signature="e#34840#35240#0#PHP" expanded="false" />  
83 - <element signature="e#35263#35836#0#PHP" expanded="false" />  
84 - <element signature="e#35859#36669#0#PHP" expanded="false" />  
85 - <element signature="e#36675#37274#0#PHP" expanded="false" />  
86 - <element signature="e#37279#38243#0#PHP" expanded="false" />  
87 - <element signature="e#38249#38916#0#PHP" expanded="false" />  
88 - <element signature="e#38921#39962#0#PHP" expanded="false" />  
89 - <element signature="e#39968#40631#0#PHP" expanded="false" />  
90 - <element signature="e#40636#41663#0#PHP" expanded="false" />  
91 - <element signature="e#41670#42101#0#PHP" expanded="false" />  
92 - <element signature="e#42106#42684#0#PHP" expanded="false" />  
93 - <element signature="e#42690#43119#0#PHP" expanded="false" />  
94 - <element signature="e#43124#43726#0#PHP" expanded="false" />  
95 - <element signature="e#43732#44159#0#PHP" expanded="false" />  
96 - <element signature="e#44164#44730#0#PHP" expanded="false" />  
97 - </folding>  
98 - </state>  
99 - </provider>  
100 - </entry>  
101 - </file>  
102 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">  
103 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
104 - <provider selected="true" editor-type-id="text-editor">  
105 - <state relative-caret-position="486">  
106 - <caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />  
107 - <folding>  
108 - <element signature="e#330#602#0#PHP" expanded="false" />  
109 - <element signature="e#608#970#0#PHP" expanded="false" />  
110 - <element signature="e#975#1835#0#PHP" expanded="false" />  
111 - <element signature="e#2787#3029#0#PHP" expanded="false" />  
112 - <element signature="e#3035#3272#0#PHP" expanded="false" />  
113 - <element signature="e#3277#3349#0#PHP" expanded="false" />  
114 - <element signature="e#3355#3834#0#PHP" expanded="false" />  
115 - <element signature="e#3839#4382#0#PHP" expanded="false" />  
116 - </folding>  
117 - </state>  
118 - </provider>  
119 - </entry>  
120 - </file>  
121 - <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">  
122 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
123 - <provider selected="true" editor-type-id="text-editor">  
124 - <state relative-caret-position="214">  
125 - <caret line="111" column="13" lean-forward="true" selection-start-line="111" selection-start-column="13" selection-end-line="111" selection-end-column="13" />  
126 - <folding>  
127 - <element signature="e#324#855#0#PHP" expanded="false" />  
128 - <element signature="e#930#1766#0#PHP" expanded="false" />  
129 - <element signature="e#1772#1853#0#PHP" expanded="false" />  
130 - <element signature="e#3883#4142#0#PHP" expanded="false" />  
131 - <element signature="e#4149#4198#0#PHP" expanded="false" />  
132 - <element signature="e#4203#4631#0#PHP" expanded="false" />  
133 - <element signature="e#4637#4701#0#PHP" expanded="false" />  
134 - <element signature="e#4706#5580#0#PHP" expanded="false" />  
135 - </folding>  
136 - </state>  
137 - </provider>  
138 - </entry>  
139 - </file>  
140 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">  
141 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
142 - <provider selected="true" editor-type-id="text-editor">  
143 - <state relative-caret-position="344">  
144 - <caret line="244" column="7" lean-forward="true" selection-start-line="244" selection-start-column="7" selection-end-line="244" selection-end-column="7" />  
145 - <folding>  
146 - <element signature="e#329#544#0#PHP" expanded="false" />  
147 - <element signature="e#549#890#0#PHP" expanded="false" />  
148 - <element signature="e#896#1112#0#PHP" expanded="false" />  
149 - <element signature="e#1117#1500#0#PHP" expanded="false" />  
150 - <element signature="e#1506#1726#0#PHP" expanded="false" />  
151 - <element signature="e#1731#2119#0#PHP" expanded="false" />  
152 - <element signature="e#2125#2642#0#PHP" expanded="false" />  
153 - <element signature="e#2647#3162#0#PHP" expanded="false" />  
154 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
155 - <element signature="e#3701#4539#0#PHP" expanded="false" />  
156 - <element signature="e#4545#4858#0#PHP" expanded="false" />  
157 - <element signature="e#4863#5238#0#PHP" expanded="false" />  
158 - <element signature="e#5244#5596#0#PHP" expanded="false" />  
159 - <element signature="e#5601#6009#0#PHP" expanded="false" />  
160 - <element signature="e#6015#6397#0#PHP" expanded="false" />  
161 - <element signature="e#6402#7072#0#PHP" expanded="false" />  
162 - <element signature="e#7078#7521#0#PHP" expanded="false" />  
163 - <element signature="e#7526#8376#0#PHP" expanded="false" />  
164 - <element signature="e#8382#8649#0#PHP" expanded="false" />  
165 - <element signature="e#8654#9129#0#PHP" expanded="false" />  
166 - <element signature="e#9135#9685#0#PHP" expanded="false" />  
167 - <element signature="e#9690#11550#0#PHP" expanded="false" />  
168 - <element signature="e#10110#10337#1#PHP" expanded="false" />  
169 - <element signature="e#10367#10598#1#PHP" expanded="false" />  
170 - <element signature="e#11556#11923#0#PHP" expanded="false" />  
171 - <element signature="e#11928#12368#0#PHP" expanded="false" /> 78 + <element signature="e#30183#31895#0#PHP" expanded="false" />
  79 + <element signature="e#31901#32185#0#PHP" expanded="false" />
  80 + <element signature="e#32190#32826#0#PHP" expanded="false" />
  81 + <element signature="e#32847#33166#0#PHP" expanded="false" />
  82 + <element signature="e#33172#33580#0#PHP" expanded="false" />
  83 + <element signature="e#33586#34345#0#PHP" expanded="false" />
  84 + <element signature="e#34364#35228#0#PHP" expanded="false" />
  85 + <element signature="e#35254#35654#0#PHP" expanded="false" />
  86 + <element signature="e#35677#36250#0#PHP" expanded="false" />
  87 + <element signature="e#36273#37083#0#PHP" expanded="false" />
  88 + <element signature="e#37089#37688#0#PHP" expanded="false" />
  89 + <element signature="e#37693#38657#0#PHP" expanded="false" />
  90 + <element signature="e#38663#39330#0#PHP" expanded="false" />
  91 + <element signature="e#39335#40376#0#PHP" expanded="false" />
  92 + <element signature="e#40382#41045#0#PHP" expanded="false" />
  93 + <element signature="e#41050#42077#0#PHP" expanded="false" />
  94 + <element signature="e#42084#42515#0#PHP" expanded="false" />
  95 + <element signature="e#42520#43098#0#PHP" expanded="false" />
  96 + <element signature="e#43104#43533#0#PHP" expanded="false" />
  97 + <element signature="e#43538#44140#0#PHP" expanded="false" />
  98 + <element signature="e#44146#44573#0#PHP" expanded="false" />
  99 + <element signature="e#44578#45144#0#PHP" expanded="false" />
172 </folding> 100 </folding>
173 </state> 101 </state>
174 </provider> 102 </provider>
@@ -235,16 +163,16 @@ @@ -235,16 +163,16 @@
235 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" /> 163 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
236 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" /> 164 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
237 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 165 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
238 - <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
239 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" /> 166 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
240 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />  
241 - <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />  
242 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 167 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
243 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 168 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
244 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 169 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
245 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
246 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 170 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
247 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 171 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
  172 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
  173 + <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
  174 + <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  175 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
248 </list> 176 </list>
249 </option> 177 </option>
250 </component> 178 </component>
@@ -262,11 +190,11 @@ @@ -262,11 +190,11 @@
262 <sorting>DEFINITION_ORDER</sorting> 190 <sorting>DEFINITION_ORDER</sorting>
263 </component> 191 </component>
264 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 192 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
265 - <component name="ProjectFrameBounds" extendedState="1">  
266 - <option name="x" value="218" />  
267 - <option name="y" value="394" /> 193 + <component name="ProjectFrameBounds">
  194 + <option name="x" value="146" />
  195 + <option name="y" value="76" />
268 <option name="width" value="1700" /> 196 <option name="width" value="1700" />
269 - <option name="height" value="1051" /> 197 + <option name="height" value="1040" />
270 </component> 198 </component>
271 <component name="ProjectView"> 199 <component name="ProjectView">
272 <navigator currentView="ProjectPane" proportions="" version="1"> 200 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -413,15 +341,15 @@ @@ -413,15 +341,15 @@
413 <workItem from="1575431441427" duration="8414000" /> 341 <workItem from="1575431441427" duration="8414000" />
414 <workItem from="1575444399653" duration="12810000" /> 342 <workItem from="1575444399653" duration="12810000" />
415 <workItem from="1575462840839" duration="250000" /> 343 <workItem from="1575462840839" duration="250000" />
416 - <workItem from="1575506248144" duration="10390000" /> 344 + <workItem from="1575506248144" duration="15103000" />
417 </task> 345 </task>
418 <servers /> 346 <servers />
419 </component> 347 </component>
420 <component name="TimeTrackingManager"> 348 <component name="TimeTrackingManager">
421 - <option name="totallyTimeSpent" value="477099000" /> 349 + <option name="totallyTimeSpent" value="481812000" />
422 </component> 350 </component>
423 <component name="ToolWindowManager"> 351 <component name="ToolWindowManager">
424 - <frame x="218" y="394" width="1700" height="1051" extended-state="1" /> 352 + <frame x="146" y="76" width="1700" height="1040" extended-state="0" />
425 <editor active="true" /> 353 <editor active="true" />
426 <layout> 354 <layout>
427 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16158536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 355 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16158536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -475,13 +403,6 @@ @@ -475,13 +403,6 @@
475 <watches-manager /> 403 <watches-manager />
476 </component> 404 </component>
477 <component name="editorHistoryManager"> 405 <component name="editorHistoryManager">
478 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">  
479 - <provider selected="true" editor-type-id="text-editor">  
480 - <state relative-caret-position="280">  
481 - <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />  
482 - </state>  
483 - </provider>  
484 - </entry>  
485 <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"> 406 <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
486 <provider selected="true" editor-type-id="text-editor"> 407 <provider selected="true" editor-type-id="text-editor">
487 <state relative-caret-position="543"> 408 <state relative-caret-position="543">
@@ -684,13 +605,6 @@ @@ -684,13 +605,6 @@
684 </state> 605 </state>
685 </provider> 606 </provider>
686 </entry> 607 </entry>
687 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
688 - <provider selected="true" editor-type-id="text-editor">  
689 - <state relative-caret-position="325">  
690 - <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />  
691 - </state>  
692 - </provider>  
693 - </entry>  
694 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html"> 608 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
695 <provider selected="true" editor-type-id="text-editor"> 609 <provider selected="true" editor-type-id="text-editor">
696 <state relative-caret-position="353"> 610 <state relative-caret-position="353">
@@ -705,20 +619,6 @@ @@ -705,20 +619,6 @@
705 </state> 619 </state>
706 </provider> 620 </provider>
707 </entry> 621 </entry>
708 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
709 - <provider selected="true" editor-type-id="text-editor">  
710 - <state relative-caret-position="402">  
711 - <caret line="128" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="204" selection-end-column="0" />  
712 - </state>  
713 - </provider>  
714 - </entry>  
715 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">  
716 - <provider selected="true" editor-type-id="text-editor">  
717 - <state relative-caret-position="2228">  
718 - <caret line="114" column="63" lean-forward="false" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />  
719 - </state>  
720 - </provider>  
721 - </entry>  
722 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html"> 622 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
723 <provider selected="true" editor-type-id="text-editor"> 623 <provider selected="true" editor-type-id="text-editor">
724 <state relative-caret-position="-6"> 624 <state relative-caret-position="-6">
@@ -726,13 +626,6 @@ @@ -726,13 +626,6 @@
726 </state> 626 </state>
727 </provider> 627 </provider>
728 </entry> 628 </entry>
729 - <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">  
730 - <provider selected="true" editor-type-id="text-editor">  
731 - <state relative-caret-position="325">  
732 - <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />  
733 - </state>  
734 - </provider>  
735 - </entry>  
736 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg"> 629 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
737 <provider selected="true" editor-type-id="images"> 630 <provider selected="true" editor-type-id="images">
738 <state /> 631 <state />
@@ -891,10 +784,109 @@ @@ -891,10 +784,109 @@
891 </state> 784 </state>
892 </provider> 785 </provider>
893 </entry> 786 </entry>
  787 + <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
  788 + <provider selected="true" editor-type-id="text-editor">
  789 + <state relative-caret-position="325">
  790 + <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
  791 + <folding />
  792 + </state>
  793 + </provider>
  794 + </entry>
  795 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
  796 + <provider selected="true" editor-type-id="text-editor">
  797 + <state relative-caret-position="-529">
  798 + <caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
  799 + <folding />
  800 + </state>
  801 + </provider>
  802 + </entry>
  803 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  804 + <provider selected="true" editor-type-id="text-editor">
  805 + <state relative-caret-position="314">
  806 + <caret line="61" column="0" lean-forward="true" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
  807 + <folding>
  808 + <element signature="e#324#855#0#PHP" expanded="false" />
  809 + <element signature="e#861#925#0#PHP" expanded="false" />
  810 + <element signature="e#930#1766#0#PHP" expanded="false" />
  811 + <element signature="e#1772#1853#0#PHP" expanded="false" />
  812 + <element signature="e#1858#3848#0#PHP" expanded="false" />
  813 + <element signature="e#3855#3878#0#PHP" expanded="false" />
  814 + <element signature="e#3883#4142#0#PHP" expanded="false" />
  815 + <element signature="e#4149#4198#0#PHP" expanded="false" />
  816 + <element signature="e#4203#4631#0#PHP" expanded="false" />
  817 + <element signature="e#4637#4701#0#PHP" expanded="false" />
  818 + <element signature="e#4706#5580#0#PHP" expanded="false" />
  819 + </folding>
  820 + </state>
  821 + </provider>
  822 + </entry>
  823 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  824 + <provider selected="true" editor-type-id="text-editor">
  825 + <state relative-caret-position="486">
  826 + <caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />
  827 + <folding>
  828 + <element signature="e#330#602#0#PHP" expanded="false" />
  829 + <element signature="e#608#970#0#PHP" expanded="false" />
  830 + <element signature="e#975#1835#0#PHP" expanded="false" />
  831 + <element signature="e#2787#3029#0#PHP" expanded="false" />
  832 + <element signature="e#3035#3272#0#PHP" expanded="false" />
  833 + <element signature="e#3277#3349#0#PHP" expanded="false" />
  834 + <element signature="e#3355#3834#0#PHP" expanded="false" />
  835 + <element signature="e#3839#4382#0#PHP" expanded="false" />
  836 + </folding>
  837 + </state>
  838 + </provider>
  839 + </entry>
  840 + <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
  841 + <provider selected="true" editor-type-id="text-editor">
  842 + <state relative-caret-position="0">
  843 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  844 + <folding />
  845 + </state>
  846 + </provider>
  847 + </entry>
  848 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
  849 + <provider selected="true" editor-type-id="text-editor">
  850 + <state relative-caret-position="302">
  851 + <caret line="106" column="70" lean-forward="true" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="70" />
  852 + <folding />
  853 + </state>
  854 + </provider>
  855 + </entry>
  856 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
  857 + <provider selected="true" editor-type-id="text-editor">
  858 + <state relative-caret-position="383">
  859 + <caret line="96" column="70" lean-forward="true" selection-start-line="96" selection-start-column="70" selection-end-line="96" selection-end-column="70" />
  860 + <folding />
  861 + </state>
  862 + </provider>
  863 + </entry>
  864 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <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" />
  868 + <folding>
  869 + <element signature="e#265#1638#0#PHP" expanded="false" />
  870 + <element signature="e#1655#3591#0#PHP" expanded="false" />
  871 + </folding>
  872 + </state>
  873 + </provider>
  874 + </entry>
  875 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
  876 + <provider selected="true" editor-type-id="text-editor">
  877 + <state relative-caret-position="325">
  878 + <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
  879 + <folding>
  880 + <element signature="e#243#1652#0#PHP" expanded="false" />
  881 + <element signature="e#1669#3046#0#PHP" expanded="false" />
  882 + </folding>
  883 + </state>
  884 + </provider>
  885 + </entry>
894 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 886 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
895 <provider selected="true" editor-type-id="text-editor"> 887 <provider selected="true" editor-type-id="text-editor">
896 - <state relative-caret-position="652">  
897 - <caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" /> 888 + <state relative-caret-position="188">
  889 + <caret line="1043" column="14" lean-forward="true" selection-start-line="1043" selection-start-column="14" selection-end-line="1043" selection-end-column="14" />
898 <folding> 890 <folding>
899 <element signature="e#366#715#0#PHP" expanded="false" /> 891 <element signature="e#366#715#0#PHP" expanded="false" />
900 <element signature="e#720#1485#0#PHP" expanded="false" /> 892 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -937,78 +929,28 @@ @@ -937,78 +929,28 @@
937 <element signature="e#28636#29060#0#PHP" expanded="false" /> 929 <element signature="e#28636#29060#0#PHP" expanded="false" />
938 <element signature="e#29065#29676#0#PHP" expanded="false" /> 930 <element signature="e#29065#29676#0#PHP" expanded="false" />
939 <element signature="e#29682#30178#0#PHP" expanded="false" /> 931 <element signature="e#29682#30178#0#PHP" expanded="false" />
940 - <element signature="e#30183#31481#0#PHP" expanded="false" />  
941 - <element signature="e#31487#31771#0#PHP" expanded="false" />  
942 - <element signature="e#31776#32412#0#PHP" expanded="false" />  
943 - <element signature="e#32433#32752#0#PHP" expanded="false" />  
944 - <element signature="e#32758#33166#0#PHP" expanded="false" />  
945 - <element signature="e#33172#33931#0#PHP" expanded="false" />  
946 - <element signature="e#33950#34814#0#PHP" expanded="false" />  
947 - <element signature="e#34840#35240#0#PHP" expanded="false" />  
948 - <element signature="e#35263#35836#0#PHP" expanded="false" />  
949 - <element signature="e#35859#36669#0#PHP" expanded="false" />  
950 - <element signature="e#36675#37274#0#PHP" expanded="false" />  
951 - <element signature="e#37279#38243#0#PHP" expanded="false" />  
952 - <element signature="e#38249#38916#0#PHP" expanded="false" />  
953 - <element signature="e#38921#39962#0#PHP" expanded="false" />  
954 - <element signature="e#39968#40631#0#PHP" expanded="false" />  
955 - <element signature="e#40636#41663#0#PHP" expanded="false" />  
956 - <element signature="e#41670#42101#0#PHP" expanded="false" />  
957 - <element signature="e#42106#42684#0#PHP" expanded="false" />  
958 - <element signature="e#42690#43119#0#PHP" expanded="false" />  
959 - <element signature="e#43124#43726#0#PHP" expanded="false" />  
960 - <element signature="e#43732#44159#0#PHP" expanded="false" />  
961 - <element signature="e#44164#44730#0#PHP" expanded="false" />  
962 - </folding>  
963 - </state>  
964 - </provider>  
965 - </entry>  
966 - <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">  
967 - <provider selected="true" editor-type-id="text-editor">  
968 - <state relative-caret-position="325">  
969 - <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />  
970 - <folding />  
971 - </state>  
972 - </provider>  
973 - </entry>  
974 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">  
975 - <provider selected="true" editor-type-id="text-editor">  
976 - <state relative-caret-position="-529">  
977 - <caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />  
978 - <folding />  
979 - </state>  
980 - </provider>  
981 - </entry>  
982 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
983 - <provider selected="true" editor-type-id="text-editor">  
984 - <state relative-caret-position="486">  
985 - <caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />  
986 - <folding>  
987 - <element signature="e#330#602#0#PHP" expanded="false" />  
988 - <element signature="e#608#970#0#PHP" expanded="false" />  
989 - <element signature="e#975#1835#0#PHP" expanded="false" />  
990 - <element signature="e#2787#3029#0#PHP" expanded="false" />  
991 - <element signature="e#3035#3272#0#PHP" expanded="false" />  
992 - <element signature="e#3277#3349#0#PHP" expanded="false" />  
993 - <element signature="e#3355#3834#0#PHP" expanded="false" />  
994 - <element signature="e#3839#4382#0#PHP" expanded="false" />  
995 - </folding>  
996 - </state>  
997 - </provider>  
998 - </entry>  
999 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
1000 - <provider selected="true" editor-type-id="text-editor">  
1001 - <state relative-caret-position="214">  
1002 - <caret line="111" column="13" lean-forward="true" selection-start-line="111" selection-start-column="13" selection-end-line="111" selection-end-column="13" />  
1003 - <folding>  
1004 - <element signature="e#324#855#0#PHP" expanded="false" />  
1005 - <element signature="e#930#1766#0#PHP" expanded="false" />  
1006 - <element signature="e#1772#1853#0#PHP" expanded="false" />  
1007 - <element signature="e#3883#4142#0#PHP" expanded="false" />  
1008 - <element signature="e#4149#4198#0#PHP" expanded="false" />  
1009 - <element signature="e#4203#4631#0#PHP" expanded="false" />  
1010 - <element signature="e#4637#4701#0#PHP" expanded="false" />  
1011 - <element signature="e#4706#5580#0#PHP" expanded="false" /> 932 + <element signature="e#30183#31895#0#PHP" expanded="false" />
  933 + <element signature="e#31901#32185#0#PHP" expanded="false" />
  934 + <element signature="e#32190#32826#0#PHP" expanded="false" />
  935 + <element signature="e#32847#33166#0#PHP" expanded="false" />
  936 + <element signature="e#33172#33580#0#PHP" expanded="false" />
  937 + <element signature="e#33586#34345#0#PHP" expanded="false" />
  938 + <element signature="e#34364#35228#0#PHP" expanded="false" />
  939 + <element signature="e#35254#35654#0#PHP" expanded="false" />
  940 + <element signature="e#35677#36250#0#PHP" expanded="false" />
  941 + <element signature="e#36273#37083#0#PHP" expanded="false" />
  942 + <element signature="e#37089#37688#0#PHP" expanded="false" />
  943 + <element signature="e#37693#38657#0#PHP" expanded="false" />
  944 + <element signature="e#38663#39330#0#PHP" expanded="false" />
  945 + <element signature="e#39335#40376#0#PHP" expanded="false" />
  946 + <element signature="e#40382#41045#0#PHP" expanded="false" />
  947 + <element signature="e#41050#42077#0#PHP" expanded="false" />
  948 + <element signature="e#42084#42515#0#PHP" expanded="false" />
  949 + <element signature="e#42520#43098#0#PHP" expanded="false" />
  950 + <element signature="e#43104#43533#0#PHP" expanded="false" />
  951 + <element signature="e#43538#44140#0#PHP" expanded="false" />
  952 + <element signature="e#44146#44573#0#PHP" expanded="false" />
  953 + <element signature="e#44578#45144#0#PHP" expanded="false" />
1012 </folding> 954 </folding>
1013 </state> 955 </state>
1014 </provider> 956 </provider>
@@ -963,33 +963,49 @@ class UserController extends RestBaseController @@ -963,33 +963,49 @@ class UserController extends RestBaseController
963 if(empty($order_id)){ 963 if(empty($order_id)){
964 $this->error('缺少必要参数'); 964 $this->error('缺少必要参数');
965 } 965 }
  966 + //对应的数据加入回收员已完成订单中
966 $data['order_id'] = $order_id; 967 $data['order_id'] = $order_id;
967 $data['user_id'] = $user_id; 968 $data['user_id'] = $user_id;
968 $data['create_time'] = time(); 969 $data['create_time'] = time();
969 $data['status'] = 2; 970 $data['status'] = 2;
970 - Db::name('subscribe')  
971 - ->where('id',$order_id)  
972 - ->update(['status'=>2,'get_integral'=>$get_integral]); 971 +
  972 + //查询我的积分信息
973 $info = Db::name('integral') 973 $info = Db::name('integral')
974 ->where('user_id',$user_id) 974 ->where('user_id',$user_id)
975 ->find(); 975 ->find();
976 $res['num'] = $info['num'] + 1; 976 $res['num'] = $info['num'] + 1;
977 $res['add_total'] = $info['add_total'] + $get_integral; 977 $res['add_total'] = $info['add_total'] + $get_integral;
978 $res['now_integral'] = $info['now_integral'] + $get_integral; 978 $res['now_integral'] = $info['now_integral'] + $get_integral;
979 - Db::name('integral')  
980 - ->where('user_id',$user_id)  
981 - ->update($res);  
982 - $info['user_id'] = $user_id;  
983 - $info['total'] = $get_integral;  
984 - $info['create_time'] = time();  
985 - $info['type'] = 5;  
986 - Db::name('detail')->insertGetId($info);  
987 - $res = Db::name('collector')  
988 - ->insertGetId($data);  
989 - if($res){  
990 - $this->success('接单成功');  
991 - }else{  
992 - $this->error('sql语句错误'); 979 +
  980 + //添加对应的积分明细
  981 + $detail['user_id'] = $user_id;
  982 + $detail['total'] = $get_integral;
  983 + $detail['create_time'] = time();
  984 + $detail['type'] = 5;
  985 +
  986 + // 启动事务
  987 + Db::startTrans();
  988 + try{
  989 + $res = Db::name('subscribe')
  990 + ->where('id',$order_id)
  991 + ->update(['status'=>2,'get_integral'=>$get_integral]);
  992 + $integral = Db::name('integral')
  993 + ->where('user_id',$user_id)
  994 + ->update($res);
  995 + $detail = Db::name('detail')->insertGetId($detail);
  996 +
  997 + //对应的数据加入回收员已完成订单中
  998 + $collector = Db::name('collector')
  999 + ->insertGetId($data);
  1000 + if($res && $integral && $detail && $collector){
  1001 + // 提交事务
  1002 + Db::commit();
  1003 + }
  1004 + $this->success('成功');
  1005 + } catch (\Exception $e) {
  1006 + // 回滚事务
  1007 + Db::rollback();
  1008 + $this->success('sql运行失败');
993 } 1009 }
994 } 1010 }
995 1011
@@ -55,19 +55,22 @@ class ShoporderController extends AdminBaseController @@ -55,19 +55,22 @@ class ShoporderController extends AdminBaseController
55 $id = $this->request->param('id'); 55 $id = $this->request->param('id');
56 if($this->request->isPost()){ 56 if($this->request->isPost()){
57 $param = $this->request->param(); 57 $param = $this->request->param();
  58 + //没有任何状态的改变 未发货
58 if($param['status'] == 1){ 59 if($param['status'] == 1){
59 $this->success('更新成功!'); 60 $this->success('更新成功!');
60 } 61 }
  62 + //如果已发货 但是 快递单号是空状态
61 if($param['status'] == 2 && empty($param['express_num'])){ 63 if($param['status'] == 2 && empty($param['express_num'])){
62 $this->error('请填写快递单号'); 64 $this->error('请填写快递单号');
63 } 65 }
  66 + //如果已发货 并且 快递单号不是空状态
64 if($param['status'] == 2 && !empty($param['express_num'])){ 67 if($param['status'] == 2 && !empty($param['express_num'])){
65 Db::name('shoporder') 68 Db::name('shoporder')
66 ->where('id',$id) 69 ->where('id',$id)
67 ->update($param); 70 ->update($param);
68 Db::name('shoporder') 71 Db::name('shoporder')
69 ->where('id',$id) 72 ->where('id',$id)
70 - ->update(['orderstatus'=>2]); 73 + ->update(['orderstatus'=>2,'fa_time'=>time()]);
71 $this->success('更新成功!'); 74 $this->success('更新成功!');
72 }else{ 75 }else{
73 Db::name('shoporder') 76 Db::name('shoporder')
@@ -57,8 +57,8 @@ class SubhomeController extends AdminBaseController @@ -57,8 +57,8 @@ class SubhomeController extends AdminBaseController
57 $param = $this->request->param(); 57 $param = $this->request->param();
58 $data = Db::name('subhome') 58 $data = Db::name('subhome')
59 ->where('id',$id) 59 ->where('id',$id)
60 - ->update($param);  
61 - if($data){ 60 + ->update(['status'=>$param['status']]);
  61 + if(!empty($data)){
62 $this->success('更新成功!'); 62 $this->success('更新成功!');
63 }else{ 63 }else{
64 $this->error('sql运行失败'); 64 $this->error('sql运行失败');
@@ -94,6 +94,7 @@ @@ -94,6 +94,7 @@
94 <label><input type="radio" class="status" name="status" value="3" id="status" 94 <label><input type="radio" class="status" name="status" value="3" id="status"
95 <eq name="$data.status" value="3">checked</eq> 95 <eq name="$data.status" value="3">checked</eq>
96 />已完成 </label> 96 />已完成 </label>
  97 + <input type="hidden" name="id" value="{$data.id}">
97 </td> 98 </td>
98 </tr> 99 </tr>
99 <tr> 100 <tr>