生日有礼代码调整

前端研发-钱巧玲
1 parent 7734388f
Showing 3 changed files with 9 additions and 44 deletions
pages/giftpack/birthdaygift/birthdaygift.js
pages/giftpack/birthdaygift/birthdaygift.wxml
pages/giftpack/birthdaygift/birthdaygift.wxss
@@ -35,21 +35,21 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         "actId": th.data.getActId, //活动id
-        "actType": th.data.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+        "actType":4, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
         "giftBagId": th.data.giftID, //礼包ID
         "storeId": a.stoid, //商家ID
         "userId": d.user_id //用户ID
       }
     }).then(res => {
       if (res.data.code == 0) {
-        if (res.data.data.lbCoupons != null) {
+        if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons!=null) {
           //礼包内容--礼券
           th.setData({
             cardShow: true,
             cards: res.data.data.lbCoupons
           })
         }
-        if (res.data.data.lbSM != null) {
+        if (res.data.data.lbSM.length > 0 && res.data.data.lbSM!=nll) {
           //礼包内容--服务项目
           th.setData({
             itemShow: true,
@@ -109,46 +109,11 @@ Page({
       }
     })
   },
-  //判断中间的连接线是否显示
-  itemShows: function () {
-    if (this.itemShow) {
-      if (this.cardShow) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      if (this.cardShow) {
-        return false;
-      } else {
-        return false;
-      }
-
-    }
-  },
-  //判断中间的连接线是否显示
-  cardShows: function () {
-    if (this.cardShow) {
-      if (this.packShow) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      if (this.packShow) {
-        return false;
-      } else {
-        return false;
-      }
-
-    }
-  },
   onLoad: function onLoad(options) {
     var th = this;
     th.setData({
       getActId: options.actId,
-      getActType: options.actType,
       giftID: options.giftBagId
     })
     th.GetList();
@@ -173,8 +138,8 @@ Page({
       var json = {
         "actId": th.data.getActId, //活动Id
-        "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "lbId": th.data.giftID, //礼包Id
+        "actType": 4, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+        "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
       };
 <view>
     <view class="image_box">
-        <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" lazy-load="true"></image>
+        <image src="{{iurl+'/miniapp/images/giftbag/birth00.png'}}" lazy-load="true"></image>
     </view>
     <block wx:if="{{itemShow}}">
         <view class="top">
@@ -49,7 +49,7 @@
             </block>
         </view>
     </block>
-    <block wx:if="{{true}}">
+    <block wx:if="{{itemShow}}">
         <view >
             <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
             <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
@@ -98,7 +98,7 @@
             </view>
         </view>
     </block>
-    <block wx:if="{{true}}">
+    <block wx:if="{{cardShow}}">
         <view>
             <view>
                 <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
@@ -313,7 +313,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 30rpx 30rpx 30rpx 30rpx;
+	border-radius: 40rpx;
 }
 .foot_button_notbuy{
 	background: #999999;