diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index c07bda3..2c03c45 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -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 }; diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js index 1173d53..ecf4354 100644 --- a/pages/giftpack/evaluategift/evaluategift.js +++ b/pages/giftpack/evaluategift/evaluategift.js @@ -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(/

- + @@ -49,15 +49,15 @@ - + - - + + ——— @@ -72,7 +72,6 @@ - 全场通用 @@ -98,7 +97,7 @@ - + diff --git a/pages/giftpack/evaluategift/evaluategift.wxss b/pages/giftpack/evaluategift/evaluategift.wxss index d528db9..858848e 100644 --- a/pages/giftpack/evaluategift/evaluategift.wxss +++ b/pages/giftpack/evaluategift/evaluategift.wxss @@ -1,338 +1,381 @@ @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; } - diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js index 3e3756b..319b7d1 100644 --- a/pages/giftpack/newvipgift/newvipgift.js +++ b/pages/giftpack/newvipgift/newvipgift.js @@ -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(/

- + @@ -98,7 +98,7 @@ - +