From 788879e6795a002f7754f397f2528b288d67b7c0 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Mon, 6 Jan 2020 09:14:33 +0800
Subject: [PATCH] 预约服务的跳转

---
 pages/user/my_service/tment_eval.js       | 34 ++++++++++++++++++++++++++++++++++
 pages/user/my_service/tment_eval.wxml     | 12 ++++++++++++
 pages/user/my_service/tment_eval.wxss     |  4 ++++
 pages/user/my_service/tment_order_list.js |  6 +++++-
 4 files changed, 55 insertions(+), 1 deletion(-)

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 @@
     <view>确认提交</view>
   </view>
 </navigator>
+<view wx:else> 
+
+
+<view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt">
+    <view>评价其他</view>
+  </view>
+
+
+  <view style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
+    <view>点击领取礼品</view>
+  </view>
+ </view>
 <warn id="warn"></warn>
\ 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;
--
libgit2 0.21.4