郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 d36c0ec8897225086d3562100589987a18f5b5e8 1 个父辈 7ffb59e5
1 个管道 的构建 通过 耗费 1 秒

修改商品列表

内嵌 并排对比
正在显示 2 个修改的文件 包含 96 行增加 和 69 行删除
@@ -2,9 +2,6 @@ @@ -2,9 +2,6 @@
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/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />  
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
9 </list> 6 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,8 +27,8 @@ @@ -30,8 +27,8 @@
30 <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false"> 27 <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
31 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
32 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="621">  
34 - <caret line="153" column="7" lean-forward="true" selection-start-line="153" selection-start-column="7" selection-end-line="153" selection-end-column="7" /> 30 + <state relative-caret-position="576">
  31 + <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
35 <folding> 32 <folding>
36 <element signature="e#305#577#0#PHP" expanded="false" /> 33 <element signature="e#305#577#0#PHP" expanded="false" />
37 <element signature="e#583#854#0#PHP" expanded="false" /> 34 <element signature="e#583#854#0#PHP" expanded="false" />
@@ -47,11 +44,44 @@ @@ -47,11 +44,44 @@
47 </provider> 44 </provider>
48 </entry> 45 </entry>
49 </file> 46 </file>
  47 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
  48 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state relative-caret-position="435">
  51 + <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
  52 + <folding>
  53 + <element signature="e#411#604#0#PHP" expanded="false" />
  54 + <element signature="e#609#825#0#PHP" expanded="false" />
  55 + <element signature="e#2099#2317#0#PHP" expanded="false" />
  56 + <element signature="e#2322#2530#0#PHP" expanded="false" />
  57 + <element signature="e#2536#3043#0#PHP" expanded="false" />
  58 + <element signature="e#3048#3566#0#PHP" expanded="false" />
  59 + <element signature="e#3572#4084#0#PHP" expanded="false" />
  60 + <element signature="e#4089#4652#0#PHP" expanded="false" />
  61 + <element signature="e#4658#5248#0#PHP" expanded="false" />
  62 + <element signature="e#5253#6299#0#PHP" expanded="false" />
  63 + <element signature="e#6305#6623#0#PHP" expanded="false" />
  64 + <element signature="e#6628#7004#0#PHP" expanded="false" />
  65 + <element signature="e#7010#7365#0#PHP" expanded="false" />
  66 + <element signature="e#7370#7779#0#PHP" expanded="false" />
  67 + <element signature="e#7785#8170#0#PHP" expanded="false" />
  68 + <element signature="e#8175#8846#0#PHP" expanded="false" />
  69 + <element signature="e#8852#9298#0#PHP" expanded="false" />
  70 + <element signature="e#9303#10154#0#PHP" expanded="false" />
  71 + <element signature="e#10160#10430#0#PHP" expanded="false" />
  72 + <element signature="e#10435#10911#0#PHP" expanded="false" />
  73 + <element signature="e#10917#11547#0#PHP" expanded="false" />
  74 + <element signature="e#11552#13484#0#PHP" expanded="false" />
  75 + </folding>
  76 + </state>
  77 + </provider>
  78 + </entry>
  79 + </file>
50 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 80 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
51 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 81 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
52 <provider selected="true" editor-type-id="text-editor"> 82 <provider selected="true" editor-type-id="text-editor">
53 - <state relative-caret-position="250">  
54 - <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> 83 + <state relative-caret-position="259">
  84 + <caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" />
55 <folding> 85 <folding>
56 <element signature="e#366#791#0#PHP" expanded="false" /> 86 <element signature="e#366#791#0#PHP" expanded="false" />
57 <element signature="e#796#1608#0#PHP" expanded="false" /> 87 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -96,7 +126,7 @@ @@ -96,7 +126,7 @@
96 <element signature="e#29715#30139#0#PHP" expanded="false" /> 126 <element signature="e#29715#30139#0#PHP" expanded="false" />
97 <element signature="e#30144#30755#0#PHP" expanded="false" /> 127 <element signature="e#30144#30755#0#PHP" expanded="false" />
98 <element signature="e#30761#31257#0#PHP" expanded="false" /> 128 <element signature="e#30761#31257#0#PHP" expanded="false" />
99 - <element signature="e#31262#34065#0#PHP" expanded="false" /> 129 + <element signature="e#31838#32925#0#PHP" expanded="false" />
100 <element signature="e#34071#34355#0#PHP" expanded="false" /> 130 <element signature="e#34071#34355#0#PHP" expanded="false" />
101 <element signature="e#34360#34996#0#PHP" expanded="false" /> 131 <element signature="e#34360#34996#0#PHP" expanded="false" />
102 <element signature="e#35017#35336#0#PHP" expanded="false" /> 132 <element signature="e#35017#35336#0#PHP" expanded="false" />
@@ -123,18 +153,6 @@ @@ -123,18 +153,6 @@
123 </provider> 153 </provider>
124 </entry> 154 </entry>
125 </file> 155 </file>
126 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">  
127 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
128 - <provider selected="true" editor-type-id="text-editor">  
129 - <state relative-caret-position="540">  
130 - <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />  
131 - <folding>  
132 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
133 - </folding>  
134 - </state>  
135 - </provider>  
136 - </entry>  
137 - </file>  
138 </leaf> 156 </leaf>
139 </component> 157 </component>
140 <component name="FileTemplateManagerImpl"> 158 <component name="FileTemplateManagerImpl">
@@ -204,8 +222,8 @@ @@ -204,8 +222,8 @@
204 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 222 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
205 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 223 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
206 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 224 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
207 - <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />  
208 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 225 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  226 + <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
209 </list> 227 </list>
210 </option> 228 </option>
211 </component> 229 </component>
@@ -223,9 +241,9 @@ @@ -223,9 +241,9 @@
223 <sorting>DEFINITION_ORDER</sorting> 241 <sorting>DEFINITION_ORDER</sorting>
224 </component> 242 </component>
225 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 243 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
226 - <component name="ProjectFrameBounds" extendedState="1">  
227 - <option name="x" value="64" />  
228 - <option name="y" value="65" /> 244 + <component name="ProjectFrameBounds">
  245 + <option name="x" value="359" />
  246 + <option name="y" value="102" />
229 <option name="width" value="1618" /> 247 <option name="width" value="1618" />
230 <option name="height" value="1013" /> 248 <option name="height" value="1013" />
231 </component> 249 </component>
@@ -384,15 +402,15 @@ @@ -384,15 +402,15 @@
384 <workItem from="1575860170691" duration="607000" /> 402 <workItem from="1575860170691" duration="607000" />
385 <workItem from="1576027263250" duration="3000" /> 403 <workItem from="1576027263250" duration="3000" />
386 <workItem from="1576049946357" duration="1233000" /> 404 <workItem from="1576049946357" duration="1233000" />
387 - <workItem from="1576056936489" duration="4526000" /> 405 + <workItem from="1576056936489" duration="6220000" />
388 </task> 406 </task>
389 <servers /> 407 <servers />
390 </component> 408 </component>
391 <component name="TimeTrackingManager"> 409 <component name="TimeTrackingManager">
392 - <option name="totallyTimeSpent" value="534392000" /> 410 + <option name="totallyTimeSpent" value="536086000" />
393 </component> 411 </component>
394 <component name="ToolWindowManager"> 412 <component name="ToolWindowManager">
395 - <frame x="64" y="65" width="1618" height="1013" extended-state="1" /> 413 + <frame x="359" y="102" width="1618" height="1013" extended-state="0" />
396 <editor active="true" /> 414 <editor active="true" />
397 <layout> 415 <layout>
398 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24582799" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 416 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24582799" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -774,24 +792,6 @@ @@ -774,24 +792,6 @@
774 </state> 792 </state>
775 </provider> 793 </provider>
776 </entry> 794 </entry>
777 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
778 - <provider selected="true" editor-type-id="text-editor">  
779 - <state relative-caret-position="621">  
780 - <caret line="153" column="7" lean-forward="true" selection-start-line="153" selection-start-column="7" selection-end-line="153" selection-end-column="7" />  
781 - <folding>  
782 - <element signature="e#305#577#0#PHP" expanded="false" />  
783 - <element signature="e#583#854#0#PHP" expanded="false" />  
784 - <element signature="e#859#1113#0#PHP" expanded="false" />  
785 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
786 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
787 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
788 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
789 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
790 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
791 - </folding>  
792 - </state>  
793 - </provider>  
794 - </entry>  
795 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 795 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
796 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
797 <state relative-caret-position="139"> 797 <state relative-caret-position="139">
@@ -813,32 +813,20 @@ @@ -813,32 +813,20 @@
813 </state> 813 </state>
814 </provider> 814 </provider>
815 </entry> 815 </entry>
816 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 816 + <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
817 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
818 - <state relative-caret-position="604">  
819 - <caret line="206" column="59" lean-forward="false" selection-start-line="206" selection-start-column="59" selection-end-line="206" selection-end-column="59" /> 818 + <state relative-caret-position="690">
  819 + <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
820 <folding> 820 <folding>
821 - <element signature="e#4667#5257#0#PHP" expanded="false" />  
822 - <element signature="e#6314#6632#0#PHP" expanded="false" />  
823 - <element signature="e#6637#7013#0#PHP" expanded="false" />  
824 - <element signature="e#7019#7374#0#PHP" expanded="false" />  
825 - <element signature="e#7379#7788#0#PHP" expanded="false" />  
826 - <element signature="e#7794#8179#0#PHP" expanded="false" />  
827 - <element signature="e#8184#8855#0#PHP" expanded="false" />  
828 - <element signature="e#8861#9307#0#PHP" expanded="false" />  
829 - <element signature="e#9312#10163#0#PHP" expanded="false" />  
830 - <element signature="e#10169#10439#0#PHP" expanded="false" />  
831 - <element signature="e#10444#10920#0#PHP" expanded="false" />  
832 - <element signature="e#10926#11556#0#PHP" expanded="false" />  
833 - <element signature="e#11561#13493#0#PHP" expanded="false" /> 821 + <element signature="e#3168#3696#0#PHP" expanded="false" />
834 </folding> 822 </folding>
835 </state> 823 </state>
836 </provider> 824 </provider>
837 </entry> 825 </entry>
838 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 826 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
839 <provider selected="true" editor-type-id="text-editor"> 827 <provider selected="true" editor-type-id="text-editor">
840 - <state relative-caret-position="250">  
841 - <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> 828 + <state relative-caret-position="259">
  829 + <caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" />
842 <folding> 830 <folding>
843 <element signature="e#366#791#0#PHP" expanded="false" /> 831 <element signature="e#366#791#0#PHP" expanded="false" />
844 <element signature="e#796#1608#0#PHP" expanded="false" /> 832 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -883,7 +871,7 @@ @@ -883,7 +871,7 @@
883 <element signature="e#29715#30139#0#PHP" expanded="false" /> 871 <element signature="e#29715#30139#0#PHP" expanded="false" />
884 <element signature="e#30144#30755#0#PHP" expanded="false" /> 872 <element signature="e#30144#30755#0#PHP" expanded="false" />
885 <element signature="e#30761#31257#0#PHP" expanded="false" /> 873 <element signature="e#30761#31257#0#PHP" expanded="false" />
886 - <element signature="e#31262#34065#0#PHP" expanded="false" /> 874 + <element signature="e#31838#32925#0#PHP" expanded="false" />
887 <element signature="e#34071#34355#0#PHP" expanded="false" /> 875 <element signature="e#34071#34355#0#PHP" expanded="false" />
888 <element signature="e#34360#34996#0#PHP" expanded="false" /> 876 <element signature="e#34360#34996#0#PHP" expanded="false" />
889 <element signature="e#35017#35336#0#PHP" expanded="false" /> 877 <element signature="e#35017#35336#0#PHP" expanded="false" />
@@ -909,12 +897,51 @@ @@ -909,12 +897,51 @@
909 </state> 897 </state>
910 </provider> 898 </provider>
911 </entry> 899 </entry>
912 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 900 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
913 <provider selected="true" editor-type-id="text-editor"> 901 <provider selected="true" editor-type-id="text-editor">
914 - <state relative-caret-position="540">  
915 - <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" /> 902 + <state relative-caret-position="576">
  903 + <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
916 <folding> 904 <folding>
917 - <element signature="e#3168#3696#0#PHP" expanded="false" /> 905 + <element signature="e#305#577#0#PHP" expanded="false" />
  906 + <element signature="e#583#854#0#PHP" expanded="false" />
  907 + <element signature="e#859#1113#0#PHP" expanded="false" />
  908 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  909 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  910 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  911 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  912 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  913 + <element signature="e#3894#4897#0#PHP" expanded="false" />
  914 + </folding>
  915 + </state>
  916 + </provider>
  917 + </entry>
  918 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  919 + <provider selected="true" editor-type-id="text-editor">
  920 + <state relative-caret-position="435">
  921 + <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
  922 + <folding>
  923 + <element signature="e#411#604#0#PHP" expanded="false" />
  924 + <element signature="e#609#825#0#PHP" expanded="false" />
  925 + <element signature="e#2099#2317#0#PHP" expanded="false" />
  926 + <element signature="e#2322#2530#0#PHP" expanded="false" />
  927 + <element signature="e#2536#3043#0#PHP" expanded="false" />
  928 + <element signature="e#3048#3566#0#PHP" expanded="false" />
  929 + <element signature="e#3572#4084#0#PHP" expanded="false" />
  930 + <element signature="e#4089#4652#0#PHP" expanded="false" />
  931 + <element signature="e#4658#5248#0#PHP" expanded="false" />
  932 + <element signature="e#5253#6299#0#PHP" expanded="false" />
  933 + <element signature="e#6305#6623#0#PHP" expanded="false" />
  934 + <element signature="e#6628#7004#0#PHP" expanded="false" />
  935 + <element signature="e#7010#7365#0#PHP" expanded="false" />
  936 + <element signature="e#7370#7779#0#PHP" expanded="false" />
  937 + <element signature="e#7785#8170#0#PHP" expanded="false" />
  938 + <element signature="e#8175#8846#0#PHP" expanded="false" />
  939 + <element signature="e#8852#9298#0#PHP" expanded="false" />
  940 + <element signature="e#9303#10154#0#PHP" expanded="false" />
  941 + <element signature="e#10160#10430#0#PHP" expanded="false" />
  942 + <element signature="e#10435#10911#0#PHP" expanded="false" />
  943 + <element signature="e#10917#11547#0#PHP" expanded="false" />
  944 + <element signature="e#11552#13484#0#PHP" expanded="false" />
918 </folding> 945 </folding>
919 </state> 946 </state>
920 </provider> 947 </provider>
@@ -67,7 +67,7 @@ class ShopgoodsController extends RestBaseController @@ -67,7 +67,7 @@ class ShopgoodsController extends RestBaseController
67 if(empty($shoptype_id)){ 67 if(empty($shoptype_id)){
68 $shopGoodsModel = new ShopgoodsModel(); 68 $shopGoodsModel = new ShopgoodsModel();
69 $where['delete_time'] = ['eq',0]; 69 $where['delete_time'] = ['eq',0];
70 - $data['goods'] = $shopGoodsModel->selectData($where,$page,$pageNum); 70 + $data = $shopGoodsModel->selectData($where,$page,$pageNum);
71 $this->success('SUCCESS',$data); 71 $this->success('SUCCESS',$data);
72 }else{ 72 }else{
73 $shopGoodsModel = new ShopgoodsModel(); 73 $shopGoodsModel = new ShopgoodsModel();