修复拼团详情显示问题,增加商品下架弹窗提醒·,订单详情和结算成功增加会员折扣展示,修改用户中心页面积分列表积分余额显示字段,调整套餐商品详情商品显示样式
This commit is contained in:
@@ -52,7 +52,9 @@
|
||||
<text class="u-font-24" v-if="isHasDiscount(item)">最低到手</text>
|
||||
<text class="u-font-40 font-bold"> ¥{{minPrice(item)}}</text>
|
||||
<text class="color-999 old-price"> ¥{{item.originPrice}}</text>
|
||||
|
||||
<view class="block">
|
||||
<image class="block-img" :src="imgs.block"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="right">
|
||||
<image class="pin" :src="imgs.pin"></image>
|
||||
@@ -74,7 +76,7 @@
|
||||
<view class="u-flex-1 u-flex u-p-l-30 u-col-center u-row-between">
|
||||
<view style="max-width: 336rpx;">
|
||||
<view class="u-line-2 font-bold u-font-32">{{item.packageName}}</view>
|
||||
<view class="u-line-1 u-m-t-10 color-666" >{{item.packageName}}
|
||||
<view class="u-line-1 u-m-t-10 color-666">{{item.packageName}}
|
||||
</view>
|
||||
</view>
|
||||
<view>
|
||||
@@ -92,23 +94,23 @@
|
||||
¥{{item.originPrice}}
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
||||
<template v-else>
|
||||
<template v-if="item&&item.finalPrice">
|
||||
<view class=" font-bold price main-color" >
|
||||
<view class=" font-bold price main-color">
|
||||
<text class="u-font-26"> ¥</text>
|
||||
<text class="u-font-40">{{item.finalPrice}}</text>
|
||||
</view>
|
||||
<view class=" main-color old-price" >
|
||||
<view class=" main-color old-price">
|
||||
¥{{item.originPrice}}
|
||||
</view>
|
||||
</template>
|
||||
<template v-else>
|
||||
<view class=" font-bold price main-color" >
|
||||
<view class=" font-bold price main-color">
|
||||
<text class="u-font-26"> ¥</text>
|
||||
<text class="u-font-40">{{item.price}}</text>
|
||||
</view>
|
||||
<view class=" main-color old-price" >
|
||||
<view class=" main-color old-price">
|
||||
¥{{item.originPrice}}
|
||||
</view>
|
||||
</template>
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user