郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 80856a180ecc36f56c713f0e83fe6c0940b68cf1 1 个父辈 fbe95f14
1 个管道 的构建 通过 耗费 1 秒

修改家政预约订单详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 61 行增加 和 57 行删除
@@ -2,6 +2,7 @@ @@ -2,6 +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" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -62,8 +63,8 @@ @@ -62,8 +63,8 @@
62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 63 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 64 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
64 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="324">  
66 - <caret line="553" column="44" lean-forward="true" selection-start-line="553" selection-start-column="44" selection-end-line="553" selection-end-column="44" /> 66 + <state relative-caret-position="254">
  67 + <caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
67 <folding> 68 <folding>
68 <element signature="e#366#715#0#PHP" expanded="false" /> 69 <element signature="e#366#715#0#PHP" expanded="false" />
69 <element signature="e#720#1485#0#PHP" expanded="false" /> 70 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -90,27 +91,29 @@ @@ -90,27 +91,29 @@
90 <element signature="e#12310#12665#0#PHP" expanded="false" /> 91 <element signature="e#12310#12665#0#PHP" expanded="false" />
91 <element signature="e#12671#13355#0#PHP" expanded="false" /> 92 <element signature="e#12671#13355#0#PHP" expanded="false" />
92 <element signature="e#13360#14767#0#PHP" expanded="false" /> 93 <element signature="e#13360#14767#0#PHP" expanded="false" />
  94 + <element signature="e#14773#15234#0#PHP" expanded="false" />
  95 + <element signature="e#15239#17939#0#PHP" expanded="false" />
93 <element signature="e#17945#18554#0#PHP" expanded="false" /> 96 <element signature="e#17945#18554#0#PHP" expanded="false" />
94 - <element signature="e#18559#19892#0#PHP" expanded="false" />  
95 - <element signature="e#19898#20255#0#PHP" expanded="false" />  
96 - <element signature="e#20260#21141#0#PHP" expanded="false" />  
97 - <element signature="e#21147#21499#0#PHP" expanded="false" />  
98 - <element signature="e#21504#22582#0#PHP" expanded="false" />  
99 - <element signature="e#22588#22943#0#PHP" expanded="false" />  
100 - <element signature="e#22948#24028#0#PHP" expanded="false" />  
101 - <element signature="e#24034#24458#0#PHP" expanded="false" />  
102 - <element signature="e#24463#25074#0#PHP" expanded="false" />  
103 - <element signature="e#25080#25576#0#PHP" expanded="false" />  
104 - <element signature="e#25581#26688#0#PHP" expanded="false" />  
105 - <element signature="e#26694#26978#0#PHP" expanded="false" />  
106 - <element signature="e#26983#27561#0#PHP" expanded="false" />  
107 - <element signature="e#27582#27901#0#PHP" expanded="false" />  
108 - <element signature="e#27907#28315#0#PHP" expanded="false" />  
109 - <element signature="e#28321#29080#0#PHP" expanded="false" />  
110 - <element signature="e#29100#29964#0#PHP" expanded="false" />  
111 - <element signature="e#29991#30391#0#PHP" expanded="false" />  
112 - <element signature="e#30415#30988#0#PHP" expanded="false" />  
113 - <element signature="e#31011#31821#0#PHP" expanded="false" /> 97 + <element signature="e#18559#19798#0#PHP" expanded="false" />
  98 + <element signature="e#19804#20161#0#PHP" expanded="false" />
  99 + <element signature="e#20166#21047#0#PHP" expanded="false" />
  100 + <element signature="e#21053#21405#0#PHP" expanded="false" />
  101 + <element signature="e#21410#22488#0#PHP" expanded="false" />
  102 + <element signature="e#22494#22849#0#PHP" expanded="false" />
  103 + <element signature="e#22854#23934#0#PHP" expanded="false" />
  104 + <element signature="e#23940#24364#0#PHP" expanded="false" />
  105 + <element signature="e#24369#24980#0#PHP" expanded="false" />
  106 + <element signature="e#24986#25482#0#PHP" expanded="false" />
  107 + <element signature="e#25487#26594#0#PHP" expanded="false" />
  108 + <element signature="e#26600#26884#0#PHP" expanded="false" />
  109 + <element signature="e#26889#27467#0#PHP" expanded="false" />
  110 + <element signature="e#27488#27807#0#PHP" expanded="false" />
  111 + <element signature="e#27813#28221#0#PHP" expanded="false" />
  112 + <element signature="e#28227#28986#0#PHP" expanded="false" />
  113 + <element signature="e#29006#29870#0#PHP" expanded="false" />
  114 + <element signature="e#29897#30297#0#PHP" expanded="false" />
  115 + <element signature="e#30321#30894#0#PHP" expanded="false" />
  116 + <element signature="e#30917#31727#0#PHP" expanded="false" />
114 </folding> 117 </folding>
115 </state> 118 </state>
116 </provider> 119 </provider>
@@ -204,11 +207,11 @@ @@ -204,11 +207,11 @@
204 <sorting>DEFINITION_ORDER</sorting> 207 <sorting>DEFINITION_ORDER</sorting>
205 </component> 208 </component>
206 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 209 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
207 - <component name="ProjectFrameBounds" extendedState="1">  
208 - <option name="x" value="384" />  
209 - <option name="y" value="62" /> 210 + <component name="ProjectFrameBounds">
  211 + <option name="x" value="232" />
  212 + <option name="y" value="63" />
210 <option name="width" value="1582" /> 213 <option name="width" value="1582" />
211 - <option name="height" value="1021" /> 214 + <option name="height" value="1023" />
212 </component> 215 </component>
213 <component name="ProjectView"> 216 <component name="ProjectView">
214 <navigator currentView="ProjectPane" proportions="" version="1"> 217 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -353,15 +356,15 @@ @@ -353,15 +356,15 @@
353 <workItem from="1575419186725" duration="599000" /> 356 <workItem from="1575419186725" duration="599000" />
354 <workItem from="1575420787741" duration="2879000" /> 357 <workItem from="1575420787741" duration="2879000" />
355 <workItem from="1575431441427" duration="8414000" /> 358 <workItem from="1575431441427" duration="8414000" />
356 - <workItem from="1575444399653" duration="2954000" /> 359 + <workItem from="1575444399653" duration="3670000" />
357 </task> 360 </task>
358 <servers /> 361 <servers />
359 </component> 362 </component>
360 <component name="TimeTrackingManager"> 363 <component name="TimeTrackingManager">
361 - <option name="totallyTimeSpent" value="456603000" /> 364 + <option name="totallyTimeSpent" value="457319000" />
362 </component> 365 </component>
363 <component name="ToolWindowManager"> 366 <component name="ToolWindowManager">
364 - <frame x="384" y="62" width="1582" height="1021" extended-state="1" /> 367 + <frame x="232" y="63" width="1582" height="1023" extended-state="0" />
365 <editor active="true" /> 368 <editor active="true" />
366 <layout> 369 <layout>
367 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 370 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -859,8 +862,8 @@ @@ -859,8 +862,8 @@
859 </entry> 862 </entry>
860 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 863 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
861 <provider selected="true" editor-type-id="text-editor"> 864 <provider selected="true" editor-type-id="text-editor">
862 - <state relative-caret-position="324">  
863 - <caret line="553" column="44" lean-forward="true" selection-start-line="553" selection-start-column="44" selection-end-line="553" selection-end-column="44" /> 865 + <state relative-caret-position="254">
  866 + <caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
864 <folding> 867 <folding>
865 <element signature="e#366#715#0#PHP" expanded="false" /> 868 <element signature="e#366#715#0#PHP" expanded="false" />
866 <element signature="e#720#1485#0#PHP" expanded="false" /> 869 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -887,27 +890,29 @@ @@ -887,27 +890,29 @@
887 <element signature="e#12310#12665#0#PHP" expanded="false" /> 890 <element signature="e#12310#12665#0#PHP" expanded="false" />
888 <element signature="e#12671#13355#0#PHP" expanded="false" /> 891 <element signature="e#12671#13355#0#PHP" expanded="false" />
889 <element signature="e#13360#14767#0#PHP" expanded="false" /> 892 <element signature="e#13360#14767#0#PHP" expanded="false" />
  893 + <element signature="e#14773#15234#0#PHP" expanded="false" />
  894 + <element signature="e#15239#17939#0#PHP" expanded="false" />
890 <element signature="e#17945#18554#0#PHP" expanded="false" /> 895 <element signature="e#17945#18554#0#PHP" expanded="false" />
891 - <element signature="e#18559#19892#0#PHP" expanded="false" />  
892 - <element signature="e#19898#20255#0#PHP" expanded="false" />  
893 - <element signature="e#20260#21141#0#PHP" expanded="false" />  
894 - <element signature="e#21147#21499#0#PHP" expanded="false" />  
895 - <element signature="e#21504#22582#0#PHP" expanded="false" />  
896 - <element signature="e#22588#22943#0#PHP" expanded="false" />  
897 - <element signature="e#22948#24028#0#PHP" expanded="false" />  
898 - <element signature="e#24034#24458#0#PHP" expanded="false" />  
899 - <element signature="e#24463#25074#0#PHP" expanded="false" />  
900 - <element signature="e#25080#25576#0#PHP" expanded="false" />  
901 - <element signature="e#25581#26688#0#PHP" expanded="false" />  
902 - <element signature="e#26694#26978#0#PHP" expanded="false" />  
903 - <element signature="e#26983#27561#0#PHP" expanded="false" />  
904 - <element signature="e#27582#27901#0#PHP" expanded="false" />  
905 - <element signature="e#27907#28315#0#PHP" expanded="false" />  
906 - <element signature="e#28321#29080#0#PHP" expanded="false" />  
907 - <element signature="e#29100#29964#0#PHP" expanded="false" />  
908 - <element signature="e#29991#30391#0#PHP" expanded="false" />  
909 - <element signature="e#30415#30988#0#PHP" expanded="false" />  
910 - <element signature="e#31011#31821#0#PHP" expanded="false" /> 896 + <element signature="e#18559#19798#0#PHP" expanded="false" />
  897 + <element signature="e#19804#20161#0#PHP" expanded="false" />
  898 + <element signature="e#20166#21047#0#PHP" expanded="false" />
  899 + <element signature="e#21053#21405#0#PHP" expanded="false" />
  900 + <element signature="e#21410#22488#0#PHP" expanded="false" />
  901 + <element signature="e#22494#22849#0#PHP" expanded="false" />
  902 + <element signature="e#22854#23934#0#PHP" expanded="false" />
  903 + <element signature="e#23940#24364#0#PHP" expanded="false" />
  904 + <element signature="e#24369#24980#0#PHP" expanded="false" />
  905 + <element signature="e#24986#25482#0#PHP" expanded="false" />
  906 + <element signature="e#25487#26594#0#PHP" expanded="false" />
  907 + <element signature="e#26600#26884#0#PHP" expanded="false" />
  908 + <element signature="e#26889#27467#0#PHP" expanded="false" />
  909 + <element signature="e#27488#27807#0#PHP" expanded="false" />
  910 + <element signature="e#27813#28221#0#PHP" expanded="false" />
  911 + <element signature="e#28227#28986#0#PHP" expanded="false" />
  912 + <element signature="e#29006#29870#0#PHP" expanded="false" />
  913 + <element signature="e#29897#30297#0#PHP" expanded="false" />
  914 + <element signature="e#30321#30894#0#PHP" expanded="false" />
  915 + <element signature="e#30917#31727#0#PHP" expanded="false" />
911 </folding> 916 </folding>
912 </state> 917 </state>
913 </provider> 918 </provider>
@@ -609,17 +609,16 @@ class UserController extends RestBaseController @@ -609,17 +609,16 @@ class UserController extends RestBaseController
609 $data['status'] = $res['status']; 609 $data['status'] = $res['status'];
610 $data['num'] = $res['num']; 610 $data['num'] = $res['num'];
611 $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']); 611 $data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
612 - $data['sub_time'] = date('Y-m-d H:i:s',$res['sub_time']);  
613 - $homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->column('name'); 612 + $data['sub_time'] = $res['sub_time'];
  613 + $homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->field('name')->find();
614 $data['homeaddress_id'] = $homeaddress_id['name']; 614 $data['homeaddress_id'] = $homeaddress_id['name'];
615 - $home = Db::name('home')->where('id',$data['home_id'])->field('id,home_name,thumbnail')->find();  
616 - $service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find(); 615 + $home = Db::name('home')->where('id',$res['home_id'])->field('id,home_name,thumbnail')->find();
  616 + $service = Db::name('service')->where('id',$res['service_id'])->field('sever_name,price')->find();
617 $data['thumbnail'] = $home['thumbnail']; 617 $data['thumbnail'] = $home['thumbnail'];
  618 + $data['home_id'] = $home['home_name'];
618 $data['service_id'] = $service['sever_name']; 619 $data['service_id'] = $service['sever_name'];
619 $data['price'] = $service['price']; 620 $data['price'] = $service['price'];
620 - $data['home_id'] = $home['home_name'];  
621 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content'])); 621 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
622 - $data['serve'] = Db::name('recyclefee')->where('id',1)->column('fee');  
623 $this->success('SUCCESS',$data); 622 $this->success('SUCCESS',$data);
624 } 623 }
625 624