From 23cf0476d510a1179493ad94911aabc533fa49b7 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 9 Jan 2020 20:58:02 +0800
Subject: [PATCH] 评价有礼的bug修改

---
 pages/giftpack/evaluategift/evaluategift.js | 12 ++++++++++--
 pages/user/my_service/tment_eval.js         | 47 ++++++++++++++++++++++++++++++-----------------
 pages/user/my_service/tment_eval.wxml       |  5 ++---
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
index 9499c47..99d8199 100644
--- a/pages/giftpack/evaluategift/evaluategift.js
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -30,6 +30,7 @@ Page({
     is_sub: 0, //是否重复领取
     orderNumber: "", //订单号
     orderGoodsId: "", //商品id
+    orderType:1,
   },
   GetList: function() {
     var th = this;
@@ -41,7 +42,7 @@ Page({
         "storeId": a.stoid, //商家Id
         "userId": d.user_id, //用户ID
         "orderNumber": th.data.orderNumber,
-        "orderType": 1,
+        "orderType": th.data.orderType,
         "orderGoodsId": th.data.orderGoodsId,
         "gifbagid": th.data.giftBagId
       }
@@ -122,6 +123,13 @@ Page({
       orderGoodsId: options.orderGoodsId,
       giftBagId: options.giftBagId
     })
+
+    var orderType = options.orderType;
+    if (orderType) {
+      th.setData({ orderType: orderType})
+    }
+    
+
     th.GetList();
   },
   onShow: function() {
@@ -148,7 +156,7 @@ Page({
         "storeId": a.stoid, //商家Id
         "userId": d.user_id, //用户ID
         "orderNumber": th.data.orderNumber,
-        "orderType": 1,
+        "orderType": th.data.orderType,
         "orderGoodsId": th.data.orderGoodsId,
         "giftBagId": th.data.giftBagId
       };
diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
index 89b04d0..c1b0076 100644
--- a/pages/user/my_service/tment_eval.js
+++ b/pages/user/my_service/tment_eval.js
@@ -23,6 +23,10 @@ Page({
     arrangeTime: "", //服务日期
     is_evaluate: 0, //是否评价
     EvaluateDatetime: "", //评价时间
+	is_act:0, //是否能购获取图片
+	actId:0,   //活动ID
+	giftBagId:0, //礼包ID
+	
   },
   //点击星级
   check_stars: function(e) {
@@ -219,6 +223,7 @@ Page({
       is_evaluate: options.evaluate
     })
     th.query_bea();
+	th.judge_act();
   },
 
   /**
@@ -240,29 +245,37 @@ Page({
   },
   //点击领取礼包
   clike_lb:function(){
-    
-    var dd=this.data.number;
+        
+        var id=this.data.actId;
+        var gifbagid = this.data.gifbagid;   
+        wx.redirectTo({
+          url: "/pages/giftpack/evaluategift/evaluategift?actId=" + id + "&gifbagid=&orderType=2&orderNumber="+this.data.number
+        });
+   
+  },
+
+  //--评价有礼判断---
+  judge_act: function () {
+    var th = this;
     var url = "/api/weshop/marketing/comment/act/judge";
     getApp().request.promiseGet(url, {
       data: {
-        userId: d.user_id,
+        orderNumber: th.data.number,
+        orderType: 2,
         storeId: a.stoid,
-        orderType: 2,//评价类型 1=商城订单评价 2=美容师评价
-        orderNumber: dd
+        userId: d.user_id
       }
     }).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
-        });
-     } 
+      if (res.data.code == 0) {
+        var id = res.data.data.id;
+        var giftbagid = res.data.data.giftbagid;
+        th.setData({
+          is_act: 1,
+          actId: id,
+          giftBagId: giftbagid
+        })
+      } 
     })
-  }
+  },
   
 })
\ 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 1c0965b..54133a8 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -97,9 +97,8 @@
 <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 wx:if="{{is_act}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
     <view>点击领取礼品</view>
   </view>
  </view>
--
libgit2 0.21.4