郭盛 / scrap · 提交

转到一个项目

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

修改家政详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 63 行增加 和 70 行删除
@@ -4,14 +4,6 @@ @@ -4,14 +4,6 @@
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" /> 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" /> 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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SeverController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SeverController.php" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
10 - <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" />  
11 - <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" />  
12 - <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" />  
13 - <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" />  
14 - <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" />  
15 </list> 7 </list>
16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -59,8 +51,8 @@ @@ -59,8 +51,8 @@
59 <file leaf-file-name="edit.html" pinned="false" current-in-tab="false"> 51 <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
60 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html"> 52 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
61 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
62 - <state relative-caret-position="703">  
63 - <caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" /> 54 + <state relative-caret-position="228">
  55 + <caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
64 <folding> 56 <folding>
65 <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" /> 57 <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
66 </folding> 58 </folding>
@@ -71,27 +63,27 @@ @@ -71,27 +63,27 @@
71 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> 63 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
72 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 64 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
73 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
74 - <state relative-caret-position="353">  
75 - <caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" /> 66 + <state relative-caret-position="458">
  67 + <caret line="111" column="31" lean-forward="false" selection-start-line="111" selection-start-column="31" selection-end-line="111" selection-end-column="31" />
76 <folding> 68 <folding>
77 <element signature="e#896#1112#0#PHP" expanded="false" /> 69 <element signature="e#896#1112#0#PHP" expanded="false" />
78 <element signature="e#1117#1500#0#PHP" expanded="false" /> 70 <element signature="e#1117#1500#0#PHP" expanded="false" />
79 - <element signature="e#2126#2608#0#PHP" expanded="false" />  
80 - <element signature="e#2613#3118#0#PHP" expanded="false" />  
81 - <element signature="e#3124#3625#0#PHP" expanded="false" />  
82 - <element signature="e#3630#4459#0#PHP" expanded="false" />  
83 - <element signature="e#4465#4778#0#PHP" expanded="false" />  
84 - <element signature="e#4783#5158#0#PHP" expanded="false" />  
85 - <element signature="e#5164#5521#0#PHP" expanded="false" />  
86 - <element signature="e#5526#5934#0#PHP" expanded="false" />  
87 - <element signature="e#5940#6322#0#PHP" expanded="false" />  
88 - <element signature="e#6327#6997#0#PHP" expanded="false" />  
89 - <element signature="e#7003#7446#0#PHP" expanded="false" />  
90 - <element signature="e#7451#8301#0#PHP" expanded="false" />  
91 - <element signature="e#8307#8574#0#PHP" expanded="false" />  
92 - <element signature="e#8579#9054#0#PHP" expanded="false" />  
93 - <element signature="e#9060#9560#0#PHP" expanded="false" />  
94 - <element signature="e#9565#10354#0#PHP" expanded="false" /> 71 + <element signature="e#1506#1726#0#PHP" expanded="false" />
  72 + <element signature="e#1731#2119#0#PHP" expanded="false" />
  73 + <element signature="e#3169#3670#0#PHP" expanded="false" />
  74 + <element signature="e#3675#4504#0#PHP" expanded="false" />
  75 + <element signature="e#4510#4823#0#PHP" expanded="false" />
  76 + <element signature="e#4828#5203#0#PHP" expanded="false" />
  77 + <element signature="e#5209#5566#0#PHP" expanded="false" />
  78 + <element signature="e#5571#5979#0#PHP" expanded="false" />
  79 + <element signature="e#5985#6367#0#PHP" expanded="false" />
  80 + <element signature="e#6372#7042#0#PHP" expanded="false" />
  81 + <element signature="e#7048#7491#0#PHP" expanded="false" />
  82 + <element signature="e#7496#8346#0#PHP" expanded="false" />
  83 + <element signature="e#8352#8619#0#PHP" expanded="false" />
  84 + <element signature="e#8624#9099#0#PHP" expanded="false" />
  85 + <element signature="e#9105#9605#0#PHP" expanded="false" />
  86 + <element signature="e#9610#10399#0#PHP" expanded="false" />
95 </folding> 87 </folding>
96 </state> 88 </state>
97 </provider> 89 </provider>
@@ -162,11 +154,11 @@ @@ -162,11 +154,11 @@
162 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 154 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
163 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" /> 155 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
164 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 156 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
165 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />  
166 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" /> 157 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
167 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" /> 158 <option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
168 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" /> 159 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
169 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" /> 160 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
  161 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
170 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 162 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
171 </list> 163 </list>
172 </option> 164 </option>
@@ -185,9 +177,9 @@ @@ -185,9 +177,9 @@
185 <sorting>DEFINITION_ORDER</sorting> 177 <sorting>DEFINITION_ORDER</sorting>
186 </component> 178 </component>
187 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 179 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
188 - <component name="ProjectFrameBounds" extendedState="1">  
189 - <option name="x" value="11" />  
190 - <option name="y" value="119" /> 180 + <component name="ProjectFrameBounds">
  181 + <option name="x" value="422" />
  182 + <option name="y" value="61" />
191 <option name="width" value="1582" /> 183 <option name="width" value="1582" />
192 <option name="height" value="965" /> 184 <option name="height" value="965" />
193 </component> 185 </component>
@@ -218,19 +210,19 @@ @@ -218,19 +210,19 @@
218 <path> 210 <path>
219 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 211 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
220 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 212 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
221 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> 213 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
222 </path> 214 </path>
223 <path> 215 <path>
224 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 216 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
225 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 217 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
226 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
227 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> 218 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
228 </path> 220 </path>
229 <path> 221 <path>
230 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 222 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
231 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 223 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
232 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
233 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> 224 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  225 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
234 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 226 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
235 </path> 227 </path>
236 <path> 228 <path>
@@ -373,15 +365,15 @@ @@ -373,15 +365,15 @@
373 <workItem from="1575016153150" duration="3315000" /> 365 <workItem from="1575016153150" duration="3315000" />
374 <workItem from="1575246616478" duration="21722000" /> 366 <workItem from="1575246616478" duration="21722000" />
375 <workItem from="1575278769037" duration="7395000" /> 367 <workItem from="1575278769037" duration="7395000" />
376 - <workItem from="1575332430854" duration="20170000" /> 368 + <workItem from="1575332430854" duration="21245000" />
377 </task> 369 </task>
378 <servers /> 370 <servers />
379 </component> 371 </component>
380 <component name="TimeTrackingManager"> 372 <component name="TimeTrackingManager">
381 - <option name="totallyTimeSpent" value="430628000" /> 373 + <option name="totallyTimeSpent" value="431703000" />
382 </component> 374 </component>
383 <component name="ToolWindowManager"> 375 <component name="ToolWindowManager">
384 - <frame x="11" y="119" width="1582" height="965" extended-state="1" /> 376 + <frame x="422" y="61" width="1582" height="965" extended-state="0" />
385 <editor active="true" /> 377 <editor active="true" />
386 <layout> 378 <layout>
387 <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" /> 379 <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 @@ @@ -854,16 +846,6 @@
854 </state> 846 </state>
855 </provider> 847 </provider>
856 </entry> 848 </entry>
857 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
858 - <provider selected="true" editor-type-id="text-editor">  
859 - <state relative-caret-position="703">  
860 - <caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />  
861 - <folding>  
862 - <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />  
863 - </folding>  
864 - </state>  
865 - </provider>  
866 - </entry>  
867 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html"> 849 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
868 <provider selected="true" editor-type-id="text-editor"> 850 <provider selected="true" editor-type-id="text-editor">
869 <state relative-caret-position="-450"> 851 <state relative-caret-position="-450">
@@ -901,7 +883,7 @@ @@ -901,7 +883,7 @@
901 <state relative-caret-position="178"> 883 <state relative-caret-position="178">
902 <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" /> 884 <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
903 <folding> 885 <folding>
904 - <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" /> 886 + <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" />
905 </folding> 887 </folding>
906 </state> 888 </state>
907 </provider> 889 </provider>
@@ -934,29 +916,39 @@ @@ -934,29 +916,39 @@
934 </state> 916 </state>
935 </provider> 917 </provider>
936 </entry> 918 </entry>
  919 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
  920 + <provider selected="true" editor-type-id="text-editor">
  921 + <state relative-caret-position="228">
  922 + <caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
  923 + <folding>
  924 + <element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
  925 + </folding>
  926 + </state>
  927 + </provider>
  928 + </entry>
937 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 929 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
938 <provider selected="true" editor-type-id="text-editor"> 930 <provider selected="true" editor-type-id="text-editor">
939 - <state relative-caret-position="353">  
940 - <caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" /> 931 + <state relative-caret-position="458">
  932 + <caret line="111" column="31" lean-forward="false" selection-start-line="111" selection-start-column="31" selection-end-line="111" selection-end-column="31" />
941 <folding> 933 <folding>
942 <element signature="e#896#1112#0#PHP" expanded="false" /> 934 <element signature="e#896#1112#0#PHP" expanded="false" />
943 <element signature="e#1117#1500#0#PHP" expanded="false" /> 935 <element signature="e#1117#1500#0#PHP" expanded="false" />
944 - <element signature="e#2126#2608#0#PHP" expanded="false" />  
945 - <element signature="e#2613#3118#0#PHP" expanded="false" />  
946 - <element signature="e#3124#3625#0#PHP" expanded="false" />  
947 - <element signature="e#3630#4459#0#PHP" expanded="false" />  
948 - <element signature="e#4465#4778#0#PHP" expanded="false" />  
949 - <element signature="e#4783#5158#0#PHP" expanded="false" />  
950 - <element signature="e#5164#5521#0#PHP" expanded="false" />  
951 - <element signature="e#5526#5934#0#PHP" expanded="false" />  
952 - <element signature="e#5940#6322#0#PHP" expanded="false" />  
953 - <element signature="e#6327#6997#0#PHP" expanded="false" />  
954 - <element signature="e#7003#7446#0#PHP" expanded="false" />  
955 - <element signature="e#7451#8301#0#PHP" expanded="false" />  
956 - <element signature="e#8307#8574#0#PHP" expanded="false" />  
957 - <element signature="e#8579#9054#0#PHP" expanded="false" />  
958 - <element signature="e#9060#9560#0#PHP" expanded="false" />  
959 - <element signature="e#9565#10354#0#PHP" expanded="false" /> 936 + <element signature="e#1506#1726#0#PHP" expanded="false" />
  937 + <element signature="e#1731#2119#0#PHP" expanded="false" />
  938 + <element signature="e#3169#3670#0#PHP" expanded="false" />
  939 + <element signature="e#3675#4504#0#PHP" expanded="false" />
  940 + <element signature="e#4510#4823#0#PHP" expanded="false" />
  941 + <element signature="e#4828#5203#0#PHP" expanded="false" />
  942 + <element signature="e#5209#5566#0#PHP" expanded="false" />
  943 + <element signature="e#5571#5979#0#PHP" expanded="false" />
  944 + <element signature="e#5985#6367#0#PHP" expanded="false" />
  945 + <element signature="e#6372#7042#0#PHP" expanded="false" />
  946 + <element signature="e#7048#7491#0#PHP" expanded="false" />
  947 + <element signature="e#7496#8346#0#PHP" expanded="false" />
  948 + <element signature="e#8352#8619#0#PHP" expanded="false" />
  949 + <element signature="e#8624#9099#0#PHP" expanded="false" />
  950 + <element signature="e#9105#9605#0#PHP" expanded="false" />
  951 + <element signature="e#9610#10399#0#PHP" expanded="false" />
960 </folding> 952 </folding>
961 </state> 953 </state>
962 </provider> 954 </provider>
@@ -109,6 +109,7 @@ class HomeController extends RestBaseController @@ -109,6 +109,7 @@ class HomeController extends RestBaseController
109 * @return id:ID 109 * @return id:ID
110 * @return home_name:名称 110 * @return home_name:名称
111 * @return home_address:地址 111 * @return home_address:地址
  112 + * @return thumbnail:家政公司封面缩略图
112 * @return home_phone:联系电话 113 * @return home_phone:联系电话
113 * @return images:轮播图 114 * @return images:轮播图
114 * @return content:公司介绍 115 * @return content:公司介绍
@@ -125,7 +126,7 @@ class HomeController extends RestBaseController @@ -125,7 +126,7 @@ class HomeController extends RestBaseController
125 $where['id'] = ['eq',$id]; 126 $where['id'] = ['eq',$id];
126 $homeModel = new HomeModel(); 127 $homeModel = new HomeModel();
127 $data = $homeModel->findData($where)->toArray(); 128 $data = $homeModel->findData($where)->toArray();
128 - $data['sever_name'] = Db::name('service')->where('home_id',$id)->field('id as sever_id,sever_name')->select(); 129 + $data['scver_name'] = Db::name('service')->where('home_id',$id)->field('id as sever_id,thumbnail,sever_name')->select();
129 $this->success('SUCCESS',$data); 130 $this->success('SUCCESS',$data);
130 } 131 }
131 132