郭盛 / scrap · 提交

转到一个项目

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

修改家政详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 63 行增加 和 70 行删除
... ... @@ -4,14 +4,6 @@
<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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SeverController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -59,8 +51,8 @@
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
<state relative-caret-position="228">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
... ... @@ -71,27 +63,27 @@
<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="353">
<caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
<state relative-caret-position="458">
<caret line="111" column="31" lean-forward="false" selection-start-line="111" selection-start-column="31" selection-end-line="111" selection-end-column="31" />
<folding>
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#2126#2608#0#PHP" expanded="false" />
<element signature="e#2613#3118#0#PHP" expanded="false" />
<element signature="e#3124#3625#0#PHP" expanded="false" />
<element signature="e#3630#4459#0#PHP" expanded="false" />
<element signature="e#4465#4778#0#PHP" expanded="false" />
<element signature="e#4783#5158#0#PHP" expanded="false" />
<element signature="e#5164#5521#0#PHP" expanded="false" />
<element signature="e#5526#5934#0#PHP" expanded="false" />
<element signature="e#5940#6322#0#PHP" expanded="false" />
<element signature="e#6327#6997#0#PHP" expanded="false" />
<element signature="e#7003#7446#0#PHP" expanded="false" />
<element signature="e#7451#8301#0#PHP" expanded="false" />
<element signature="e#8307#8574#0#PHP" expanded="false" />
<element signature="e#8579#9054#0#PHP" expanded="false" />
<element signature="e#9060#9560#0#PHP" expanded="false" />
<element signature="e#9565#10354#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#3169#3670#0#PHP" expanded="false" />
<element signature="e#3675#4504#0#PHP" expanded="false" />
<element signature="e#4510#4823#0#PHP" expanded="false" />
<element signature="e#4828#5203#0#PHP" expanded="false" />
<element signature="e#5209#5566#0#PHP" expanded="false" />
<element signature="e#5571#5979#0#PHP" expanded="false" />
<element signature="e#5985#6367#0#PHP" expanded="false" />
<element signature="e#6372#7042#0#PHP" expanded="false" />
<element signature="e#7048#7491#0#PHP" expanded="false" />
<element signature="e#7496#8346#0#PHP" expanded="false" />
<element signature="e#8352#8619#0#PHP" expanded="false" />
<element signature="e#8624#9099#0#PHP" expanded="false" />
<element signature="e#9105#9605#0#PHP" expanded="false" />
<element signature="e#9610#10399#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -162,11 +154,11 @@
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
</list>
</option>
... ... @@ -185,9 +177,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="11" />
<option name="y" value="119" />
<component name="ProjectFrameBounds">
<option name="x" value="422" />
<option name="y" value="61" />
<option name="width" value="1582" />
<option name="height" value="965" />
</component>
... ... @@ -218,19 +210,19 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -373,15 +365,15 @@
<workItem from="1575016153150" duration="3315000" />
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="20170000" />
<workItem from="1575332430854" duration="21245000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="430628000" />
<option name="totallyTimeSpent" value="431703000" />
</component>
<component name="ToolWindowManager">
<frame x="11" y="119" width="1582" height="965" extended-state="1" />
<frame x="422" y="61" width="1582" height="965" 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.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -854,16 +846,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
... ... @@ -901,7 +883,7 @@
<state relative-caret-position="178">
<caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#div#0;n#td#0;n#tr#1;n#table#0;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#1;n#table#0;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -934,29 +916,39 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
<state relative-caret-position="458">
<caret line="111" column="31" lean-forward="false" selection-start-line="111" selection-start-column="31" selection-end-line="111" selection-end-column="31" />
<folding>
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#2126#2608#0#PHP" expanded="false" />
<element signature="e#2613#3118#0#PHP" expanded="false" />
<element signature="e#3124#3625#0#PHP" expanded="false" />
<element signature="e#3630#4459#0#PHP" expanded="false" />
<element signature="e#4465#4778#0#PHP" expanded="false" />
<element signature="e#4783#5158#0#PHP" expanded="false" />
<element signature="e#5164#5521#0#PHP" expanded="false" />
<element signature="e#5526#5934#0#PHP" expanded="false" />
<element signature="e#5940#6322#0#PHP" expanded="false" />
<element signature="e#6327#6997#0#PHP" expanded="false" />
<element signature="e#7003#7446#0#PHP" expanded="false" />
<element signature="e#7451#8301#0#PHP" expanded="false" />
<element signature="e#8307#8574#0#PHP" expanded="false" />
<element signature="e#8579#9054#0#PHP" expanded="false" />
<element signature="e#9060#9560#0#PHP" expanded="false" />
<element signature="e#9565#10354#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#3169#3670#0#PHP" expanded="false" />
<element signature="e#3675#4504#0#PHP" expanded="false" />
<element signature="e#4510#4823#0#PHP" expanded="false" />
<element signature="e#4828#5203#0#PHP" expanded="false" />
<element signature="e#5209#5566#0#PHP" expanded="false" />
<element signature="e#5571#5979#0#PHP" expanded="false" />
<element signature="e#5985#6367#0#PHP" expanded="false" />
<element signature="e#6372#7042#0#PHP" expanded="false" />
<element signature="e#7048#7491#0#PHP" expanded="false" />
<element signature="e#7496#8346#0#PHP" expanded="false" />
<element signature="e#8352#8619#0#PHP" expanded="false" />
<element signature="e#8624#9099#0#PHP" expanded="false" />
<element signature="e#9105#9605#0#PHP" expanded="false" />
<element signature="e#9610#10399#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -109,6 +109,7 @@ class HomeController extends RestBaseController
* @return id:ID
* @return home_name:名称
* @return home_address:地址
* @return thumbnail:家政公司封面缩略图
* @return home_phone:联系电话
* @return images:轮播图
* @return content:公司介绍
... ... @@ -125,7 +126,7 @@ class HomeController extends RestBaseController
$where['id'] = ['eq',$id];
$homeModel = new HomeModel();
$data = $homeModel->findData($where)->toArray();
$data['sever_name'] = Db::name('service')->where('home_id',$id)->field('id as sever_id,sever_name')->select();
$data['scver_name'] = Db::name('service')->where('home_id',$id)->field('id as sever_id,thumbnail,sever_name')->select();
$this->success('SUCCESS',$data);
}
... ...