郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 2dd4daac64a61954be6080534ddbb12d49ed97e5 1 个父辈 18c379ea
1 个管道 的构建 通过 耗费 1 秒

修改首页图片

内嵌 并排对比
正在显示 2 个修改的文件 包含 104 行增加 和 110 行删除
@@ -2,8 +2,7 @@ @@ -2,8 +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$/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$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -25,42 +24,44 @@ @@ -25,42 +24,44 @@
25 </component> 24 </component>
26 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 27 + <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
  28 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
30 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="286">  
32 - <caret line="157" column="41" lean-forward="true" selection-start-line="157" selection-start-column="41" selection-end-line="157" selection-end-column="41" /> 30 + <state relative-caret-position="182">
  31 + <caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
33 <folding> 32 <folding>
34 - <element signature="e#131#162#0#PHP" expanded="true" />  
35 - <element signature="e#336#608#0#PHP" expanded="false" />  
36 - <element signature="e#614#976#0#PHP" expanded="false" />  
37 - <element signature="e#981#2020#0#PHP" expanded="false" />  
38 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
39 - <element signature="e#2268#3059#0#PHP" expanded="false" />  
40 - <element signature="e#3065#3374#0#PHP" expanded="false" />  
41 - <element signature="e#5277#5756#0#PHP" expanded="false" />  
42 - <element signature="e#5761#6328#0#PHP" expanded="false" />  
43 - </folding>  
44 - </state>  
45 - </provider>  
46 - </entry>  
47 - </file>  
48 - <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">  
49 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
50 - <provider selected="true" editor-type-id="text-editor">  
51 - <state relative-caret-position="336">  
52 - <caret line="159" column="47" lean-forward="true" selection-start-line="159" selection-start-column="47" selection-end-line="159" selection-end-column="47" />  
53 - <folding>  
54 - <element signature="e#40#78#0#PHP" expanded="true" />  
55 - <element signature="e#947#1011#0#PHP" expanded="false" />  
56 - <element signature="e#1016#1849#0#PHP" expanded="false" />  
57 - <element signature="e#1855#1936#0#PHP" expanded="false" />  
58 - <element signature="e#1941#3993#0#PHP" expanded="false" />  
59 - <element signature="e#4000#4023#0#PHP" expanded="false" />  
60 - <element signature="e#4028#4287#0#PHP" expanded="false" />  
61 - <element signature="e#4294#4343#0#PHP" expanded="false" />  
62 - <element signature="e#4348#4776#0#PHP" expanded="false" />  
63 - <element signature="e#4783#4847#0#PHP" expanded="false" /> 33 + <element signature="e#342#596#0#PHP" expanded="false" />
  34 + <element signature="e#601#886#0#PHP" expanded="false" />
  35 + <element signature="e#892#1227#0#PHP" expanded="false" />
  36 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  37 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  38 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  39 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  40 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  41 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  42 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  43 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  44 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  45 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  46 + <element signature="e#4855#5051#0#PHP" expanded="false" />
  47 + <element signature="e#5056#5318#0#PHP" expanded="false" />
  48 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  49 + <element signature="e#5784#6448#0#PHP" expanded="false" />
  50 + <element signature="e#6454#6797#0#PHP" expanded="false" />
  51 + <element signature="e#6802#7283#0#PHP" expanded="false" />
  52 + <element signature="e#7289#7580#0#PHP" expanded="false" />
  53 + <element signature="e#7585#7936#0#PHP" expanded="false" />
  54 + <element signature="e#7942#8295#0#PHP" expanded="false" />
  55 + <element signature="e#8300#8705#0#PHP" expanded="false" />
  56 + <element signature="e#8711#9094#0#PHP" expanded="false" />
  57 + <element signature="e#9099#9766#0#PHP" expanded="false" />
  58 + <element signature="e#9772#10216#0#PHP" expanded="false" />
  59 + <element signature="e#10221#11068#0#PHP" expanded="false" />
  60 + <element signature="e#11074#11342#0#PHP" expanded="false" />
  61 + <element signature="e#11347#11819#0#PHP" expanded="false" />
  62 + <element signature="e#11825#12131#0#PHP" expanded="false" />
  63 + <element signature="e#12136#13779#0#PHP" expanded="false" />
  64 + <element signature="e#13800#14119#0#PHP" expanded="false" />
64 </folding> 65 </folding>
65 </state> 66 </state>
66 </provider> 67 </provider>
@@ -125,7 +126,6 @@ @@ -125,7 +126,6 @@
125 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 126 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
126 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 127 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
127 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 128 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
128 - <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />  
129 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 129 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
130 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 130 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
131 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 131 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
@@ -137,6 +137,7 @@ @@ -137,6 +137,7 @@
137 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" /> 137 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
138 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 138 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
139 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 139 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  140 + <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
140 </list> 141 </list>
141 </option> 142 </option>
142 </component> 143 </component>
@@ -155,8 +156,8 @@ @@ -155,8 +156,8 @@
155 </component> 156 </component>
156 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 157 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
157 <component name="ProjectFrameBounds" extendedState="1"> 158 <component name="ProjectFrameBounds" extendedState="1">
158 - <option name="x" value="81" />  
159 - <option name="y" value="58" /> 159 + <option name="x" value="8" />
  160 + <option name="y" value="102" />
160 <option name="width" value="1618" /> 161 <option name="width" value="1618" />
161 <option name="height" value="1023" /> 162 <option name="height" value="1023" />
162 </component> 163 </component>
@@ -186,25 +187,20 @@ @@ -186,25 +187,20 @@
186 <path> 187 <path>
187 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 188 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
188 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 189 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
189 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 190 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
190 </path> 191 </path>
191 <path> 192 <path>
192 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 193 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
193 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 194 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
194 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
195 - <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" /> 195 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  196 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
196 </path> 197 </path>
197 <path> 198 <path>
198 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 199 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
199 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 200 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
200 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
201 - <item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />  
202 - <item name="cert" type="2a2b976b:PhpTreeStructureProvider$1" />  
203 - </path>  
204 - <path>  
205 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
206 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
207 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" /> 201 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  202 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
208 </path> 204 </path>
209 </expand> 205 </expand>
210 <select /> 206 <select />
@@ -315,18 +311,18 @@ @@ -315,18 +311,18 @@
315 <workItem from="1575527294268" duration="10705000" /> 311 <workItem from="1575527294268" duration="10705000" />
316 <workItem from="1575543830603" duration="2980000" /> 312 <workItem from="1575543830603" duration="2980000" />
317 <workItem from="1575592067577" duration="15900000" /> 313 <workItem from="1575592067577" duration="15900000" />
318 - <workItem from="1575615529386" duration="5898000" /> 314 + <workItem from="1575615529386" duration="6506000" />
319 </task> 315 </task>
320 <servers /> 316 <servers />
321 </component> 317 </component>
322 <component name="TimeTrackingManager"> 318 <component name="TimeTrackingManager">
323 - <option name="totallyTimeSpent" value="517295000" /> 319 + <option name="totallyTimeSpent" value="517903000" />
324 </component> 320 </component>
325 <component name="ToolWindowManager"> 321 <component name="ToolWindowManager">
326 - <frame x="81" y="58" width="1618" height="1023" extended-state="1" /> 322 + <frame x="8" y="102" width="1618" height="1023" extended-state="1" />
327 <editor active="true" /> 323 <editor active="true" />
328 <layout> 324 <layout>
329 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 325 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
330 <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" /> 326 <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" />
331 <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" /> 327 <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" />
332 <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" /> 328 <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" />
@@ -622,48 +618,6 @@ @@ -622,48 +618,6 @@
622 </state> 618 </state>
623 </provider> 619 </provider>
624 </entry> 620 </entry>
625 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
626 - <provider selected="true" editor-type-id="text-editor">  
627 - <state relative-caret-position="102">  
628 - <caret line="244" column="29" lean-forward="false" selection-start-line="244" selection-start-column="29" selection-end-line="244" selection-end-column="29" />  
629 - <folding>  
630 - <element signature="e#342#596#0#PHP" expanded="false" />  
631 - <element signature="e#601#886#0#PHP" expanded="false" />  
632 - <element signature="e#892#1227#0#PHP" expanded="false" />  
633 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
634 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
635 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
636 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
637 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
638 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
639 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
640 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
641 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
642 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
643 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
644 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
645 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
646 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
647 - <element signature="e#5850#6514#0#PHP" expanded="false" />  
648 - <element signature="e#6520#6863#0#PHP" expanded="false" />  
649 - <element signature="e#6868#7349#0#PHP" expanded="false" />  
650 - <element signature="e#7355#7646#0#PHP" expanded="false" />  
651 - <element signature="e#7651#8002#0#PHP" expanded="false" />  
652 - <element signature="e#8008#8361#0#PHP" expanded="false" />  
653 - <element signature="e#8366#8771#0#PHP" expanded="false" />  
654 - <element signature="e#8777#9160#0#PHP" expanded="false" />  
655 - <element signature="e#9165#9832#0#PHP" expanded="false" />  
656 - <element signature="e#9838#10282#0#PHP" expanded="false" />  
657 - <element signature="e#10287#11134#0#PHP" expanded="false" />  
658 - <element signature="e#11140#11408#0#PHP" expanded="false" />  
659 - <element signature="e#11413#11885#0#PHP" expanded="false" />  
660 - <element signature="e#11891#12197#0#PHP" expanded="false" />  
661 - <element signature="e#12202#13845#0#PHP" expanded="false" />  
662 - <element signature="e#13866#14185#0#PHP" expanded="false" />  
663 - </folding>  
664 - </state>  
665 - </provider>  
666 - </entry>  
667 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php"> 621 <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
668 <provider selected="true" editor-type-id="text-editor"> 622 <provider selected="true" editor-type-id="text-editor">
669 <state relative-caret-position="725"> 623 <state relative-caret-position="725">
@@ -888,6 +842,24 @@ @@ -888,6 +842,24 @@
888 </state> 842 </state>
889 </provider> 843 </provider>
890 </entry> 844 </entry>
  845 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  846 + <provider selected="true" editor-type-id="text-editor">
  847 + <state relative-caret-position="25">
  848 + <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
  849 + <folding>
  850 + <element signature="e#131#162#0#PHP" expanded="true" />
  851 + <element signature="e#336#608#0#PHP" expanded="false" />
  852 + <element signature="e#614#976#0#PHP" expanded="false" />
  853 + <element signature="e#981#2020#0#PHP" expanded="false" />
  854 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  855 + <element signature="e#2268#3059#0#PHP" expanded="false" />
  856 + <element signature="e#3065#3374#0#PHP" expanded="false" />
  857 + <element signature="e#5277#5756#0#PHP" expanded="false" />
  858 + <element signature="e#5761#6328#0#PHP" expanded="false" />
  859 + </folding>
  860 + </state>
  861 + </provider>
  862 + </entry>
891 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 863 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
892 <provider selected="true" editor-type-id="text-editor"> 864 <provider selected="true" editor-type-id="text-editor">
893 <state relative-caret-position="336"> 865 <state relative-caret-position="336">
@@ -907,20 +879,43 @@ @@ -907,20 +879,43 @@
907 </state> 879 </state>
908 </provider> 880 </provider>
909 </entry> 881 </entry>
910 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 882 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
911 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
912 - <state relative-caret-position="286">  
913 - <caret line="157" column="41" lean-forward="true" selection-start-line="157" selection-start-column="41" selection-end-line="157" selection-end-column="41" /> 884 + <state relative-caret-position="182">
  885 + <caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
914 <folding> 886 <folding>
915 - <element signature="e#131#162#0#PHP" expanded="true" />  
916 - <element signature="e#336#608#0#PHP" expanded="false" />  
917 - <element signature="e#614#976#0#PHP" expanded="false" />  
918 - <element signature="e#981#2020#0#PHP" expanded="false" />  
919 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
920 - <element signature="e#2268#3059#0#PHP" expanded="false" />  
921 - <element signature="e#3065#3374#0#PHP" expanded="false" />  
922 - <element signature="e#5277#5756#0#PHP" expanded="false" />  
923 - <element signature="e#5761#6328#0#PHP" expanded="false" /> 887 + <element signature="e#342#596#0#PHP" expanded="false" />
  888 + <element signature="e#601#886#0#PHP" expanded="false" />
  889 + <element signature="e#892#1227#0#PHP" expanded="false" />
  890 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  891 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  892 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  893 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  894 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  895 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  896 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  897 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  898 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  899 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  900 + <element signature="e#4855#5051#0#PHP" expanded="false" />
  901 + <element signature="e#5056#5318#0#PHP" expanded="false" />
  902 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  903 + <element signature="e#5784#6448#0#PHP" expanded="false" />
  904 + <element signature="e#6454#6797#0#PHP" expanded="false" />
  905 + <element signature="e#6802#7283#0#PHP" expanded="false" />
  906 + <element signature="e#7289#7580#0#PHP" expanded="false" />
  907 + <element signature="e#7585#7936#0#PHP" expanded="false" />
  908 + <element signature="e#7942#8295#0#PHP" expanded="false" />
  909 + <element signature="e#8300#8705#0#PHP" expanded="false" />
  910 + <element signature="e#8711#9094#0#PHP" expanded="false" />
  911 + <element signature="e#9099#9766#0#PHP" expanded="false" />
  912 + <element signature="e#9772#10216#0#PHP" expanded="false" />
  913 + <element signature="e#10221#11068#0#PHP" expanded="false" />
  914 + <element signature="e#11074#11342#0#PHP" expanded="false" />
  915 + <element signature="e#11347#11819#0#PHP" expanded="false" />
  916 + <element signature="e#11825#12131#0#PHP" expanded="false" />
  917 + <element signature="e#12136#13779#0#PHP" expanded="false" />
  918 + <element signature="e#13800#14119#0#PHP" expanded="false" />
924 </folding> 919 </folding>
925 </state> 920 </state>
926 </provider> 921 </provider>
@@ -196,11 +196,10 @@ class RecycleController extends RestBaseController @@ -196,11 +196,10 @@ class RecycleController extends RestBaseController
196 * 196 *
197 */ 197 */
198 public function build(){ 198 public function build(){
199 - $data = Db::name('pic') 199 + $data = Db::name('build')
200 ->where('id',1) 200 ->where('id',1)
201 ->field('id,thumbnail') 201 ->field('id,thumbnail')
202 ->find(); 202 ->find();
203 - $data['thumbnail'] = cmf_get_image_url($data['thumbnail']);  
204 $this->success('SUCCESS',$data); 203 $this->success('SUCCESS',$data);
205 } 204 }
206 205