|
|
@@ -52,7 +52,7 @@
|
|
|
<view class="ells title">{{ item.title }}</view>
|
|
|
<view class="num flex">
|
|
|
<view class="sku ells-one">规格：{{ item.properties || '-' }}</view>
|
|
|
- <view class="">数量：{{ item.goodsNum }}</view>
|
|
|
+ <view class="">共{{ item.goodsNum }}件</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -78,24 +78,8 @@
|
|
|
<!-- 优惠券 -->
|
|
|
<view class="prize-coupon" v-else>
|
|
|
<view class="prize-coupon-list">
|
|
|
- <!-- <navigator :url="`/pages/prize/detail?info=${ JSON.stringify(item) }`" class="flex prize-coupon-list-item" hover-class="navigator-hover" v-for="(item, index) in list" :key="index">
|
|
|
- <image :src="item.picUrl" mode="aspectFill"></image>
|
|
|
- <view class="flex info">
|
|
|
- <view class="flex desc">
|
|
|
- <view class="title">{{ item.title }}</view>
|
|
|
- <view class="txt">使用期限：{{ $parseTime(item.validStart, '{y}.{m}.{d}') }}-{{ $parseTime(item.validEnd, '{y}.{m}.{d}') }}</view>
|
|
|
- <view class="txt">使用范围：{{ item.useAreaDesc }}</view>
|
|
|
- </view>
|
|
|
- <view class="flex btn">
|
|
|
- <view class="amt"><text>￥</text>{{ item.discount / 100 }}</view>
|
|
|
- <view class="action">立即使用</view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </navigator> -->
|
|
|
-
|
|
|
- <view @click="toPrizeDetail(item)" class="prize-coupon-list-item" hover-class="navigator-hover"
|
|
|
- v-for="(item, index) in list" :key="index">
|
|
|
- <image src="../../static/icon/coupon_bg.png" mode=""></image>
|
|
|
+ <view @click="toPrizeDetail(item)" class="prize-coupon-list-item" v-for="(item, index) in list" :key="index">
|
|
|
+ <!-- <image src="../../static/icon/coupon_bg.png" mode=""></image>
|
|
|
<view class="info">
|
|
|
<view class="info-item">
|
|
|
<text>使用期限：</text>
|
|
|
@@ -114,9 +98,26 @@
|
|
|
<view class="flex price-title">
|
|
|
<view class="price"><text>￥</text>{{ item.discount / 100 }}</view>
|
|
|
<view class="title">{{ item.title }}</view>
|
|
|
+ </view> -->
|
|
|
+ <view class="content flex">
|
|
|
+ <view class="content-left flex">
|
|
|
+ <image src="../static/prize_coupon.png" mode=""></image>
|
|
|
+ <view class="price flex">
|
|
|
+ <text>{{ item.discount / 100 }}</text>
|
|
|
+ <text>元</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="content-right flex">
|
|
|
+ <view class="title ells-one">{{ item.title }}</view>
|
|
|
+ <view class="desc">适用范围：{{ item.useAreaDesc || '-' }}</view>
|
|
|
+ <view class="desc">使用期限：{{ $parseTime(item.validStart, '{y}.{m}.{d}') }} ~ {{ $parseTime(item.validEnd, '{y}.{m}.{d}') }}</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="btn flex">
|
|
|
+ <view class="btn-title" v-if="JSON.parse(item.useArea).value != '4'">立即使用</view>
|
|
|
+ <view class="btn-title" v-else>查看详情</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
<view class="flex empty" v-if="!list.length && !loading">
|
|
|
<view class="center">
|
|
|
@@ -141,7 +142,7 @@
|
|
|
<!-- 优惠券使用记录 -->
|
|
|
<view class="flex prize-action-coupon" @click="toCoupon" v-else>
|
|
|
<view class="title">优惠券使用记录</view>
|
|
|
- <u-icon name="arrow-right" size="15" color="#333"></u-icon>
|
|
|
+ <u-icon name="arrow-right" size="15" color="#999"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -184,7 +185,6 @@
|
|
|
this.couponNum()
|
|
|
},
|
|
|
onLoad(opthios) {
|
|
|
-
|
|
|
if (opthios != undefined) {
|
|
|
if (opthios.coupon == 1) {
|
|
|
this.currentIndex = 1
|
|
|
@@ -264,8 +264,6 @@
|
|
|
this.statusIndex = 3 //已兑换
|
|
|
this.getListTwo()
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
|
|
|
toIndex() {
|
|
|
@@ -313,7 +311,6 @@
|
|
|
this.$forceUpdate()
|
|
|
},
|
|
|
|
|
|
-
|
|
|
// 查看优惠券使用记录
|
|
|
toCoupon() {
|
|
|
uni.navigateTo({
|
|
|
@@ -477,8 +474,7 @@
|
|
|
|
|
|
&__content {
|
|
|
justify-content: space-between;
|
|
|
- padding-bottom: 22rpx;
|
|
|
- border-bottom: 1px solid #E5E5E5;
|
|
|
+ padding-bottom: 34rpx;
|
|
|
|
|
|
.info {
|
|
|
padding-left: 16rpx;
|
|
|
@@ -486,13 +482,13 @@
|
|
|
justify-content: flex-start;
|
|
|
|
|
|
image {
|
|
|
- width: 200rpx;
|
|
|
- height: 200rpx;
|
|
|
+ width: 176rpx;
|
|
|
+ height: 176rpx;
|
|
|
border-radius: 12rpx;
|
|
|
}
|
|
|
|
|
|
.desc {
|
|
|
- height: 200rpx;
|
|
|
+ height: 176rpx;
|
|
|
padding-left: 22rpx;
|
|
|
flex: 1;
|
|
|
font-size: 30rpx;
|
|
|
@@ -521,31 +517,31 @@
|
|
|
|
|
|
&__btn {
|
|
|
justify-content: space-between;
|
|
|
- padding-top: 22rpx;
|
|
|
|
|
|
.type {
|
|
|
- font-size: 30rpx;
|
|
|
+ font-size: 26rpx;
|
|
|
color: #999999;
|
|
|
- line-height: 30rpx;
|
|
|
+ line-height: 26rpx;
|
|
|
padding-left: 70rpx;
|
|
|
}
|
|
|
|
|
|
.btn {
|
|
|
- width: 200rpx;
|
|
|
- height: 66rpx;
|
|
|
- line-height: 66rpx;
|
|
|
+ width: 168rpx;
|
|
|
+ height: 60rpx;
|
|
|
+ line-height: 60rpx;
|
|
|
text-align: center;
|
|
|
- color: #fff;
|
|
|
- background: #F9822C;
|
|
|
- border-radius: 34rpx;
|
|
|
+ color: #F9822C;
|
|
|
+ border: 1px solid #F9822C;
|
|
|
+ border-radius: 30rpx;
|
|
|
}
|
|
|
.btnTwo {
|
|
|
- width: 200rpx;
|
|
|
- height: 66rpx;
|
|
|
- line-height: 66rpx;
|
|
|
+ width: 168rpx;
|
|
|
+ height: 60rpx;
|
|
|
+ line-height: 60rpx;
|
|
|
text-align: center;
|
|
|
- border-radius: 34rpx;
|
|
|
- background-color: #f1f1f1; color: #999;
|
|
|
+ border-radius: 30rpx;
|
|
|
+ background-color: #f1f1f1;
|
|
|
+ color: #666;
|
|
|
border: 2rpx solid #999;
|
|
|
}
|
|
|
}
|
|
|
@@ -557,71 +553,83 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 优惠券
|
|
|
.prize-coupon {
|
|
|
margin-top: 85rpx;
|
|
|
- padding: 40rpx 20rpx 150rpx;
|
|
|
+ padding: 20rpx 20rpx 150rpx;
|
|
|
|
|
|
&-list {
|
|
|
-
|
|
|
&-item {
|
|
|
- position: relative;
|
|
|
- background-color: #FFFFFF;
|
|
|
- margin-bottom: 20rpx;
|
|
|
- border-radius: 10rpx;
|
|
|
-
|
|
|
- image {
|
|
|
+ padding-top: 30rpx;
|
|
|
+ margin-bottom: 30rpx;
|
|
|
+ background-color: #fff;
|
|
|
+
|
|
|
+ .content {
|
|
|
width: 100%;
|
|
|
- height: 156rpx;
|
|
|
- margin-bottom: 24rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .info {
|
|
|
- padding-left: 40rpx;
|
|
|
- padding-bottom: 8rpx;
|
|
|
-
|
|
|
- .info-item {
|
|
|
- line-height: 40rpx;
|
|
|
- color: #333333;
|
|
|
- margin-bottom: 12rpx;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .info-now {
|
|
|
- margin-top: 10rpx;
|
|
|
- color: #848484;
|
|
|
- font-size: 30rpx;
|
|
|
- height: 100rpx;
|
|
|
- line-height: 90rpx;
|
|
|
- text-align: center;
|
|
|
- }
|
|
|
-
|
|
|
- .info-now view {
|
|
|
- height: 2rpx;
|
|
|
- margin: 0 10rpx;
|
|
|
- background-image: linear-gradient(to right, #cfcfcf 0%, #cfcfcf 50%, transparent 1%);
|
|
|
- background-size: 25rpx 10rpx;
|
|
|
- }
|
|
|
-
|
|
|
- .price-title {
|
|
|
+ height: 184rpx;
|
|
|
justify-content: flex-start;
|
|
|
- position: absolute;
|
|
|
- top: 0;
|
|
|
- width: 100%;
|
|
|
- padding: 36rpx 0 0 40rpx;
|
|
|
-
|
|
|
- .price {
|
|
|
- color: #FFFFFF;
|
|
|
- font-size: 60rpx;
|
|
|
+ margin-bottom: 40rpx;
|
|
|
+
|
|
|
+ &-left {
|
|
|
+ width: 210rpx;
|
|
|
+ height: 100%;
|
|
|
margin-right: 20rpx;
|
|
|
-
|
|
|
- text {
|
|
|
- font-size: 40rpx;
|
|
|
+
|
|
|
+ image {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+
|
|
|
+ .price {
|
|
|
+ position: absolute;
|
|
|
+ color: #fff;
|
|
|
+
|
|
|
+ text:first-child {
|
|
|
+ font-size: 70rpx;
|
|
|
+ padding-right: 20rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ text:last-child {
|
|
|
+ font-size: 40rpx;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- .title {
|
|
|
- color: #FFFFFF;
|
|
|
- font-size: 48rpx;
|
|
|
+
|
|
|
+ &-right {
|
|
|
+ flex: 1;
|
|
|
+ align-items: flex-start;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: space-between;
|
|
|
+ height: 100%;
|
|
|
+ padding: 24rpx 0;
|
|
|
+
|
|
|
+ .title {
|
|
|
+ font-size: 32rpx;
|
|
|
+ line-height: 32rpx;
|
|
|
+ height: 32rpx;
|
|
|
+ overflow: hidden;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+
|
|
|
+ .desc {
|
|
|
+ font-size: 24rpx;
|
|
|
+ line-height: 24rpx;
|
|
|
+ color: #999999;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .btn {
|
|
|
+ padding: 20rpx 0 22rpx;
|
|
|
+ margin: 0 30rpx 0;
|
|
|
+ border-top: 1px solid #F2F2F2;
|
|
|
+
|
|
|
+ &-title {
|
|
|
+ font-size: 30rpx;
|
|
|
+ line-height: 30rpx;
|
|
|
+ height: 30rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #F9822C;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -670,14 +678,15 @@
|
|
|
padding: 30rpx 40rpx;
|
|
|
|
|
|
.title {
|
|
|
- margin-right: 20rpx;
|
|
|
+ margin-right: 10rpx;
|
|
|
+ color: #999;
|
|
|
line-height: 40rpx;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
.empty {
|
|
|
height: 60vh;
|
|
|
-
|
|
|
+
|
|
|
.center {
|
|
|
text-align: center;
|
|
|
|
hwb0
