郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 b56ed2e520a564bc087f3273f2cb61118d055d67 1 个父辈 dd0879d9
1 个管道 的构建 通过 耗费 0 秒

备注信息

内嵌 并排对比
正在显示 2 个修改的文件 包含 62 行增加 和 62 行删除
@@ -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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.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" />
@@ -70,40 +69,40 @@ @@ -70,40 +69,40 @@
70 </provider> 69 </provider>
71 </entry> 70 </entry>
72 </file> 71 </file>
73 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false"> 72 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
74 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 73 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
75 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
76 - <state relative-caret-position="375">  
77 - <caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" /> 75 + <state relative-caret-position="250">
  76 + <caret line="57" column="28" lean-forward="false" selection-start-line="57" selection-start-column="28" selection-end-line="57" selection-end-column="28" />
78 <folding> 77 <folding>
79 <element signature="e#411#604#0#PHP" expanded="false" /> 78 <element signature="e#411#604#0#PHP" expanded="false" />
80 <element signature="e#609#825#0#PHP" expanded="false" /> 79 <element signature="e#609#825#0#PHP" expanded="false" />
81 - <element signature="e#2079#2297#0#PHP" expanded="false" />  
82 - <element signature="e#2302#2510#0#PHP" expanded="false" />  
83 - <element signature="e#2516#2992#0#PHP" expanded="false" />  
84 - <element signature="e#2997#3515#0#PHP" expanded="false" />  
85 - <element signature="e#3521#4033#0#PHP" expanded="false" />  
86 - <element signature="e#4038#4601#0#PHP" expanded="false" />  
87 - <element signature="e#4607#5104#0#PHP" expanded="false" />  
88 - <element signature="e#5109#5949#0#PHP" expanded="false" />  
89 - <element signature="e#5955#6273#0#PHP" expanded="false" />  
90 - <element signature="e#6278#6654#0#PHP" expanded="false" />  
91 - <element signature="e#6660#7015#0#PHP" expanded="false" />  
92 - <element signature="e#7020#7429#0#PHP" expanded="false" />  
93 - <element signature="e#7435#7820#0#PHP" expanded="false" />  
94 - <element signature="e#7825#8496#0#PHP" expanded="false" />  
95 - <element signature="e#8502#8948#0#PHP" expanded="false" />  
96 - <element signature="e#8953#9804#0#PHP" expanded="false" />  
97 - <element signature="e#9810#10080#0#PHP" expanded="false" />  
98 - <element signature="e#10085#10561#0#PHP" expanded="false" />  
99 - <element signature="e#10567#11127#0#PHP" expanded="false" />  
100 - <element signature="e#11132#11959#0#PHP" expanded="false" /> 80 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  81 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  82 + <element signature="e#2545#3021#0#PHP" expanded="false" />
  83 + <element signature="e#3026#3544#0#PHP" expanded="false" />
  84 + <element signature="e#3550#4062#0#PHP" expanded="false" />
  85 + <element signature="e#4067#4630#0#PHP" expanded="false" />
  86 + <element signature="e#4636#5133#0#PHP" expanded="false" />
  87 + <element signature="e#5138#5978#0#PHP" expanded="false" />
  88 + <element signature="e#5984#6302#0#PHP" expanded="false" />
  89 + <element signature="e#6307#6683#0#PHP" expanded="false" />
  90 + <element signature="e#6689#7044#0#PHP" expanded="false" />
  91 + <element signature="e#7049#7458#0#PHP" expanded="false" />
  92 + <element signature="e#7464#7849#0#PHP" expanded="false" />
  93 + <element signature="e#7854#8525#0#PHP" expanded="false" />
  94 + <element signature="e#8531#8977#0#PHP" expanded="false" />
  95 + <element signature="e#8982#9833#0#PHP" expanded="false" />
  96 + <element signature="e#9839#10109#0#PHP" expanded="false" />
  97 + <element signature="e#10114#10590#0#PHP" expanded="false" />
  98 + <element signature="e#10596#11156#0#PHP" expanded="false" />
  99 + <element signature="e#11161#11988#0#PHP" expanded="false" />
101 </folding> 100 </folding>
102 </state> 101 </state>
103 </provider> 102 </provider>
104 </entry> 103 </entry>
105 </file> 104 </file>
106 - <file leaf-file-name="ShopgoodsModel.php" pinned="false" current-in-tab="true"> 105 + <file leaf-file-name="ShopgoodsModel.php" pinned="false" current-in-tab="false">
107 <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php"> 106 <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
108 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
109 <state relative-caret-position="381"> 108 <state relative-caret-position="381">
@@ -188,7 +187,6 @@ @@ -188,7 +187,6 @@
188 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" /> 187 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
189 <option value="$PROJECT_DIR$/public/info.php" /> 188 <option value="$PROJECT_DIR$/public/info.php" />
190 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 189 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
191 - <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />  
192 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" /> 190 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
193 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" /> 191 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
194 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" /> 192 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
@@ -214,6 +212,7 @@ @@ -214,6 +212,7 @@
214 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 212 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
215 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 213 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
216 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 214 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
  215 + <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
217 </list> 216 </list>
218 </option> 217 </option>
219 </component> 218 </component>
@@ -232,8 +231,8 @@ @@ -232,8 +231,8 @@
232 </component> 231 </component>
233 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 232 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
234 <component name="ProjectFrameBounds" extendedState="1"> 233 <component name="ProjectFrameBounds" extendedState="1">
235 - <option name="x" value="96" />  
236 - <option name="y" value="116" /> 234 + <option name="x" value="256" />
  235 + <option name="y" value="85" />
237 <option name="width" value="1582" /> 236 <option name="width" value="1582" />
238 <option name="height" value="969" /> 237 <option name="height" value="969" />
239 </component> 238 </component>
@@ -375,15 +374,15 @@ @@ -375,15 +374,15 @@
375 <workItem from="1575016153150" duration="3315000" /> 374 <workItem from="1575016153150" duration="3315000" />
376 <workItem from="1575246616478" duration="21722000" /> 375 <workItem from="1575246616478" duration="21722000" />
377 <workItem from="1575278769037" duration="7395000" /> 376 <workItem from="1575278769037" duration="7395000" />
378 - <workItem from="1575332430854" duration="1871000" /> 377 + <workItem from="1575332430854" duration="1955000" />
379 </task> 378 </task>
380 <servers /> 379 <servers />
381 </component> 380 </component>
382 <component name="TimeTrackingManager"> 381 <component name="TimeTrackingManager">
383 - <option name="totallyTimeSpent" value="412329000" /> 382 + <option name="totallyTimeSpent" value="412413000" />
384 </component> 383 </component>
385 <component name="ToolWindowManager"> 384 <component name="ToolWindowManager">
386 - <frame x="96" y="116" width="1582" height="969" extended-state="1" /> 385 + <frame x="256" y="85" width="1582" height="969" extended-state="1" />
387 <editor active="true" /> 386 <editor active="true" />
388 <layout> 387 <layout>
389 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 388 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -823,44 +822,44 @@ @@ -823,44 +822,44 @@
823 </state> 822 </state>
824 </provider> 823 </provider>
825 </entry> 824 </entry>
  825 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
  826 + <provider selected="true" editor-type-id="text-editor">
  827 + <state relative-caret-position="381">
  828 + <caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
  829 + <folding />
  830 + </state>
  831 + </provider>
  832 + </entry>
826 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 833 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
827 <provider selected="true" editor-type-id="text-editor"> 834 <provider selected="true" editor-type-id="text-editor">
828 - <state relative-caret-position="375">  
829 - <caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" /> 835 + <state relative-caret-position="250">
  836 + <caret line="57" column="28" lean-forward="false" selection-start-line="57" selection-start-column="28" selection-end-line="57" selection-end-column="28" />
830 <folding> 837 <folding>
831 <element signature="e#411#604#0#PHP" expanded="false" /> 838 <element signature="e#411#604#0#PHP" expanded="false" />
832 <element signature="e#609#825#0#PHP" expanded="false" /> 839 <element signature="e#609#825#0#PHP" expanded="false" />
833 - <element signature="e#2079#2297#0#PHP" expanded="false" />  
834 - <element signature="e#2302#2510#0#PHP" expanded="false" />  
835 - <element signature="e#2516#2992#0#PHP" expanded="false" />  
836 - <element signature="e#2997#3515#0#PHP" expanded="false" />  
837 - <element signature="e#3521#4033#0#PHP" expanded="false" />  
838 - <element signature="e#4038#4601#0#PHP" expanded="false" />  
839 - <element signature="e#4607#5104#0#PHP" expanded="false" />  
840 - <element signature="e#5109#5949#0#PHP" expanded="false" />  
841 - <element signature="e#5955#6273#0#PHP" expanded="false" />  
842 - <element signature="e#6278#6654#0#PHP" expanded="false" />  
843 - <element signature="e#6660#7015#0#PHP" expanded="false" />  
844 - <element signature="e#7020#7429#0#PHP" expanded="false" />  
845 - <element signature="e#7435#7820#0#PHP" expanded="false" />  
846 - <element signature="e#7825#8496#0#PHP" expanded="false" />  
847 - <element signature="e#8502#8948#0#PHP" expanded="false" />  
848 - <element signature="e#8953#9804#0#PHP" expanded="false" />  
849 - <element signature="e#9810#10080#0#PHP" expanded="false" />  
850 - <element signature="e#10085#10561#0#PHP" expanded="false" />  
851 - <element signature="e#10567#11127#0#PHP" expanded="false" />  
852 - <element signature="e#11132#11959#0#PHP" expanded="false" /> 840 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  841 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  842 + <element signature="e#2545#3021#0#PHP" expanded="false" />
  843 + <element signature="e#3026#3544#0#PHP" expanded="false" />
  844 + <element signature="e#3550#4062#0#PHP" expanded="false" />
  845 + <element signature="e#4067#4630#0#PHP" expanded="false" />
  846 + <element signature="e#4636#5133#0#PHP" expanded="false" />
  847 + <element signature="e#5138#5978#0#PHP" expanded="false" />
  848 + <element signature="e#5984#6302#0#PHP" expanded="false" />
  849 + <element signature="e#6307#6683#0#PHP" expanded="false" />
  850 + <element signature="e#6689#7044#0#PHP" expanded="false" />
  851 + <element signature="e#7049#7458#0#PHP" expanded="false" />
  852 + <element signature="e#7464#7849#0#PHP" expanded="false" />
  853 + <element signature="e#7854#8525#0#PHP" expanded="false" />
  854 + <element signature="e#8531#8977#0#PHP" expanded="false" />
  855 + <element signature="e#8982#9833#0#PHP" expanded="false" />
  856 + <element signature="e#9839#10109#0#PHP" expanded="false" />
  857 + <element signature="e#10114#10590#0#PHP" expanded="false" />
  858 + <element signature="e#10596#11156#0#PHP" expanded="false" />
  859 + <element signature="e#11161#11988#0#PHP" expanded="false" />
853 </folding> 860 </folding>
854 </state> 861 </state>
855 </provider> 862 </provider>
856 </entry> 863 </entry>
857 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">  
858 - <provider selected="true" editor-type-id="text-editor">  
859 - <state relative-caret-position="381">  
860 - <caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />  
861 - <folding />  
862 - </state>  
863 - </provider>  
864 - </entry>  
865 </component> 864 </component>
866 </project> 865 </project>
@@ -55,6 +55,7 @@ class ShopgoodsController extends RestBaseController @@ -55,6 +55,7 @@ class ShopgoodsController extends RestBaseController
55 * 55 *
56 * @return id:商品ID 56 * @return id:商品ID
57 * @return shoptype_id:所属类型ID 57 * @return shoptype_id:所属类型ID
  58 + * @return thumbnail:缩略图
58 * @return goods_name:商品名称 59 * @return goods_name:商品名称
59 * @return price:所需积分 60 * @return price:所需积分
60 * 61 *