郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 5a231e62b6bda3121acc8a5c904d4ddef43f0372 1 个父辈 9b2e8c65
1 个管道 的构建 通过 耗费 1 秒

修改家政服务评价

内嵌 并排对比
正在显示 2 个修改的文件 包含 198 行增加 和 120 行删除
... ... @@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<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$/api/index/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,11 +24,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<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="359">
<caret line="1206" column="5" lean-forward="true" selection-start-line="1206" selection-start-column="5" selection-end-line="1206" selection-end-column="5" />
<state relative-caret-position="409">
<caret line="1208" column="0" lean-forward="true" selection-start-line="1208" selection-start-column="0" selection-end-line="1208" selection-end-column="0" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -87,14 +86,93 @@
<element signature="e#33790#34754#0#PHP" expanded="false" />
<element signature="e#34760#35427#0#PHP" expanded="false" />
<element signature="e#35432#36473#0#PHP" expanded="false" />
<element signature="e#36479#37136#0#PHP" expanded="false" />
<element signature="e#37141#38158#0#PHP" expanded="false" />
<element signature="e#38165#38596#0#PHP" expanded="false" />
<element signature="e#38601#39219#0#PHP" expanded="false" />
<element signature="e#39225#39654#0#PHP" expanded="false" />
<element signature="e#39659#40261#0#PHP" expanded="false" />
<element signature="e#40267#40688#0#PHP" expanded="false" />
<element signature="e#40693#41249#0#PHP" expanded="false" />
<element signature="e#36479#37142#0#PHP" expanded="false" />
<element signature="e#37147#38174#0#PHP" expanded="false" />
<element signature="e#38181#38612#0#PHP" expanded="false" />
<element signature="e#38617#39235#0#PHP" expanded="false" />
<element signature="e#39241#39670#0#PHP" expanded="false" />
<element signature="e#39675#40277#0#PHP" expanded="false" />
<element signature="e#40283#40710#0#PHP" expanded="false" />
<element signature="e#40715#41281#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="291" column="5" lean-forward="true" selection-start-line="291" selection-start-column="5" selection-end-line="291" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</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="214">
<caret line="240" column="0" lean-forward="true" selection-start-line="240" selection-start-column="0" selection-end-line="240" selection-end-column="0" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -188,11 +266,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="377" />
<option name="y" value="55" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="381" />
<option name="y" value="74" />
<option name="width" value="1582" />
<option name="height" value="1021" />
<option name="height" value="1022" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -362,15 +440,15 @@
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="10706000" />
<workItem from="1575444399653" duration="11123000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="464355000" />
<option name="totallyTimeSpent" value="464772000" />
</component>
<component name="ToolWindowManager">
<frame x="377" y="55" width="1582" height="1021" extended-state="0" />
<frame x="381" y="74" width="1582" height="1022" extended-state="1" />
<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" />
... ... @@ -732,39 +810,6 @@
<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="225">
<caret line="167" column="4" lean-forward="false" selection-start-line="167" selection-start-column="4" selection-end-line="211" selection-end-column="5" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
</folding>
</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="175">
... ... @@ -782,10 +827,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
<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="584">
<caret line="386" column="0" lean-forward="true" selection-start-line="386" selection-start-column="0" selection-end-line="386" selection-end-column="0" />
<state relative-caret-position="185">
<caret line="188" column="7" lean-forward="true" selection-start-line="188" selection-start-column="7" selection-end-line="188" selection-end-column="7" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -815,60 +868,10 @@
</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="38">
<caret line="226" column="7" lean-forward="false" selection-start-line="226" selection-start-column="7" selection-end-line="226" selection-end-column="7" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
<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="359">
<caret line="1206" column="5" lean-forward="true" selection-start-line="1206" selection-start-column="5" selection-end-line="1206" selection-end-column="5" />
<state relative-caret-position="409">
<caret line="1208" column="0" lean-forward="true" selection-start-line="1208" selection-start-column="0" selection-end-line="1208" selection-end-column="0" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -926,14 +929,89 @@
<element signature="e#33790#34754#0#PHP" expanded="false" />
<element signature="e#34760#35427#0#PHP" expanded="false" />
<element signature="e#35432#36473#0#PHP" expanded="false" />
<element signature="e#36479#37136#0#PHP" expanded="false" />
<element signature="e#37141#38158#0#PHP" expanded="false" />
<element signature="e#38165#38596#0#PHP" expanded="false" />
<element signature="e#38601#39219#0#PHP" expanded="false" />
<element signature="e#39225#39654#0#PHP" expanded="false" />
<element signature="e#39659#40261#0#PHP" expanded="false" />
<element signature="e#40267#40688#0#PHP" expanded="false" />
<element signature="e#40693#41249#0#PHP" expanded="false" />
<element signature="e#36479#37142#0#PHP" expanded="false" />
<element signature="e#37147#38174#0#PHP" expanded="false" />
<element signature="e#38181#38612#0#PHP" expanded="false" />
<element signature="e#38617#39235#0#PHP" expanded="false" />
<element signature="e#39241#39670#0#PHP" expanded="false" />
<element signature="e#39675#40277#0#PHP" expanded="false" />
<element signature="e#40283#40710#0#PHP" expanded="false" />
<element signature="e#40715#41281#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="163">
<caret line="291" column="5" lean-forward="true" selection-start-line="291" selection-start-column="5" selection-end-line="291" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#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="214">
<caret line="240" column="0" lean-forward="true" selection-start-line="240" selection-start-column="0" selection-end-line="240" selection-end-column="0" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1163,7 +1163,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:num type:int require:1 other: desc:订单号
* @param name:order_id type:int require:1 other: desc:订单ID
* @param name:home_id type:int require:1 other: desc:家政公司ID
* @param name:speed type:int require:1 other: desc:服务质量
* @param name:service type:int require:1 other: desc:服务态度
... ... @@ -1179,7 +1179,7 @@ class UserController extends RestBaseController
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'num' => 'require',
'order_id' => 'require',
'home_id'=>'require',
'speed' => 'require',
'service'=>'require',
... ... @@ -1187,7 +1187,7 @@ class UserController extends RestBaseController
'content'=>'require'
]);
$validate->message([
'num'=>'订单ID不能为空',
'order_id'=>'订单ID不能为空',
'home_id'=>'家政公司ID不能为空',
'speed'=>'服务质量不能为空',
'service'=>'服务态度不能为空',
... ... @@ -1287,7 +1287,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:num type:int require:1 other: desc:订单号
* @param name:order_id type:int require:1 other: desc:订单ID
*
* @return speed:服务质量
* @return service:服务态度
... ... @@ -1299,13 +1299,13 @@ class UserController extends RestBaseController
public function selhomecomment()
{
$user_id = $this->getUserId();
$num = $this->request->param('num');
$num = $this->request->param('order_id');
if(empty($num)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('homecomment')
->where('user_id',$user_id)
->where('num',$num)
->where('order_id',$num)
->find();
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
$data['thumbnail'] = explode(',',$data['thumbnail']);
... ...