From 603c527cd5a780bf4777fa4f99f9486b9a6eb919 Mon Sep 17 00:00:00 2001
From: iceling <iceling.qian@meidd.com>
Date: Mon, 6 Jan 2020 19:25:03 +0800
Subject: [PATCH] 首页生日营销代码调整，查看评价调整评价有礼bug修改

---
 pages/user/index/index.js                 | 29 ++++++++++++++---------------
 pages/user/index/index.wxml               |  4 ++--
 pages/user/index/index.wxss               |  3 ---
 pages/user/view_comment/view_comment.js   | 21 ++++++++++++---------
 pages/user/view_comment/view_comment.wxml |  2 +-
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 6215117..7e4dfd7 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -455,29 +455,28 @@ Page({
   },
   // 判断生日营销的页面是不是存在
   birthday:function(){
-    
-   var t=this;
+    var th = this;
     rq.get("/api/weshop/marketing/birthday/act/judge", {
       data: { storeId: os.stoid, userId: app_d.user_id },
-      success: function (su) {
-        var code=su.data.code;
-        console.log(su, "生日有礼的数据", code);
-        if (code==0){
-          var giftbagid = su.data.data.giftBagId;
-          var actId = su.data.data.id;
-          var actImg = su.data.data.actImg
-          t.setData({ giftbagid: giftbagid, actId: actId, actImg:actImg});
+      success: function (res) {
+        var code = res.data.code;
+        if (code == 0) {
+          var giftbagid = res.data.data.giftBagId;
+          var actId = res.data.data.id;
+          var actImg = res.data.data.actImg;
+          t.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
+          t.setData({ is_banner: 1 });
         }
-        
-        t.setData({is_banner:code});
+
       }
     })
 
+
   },
   clike_banne:function(){
-    var actId=this.data.actId;
-    var giftbagid=this.data.giftbagid;
-    console.log(giftbagid, "生日有礼的数据55555", actId);
+    var th = this;
+    var actId=th.data.actId;
+    var giftbagid=th.data.giftbagid;
     if (actId != "" && giftbagid!=""){
 
     wx.redirectTo({
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 9b56a13..9b5ab7a 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -167,9 +167,9 @@
     </view>
   </view>
   <!-- 生日营销 is_banner-->
- <block wx:if="{{is_banner==0}}">
+ <block wx:if="{{is_banner}}">
     <view class="t-c banner-frame" bindtap="clike_banne">
-      <image class="banner-img" src="{{actImg==''?'iurl+/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
+      <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
       </image>
   </view>
  </block>
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 80e2e55..53b652a 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -361,9 +361,6 @@
   width: 100%;
 }
 
-.xc-project-frame .center_v {
-}
-
 .xc-project-frame .item {
   width: 25%;
   margin-top: 30rpx;
diff --git a/pages/user/view_comment/view_comment.js b/pages/user/view_comment/view_comment.js
index 4e3ecbe..95e3fc3 100644
--- a/pages/user/view_comment/view_comment.js
+++ b/pages/user/view_comment/view_comment.js
@@ -1,5 +1,5 @@
 var i = require("../../../utils/util.js"),
-ut = i;
+  ut = i;
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
@@ -17,7 +17,8 @@ Page({
     goods_id: "", //商品id
     order_id: "", //订单id
     is_act: 0, //是否开启活动
-    actId:"",//活动id
+    actId: "", //活动id
+    giftBagId: "", //礼包id
   },
 
   /**
@@ -81,17 +82,19 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         var id = res.data.data.id;
+        var giftbagid = res.data.data.giftbagid;
         th.setData({
           is_act: 1,
-          actId:id
+          actId: id,
+          giftBagId: giftbagid
         })
       } else {
-         
+
       }
     })
   },
   //预览图片
-  previewImg: function (e) {
+  previewImg: function(e) {
     var th = this;
     var index = e.currentTarget.dataset.index;
     var sindex = e.currentTarget.dataset.sindex;
@@ -99,17 +102,17 @@ Page({
     var image = imgArr[0].weapp_img;
     var imagename = "";
     var iurl = th.data.iurl;
-    if (image!=""){
+    if (image != "") {
       image = imgArr[0].weapp_img[index];
       wx.previewImage({
-        current: iurl+image,
+        current: iurl + image,
         //当前图片地址
         urls: imgArr[0].weapp_img, //所有要预览的图片的地址集合 数组形式
       })
-    }else{
+    } else {
       image = imgArr[0].img[index];
       wx.previewImage({
-        current: iurl+image,
+        current: iurl + image,
         //当前图片地址
         urls: imgArr[0].img, //所有要预览的图片的地址集合 数组形式
       })
diff --git a/pages/user/view_comment/view_comment.wxml b/pages/user/view_comment/view_comment.wxml
index fc1a0ed..793444c 100644
--- a/pages/user/view_comment/view_comment.wxml
+++ b/pages/user/view_comment/view_comment.wxml
@@ -96,7 +96,7 @@
     <view class="fs30 flex-level white " bindtap="goto" data-url="/pages/user/comment/comment">评价其他</view>
   </view>
   <view class="flex-level" wx:if="{{is_act}}">
-    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&actType=2orderNumber={{order_id}}&orderType=1&orderGoodsId={{goods_id}}" bindtap="goto">点击领取礼品</view>
+    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
   </view>
 </view>
 
--
libgit2 0.21.4