diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js index 1173d53..8843921 100644 --- a/pages/giftpack/birthdaygift/birthdaygift.js +++ b/pages/giftpack/birthdaygift/birthdaygift.js @@ -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 }; diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxml b/pages/giftpack/birthdaygift/birthdaygift.wxml index 7cbb7a6..f925b54 100644 --- a/pages/giftpack/birthdaygift/birthdaygift.wxml +++ b/pages/giftpack/birthdaygift/birthdaygift.wxml @@ -1,6 +1,6 @@ - + @@ -49,7 +49,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxss b/pages/giftpack/birthdaygift/birthdaygift.wxss index 86b115d..33e96fa 100644 --- a/pages/giftpack/birthdaygift/birthdaygift.wxss +++ b/pages/giftpack/birthdaygift/birthdaygift.wxss @@ -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;