评价有礼代码调整和我的礼包变量名修改

前端研发-钱巧玲
1 parent 8f43363a
Showing 6 changed files with 329 additions and 349 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/evaluategift/evaluategift.wxml
pages/giftpack/evaluategift/evaluategift.wxss
pages/giftpack/newvipgift/newvipgift.js
pages/giftpack/newvipgift/newvipgift.wxml
@@ -51,8 +51,8 @@ Page({
     var th = this;
     var id = e.currentTarget.dataset.id; //活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    var order_sn = e.currentTarget.dataset.order_sn;//订单号
-    var money=e.currentTarget.dataset.money; //支付金额
+    var order_sn = e.currentTarget.dataset.order_sn; //订单号
+    var money = e.currentTarget.dataset.money; //支付金额
     my_confirm.open(
       "是否确定购买该礼包",
@@ -67,7 +67,7 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '2', //1=积分兑换 2=余额购买
-          "lbId": id, //礼包Id
+          "giftBagId": id, //礼包Id
           "storeId": that.getStorageID, //商家Id
           "userId": that.getUserID, //用户ID
           "buyFrom": 2
@@ -83,7 +83,7 @@ Page({
           }, // 设置请求的 header
           success: function(res) {
             if (res.data.code == 0) {
-              var order_sn=res.data.data.orderSn;
+              var order_sn = res.data.data.orderSn;
               res = res.data.data.result;
               var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
@@ -95,8 +95,7 @@ Page({
                 success: function(res) {
                   getApp().goto(url);
                 },
-                fail: function(res) {
-                }
+                fail: function(res) {}
               });
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
@@ -129,7 +128,7 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '1', //1=积分兑换 2=余额购买
-          "lbId": id, //礼包Id
+          "giftBagId": id, //礼包Id
           "storeId": that.getStorageID, //商家Id
           "userId": that.getUserID //用户ID
         };
@@ -18,7 +18,7 @@ Page({
     cardButton: '',
     getActId: '',
     getActType: '',
-    giftID: '',
+    giftBagId: '',
     receiveState: '一键全部领取',
     textTitle: '',
     getUrl: '',
@@ -28,28 +28,33 @@ Page({
     integralTitle: "",
     growUpTitle: "",
     is_sub: 0, //是否重复领取
+    orderNumber: "", //订单号
+    orderGoodsId: "", //商品id
   },
-  GetList: function () {
+  GetList: function() {
     var th = this;
     var url = "/api/weshop/marketing/giftbag/bound/get";
     getApp().request.promiseGet(url, {
       data: {
-        "actId": th.data.getActId, //活动id
-        "actType": th.data.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
-        "giftBagId": th.data.giftID, //礼包ID
-        "storeId": a.stoid, //商家ID
-        "userId": d.user_id //用户ID
+        "actId": th.data.getActId, //活动Id
+        "actType": 2, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+        "storeId": a.stoid, //商家Id
+        "userId": d.user_id, //用户ID
+        "orderNumber": th.data.orderNumber,
+        "orderType": 1,
+        "orderGoodsId": th.data.orderGoodsId,
+        "gifbagid": th.data.giftBagId
       }
     }).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 != null) {
           //礼包内容--服务项目
           th.setData({
             itemShow: true,
@@ -109,58 +114,24 @@ 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) {
+  onLoad: function(options) {
     var th = this;
     th.setData({
       getActId: options.actId,
-      getActType: options.actType,
-      giftID: options.giftBagId
+      orderNumber: options.orderNumber,
+      orderGoodsId: options.orderGoodsId,
+      giftBagId: options.giftBagId
     })
     th.GetList();
   },
-  onShow: function onShow() {
+  onShow: function() {
     var th = this;
     var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img");
     th.setData({
       textTitle: textTitle
     })
   },
-  GetReceive: function () {
+  GetReceive: function() {
     var th = this;
     if (th.data.receiveState == '已领取') {
       return false;
@@ -173,10 +144,13 @@ Page({
       var json = {
         "actId": th.data.getActId, //活动Id
-        "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "lbId": th.data.giftID, //礼包Id
+        "actType": 2, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "storeId": a.stoid, //商家Id
-        "userId": d.user_id //用户ID
+        "userId": d.user_id, //用户ID
+        "orderNumber": th.data.orderNumber,
+        "orderType": 1,
+        "orderGoodsId": th.data.orderGoodsId,
+        "giftBagId": th.data.giftBagId
       };
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
@@ -187,7 +161,7 @@ Page({
         header: {
           'content-type': 'application/json'
         }, // 设置请求的 header
-        success: function (res) {
+        success: function(res) {
           th.setData({
             is_sub: 0
           })
@@ -197,19 +171,19 @@ Page({
             })
             getApp().my_warnning("领取成功", 1, th);
           } else {
-            getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+            getApp().my_warnning(res.data.msg, 0, th);
           }
         }
       })
     }
   },
   //界面跳转
-  goto: function (e) {
+  goto: function(e) {
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //图片失败，默认图片
-  bind_bnerr1: function (e) {
+  bind_bnerr1: function(e) {
     var th = this;
     var _errImg = e.target.dataset.errorimg;
     var _Img = e.target.dataset.img;
 <view>
     <view class="image_box">
-        <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" lazy-load="true"></image>
+        <image src="{{iurl+'miniapp/images/giftbag/eval00.png'}}" lazy-load="true"></image>
     </view>
     <block wx:if="{{itemShow}}">
         <view class="top">
@@ -49,15 +49,15 @@
             </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>
         </view>
     </block>
     <block wx:if="{{cardShow}}">
-        <view >
-            <view class="top ">
+        <view>
+            <view class="top">
                 <view class="top_box ">
                     <view class="top_box_text ">
                         <text >———</text>
@@ -72,7 +72,6 @@
                 <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
                     <view class="top_card ">
                         <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}">
-                        <!-- class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}" -->
                             <view class="top_card_tite_box ">
                                 <block wx:if="{{item.useObjectType==0}}">
                                     <view class="top_card_tite_a">全场通用</view>
@@ -98,7 +97,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>
 @charset "UTF-8";
+
 /* Author XGQ
  * 2019-10-27
  */
+
 .image_box {
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
 }
+
 .image_box image {
-	width: 100%;
-	height: 690rpx;
+  width: 100%;
+  height: 690rpx;
 }
+
 .top {
-	margin: -20rpx 28rpx 45rpx 28rpx;
-	padding: 10rpx 10rpx 70rpx 10rpx;
-	background-color: #FFFFFF;
-	border-radius: 0rpx 0rpx 15rpx 15rpx;
+  margin: -20rpx 28rpx 45rpx 28rpx;
+  padding: 10rpx 10rpx 70rpx 10rpx;
+  background-color: #fff;
+  border-radius: 0rpx 0rpx 15rpx 15rpx;
 }
+
 .top_box {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	text-align: center;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  text-align: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
 }
+
 .top_box_text {
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
-	margin: 50rpx 15rpx 20rpx 15rpx;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  margin: 50rpx 15rpx 20rpx 15rpx;
 }
+
 .top_box_text text {
-	color: #FB6451;
-	font-size: 40rpx;
+  color: rgb(71, 132, 239);
+  font-size: 40rpx;
 }
+
 .top_item {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	width: 100%;
-	margin: 60rpx 0 0 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  width: 100%;
+  margin: 60rpx 0 0 0;
 }
+
 .top_item_img {
-	float: left;
-	width: 28%;
-	margin: 0rpx 10rpx 0rpx 20rpx;
+  float: left;
+  width: 28%;
+  margin: 0rpx 10rpx 0rpx 20rpx;
 }
+
 .top_item_img image {
-	width: 150rpx;
-	height: 150rpx;
-	border-radius: 50%;
-	border: #F96865 solid 3rpx;
+  width: 150rpx;
+  height: 150rpx;
+  border-radius: 50%;
+  border: #f96865 solid 3rpx;
 }
+
 .top_item_center {
-	float: left;
-	width: 50%;
+  float: left;
+  width: 50%;
 }
+
 .top_item_center_title {
-	font-size: 35rpx;
-	color: #FB6451;
-	-webkit-box-pack: start;
-	-webkit-justify-content: flex-start;
-	        justify-content: flex-start;
-	padding: 0 10rpx 15rpx 0rpx;
-	word-break: break-all;
-	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	/** 对象作为伸缩盒子模型显示 **/
-	-webkit-box-orient: vertical;
-	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
-	-webkit-line-clamp: 2;
-	/** 显示的行数 **/
-	overflow: hidden;
-	/** 隐藏超出的内容 **/
+  font-size: 35rpx;
+  color: rgb(71, 132, 239);
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  justify-content: flex-start;
+  padding: 0 10rpx 15rpx 0rpx;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
 }
+
 .top_item_center_ramke {
-	font-size: 25rpx;
-	-webkit-box-pack: start;
-	-webkit-justify-content: flex-start;
-	        justify-content: flex-start;
-	line-height: 35rpx;
-	letter-spacing: 0.5rpx;
-	word-break: break-all;
-	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	/** 对象作为伸缩盒子模型显示 **/
-	-webkit-box-orient: vertical;
-	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
-	-webkit-line-clamp: 2;
-	/** 显示的行数 **/
-	overflow: hidden;
-	/** 隐藏超出的内容 **/
+  font-size: 25rpx;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  justify-content: flex-start;
+  line-height: 35rpx;
+  letter-spacing: 0.5rpx;
+  word-break: break-all;
+  /*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  /** 对象作为伸缩盒子模型显示 **/
+  -webkit-box-orient: vertical;
+  /** 设置或检索伸缩盒对象的子元素的排列方式 **/
+  -webkit-line-clamp: 2;
+  /** 显示的行数 **/
+  overflow: hidden;
+  /** 隐藏超出的内容 **/
 }
+
 .top_item_button {
-	float: right;
-	width: 22%;
-	padding: 65rpx 20rpx 0 1rpx;
+  float: right;
+  width: 22%;
+  padding: 65rpx 20rpx 0 1rpx;
 }
+
 .top_item_button button {
-	font-size: 25rpx;
-	background: #fd6969;
-	color: #FFFFFF;
-	border-radius: 50rpx;
-	height: 45rpx;
-	line-height: 45rpx;
+  font-size: 25rpx;
+  background: #fd6969;
+  color: #fff;
+  border-radius: 50rpx;
+  height: 45rpx;
+  line-height: 45rpx;
 }
+
 .top_card {
-	width: calc(50% - 30rpx);
-	display: inline-block;
-	margin: 15rpx;
+  width: calc(50% - 30rpx);
+  display: inline-block;
+  margin: 15rpx;
 }
+
 .top_card_box {
-	background-size: cover;
-	background-position: center;
-	background-repeat: no-repeat;
-	border-radius: 20rpx;
-	height: 250rpx;
-	margin: 5rpx;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 20rpx;
+  height: 250rpx;
+  margin: 5rpx;
 }
+
 .img1 {
-	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
+  background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
 }
+
 .img2 {
-	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
+  background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
 }
+
 .img3 {
-	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
+  background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
 }
+
 .top_card_tite_box {
-	width: 100%;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-pack: end;
-	-webkit-justify-content: flex-end;
-	        justify-content: flex-end;
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  justify-content: flex-end;
 }
+
 .top_card_tite_a {
-	padding: 5rpx 25rpx 5rpx 25rpx;
-	line-height: 29rpx;
-	font-size: 25rpx;
-	color: #FFFFFF;
-	background: #ffa7c0;
-	border-radius: 0rpx 20rpx 0rpx 6rpx;
+  padding: 5rpx 25rpx 5rpx 25rpx;
+  line-height: 29rpx;
+  font-size: 25rpx;
+  color: #fff;
+  background: #ffa7c0;
+  border-radius: 0rpx 20rpx 0rpx 6rpx;
 }
+
 .top_card_tite_b {
-	padding: 5rpx 25rpx 5rpx 25rpx;
-	line-height: 29rpx;
-	font-size: 25rpx;
-	color: #FFFFFF;
-	background: #50dfdb;
-	border-radius: 0rpx 20rpx 0rpx 6rpx;
+  padding: 5rpx 25rpx 5rpx 25rpx;
+  line-height: 29rpx;
+  font-size: 25rpx;
+  color: #fff;
+  background: #50dfdb;
+  border-radius: 0rpx 20rpx 0rpx 6rpx;
 }
+
 .top_card_tite_c {
-	padding: 5rpx 25rpx 5rpx 25rpx;
-	line-height: 29rpx;
-	font-size: 25rpx;
-	color: #FFFFFF;
-	background: #92cbff;
-	border-radius: 0rpx 20rpx 0rpx 6rpx;
+  padding: 5rpx 25rpx 5rpx 25rpx;
+  line-height: 29rpx;
+  font-size: 25rpx;
+  color: #fff;
+  background: #92cbff;
+  border-radius: 0rpx 20rpx 0rpx 6rpx;
 }
+
 .top_card_tite_d {
-	padding: 5rpx 25rpx 5rpx 25rpx;
-	line-height: 29rpx;
-	font-size: 25rpx;
-	color: #FFFFFF;
-	border-radius: 0rpx 20rpx 0rpx 6rpx;
+  padding: 5rpx 25rpx 5rpx 25rpx;
+  line-height: 29rpx;
+  font-size: 25rpx;
+  color: #fff;
+  border-radius: 0rpx 20rpx 0rpx 6rpx;
 }
+
 .top_card_counte {
-	padding: 40rpx 20rpx 0 0;
-	text-align: center;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	        align-items: center;
-	color: #FFFFFF;
-	font-size: 40rpx;
+  padding: 40rpx 20rpx 0 0;
+  text-align: center;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  color: #fff;
+  font-size: 40rpx;
 }
+
 .top_card_remak {
-	padding: 20rpx 0 40rpx 0;
-	text-align: center;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	        align-items: center;
-	font-size: 20rpx;
-	color: #FFFFFF;
+  padding: 20rpx 0 40rpx 0;
+  text-align: center;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  font-size: 20rpx;
+  color: #fff;
 }
+
 .top_card_button_a button {
-	margin: 0 85rpx;
-	background: #ffa6bc;
-	border-radius: 50rpx;
-	line-height: 40rpx;
-	height: 40rpx;
-	color: white;
-	font-size: 25rpx;
+  margin: 0 85rpx;
+  background: #ffa6bc;
+  border-radius: 50rpx;
+  line-height: 40rpx;
+  height: 40rpx;
+  color: white;
+  font-size: 25rpx;
 }
+
 .top_card_button_b button {
-	margin: 0 85rpx;
-	background: #50dfdb;
-	border-radius: 50rpx;
-	line-height: 40rpx;
-	height: 40rpx;
-	color: white;
-	font-size: 25rpx;
+  margin: 0 85rpx;
+  background: #50dfdb;
+  border-radius: 50rpx;
+  line-height: 40rpx;
+  height: 40rpx;
+  color: white;
+  font-size: 25rpx;
 }
+
 .top_card_button_c button {
-	margin: 0 85rpx;
-	background: #75bcfc;
-	border-radius: 50rpx;
-	line-height: 40rpx;
-	height: 40rpx;
-	color: white;
-	font-size: 25rpx;
+  margin: 0 85rpx;
+  background: #75bcfc;
+  border-radius: 50rpx;
+  line-height: 40rpx;
+  height: 40rpx;
+  color: white;
+  font-size: 25rpx;
 }
+
 .top_card_button_d button {
-	margin: 0 85rpx;
-	border-radius: 50rpx;
-	line-height: 40rpx;
-	height: 40rpx;
-	color: white;
-	font-size: 25rpx;
+  margin: 0 85rpx;
+  border-radius: 50rpx;
+  line-height: 40rpx;
+  height: 40rpx;
+  color: white;
+  font-size: 25rpx;
 }
+
 .top_box_image {
-	padding: 20rpx 20rpx 20rpx 20rpx;
+  padding: 20rpx 20rpx 20rpx 20rpx;
 }
+
 .top_box_image image {
-	height: 216rpx;
-	width: 100%;
+  height: 216rpx;
+  width: 100%;
 }
+
 .top_box_image button {
-	margin: 15rpx 95rpx 0rpx 95rpx;
-	background: #fe6a6a;
-	border-radius: 50rpx;
-	line-height: 60rpx;
-	height: 60rpx;
-	color: white;
-	font-size: 30rpx;
+  margin: 15rpx 95rpx 0rpx 95rpx;
+  background: #fe6a6a;
+  border-radius: 50rpx;
+  line-height: 60rpx;
+  height: 60rpx;
+  color: white;
+  font-size: 30rpx;
 }
+
 .foot_box {
-	margin: 0 30rpx 40rpx 30rpx;
-	background: #FFFFFF;
-	border-radius: 20rpx;
+  margin: 0 30rpx 40rpx 30rpx;
+  /* background: #FFFFFF; */
+  border-radius: 20rpx;
+  color: rgb(255, 255, 255);
 }
+
 .foot_box_title {
-	color: #000000;
-	padding: 20rpx 30rpx 20rpx 30rpx;
+  /* color: #000000; */
+  padding: 20rpx 30rpx 20rpx 30rpx;
 }
+
 .foot_box_text {
-	font-size: 30rpx;
-	color: #000000;
-	line-height: 48rpx;
-	padding: 20rpx 35rpx 50rpx 30rpx;
+  font-size: 30rpx;
+  /* color: #000000; */
+  line-height: 48rpx;
+  padding: 20rpx 35rpx 50rpx 30rpx;
 }
+
 .button_box {
-	margin: 50rpx 50rpx 50rpx 50rpx;
-	text-align: center;
+  margin: 50rpx 50rpx 50rpx 50rpx;
+  text-align: center;
 }
+
 .button {
-	margin: 0 30rpx;
-	background: #ff9a8c;
-	border-radius: 50rpx;
-	line-height: 80rpx;
-	height: 80rpx;
-	color: white;
-	font-size: 35rpx;
+  margin: 0 30rpx;
+  background: rgb(93, 147, 245);
+  border-radius: 50rpx;
+  line-height: 80rpx;
+  height: 80rpx;
+  color: rgb(255, 255, 255);
+  font-size: 35rpx;
 }
+
 .button_text {
-	padding-top: 20rpx;
-	font-size: 20rpx;
-	color: white;
-	height: 100rpx;
+  padding-top: 20rpx;
+  font-size: 22rpx;
+  color: white;
+  height: 100rpx;
 }
+
 .foot_empty {
-	height: 90rpx;
+  height: 90rpx;
 }
+
 .foot_button {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	margin: 20rpx 0rpx 0rpx 0rpx;
-	padding: 25rpx 0rpx;
-	background: #FFFFFF;
-	text-align: center;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	        justify-content: center;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  margin: 20rpx 0rpx 0rpx 0rpx;
+  padding: 25rpx 0rpx;
+  background: #fff;
+  text-align: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
 }
+
 .foot_button_buy {
-	background: #e4010c;
-	color: #FFFFFF;
-	width: 400rpx;
-	height: 70rpx;
-	font-size: 28rpx;
-	line-height: 70rpx;
-	border-radius: 30rpx;
-}
-.foot_button_notbuy{
-	background: #999999;
-	color: #FFFFFF;
-	width: 400rpx;
-	height: 70rpx;
-	font-size: 28rpx;
-	line-height: 70rpx;
-	border-radius: 30rpx 30rpx 30rpx 30rpx;
+  background: #e4010c;
+  color: #fff;
+  width: 400rpx;
+  height: 70rpx;
+  font-size: 28rpx;
+  line-height: 70rpx;
+  border-radius: 40rpx;
 }
+
+.foot_button_notbuy {
+  background: #999;
+  color: #fff;
+  width: 400rpx;
+  height: 70rpx;
+  font-size: 28rpx;
+  line-height: 70rpx;
+  border-radius: 40rpx;
+}
+
 page {
-  background-color: #fb6451;
+  background-color: rgb(71, 132, 239);
 }
+
 button::after {
   border: none;
 }
+
 .foot_box_text ._img {
   width: 100%;
 }
+
 .foot_box_text .img {
   line-height: 0;
 }
-
@@ -35,7 +35,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         "actId": th.data.getActId, //活动id
-        "actType": th.data.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+        "actType":1, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
         "giftBagId": th.data.giftID, //礼包ID
         "storeId": a.stoid, //商家ID
         "userId": d.user_id //用户ID
@@ -109,51 +109,16 @@ 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) {
+  onLoad: function(options) {
     var th = this;
     th.setData({
       getActId: options.actId,
-      getActType: options.actType,
       giftID: options.giftBagId
     })
     th.GetList();
   },
-  onShow: function onShow() {
+  onShow: function() {
     var th = this;
     var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img");
     th.setData({
@@ -174,7 +139,7 @@ Page({
       var json = {
         "actId": th.data.getActId, //活动Id
         "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-        "lbId": th.data.giftID, //礼包Id
+        "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
       };
@@ -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>