From 87c7f1b6940635f4db3248b25eda6c979d20dbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 3 Mar 2023 14:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/CommodityDetails/CommodityDetails.vue | 22 ++++++++++------
pages/Personal/Personal.scss | 2 +-
pages/coupon/coupon.vue | 28 +++++++++++++--------
pages/materialbenefits/materialbenefits.vue | 7 +++++-
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 7106d8d..7ce227e 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -615,13 +615,6 @@
this.couponListtrue = []
this.couponListfalse = []
this.goodsDetailslist = res.data
- this.goodsDetailslist.couponList.forEach(e => {
- if (this.totalPrice >= e.couponConsumePrice) {
- this.couponListtrue.push(e)
- } else {
- this.couponListfalse.push(e)
- }
- })
this.updata.goodsName = this.goodsDetailslist.goodsName
this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
this.updata.goodsUnit = res.data.goodsUnit
@@ -630,11 +623,19 @@
this.updata.img = this.goodDetailsLists[0].attributePitureUrl
this.updata.goodsAttributeName = this.goodDetailsLists[0].attributeDetailsName
this.updata.goodsPrice = this.goodDetailsLists[0].goodsPrice
+ this.totalPrice = this.goodDetailsLists[0].goodsPrice
this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
this.updata.attributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
this.updata.goodsStock = this.goodDetailsLists[0].goodsStock
this.updata.goodsAttributeId = this.goodDetailsLists[0].goodsAttributeId
this.updata.goodsAttributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
+ this.goodsDetailslist.couponList.forEach(e => {
+ if (this.totalPrice >= e.couponConsumePrice) {
+ this.couponListtrue.push(e)
+ } else {
+ this.couponListfalse.push(e)
+ }
+ })
} else {
var list = {}
this.goodsDetailslist.goodAttributeDetailsLists.forEach(e => {
@@ -649,6 +650,13 @@
this.updata.goodsAttributeName = list.attributeDetailsName
this.updata.goodsPrice = list.goodsPrice
this.totalPrice = list.goodsPrice
+ this.goodsDetailslist.couponList.forEach(e => {
+ if (this.totalPrice >= e.couponConsumePrice) {
+ this.couponListtrue.push(e)
+ } else {
+ this.couponListfalse.push(e)
+ }
+ })
this.updata.attributeDetailsId = list.attributeDetailsId
this.updata.goodsStock = list.goodsStock
this.updata.img = list.attributePitureUrl
diff --git a/pages/Personal/Personal.scss b/pages/Personal/Personal.scss
index 9829611..c2fd712 100644
--- a/pages/Personal/Personal.scss
+++ b/pages/Personal/Personal.scss
@@ -155,7 +155,7 @@
}
.nickname {
position: absolute;
- top: 265rpx;
+ top: 275rpx;
left: 35%;
font-size: 30rpx;
}
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index 396e471..4140e39 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -52,7 +52,7 @@
{{item.useStatus=='EXPIRED'?'已过期':''}}
{{item.useStatus=='USED'?'已使用':''}}
-
+
{{item.useStatus=='NOT_USED'?'使用':''}}
@@ -112,6 +112,11 @@
}
this.getlist();
},
+ goshoping() {
+ uni.switchTab({
+ url: '/pages/shopping/shopping'
+ })
+ },
},
onReachBottom() { //下滑加载
if (this.couponlist.length >= this.total) {} else {
@@ -183,14 +188,17 @@
}
.btngq {
- width: 109rpx;
- height: 180rpx;
- background: #DFDEDE;
+ width: 110rpx;
+ height: 50rpx;
+ border: 2rpx solid #DFDEDE;
+ border-radius: 24rpx;
+ font-size: 24rpx;
position: absolute;
- top: 0;
- right: 0;
+ top: 70rpx;
+ right: 20rpx;
text-align: center;
- line-height: 180rpx;
+ line-height: 50rpx;
+ background: #DFDEDE;
}
.btn {
@@ -203,14 +211,14 @@
top: 70rpx;
right: 20rpx;
text-align: center;
- line-height: 49rpx;
+ line-height: 50rpx;
}
.time {
font-size: 24rpx;
position: absolute;
top: 120rpx;
- left: 200rpx;
+ left: 240rpx;
}
.texts {
@@ -218,7 +226,7 @@
font-weight: 800;
position: absolute;
top: 44rpx;
- left: 200rpx;
+ left: 240rpx;
}
.title {
diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue
index f2e7501..bcee6dc 100644
--- a/pages/materialbenefits/materialbenefits.vue
+++ b/pages/materialbenefits/materialbenefits.vue
@@ -62,7 +62,7 @@
{{item.useStatus=='EXPIRED'?'已过期':''}}
{{item.useStatus=='USED'?'已使用':''}}
-
+
{{item.useStatus=='NOT_USED'?'使用':''}}
@@ -172,6 +172,11 @@
url: '/pages/information/information'
})
},
+ goshoping() {
+ uni.switchTab({
+ url: '/pages/shopping/shopping'
+ })
+ },
},
onReachBottom() { //下滑加载
if (this.couponlist.length >= this.total) {} else {