diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index 90190d7..aa5a756 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -58,12 +58,15 @@ {{item.creditPrice}} 积分 - {{'原价 '+item.priceStr+'元'}} + + + {{item.salePrice}} + + + 立即购买 diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss index b8c45d9..6a06f7a 100644 --- a/pages/integralmall/index.wxss +++ b/pages/integralmall/index.wxss @@ -9,7 +9,7 @@ .topbg-top{ width:100%; height: 50%; - display: inline-block + display: inline-block; } .topbg-btom{ width:84%; @@ -104,18 +104,17 @@ progress{ margin-left: 5rpx; } .topbg .score{ + line-height: 65rpx; font-size: 40rpx; font-weight: 500; float: left; color: #FFFFFF; margin-right: 10rpx; } - .qrcode{ width: 84rpx; height: 84rpx; float: right; - /* margin-right: 48rpx; */ } .qrcode image { margin: auto; @@ -186,7 +185,7 @@ image{ } .content .sepll-list{ width: 714rpx; - height: 230rpx; + height: 270rpx; background: #fff; border-radius: 30rpx; margin: 0 auto 30rpx; @@ -219,23 +218,23 @@ image{ color: #FD782D; } .content .spell-left{ - width: 170rpx; - height: 170rpx; + width: 200rpx; + height: 200rpx; float: left; } .content .spell-left image{ - width: 120rpx; - height: 120rpx; + width: 150rpx; + height: 150rpx; margin: 25rpx; border-radius: 8rpx; } .content .spell-center{ float: left; - width: 380rpx; - height: 170rpx; + width: 350rpx; + height: 200rpx; } .content .tilte{ - margin-top: 20rpx; + margin-top: 10rpx; font-size:32rpx; font-family:PingFang-SC-Bold; font-weight:bold; @@ -271,14 +270,14 @@ image{ } .content .price{ overflow: hidden; - margin-top: 20rpx; + margin-top: 10rpx; } .content .price01{ font-size:40rpx; font-family:PingFang-SC-Medium; font-weight:500; color:#FD832D; - line-height:44rpx; + line-height:34rpx; } .content .price02{ display: inline; @@ -290,6 +289,7 @@ image{ } .content .price-num{ display: inline; + font-size:32rpx; } .more{ display: inline; @@ -316,7 +316,7 @@ image{ color:rgba(255,255,255,1); line-height:52rpx; margin: 88rpx 24rpx 0 0; - margin-top: 90rpx; + margin-top: 130rpx; } .right-text{ font-size:22rpx; diff --git a/pages/integralmall/payIntegcoupondetail/index.js b/pages/integralmall/payIntegcoupondetail/index.js index 6af8587..be11cdb 100644 --- a/pages/integralmall/payIntegcoupondetail/index.js +++ b/pages/integralmall/payIntegcoupondetail/index.js @@ -21,7 +21,8 @@ Page({ showErr: false, showAlert: false, remainingPoints:0, - submitAble:true + submitAble:true, + salePrice:'' }, getUserInfo: function () { let that = this; @@ -85,7 +86,7 @@ Page({ url: config.api.checkPhoneStatus, data: {} }) - .then(res => { + .then(res => { var data = { couponChannelId: "" + that.data.paramData.couponChannelId, couponId: "" + that.data.paramData.couponId @@ -133,7 +134,7 @@ Page({ }); } else if (err.code == 3002) { wx.showToast({ - title: "订单失败", + title: "订单失败", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -199,6 +200,11 @@ Page({ }) .then(res => { console.log(res) + debugger + if (that.data.salePrice != 0) { + console.log(22222222222) + } + if (typeof (res) != "undefined") { let orderId = "" + res.data.id; that.setData({ @@ -266,7 +272,8 @@ Page({ that.getUserInfo() let data = res.data; that.setData({ - data + data, + salePrice: data.salePrice }); }); }, diff --git a/pages/integralmall/payIntegcoupondetail/index.wxml b/pages/integralmall/payIntegcoupondetail/index.wxml index 0e81f38..2a395e8 100644 --- a/pages/integralmall/payIntegcoupondetail/index.wxml +++ b/pages/integralmall/payIntegcoupondetail/index.wxml @@ -9,13 +9,23 @@ {{data.title}} - {{data.subTitle}} + + + {{data.creditPrice}} + 积分 + {{'原价 '+data.priceStr+'元'}} + + + {{data.salePrice}} + + - + @@ -25,6 +35,10 @@ 当前积分总额 {{userInfo.credit}} + + 支付金额(元) + {{data.salePrice}} + 兑换使用积分 {{data.creditPrice}} diff --git a/pages/integralmall/payIntegcoupondetail/index.wxss b/pages/integralmall/payIntegcoupondetail/index.wxss index 015f732..5a2bb34 100644 --- a/pages/integralmall/payIntegcoupondetail/index.wxss +++ b/pages/integralmall/payIntegcoupondetail/index.wxss @@ -204,17 +204,18 @@ page { width: 180rpx; } .detail-top01 image{ - width: 180rpx; - height: 180rpx; + width: 160rpx; + height: 160rpx; margin-top: 33rpx; + border-radius: 8rpx; } .detail-top02{ - width: 208rpx; + width: 250rpx; float: left; - margin-left: 16rpx; + /* margin-left: 16rpx; */ } .title{ - font-size:30rpx; + font-size:32rpx; font-family:PingFang-SC-Bold; font-weight:bold; color:rgba(51,51,51,1); @@ -455,4 +456,29 @@ page { text-align: center; line-height: 95rpx; margin: 0 auto 43rpx; +} +.price01{ + font-size:40rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:#FD832D; + line-height:44rpx; + margin-top: 10rpx; +} +.price-num{ + display: inline; + font-size: 32rpx; +} +.price-unit{ + display: inline; + font-size:24rpx; + margin-right: 10rpx; +} +.price02{ + display: inline; + font-size: 24rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + text-decoration:line-through; + color:rgba(140,140,140,1); } \ No newline at end of file