郭盛 / scrap · 提交

转到一个项目

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

修改我的回收订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 89 行增加 和 67 行删除
@@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
24 <select /> 24 <select />
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 - <leaf> 27 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> 28 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
30 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="498"> 31 + <state relative-caret-position="1150">
32 <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" /> 32 <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
33 <folding> 33 <folding>
34 <element signature="e#329#544#0#PHP" expanded="false" /> 34 <element signature="e#329#544#0#PHP" expanded="false" />
@@ -63,8 +63,8 @@ @@ -63,8 +63,8 @@
63 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 63 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
64 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 64 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
65 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="-152">  
67 - <caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" /> 66 + <state relative-caret-position="1057">
  67 + <caret line="283" column="9" lean-forward="true" selection-start-line="283" selection-start-column="9" selection-end-line="283" selection-end-column="9" />
68 <folding> 68 <folding>
69 <element signature="e#366#715#0#PHP" expanded="false" /> 69 <element signature="e#366#715#0#PHP" expanded="false" />
70 <element signature="e#720#1485#0#PHP" expanded="false" /> 70 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -78,28 +78,38 @@ @@ -78,28 +78,38 @@
78 <element signature="e#4919#5120#0#PHP" expanded="false" /> 78 <element signature="e#4919#5120#0#PHP" expanded="false" />
79 <element signature="e#5126#5388#0#PHP" expanded="false" /> 79 <element signature="e#5126#5388#0#PHP" expanded="false" />
80 <element signature="e#5393#5598#0#PHP" expanded="false" /> 80 <element signature="e#5393#5598#0#PHP" expanded="false" />
81 - <element signature="e#6050#7278#0#PHP" expanded="false" />  
82 - <element signature="e#7301#7846#0#PHP" expanded="false" />  
83 - <element signature="e#8137#8529#0#PHP" expanded="false" />  
84 - <element signature="e#9088#10287#0#PHP" expanded="false" />  
85 - <element signature="e#10754#12017#0#PHP" expanded="false" />  
86 - <element signature="e#12040#12392#0#PHP" expanded="false" />  
87 - <element signature="e#13087#14346#0#PHP" expanded="false" />  
88 - <element signature="e#14818#17023#0#PHP" expanded="false" />  
89 - <element signature="e#17643#18976#0#PHP" expanded="false" />  
90 - <element signature="e#19344#20225#0#PHP" expanded="false" />  
91 - <element signature="e#20588#21665#0#PHP" expanded="false" />  
92 - <element signature="e#22031#23111#0#PHP" expanded="false" />  
93 - <element signature="e#23546#24157#0#PHP" expanded="false" />  
94 - <element signature="e#24664#25771#0#PHP" expanded="false" />  
95 - <element signature="e#26066#26644#0#PHP" expanded="false" />  
96 - <element signature="e#26665#26984#0#PHP" expanded="false" />  
97 - <element signature="e#26990#27398#0#PHP" expanded="false" />  
98 - <element signature="e#27404#28163#0#PHP" expanded="false" />  
99 - <element signature="e#28183#29047#0#PHP" expanded="false" />  
100 - <element signature="e#29074#29474#0#PHP" expanded="false" />  
101 - <element signature="e#29498#30071#0#PHP" expanded="false" />  
102 - <element signature="e#30094#30904#0#PHP" expanded="false" /> 81 + <element signature="e#7850#8130#0#PHP" expanded="false" />
  82 + <element signature="e#8135#8527#0#PHP" expanded="false" />
  83 + <element signature="e#8533#9081#0#PHP" expanded="false" />
  84 + <element signature="e#9086#10285#0#PHP" expanded="false" />
  85 + <element signature="e#10291#10747#0#PHP" expanded="false" />
  86 + <element signature="e#10752#12015#0#PHP" expanded="false" />
  87 + <element signature="e#12038#12390#0#PHP" expanded="false" />
  88 + <element signature="e#12396#13080#0#PHP" expanded="false" />
  89 + <element signature="e#13085#14344#0#PHP" expanded="false" />
  90 + <element signature="e#14350#14811#0#PHP" expanded="false" />
  91 + <element signature="e#14816#17021#0#PHP" expanded="false" />
  92 + <element signature="e#17027#17636#0#PHP" expanded="false" />
  93 + <element signature="e#17641#18974#0#PHP" expanded="false" />
  94 + <element signature="e#18980#19337#0#PHP" expanded="false" />
  95 + <element signature="e#19342#20223#0#PHP" expanded="false" />
  96 + <element signature="e#20229#20581#0#PHP" expanded="false" />
  97 + <element signature="e#20586#21663#0#PHP" expanded="false" />
  98 + <element signature="e#21669#22024#0#PHP" expanded="false" />
  99 + <element signature="e#22029#23109#0#PHP" expanded="false" />
  100 + <element signature="e#23115#23539#0#PHP" expanded="false" />
  101 + <element signature="e#23544#24155#0#PHP" expanded="false" />
  102 + <element signature="e#24161#24657#0#PHP" expanded="false" />
  103 + <element signature="e#24662#25769#0#PHP" expanded="false" />
  104 + <element signature="e#25775#26059#0#PHP" expanded="false" />
  105 + <element signature="e#26064#26642#0#PHP" expanded="false" />
  106 + <element signature="e#26663#26982#0#PHP" expanded="false" />
  107 + <element signature="e#26988#27396#0#PHP" expanded="false" />
  108 + <element signature="e#27402#28161#0#PHP" expanded="false" />
  109 + <element signature="e#28181#29045#0#PHP" expanded="false" />
  110 + <element signature="e#29072#29472#0#PHP" expanded="false" />
  111 + <element signature="e#29496#30069#0#PHP" expanded="false" />
  112 + <element signature="e#30092#30902#0#PHP" expanded="false" />
103 </folding> 113 </folding>
104 </state> 114 </state>
105 </provider> 115 </provider>
@@ -194,8 +204,8 @@ @@ -194,8 +204,8 @@
194 </component> 204 </component>
195 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 205 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
196 <component name="ProjectFrameBounds"> 206 <component name="ProjectFrameBounds">
197 - <option name="x" value="418" />  
198 - <option name="y" value="66" /> 207 + <option name="x" value="310" />
  208 + <option name="y" value="12" />
199 <option name="width" value="1582" /> 209 <option name="width" value="1582" />
200 <option name="height" value="960" /> 210 <option name="height" value="960" />
201 </component> 211 </component>
@@ -214,6 +224,7 @@ @@ -214,6 +224,7 @@
214 <foldersAlwaysOnTop value="true" /> 224 <foldersAlwaysOnTop value="true" />
215 </navigator> 225 </navigator>
216 <panes> 226 <panes>
  227 + <pane id="Scratches" />
217 <pane id="Scope" /> 228 <pane id="Scope" />
218 <pane id="ProjectPane"> 229 <pane id="ProjectPane">
219 <subPane> 230 <subPane>
@@ -244,12 +255,11 @@ @@ -244,12 +255,11 @@
244 <select /> 255 <select />
245 </subPane> 256 </subPane>
246 </pane> 257 </pane>
247 - <pane id="Scratches" />  
248 </panes> 258 </panes>
249 </component> 259 </component>
250 <component name="PropertiesComponent"> 260 <component name="PropertiesComponent">
251 <property name="WebServerToolWindowFactoryState" value="false" /> 261 <property name="WebServerToolWindowFactoryState" value="false" />
252 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" /> 262 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
253 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 263 <property name="DefaultHtmlFileTemplate" value="HTML File" />
254 </component> 264 </component>
255 <component name="RecentsManager"> 265 <component name="RecentsManager">
@@ -340,27 +350,28 @@ @@ -340,27 +350,28 @@
340 <workItem from="1575332430854" duration="21245000" /> 350 <workItem from="1575332430854" duration="21245000" />
341 <workItem from="1575359408189" duration="10054000" /> 351 <workItem from="1575359408189" duration="10054000" />
342 <workItem from="1575419186725" duration="599000" /> 352 <workItem from="1575419186725" duration="599000" />
343 - <workItem from="1575420787741" duration="2280000" /> 353 + <workItem from="1575420787741" duration="2879000" />
  354 + <workItem from="1575431441427" duration="4417000" />
344 </task> 355 </task>
345 <servers /> 356 <servers />
346 </component> 357 </component>
347 <component name="TimeTrackingManager"> 358 <component name="TimeTrackingManager">
348 - <option name="totallyTimeSpent" value="444636000" /> 359 + <option name="totallyTimeSpent" value="449652000" />
349 </component> 360 </component>
350 <component name="ToolWindowManager"> 361 <component name="ToolWindowManager">
351 - <frame x="418" y="66" width="1582" height="960" extended-state="0" /> 362 + <frame x="310" y="12" width="1582" height="960" extended-state="0" />
352 <editor active="true" /> 363 <editor active="true" />
353 <layout> 364 <layout>
354 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17017083" 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.17214192" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
355 <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" />
356 <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" />
357 <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" />
358 - <window_info id="Version Control" 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="false" content_ui="tabs" />  
359 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" /> 369 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
  370 + <window_info id="Version Control" 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="false" content_ui="tabs" />
360 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 371 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
361 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 372 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
362 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
363 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 373 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  374 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
364 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 375 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
365 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 376 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
366 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 377 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -813,7 +824,7 @@ @@ -813,7 +824,7 @@
813 </entry> 824 </entry>
814 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 825 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
815 <provider selected="true" editor-type-id="text-editor"> 826 <provider selected="true" editor-type-id="text-editor">
816 - <state relative-caret-position="498"> 827 + <state relative-caret-position="1150">
817 <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" /> 828 <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
818 <folding> 829 <folding>
819 <element signature="e#329#544#0#PHP" expanded="false" /> 830 <element signature="e#329#544#0#PHP" expanded="false" />
@@ -846,8 +857,8 @@ @@ -846,8 +857,8 @@
846 </entry> 857 </entry>
847 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 858 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
848 <provider selected="true" editor-type-id="text-editor"> 859 <provider selected="true" editor-type-id="text-editor">
849 - <state relative-caret-position="-152">  
850 - <caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" /> 860 + <state relative-caret-position="1057">
  861 + <caret line="283" column="9" lean-forward="true" selection-start-line="283" selection-start-column="9" selection-end-line="283" selection-end-column="9" />
851 <folding> 862 <folding>
852 <element signature="e#366#715#0#PHP" expanded="false" /> 863 <element signature="e#366#715#0#PHP" expanded="false" />
853 <element signature="e#720#1485#0#PHP" expanded="false" /> 864 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -861,28 +872,38 @@ @@ -861,28 +872,38 @@
861 <element signature="e#4919#5120#0#PHP" expanded="false" /> 872 <element signature="e#4919#5120#0#PHP" expanded="false" />
862 <element signature="e#5126#5388#0#PHP" expanded="false" /> 873 <element signature="e#5126#5388#0#PHP" expanded="false" />
863 <element signature="e#5393#5598#0#PHP" expanded="false" /> 874 <element signature="e#5393#5598#0#PHP" expanded="false" />
864 - <element signature="e#6050#7278#0#PHP" expanded="false" />  
865 - <element signature="e#7301#7846#0#PHP" expanded="false" />  
866 - <element signature="e#8137#8529#0#PHP" expanded="false" />  
867 - <element signature="e#9088#10287#0#PHP" expanded="false" />  
868 - <element signature="e#10754#12017#0#PHP" expanded="false" />  
869 - <element signature="e#12040#12392#0#PHP" expanded="false" />  
870 - <element signature="e#13087#14346#0#PHP" expanded="false" />  
871 - <element signature="e#14818#17023#0#PHP" expanded="false" />  
872 - <element signature="e#17643#18976#0#PHP" expanded="false" />  
873 - <element signature="e#19344#20225#0#PHP" expanded="false" />  
874 - <element signature="e#20588#21665#0#PHP" expanded="false" />  
875 - <element signature="e#22031#23111#0#PHP" expanded="false" />  
876 - <element signature="e#23546#24157#0#PHP" expanded="false" />  
877 - <element signature="e#24664#25771#0#PHP" expanded="false" />  
878 - <element signature="e#26066#26644#0#PHP" expanded="false" />  
879 - <element signature="e#26665#26984#0#PHP" expanded="false" />  
880 - <element signature="e#26990#27398#0#PHP" expanded="false" />  
881 - <element signature="e#27404#28163#0#PHP" expanded="false" />  
882 - <element signature="e#28183#29047#0#PHP" expanded="false" />  
883 - <element signature="e#29074#29474#0#PHP" expanded="false" />  
884 - <element signature="e#29498#30071#0#PHP" expanded="false" />  
885 - <element signature="e#30094#30904#0#PHP" expanded="false" /> 875 + <element signature="e#7850#8130#0#PHP" expanded="false" />
  876 + <element signature="e#8135#8527#0#PHP" expanded="false" />
  877 + <element signature="e#8533#9081#0#PHP" expanded="false" />
  878 + <element signature="e#9086#10285#0#PHP" expanded="false" />
  879 + <element signature="e#10291#10747#0#PHP" expanded="false" />
  880 + <element signature="e#10752#12015#0#PHP" expanded="false" />
  881 + <element signature="e#12038#12390#0#PHP" expanded="false" />
  882 + <element signature="e#12396#13080#0#PHP" expanded="false" />
  883 + <element signature="e#13085#14344#0#PHP" expanded="false" />
  884 + <element signature="e#14350#14811#0#PHP" expanded="false" />
  885 + <element signature="e#14816#17021#0#PHP" expanded="false" />
  886 + <element signature="e#17027#17636#0#PHP" expanded="false" />
  887 + <element signature="e#17641#18974#0#PHP" expanded="false" />
  888 + <element signature="e#18980#19337#0#PHP" expanded="false" />
  889 + <element signature="e#19342#20223#0#PHP" expanded="false" />
  890 + <element signature="e#20229#20581#0#PHP" expanded="false" />
  891 + <element signature="e#20586#21663#0#PHP" expanded="false" />
  892 + <element signature="e#21669#22024#0#PHP" expanded="false" />
  893 + <element signature="e#22029#23109#0#PHP" expanded="false" />
  894 + <element signature="e#23115#23539#0#PHP" expanded="false" />
  895 + <element signature="e#23544#24155#0#PHP" expanded="false" />
  896 + <element signature="e#24161#24657#0#PHP" expanded="false" />
  897 + <element signature="e#24662#25769#0#PHP" expanded="false" />
  898 + <element signature="e#25775#26059#0#PHP" expanded="false" />
  899 + <element signature="e#26064#26642#0#PHP" expanded="false" />
  900 + <element signature="e#26663#26982#0#PHP" expanded="false" />
  901 + <element signature="e#26988#27396#0#PHP" expanded="false" />
  902 + <element signature="e#27402#28161#0#PHP" expanded="false" />
  903 + <element signature="e#28181#29045#0#PHP" expanded="false" />
  904 + <element signature="e#29072#29472#0#PHP" expanded="false" />
  905 + <element signature="e#29496#30069#0#PHP" expanded="false" />
  906 + <element signature="e#30092#30902#0#PHP" expanded="false" />
886 </folding> 907 </folding>
887 </state> 908 </state>
888 </provider> 909 </provider>
@@ -242,7 +242,8 @@ class UserController extends RestBaseController @@ -242,7 +242,8 @@ class UserController extends RestBaseController
242 ->where('user_id',$user_id) 242 ->where('user_id',$user_id)
243 ->where('status',0) 243 ->where('status',0)
244 ->field('id,num,create_time,sub_time,attr_id') 244 ->field('id,num,create_time,sub_time,attr_id')
245 - ->select(); 245 + ->select()
  246 + ->toArray();
246 $res = $this->r_foreach($data); 247 $res = $this->r_foreach($data);
247 $this->success('SUCCESS',$res); 248 $this->success('SUCCESS',$res);
248 }elseif ($status == 1){ 249 }elseif ($status == 1){
@@ -251,7 +252,8 @@ class UserController extends RestBaseController @@ -251,7 +252,8 @@ class UserController extends RestBaseController
251 ->where('user_id',$user_id) 252 ->where('user_id',$user_id)
252 ->where('status',1) 253 ->where('status',1)
253 ->field('id,num,create_time,sub_time,attr_id') 254 ->field('id,num,create_time,sub_time,attr_id')
254 - ->select(); 255 + ->select()
  256 + ->toArray();
255 $res = $this->r_foreach($data); 257 $res = $this->r_foreach($data);
256 $this->success('SUCCESS',$res); 258 $this->success('SUCCESS',$res);
257 }elseif ($status == 2){ 259 }elseif ($status == 2){
@@ -260,7 +262,8 @@ class UserController extends RestBaseController @@ -260,7 +262,8 @@ class UserController extends RestBaseController
260 ->where('user_id',$user_id) 262 ->where('user_id',$user_id)
261 ->where('status',2) 263 ->where('status',2)
262 ->field('id,num,create_time,sub_time,attr_id') 264 ->field('id,num,create_time,sub_time,attr_id')
263 - ->select(); 265 + ->select()
  266 + ->toArray();
264 $res = $this->r_foreach($data); 267 $res = $this->r_foreach($data);
265 $this->success('SUCCESS',$res); 268 $this->success('SUCCESS',$res);
266 } 269 }
@@ -269,16 +272,14 @@ class UserController extends RestBaseController @@ -269,16 +272,14 @@ class UserController extends RestBaseController
269 //封装回收订单循环逻辑 272 //封装回收订单循环逻辑
270 public function r_foreach($res){ 273 public function r_foreach($res){
271 foreach ($res as &$v){ 274 foreach ($res as &$v){
272 - $v['rgoods_name'] = [];  
273 $v['attr_id'] = explode(',',$v['attr_id']); 275 $v['attr_id'] = explode(',',$v['attr_id']);
274 foreach ($v['attr_id'] as &$v1){ 276 foreach ($v['attr_id'] as &$v1){
275 $v1 = Db::name('attr') 277 $v1 = Db::name('attr')
276 ->alias('a') 278 ->alias('a')
277 ->join('rgoods r','a.rgoods_id=r.id') 279 ->join('rgoods r','a.rgoods_id=r.id')
278 ->field('r.rgoods_name') 280 ->field('r.rgoods_name')
279 - ->where('id',$v1) 281 + ->where('a.id',$v1)
280 ->find(); 282 ->find();
281 - array_push($v['rgoods_name'],$v1);  
282 } 283 }
283 } 284 }
284 return $res; 285 return $res;