郭盛 / scrap · 提交

转到一个项目

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

修改回收员订单中的时间戳

内嵌 并排对比
正在显示 2 个修改的文件 包含 170 行增加 和 107 行删除
@@ -2,10 +2,7 @@ @@ -2,10 +2,7 @@
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$/.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" /> 5 <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" />  
9 </list> 6 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -27,15 +24,77 @@ @@ -27,15 +24,77 @@
27 </component> 24 </component>
28 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30 - <file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="true">  
31 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php"> 27 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
  28 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
32 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
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" /> 30 + <state relative-caret-position="180">
  31 + <caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
35 <folding> 32 <folding>
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" /> 33 + <element signature="e#366#791#0#PHP" expanded="false" />
  34 + <element signature="e#796#1608#0#PHP" expanded="false" />
  35 + <element signature="e#1614#1872#0#PHP" expanded="false" />
  36 + <element signature="e#1877#2260#0#PHP" expanded="false" />
  37 + <element signature="e#2266#2495#0#PHP" expanded="false" />
  38 + <element signature="e#2500#4135#0#PHP" expanded="false" />
  39 + <element signature="e#4141#4381#0#PHP" expanded="false" />
  40 + <element signature="e#4386#4621#0#PHP" expanded="false" />
  41 + <element signature="e#4627#4974#0#PHP" expanded="false" />
  42 + <element signature="e#4979#5425#0#PHP" expanded="false" />
  43 + <element signature="e#5431#5691#0#PHP" expanded="false" />
  44 + <element signature="e#5696#5897#0#PHP" expanded="false" />
  45 + <element signature="e#5903#6165#0#PHP" expanded="false" />
  46 + <element signature="e#6170#6375#0#PHP" expanded="false" />
  47 + <element signature="e#6381#6860#0#PHP" expanded="false" />
  48 + <element signature="e#6865#9088#0#PHP" expanded="false" />
  49 + <element signature="e#9111#9642#0#PHP" expanded="false" />
  50 + <element signature="e#9648#9928#0#PHP" expanded="false" />
  51 + <element signature="e#9933#10325#0#PHP" expanded="false" />
  52 + <element signature="e#10331#10615#0#PHP" expanded="false" />
  53 + <element signature="e#10620#11565#0#PHP" expanded="false" />
  54 + <element signature="e#11571#11859#0#PHP" expanded="false" />
  55 + <element signature="e#11864#12803#0#PHP" expanded="false" />
  56 + <element signature="e#12809#13390#0#PHP" expanded="false" />
  57 + <element signature="e#13395#15023#0#PHP" expanded="false" />
  58 + <element signature="e#15029#15485#0#PHP" expanded="false" />
  59 + <element signature="e#15490#17558#0#PHP" expanded="false" />
  60 + <element signature="e#17581#17936#0#PHP" expanded="false" />
  61 + <element signature="e#17942#18655#0#PHP" expanded="false" />
  62 + <element signature="e#18660#20117#0#PHP" expanded="false" />
  63 + <element signature="e#20123#20584#0#PHP" expanded="false" />
  64 + <element signature="e#20589#23716#0#PHP" expanded="false" />
  65 + <element signature="e#23722#24331#0#PHP" expanded="false" />
  66 + <element signature="e#24336#25621#0#PHP" expanded="false" />
  67 + <element signature="e#25627#25984#0#PHP" expanded="false" />
  68 + <element signature="e#25989#26972#0#PHP" expanded="false" />
  69 + <element signature="e#26978#27330#0#PHP" expanded="false" />
  70 + <element signature="e#28450#28805#0#PHP" expanded="false" />
  71 + <element signature="e#28810#30237#0#PHP" expanded="false" />
  72 + <element signature="e#30243#30667#0#PHP" expanded="false" />
  73 + <element signature="e#30672#31283#0#PHP" expanded="false" />
  74 + <element signature="e#31289#31785#0#PHP" expanded="false" />
  75 + <element signature="e#31790#35152#0#PHP" expanded="false" />
  76 + <element signature="e#32592#33719#0#PHP" expanded="false" />
  77 + <element signature="e#35158#35442#0#PHP" expanded="false" />
  78 + <element signature="e#35447#36083#0#PHP" expanded="false" />
  79 + <element signature="e#36104#36423#0#PHP" expanded="false" />
  80 + <element signature="e#36429#36837#0#PHP" expanded="false" />
  81 + <element signature="e#36843#37602#0#PHP" expanded="false" />
  82 + <element signature="e#37621#38485#0#PHP" expanded="false" />
  83 + <element signature="e#38511#38911#0#PHP" expanded="false" />
  84 + <element signature="e#38934#39507#0#PHP" expanded="false" />
  85 + <element signature="e#39530#40340#0#PHP" expanded="false" />
  86 + <element signature="e#40346#40945#0#PHP" expanded="false" />
  87 + <element signature="e#40950#41914#0#PHP" expanded="false" />
  88 + <element signature="e#41920#42587#0#PHP" expanded="false" />
  89 + <element signature="e#42592#43633#0#PHP" expanded="false" />
  90 + <element signature="e#43639#44302#0#PHP" expanded="false" />
  91 + <element signature="e#44307#45334#0#PHP" expanded="false" />
  92 + <element signature="e#45341#45772#0#PHP" expanded="false" />
  93 + <element signature="e#45777#46355#0#PHP" expanded="false" />
  94 + <element signature="e#46361#46790#0#PHP" expanded="false" />
  95 + <element signature="e#46795#47397#0#PHP" expanded="false" />
  96 + <element signature="e#47403#47830#0#PHP" expanded="false" />
  97 + <element signature="e#47835#48401#0#PHP" expanded="false" />
39 </folding> 98 </folding>
40 </state> 99 </state>
41 </provider> 100 </provider>
@@ -109,9 +168,9 @@ @@ -109,9 +168,9 @@
109 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 168 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
110 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 169 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
111 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 170 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
112 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
113 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 171 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
114 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 172 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
  173 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
115 </list> 174 </list>
116 </option> 175 </option>
117 </component> 176 </component>
@@ -129,11 +188,11 @@ @@ -129,11 +188,11 @@
129 <sorting>DEFINITION_ORDER</sorting> 188 <sorting>DEFINITION_ORDER</sorting>
130 </component> 189 </component>
131 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
132 - <component name="ProjectFrameBounds" extendedState="1">  
133 - <option name="x" value="237" />  
134 - <option name="y" value="72" /> 191 + <component name="ProjectFrameBounds">
  192 + <option name="x" value="371" />
  193 + <option name="y" value="37" />
135 <option name="width" value="1618" /> 194 <option name="width" value="1618" />
136 - <option name="height" value="1008" /> 195 + <option name="height" value="1007" />
137 </component> 196 </component>
138 <component name="ProjectView"> 197 <component name="ProjectView">
139 <navigator currentView="ProjectPane" proportions="" version="1"> 198 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -150,7 +209,6 @@ @@ -150,7 +209,6 @@
150 <foldersAlwaysOnTop value="true" /> 209 <foldersAlwaysOnTop value="true" />
151 </navigator> 210 </navigator>
152 <panes> 211 <panes>
153 - <pane id="Scope" />  
154 <pane id="Scratches" /> 212 <pane id="Scratches" />
155 <pane id="ProjectPane"> 213 <pane id="ProjectPane">
156 <subPane> 214 <subPane>
@@ -159,15 +217,34 @@ @@ -159,15 +217,34 @@
159 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 217 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
160 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 218 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
161 </path> 219 </path>
  220 + <path>
  221 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  222 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  223 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  224 + </path>
  225 + <path>
  226 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  227 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  228 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  230 + </path>
  231 + <path>
  232 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  233 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  234 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + </path>
162 </expand> 238 </expand>
163 <select /> 239 <select />
164 </subPane> 240 </subPane>
165 </pane> 241 </pane>
  242 + <pane id="Scope" />
166 </panes> 243 </panes>
167 </component> 244 </component>
168 <component name="PropertiesComponent"> 245 <component name="PropertiesComponent">
169 <property name="WebServerToolWindowFactoryState" value="false" /> 246 <property name="WebServerToolWindowFactoryState" value="false" />
170 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 247 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../micro" />
171 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 248 <property name="DefaultHtmlFileTemplate" value="HTML File" />
172 </component> 249 </component>
173 <component name="RecentsManager"> 250 <component name="RecentsManager">
@@ -274,16 +351,18 @@ @@ -274,16 +351,18 @@
274 <workItem from="1576049946357" duration="1233000" /> 351 <workItem from="1576049946357" duration="1233000" />
275 <workItem from="1576056936489" duration="7947000" /> 352 <workItem from="1576056936489" duration="7947000" />
276 <workItem from="1576066696521" duration="5462000" /> 353 <workItem from="1576066696521" duration="5462000" />
  354 + <workItem from="1576110549014" duration="3202000" />
277 </task> 355 </task>
278 <servers /> 356 <servers />
279 </component> 357 </component>
280 <component name="TimeTrackingManager"> 358 <component name="TimeTrackingManager">
281 - <option name="totallyTimeSpent" value="543275000" /> 359 + <option name="totallyTimeSpent" value="546477000" />
282 </component> 360 </component>
283 <component name="ToolWindowManager"> 361 <component name="ToolWindowManager">
284 - <frame x="237" y="72" width="1618" height="1008" extended-state="1" /> 362 + <frame x="371" y="37" width="1618" height="1007" extended-state="0" />
  363 + <editor active="true" />
285 <layout> 364 <layout>
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" /> 365 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1508344" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
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" /> 366 <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" />
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" /> 367 <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" />
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" /> 368 <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" />
@@ -565,7 +644,6 @@ @@ -565,7 +644,6 @@
565 <provider selected="true" editor-type-id="text-editor"> 644 <provider selected="true" editor-type-id="text-editor">
566 <state relative-caret-position="400"> 645 <state relative-caret-position="400">
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" /> 646 <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 />  
569 </state> 647 </state>
570 </provider> 648 </provider>
571 </entry> 649 </entry>
@@ -587,10 +665,6 @@ @@ -587,10 +665,6 @@
587 <provider selected="true" editor-type-id="text-editor"> 665 <provider selected="true" editor-type-id="text-editor">
588 <state relative-caret-position="300"> 666 <state relative-caret-position="300">
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" /> 667 <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>  
594 </state> 668 </state>
595 </provider> 669 </provider>
596 </entry> 670 </entry>
@@ -732,10 +806,36 @@ @@ -732,10 +806,36 @@
732 </state> 806 </state>
733 </provider> 807 </provider>
734 </entry> 808 </entry>
  809 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state relative-caret-position="425">
  812 + <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
  813 + </state>
  814 + </provider>
  815 + </entry>
  816 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
  817 + <provider selected="true" editor-type-id="text-editor">
  818 + <state relative-caret-position="0">
  819 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  820 + </state>
  821 + </provider>
  822 + </entry>
  823 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  824 + <provider selected="true" editor-type-id="text-editor">
  825 + <state relative-caret-position="375">
  826 + <caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
  827 + <folding>
  828 + <element signature="e#265#1638#0#PHP" expanded="false" />
  829 + <element signature="e#1655#3619#0#PHP" expanded="false" />
  830 + <element signature="e#3640#4059#0#PHP" expanded="false" />
  831 + </folding>
  832 + </state>
  833 + </provider>
  834 + </entry>
735 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 835 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
736 <provider selected="true" editor-type-id="text-editor"> 836 <provider selected="true" editor-type-id="text-editor">
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" /> 837 + <state relative-caret-position="180">
  838 + <caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
739 <folding> 839 <folding>
740 <element signature="e#366#791#0#PHP" expanded="false" /> 840 <element signature="e#366#791#0#PHP" expanded="false" />
741 <element signature="e#796#1608#0#PHP" expanded="false" /> 841 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -761,85 +861,47 @@ @@ -761,85 +861,47 @@
761 <element signature="e#11571#11859#0#PHP" expanded="false" /> 861 <element signature="e#11571#11859#0#PHP" expanded="false" />
762 <element signature="e#11864#12803#0#PHP" expanded="false" /> 862 <element signature="e#11864#12803#0#PHP" expanded="false" />
763 <element signature="e#12809#13390#0#PHP" expanded="false" /> 863 <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" /> 864 + <element signature="e#13395#15023#0#PHP" expanded="false" />
  865 + <element signature="e#15029#15485#0#PHP" expanded="false" />
  866 + <element signature="e#15490#17558#0#PHP" expanded="false" />
  867 + <element signature="e#17581#17936#0#PHP" expanded="false" />
  868 + <element signature="e#17942#18655#0#PHP" expanded="false" />
  869 + <element signature="e#18660#20117#0#PHP" expanded="false" />
  870 + <element signature="e#20123#20584#0#PHP" expanded="false" />
  871 + <element signature="e#20589#23716#0#PHP" expanded="false" />
  872 + <element signature="e#23722#24331#0#PHP" expanded="false" />
  873 + <element signature="e#24336#25621#0#PHP" expanded="false" />
  874 + <element signature="e#25627#25984#0#PHP" expanded="false" />
  875 + <element signature="e#25989#26972#0#PHP" expanded="false" />
  876 + <element signature="e#26978#27330#0#PHP" expanded="false" />
  877 + <element signature="e#28450#28805#0#PHP" expanded="false" />
  878 + <element signature="e#28810#30237#0#PHP" expanded="false" />
  879 + <element signature="e#30243#30667#0#PHP" expanded="false" />
  880 + <element signature="e#30672#31283#0#PHP" expanded="false" />
  881 + <element signature="e#31289#31785#0#PHP" expanded="false" />
  882 + <element signature="e#31790#35152#0#PHP" expanded="false" />
  883 + <element signature="e#32592#33719#0#PHP" expanded="false" />
  884 + <element signature="e#35158#35442#0#PHP" expanded="false" />
  885 + <element signature="e#35447#36083#0#PHP" expanded="false" />
  886 + <element signature="e#36104#36423#0#PHP" expanded="false" />
  887 + <element signature="e#36429#36837#0#PHP" expanded="false" />
  888 + <element signature="e#36843#37602#0#PHP" expanded="false" />
  889 + <element signature="e#37621#38485#0#PHP" expanded="false" />
  890 + <element signature="e#38511#38911#0#PHP" expanded="false" />
  891 + <element signature="e#38934#39507#0#PHP" expanded="false" />
  892 + <element signature="e#39530#40340#0#PHP" expanded="false" />
  893 + <element signature="e#40346#40945#0#PHP" expanded="false" />
  894 + <element signature="e#40950#41914#0#PHP" expanded="false" />
  895 + <element signature="e#41920#42587#0#PHP" expanded="false" />
  896 + <element signature="e#42592#43633#0#PHP" expanded="false" />
  897 + <element signature="e#43639#44302#0#PHP" expanded="false" />
  898 + <element signature="e#44307#45334#0#PHP" expanded="false" />
  899 + <element signature="e#45341#45772#0#PHP" expanded="false" />
  900 + <element signature="e#45777#46355#0#PHP" expanded="false" />
  901 + <element signature="e#46361#46790#0#PHP" expanded="false" />
  902 + <element signature="e#46795#47397#0#PHP" expanded="false" />
  903 + <element signature="e#47403#47830#0#PHP" expanded="false" />
  904 + <element signature="e#47835#48401#0#PHP" expanded="false" />
843 </folding> 905 </folding>
844 </state> 906 </state>
845 </provider> 907 </provider>
@@ -501,7 +501,7 @@ class UserController extends RestBaseController @@ -501,7 +501,7 @@ class UserController extends RestBaseController
501 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find(); 501 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
502 $data['status'] = $res['status']; 502 $data['status'] = $res['status'];
503 if($data['status'] == 1 || $data['status'] == 0){ 503 if($data['status'] == 1 || $data['status'] == 0){
504 - $data['serve'] = $serve['fee']."%"; 504 + $data['serve'] = $serve['fee'];
505 }else{ 505 }else{
506 $data['serve'] = ceil($data['get_integral']*(5/100)); 506 $data['serve'] = ceil($data['get_integral']*(5/100));
507 } 507 }
@@ -821,6 +821,7 @@ class UserController extends RestBaseController @@ -821,6 +821,7 @@ class UserController extends RestBaseController
821 ->select() 821 ->select()
822 ->toArray(); 822 ->toArray();
823 foreach ($data as &$v){ 823 foreach ($data as &$v){
  824 + $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
824 $v['goods_name'] = []; 825 $v['goods_name'] = [];
825 $attr_id = explode(',',$v['attr_id']); 826 $attr_id = explode(',',$v['attr_id']);
826 foreach ($attr_id as &$v1){ 827 foreach ($attr_id as &$v1){