@@ -58,12 +58,15 @@ | |||
<view class='price01'> | |||
<view class='price-num'>{{item.creditPrice}}</view> | |||
<view class='price-unit'>积分</view> | |||
<!-- <view class='more' wx:if="{{item.salePrice!=0}}">+</view> | |||
<view class='price-num' wx:if="{{item.salePrice!=0}}">{{item.salePrice}}</view> | |||
<view class='price-unit' wx:if="{{item.salePrice!=0}}">元</view> --> | |||
<view class='price02'>{{'原价 '+item.priceStr+'元'}}</view> | |||
</view> | |||
</view> | |||
<view class='price'> | |||
<view class='price01'> | |||
<view class='price-num' wx:if="{{item.salePrice!=0}}">{{item.salePrice}}</view> | |||
<view class='price-unit' wx:if="{{item.salePrice!=0}}">元</view> | |||
</view> | |||
</view> | |||
</view> | |||
<view class='spell-right'> | |||
<view class='right-button' wx:if="{{item.salePrice!=0}}">立即购买</view> | |||
@@ -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; | |||
@@ -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 | |||
}); | |||
}); | |||
}, | |||
@@ -9,13 +9,23 @@ | |||
</view> | |||
<view class='detail-top02'> | |||
<view class='title'>{{data.title}}</view> | |||
<view class='des'>{{data.subTitle}}</view> | |||
<!-- <view class='des'>{{data.creditPrice}}</view> | |||
<view class='des'>{{'价值:'+data.priceStr+'元'}}</view> | |||
<view class='des'>{{data.salePrice+'元'}}</view> --> | |||
<view class='price01'> | |||
<view class='price-num'>{{data.creditPrice}}</view> | |||
<view class='price-unit'>积分</view> | |||
<view class='price02'>{{'原价 '+data.priceStr+'元'}}</view> | |||
</view> | |||
<view class='price01' wx:if='{{data.salePrice!= 0}}'> | |||
<view class='price-num' wx:if="{{item.salePrice!=0}}">{{data.salePrice}}</view> | |||
<view class='price-unit' wx:if="{{item.salePrice!=0}}">元</view> | |||
</view> | |||
</view> | |||
<view class='detail-top03'> | |||
<!-- <view class='detail-top03'> | |||
<view class='detail-p-price'>{{data.creditPrice}}积分</view> | |||
<view class='detail-p-name'>积分售价</view> | |||
</view> | |||
</view> --> | |||
</view> | |||
</view> | |||
@@ -25,6 +35,10 @@ | |||
<view class='order-title'>当前积分总额</view> | |||
<view class='order-text'>{{userInfo.credit}}</view> | |||
</view> | |||
<view class='order-list' wx:if='{{data.salePrice != 0}}'> | |||
<view class='order-title'>支付金额(元)</view> | |||
<view class='order-text'>{{data.salePrice}}</view> | |||
</view> | |||
<view class='order-list'> | |||
<view class='order-title'>兑换使用积分</view> | |||
<view class='order-text'>{{data.creditPrice}}</view> | |||
@@ -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); | |||
} |