郭盛 / scrap · 提交

转到一个项目

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

修改商品列表

内嵌 并排对比
正在显示 2 个修改的文件 包含 96 行增加 和 69 行删除
... ... @@ -2,9 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -30,8 +27,8 @@
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="153" column="7" lean-forward="true" selection-start-line="153" selection-start-column="7" selection-end-line="153" selection-end-column="7" />
<state relative-caret-position="576">
<caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
... ... @@ -47,11 +44,44 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13484#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<state relative-caret-position="259">
<caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -96,7 +126,7 @@
<element signature="e#29715#30139#0#PHP" expanded="false" />
<element signature="e#30144#30755#0#PHP" expanded="false" />
<element signature="e#30761#31257#0#PHP" expanded="false" />
<element signature="e#31262#34065#0#PHP" expanded="false" />
<element signature="e#31838#32925#0#PHP" expanded="false" />
<element signature="e#34071#34355#0#PHP" expanded="false" />
<element signature="e#34360#34996#0#PHP" expanded="false" />
<element signature="e#35017#35336#0#PHP" expanded="false" />
... ... @@ -123,18 +153,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -204,8 +222,8 @@
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
</option>
</component>
... ... @@ -223,9 +241,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="64" />
<option name="y" value="65" />
<component name="ProjectFrameBounds">
<option name="x" value="359" />
<option name="y" value="102" />
<option name="width" value="1618" />
<option name="height" value="1013" />
</component>
... ... @@ -384,15 +402,15 @@
<workItem from="1575860170691" duration="607000" />
<workItem from="1576027263250" duration="3000" />
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="4526000" />
<workItem from="1576056936489" duration="6220000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="534392000" />
<option name="totallyTimeSpent" value="536086000" />
</component>
<component name="ToolWindowManager">
<frame x="64" y="65" width="1618" height="1013" extended-state="1" />
<frame x="359" y="102" width="1618" height="1013" extended-state="0" />
<editor active="true" />
<layout>
<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 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="153" column="7" lean-forward="true" selection-start-line="153" selection-start-column="7" selection-end-line="153" selection-end-column="7" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
... ... @@ -813,32 +813,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="604">
<caret line="206" column="59" lean-forward="false" selection-start-line="206" selection-start-column="59" selection-end-line="206" selection-end-column="59" />
<state relative-caret-position="690">
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
<folding>
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#6314#6632#0#PHP" expanded="false" />
<element signature="e#6637#7013#0#PHP" expanded="false" />
<element signature="e#7019#7374#0#PHP" expanded="false" />
<element signature="e#7379#7788#0#PHP" expanded="false" />
<element signature="e#7794#8179#0#PHP" expanded="false" />
<element signature="e#8184#8855#0#PHP" expanded="false" />
<element signature="e#8861#9307#0#PHP" expanded="false" />
<element signature="e#9312#10163#0#PHP" expanded="false" />
<element signature="e#10169#10439#0#PHP" expanded="false" />
<element signature="e#10444#10920#0#PHP" expanded="false" />
<element signature="e#10926#11556#0#PHP" expanded="false" />
<element signature="e#11561#13493#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<state relative-caret-position="259">
<caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -883,7 +871,7 @@
<element signature="e#29715#30139#0#PHP" expanded="false" />
<element signature="e#30144#30755#0#PHP" expanded="false" />
<element signature="e#30761#31257#0#PHP" expanded="false" />
<element signature="e#31262#34065#0#PHP" expanded="false" />
<element signature="e#31838#32925#0#PHP" expanded="false" />
<element signature="e#34071#34355#0#PHP" expanded="false" />
<element signature="e#34360#34996#0#PHP" expanded="false" />
<element signature="e#35017#35336#0#PHP" expanded="false" />
... ... @@ -909,12 +897,51 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
<state relative-caret-position="576">
<caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13484#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -67,7 +67,7 @@ class ShopgoodsController extends RestBaseController
if(empty($shoptype_id)){
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$data['goods'] = $shopGoodsModel->selectData($where,$page,$pageNum);
$data = $shopGoodsModel->selectData($where,$page,$pageNum);
$this->success('SUCCESS',$data);
}else{
$shopGoodsModel = new ShopgoodsModel();
... ...