郭盛 / scrap · 提交

转到一个项目

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

修改家政预约订单详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 61 行增加 和 57 行删除
... ... @@ -2,6 +2,7 @@
<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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -62,8 +63,8 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="553" column="44" lean-forward="true" selection-start-line="553" selection-start-column="44" selection-end-line="553" selection-end-column="44" />
<state relative-caret-position="254">
<caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -90,27 +91,29 @@
<element signature="e#12310#12665#0#PHP" expanded="false" />
<element signature="e#12671#13355#0#PHP" expanded="false" />
<element signature="e#13360#14767#0#PHP" expanded="false" />
<element signature="e#14773#15234#0#PHP" expanded="false" />
<element signature="e#15239#17939#0#PHP" expanded="false" />
<element signature="e#17945#18554#0#PHP" expanded="false" />
<element signature="e#18559#19892#0#PHP" expanded="false" />
<element signature="e#19898#20255#0#PHP" expanded="false" />
<element signature="e#20260#21141#0#PHP" expanded="false" />
<element signature="e#21147#21499#0#PHP" expanded="false" />
<element signature="e#21504#22582#0#PHP" expanded="false" />
<element signature="e#22588#22943#0#PHP" expanded="false" />
<element signature="e#22948#24028#0#PHP" expanded="false" />
<element signature="e#24034#24458#0#PHP" expanded="false" />
<element signature="e#24463#25074#0#PHP" expanded="false" />
<element signature="e#25080#25576#0#PHP" expanded="false" />
<element signature="e#25581#26688#0#PHP" expanded="false" />
<element signature="e#26694#26978#0#PHP" expanded="false" />
<element signature="e#26983#27561#0#PHP" expanded="false" />
<element signature="e#27582#27901#0#PHP" expanded="false" />
<element signature="e#27907#28315#0#PHP" expanded="false" />
<element signature="e#28321#29080#0#PHP" expanded="false" />
<element signature="e#29100#29964#0#PHP" expanded="false" />
<element signature="e#29991#30391#0#PHP" expanded="false" />
<element signature="e#30415#30988#0#PHP" expanded="false" />
<element signature="e#31011#31821#0#PHP" expanded="false" />
<element signature="e#18559#19798#0#PHP" expanded="false" />
<element signature="e#19804#20161#0#PHP" expanded="false" />
<element signature="e#20166#21047#0#PHP" expanded="false" />
<element signature="e#21053#21405#0#PHP" expanded="false" />
<element signature="e#21410#22488#0#PHP" expanded="false" />
<element signature="e#22494#22849#0#PHP" expanded="false" />
<element signature="e#22854#23934#0#PHP" expanded="false" />
<element signature="e#23940#24364#0#PHP" expanded="false" />
<element signature="e#24369#24980#0#PHP" expanded="false" />
<element signature="e#24986#25482#0#PHP" expanded="false" />
<element signature="e#25487#26594#0#PHP" expanded="false" />
<element signature="e#26600#26884#0#PHP" expanded="false" />
<element signature="e#26889#27467#0#PHP" expanded="false" />
<element signature="e#27488#27807#0#PHP" expanded="false" />
<element signature="e#27813#28221#0#PHP" expanded="false" />
<element signature="e#28227#28986#0#PHP" expanded="false" />
<element signature="e#29006#29870#0#PHP" expanded="false" />
<element signature="e#29897#30297#0#PHP" expanded="false" />
<element signature="e#30321#30894#0#PHP" expanded="false" />
<element signature="e#30917#31727#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -204,11 +207,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="384" />
<option name="y" value="62" />
<component name="ProjectFrameBounds">
<option name="x" value="232" />
<option name="y" value="63" />
<option name="width" value="1582" />
<option name="height" value="1021" />
<option name="height" value="1023" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -353,15 +356,15 @@
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="2954000" />
<workItem from="1575444399653" duration="3670000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="456603000" />
<option name="totallyTimeSpent" value="457319000" />
</component>
<component name="ToolWindowManager">
<frame x="384" y="62" width="1582" height="1021" extended-state="1" />
<frame x="232" y="63" width="1582" height="1023" 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.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -859,8 +862,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="553" column="44" lean-forward="true" selection-start-line="553" selection-start-column="44" selection-end-line="553" selection-end-column="44" />
<state relative-caret-position="254">
<caret line="665" column="0" lean-forward="true" selection-start-line="665" selection-start-column="0" selection-end-line="665" selection-end-column="0" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -887,27 +890,29 @@
<element signature="e#12310#12665#0#PHP" expanded="false" />
<element signature="e#12671#13355#0#PHP" expanded="false" />
<element signature="e#13360#14767#0#PHP" expanded="false" />
<element signature="e#14773#15234#0#PHP" expanded="false" />
<element signature="e#15239#17939#0#PHP" expanded="false" />
<element signature="e#17945#18554#0#PHP" expanded="false" />
<element signature="e#18559#19892#0#PHP" expanded="false" />
<element signature="e#19898#20255#0#PHP" expanded="false" />
<element signature="e#20260#21141#0#PHP" expanded="false" />
<element signature="e#21147#21499#0#PHP" expanded="false" />
<element signature="e#21504#22582#0#PHP" expanded="false" />
<element signature="e#22588#22943#0#PHP" expanded="false" />
<element signature="e#22948#24028#0#PHP" expanded="false" />
<element signature="e#24034#24458#0#PHP" expanded="false" />
<element signature="e#24463#25074#0#PHP" expanded="false" />
<element signature="e#25080#25576#0#PHP" expanded="false" />
<element signature="e#25581#26688#0#PHP" expanded="false" />
<element signature="e#26694#26978#0#PHP" expanded="false" />
<element signature="e#26983#27561#0#PHP" expanded="false" />
<element signature="e#27582#27901#0#PHP" expanded="false" />
<element signature="e#27907#28315#0#PHP" expanded="false" />
<element signature="e#28321#29080#0#PHP" expanded="false" />
<element signature="e#29100#29964#0#PHP" expanded="false" />
<element signature="e#29991#30391#0#PHP" expanded="false" />
<element signature="e#30415#30988#0#PHP" expanded="false" />
<element signature="e#31011#31821#0#PHP" expanded="false" />
<element signature="e#18559#19798#0#PHP" expanded="false" />
<element signature="e#19804#20161#0#PHP" expanded="false" />
<element signature="e#20166#21047#0#PHP" expanded="false" />
<element signature="e#21053#21405#0#PHP" expanded="false" />
<element signature="e#21410#22488#0#PHP" expanded="false" />
<element signature="e#22494#22849#0#PHP" expanded="false" />
<element signature="e#22854#23934#0#PHP" expanded="false" />
<element signature="e#23940#24364#0#PHP" expanded="false" />
<element signature="e#24369#24980#0#PHP" expanded="false" />
<element signature="e#24986#25482#0#PHP" expanded="false" />
<element signature="e#25487#26594#0#PHP" expanded="false" />
<element signature="e#26600#26884#0#PHP" expanded="false" />
<element signature="e#26889#27467#0#PHP" expanded="false" />
<element signature="e#27488#27807#0#PHP" expanded="false" />
<element signature="e#27813#28221#0#PHP" expanded="false" />
<element signature="e#28227#28986#0#PHP" expanded="false" />
<element signature="e#29006#29870#0#PHP" expanded="false" />
<element signature="e#29897#30297#0#PHP" expanded="false" />
<element signature="e#30321#30894#0#PHP" expanded="false" />
<element signature="e#30917#31727#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -609,17 +609,16 @@ class UserController extends RestBaseController
$data['status'] = $res['status'];
$data['num'] = $res['num'];
$data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
$data['sub_time'] = date('Y-m-d H:i:s',$res['sub_time']);
$homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->column('name');
$data['sub_time'] = $res['sub_time'];
$homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->field('name')->find();
$data['homeaddress_id'] = $homeaddress_id['name'];
$home = Db::name('home')->where('id',$data['home_id'])->field('id,home_name,thumbnail')->find();
$service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
$home = Db::name('home')->where('id',$res['home_id'])->field('id,home_name,thumbnail')->find();
$service = Db::name('service')->where('id',$res['service_id'])->field('sever_name,price')->find();
$data['thumbnail'] = $home['thumbnail'];
$data['home_id'] = $home['home_name'];
$data['service_id'] = $service['sever_name'];
$data['price'] = $service['price'];
$data['home_id'] = $home['home_name'];
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
$data['serve'] = Db::name('recyclefee')->where('id',1)->column('fee');
$this->success('SUCCESS',$data);
}
... ...