diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
index 46c8c97..89b04d0 100644
--- a/pages/user/my_service/tment_eval.js
+++ b/pages/user/my_service/tment_eval.js
@@ -231,4 +231,38 @@ Page({
th.evaluate_get();
}
},
+ //评价其他跳转
+ evaluate_qt:function(){
+
+ wx.redirectTo({
+ url: "/pages/user/my_service/tment_order_list?state="+2
+ });
+ },
+ //点击领取礼包
+ clike_lb:function(){
+
+ var dd=this.data.number;
+ var url = "/api/weshop/marketing/comment/act/judge";
+ getApp().request.promiseGet(url, {
+ data: {
+ userId: d.user_id,
+ storeId: a.stoid,
+ orderType: 2,//评价类型 1=商城订单评价 2=美容师评价
+ orderNumber: dd
+ }
+ }).then(res => {
+
+ if (res.data.code==0){
+ var data=res.data.data;
+ var id=data.id;
+ var gifbagid = data.gifbagid;
+ var type= data.type
+
+ wx.redirectTo({
+ url: "/pages/giftpack/evaluategift/evaluategift?actId=" + id + "&gifbagid=" + gifbagid + "&orderType=" + type
+ });
+ }
+ })
+ }
+
})
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index 20dd053..1c0965b 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -91,4 +91,16 @@
确认提交
+
+
+
+
+ 评价其他
+
+
+
+
+ 点击领取礼品
+
+
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss
index 2606dc7..8b0b898 100644
--- a/pages/user/my_service/tment_eval.wxss
+++ b/pages/user/my_service/tment_eval.wxss
@@ -115,6 +115,10 @@
background-color: rgb(214, 1, 33);
color: rgb(255, 255, 255);
}
+.Submission.yellow-b{
+ background-color: #ffb03f;
+
+}
.clonri {
margin: 0rpx;
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index 6e0134e..8ad4b7f 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -39,7 +39,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
-
+ var state=options.state;
+ if (state != null && state != undefined && state!=""){
+ this.setData({ activeCategoryId: state });
+ }
+
},
changeTab: function(e) {
var th = this;