diff --git a/groupBuying/detail/index.vue b/groupBuying/detail/index.vue
index d6b8355..caed4ff 100644
--- a/groupBuying/detail/index.vue
+++ b/groupBuying/detail/index.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/groupBuying/goodsDetail/goodsDetail.vue b/groupBuying/goodsDetail/goodsDetail.vue
index 2203cca..d40fa20 100644
--- a/groupBuying/goodsDetail/goodsDetail.vue
+++ b/groupBuying/goodsDetail/goodsDetail.vue
@@ -353,6 +353,20 @@
function getDetail() {
Api.wareDetail(query).then(res => {
+ console.log('res',res)
+ if(!res){
+ uni.showModal({
+ title:'提示',
+ content:'当前商品已下架',
+ showCancel:false,
+ success() {
+ uni.redirectTo({
+ url:'/groupBuying/index/index'
+ })
+ }
+ })
+ }
+
res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v => v)
Object.assign(item, res)
console.log(item)
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index f23ea7d..511f6b8 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -226,6 +226,11 @@
新客立减
-{{listinfo.newCustomerDiscountAmount}}
+
+ 会员折扣
+ -{{listinfo.vipDiscountAmount}}
+
+
@@ -451,7 +456,7 @@
const showDiscount = computed(() => {
const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount',
- 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount'
+ 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount'
]
if (isObjHasPropertyAndNotNull(props.listinfo, keys)) {
return true
diff --git a/pages/order/components/orderInfoAfter.vue b/pages/order/components/orderInfoAfter.vue
index 2e156a5..18c2d6e 100644
--- a/pages/order/components/orderInfoAfter.vue
+++ b/pages/order/components/orderInfoAfter.vue
@@ -222,6 +222,11 @@
新客立减
-{{listinfo.newCustomerDiscountAmount}}
+
+
+ 会员折扣
+ -{{listinfo.vipDiscountAmount}}
+
@@ -402,7 +407,7 @@
const showDiscount = computed(() => {
const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount',
- 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount'
+ 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount'
]
if (isObjHasPropertyAndNotNull(props.listinfo, keys)) {
return true
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 90bb4cc..e44ccaa 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -124,7 +124,7 @@
积分
-
+
{{ coinTotal }}家店
@@ -138,7 +138,7 @@
¥
{{
- item.accountPoints || "0.00"
+ item.pointBalance || "0.00"
}}
{{
@@ -147,7 +147,7 @@
+ @click="toCoin()">
查看全部
@@ -163,7 +163,7 @@
{{
- userInfo.accountPoints || 0
+ userInfo.pointBalance || 0
}}
查看
@@ -434,7 +434,13 @@
coinList.value = res3;
}
- function toCoin() {
+ function toCoin(item) {
+ if(item){
+ uni.navigateTo({
+ url: "/pages/user/member/billDetails?type=2&shopId="+item.shopId+"&id="+(item.id||''),
+ });
+ return
+ }
uni.navigateTo({
url: "/user/score/list",
});
diff --git a/userPackage/goodsDetail/goodsDetail.vue b/userPackage/goodsDetail/goodsDetail.vue
index 4248ee6..6891931 100644
--- a/userPackage/goodsDetail/goodsDetail.vue
+++ b/userPackage/goodsDetail/goodsDetail.vue
@@ -75,18 +75,18 @@
-
-
-
- {{item.name}}
+
+
+
+ {{item.name}}
{{item.packageProducts.length}}选{{item.num}}
-
-
+
{{goods.name}}
- {{goods.num}}
+ x{{goods.num}}
¥{{goods.price}}
diff --git a/userPackage/index/index.vue b/userPackage/index/index.vue
index 1a5d17e..4b0c684 100644
--- a/userPackage/index/index.vue
+++ b/userPackage/index/index.vue
@@ -52,7 +52,9 @@
最低到手
¥{{minPrice(item)}}
¥{{item.originPrice}}
-
+
+
+
@@ -74,7 +76,7 @@
{{item.packageName}}
- {{item.packageName}}
+ {{item.packageName}}
@@ -92,23 +94,23 @@
¥{{item.originPrice}}
-
+
-
+
¥
{{item.finalPrice}}
-
+
¥{{item.originPrice}}
-
+
¥
{{item.price}}
-
+
¥{{item.originPrice}}
@@ -223,7 +225,8 @@
bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/dd298d6a503d432f832f3c7c2bb7fb0e.png',
bg1: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/604c3f917daa41af9239145196c6d3f3.png',
map: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/0a293f6e1a6a4e7b956379a5b6701104.png',
- pin: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/8eaf3bdd44ce422889e5feeb30bcb2ea.png'
+ pin: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/8eaf3bdd44ce422889e5feeb30bcb2ea.png',
+ block: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/8a978da77a4d47ff95a5a152485849fe.png'
}
const shopInfo = ref(uni.cache.get('shopInfo'))
@@ -531,7 +534,7 @@
function returnTime(item) {
nowTime.value
- return getRemainingHMS(item,'expireTime')
+ return getRemainingHMS(item, 'expireTime')
}
function minPrice(item) {
@@ -664,20 +667,46 @@
}
.info {
- background: linear-gradient(270deg, #FFF7F4 44.8%, #ffffff00 89.37%);
width: 452rpx;
height: 92rpx;
border-radius: 12rpx;
background-size: cover;
transform: translateY(-10rpx);
display: flex;
- justify-content: space-between;
+ justify-content: flex-end;
+ position: relative;
+ overflow: hidden;
+ $right-width: 102rpx;
.left {
- width: 306rpx;
+ width: 360rpx;
padding: 16rpx 22rpx;
color: #eb532a;
- flex: 1;
+ background: linear-gradient(270deg, #FFF7F4 44.8%, #ffffff00 89.37%);
+ align-items: baseline;
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 2;
+ right: $right-width;
+
+ .block {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ z-index: 3;
+ background: linear-gradient(-110deg,
+ #eb532a 39%,
+ transparent 43%
+ );
+
+ .block-img {
+ height: 100%;
+ width: 62rpx;
+ }
+ }
}
.old-price {
@@ -687,17 +716,18 @@
.right {
background-color: #ED5A2E;
- border-radius: 0 16rpx 16rpx 0;
- padding-right: 10rpx;
- padding-left: 16rpx;
+ width: $right-width;
display: flex;
justify-content: center;
align-items: center;
+ position: relative;
+ z-index: 1;
.pin {
width: 76rpx;
height: 54rpx;
}
+
}
}
}
@@ -752,6 +782,7 @@
.orders {
padding: 0 26rpx 36rpx;
margin-top: 32rpx;
+
.item {
padding: 32rpx 24rpx;
border-radius: 16rpx;