问题修复
This commit is contained in:
@@ -5,13 +5,14 @@
|
||||
<view class="u-flex u-flex-between">
|
||||
<view class="">
|
||||
<text class="color-333 font-16">查看优惠券</text>
|
||||
<text class="color-666 font-14">({{list.length}})张</text>
|
||||
<text class="color-666 font-14">({{couponList }})张</text>
|
||||
</view>
|
||||
<up-icon name="close-circle" color="#666" size="28rpx" @click="close"></up-icon>
|
||||
</view>
|
||||
<scroll-view scroll-y="true" class="u-m-t-42" style="max-height: 50vh;">
|
||||
<view class="list">
|
||||
<view class="item u-flex u-m-b-32 u-col-center" v-for="(item,index) in list" :key="index">
|
||||
<view v-for="(item,index) in list" :key="index">
|
||||
<view class="item u-flex u-m-b-32 u-col-center" v-for="(item1,index1) in item.num">
|
||||
<view class="left" style="min-width: 162rpx;">
|
||||
<couponIcon :item="item.coupon" />
|
||||
<!-- <view class="red font-16 font-700" style="width: 122rpx;">第二件半价券</view> -->
|
||||
@@ -28,6 +29,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
</view>
|
||||
@@ -38,6 +41,9 @@
|
||||
<script setup>
|
||||
import dayjs from 'dayjs';
|
||||
import couponIcon from './coupon-icon.vue'
|
||||
import {
|
||||
computed
|
||||
} from 'vue';
|
||||
const props = defineProps({
|
||||
title: {
|
||||
type: String,
|
||||
@@ -51,6 +57,11 @@
|
||||
}
|
||||
})
|
||||
const show = defineModel(false)
|
||||
const couponList = computed(() => {
|
||||
return props.list.reduce((prve, cur) => {
|
||||
return prve + cur.num
|
||||
}, 0)
|
||||
})
|
||||
|
||||
function close() {
|
||||
show.value = false
|
||||
|
||||
@@ -321,12 +321,13 @@ function formatCoupon(){
|
||||
const shopId = uni.cache.get('shopId');
|
||||
for (let i = 0; i < couponList.value.length; i++) {
|
||||
const coupon = couponList.value[i];
|
||||
const selCoupon=querForm.value.statusActiveIndex!=1?quansSelArr.value.filter(v=>v.type!=2):quansSelArr.value.filter(v=>v.type==2)
|
||||
const canuseResult = UTILS.returnCouponCanUse({
|
||||
canDikouGoodsArr,
|
||||
coupon,
|
||||
goodsOrderPrice,
|
||||
user,
|
||||
selCoupon: quansSelArr.value,
|
||||
selCoupon:selCoupon,
|
||||
shopInfo
|
||||
});
|
||||
const { canUse, reason } = canuseResult;
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
<!-- 账单明细 -->
|
||||
<view style="padding-bottom: 40rpx;">
|
||||
<up-navbar bgColor="transparent" title="明细" @leftClick="back"></up-navbar>
|
||||
<view class="bild" style="background-image: url(/static/czzx_header_bg.png);">
|
||||
<view class="bild" >
|
||||
<view class="bg">
|
||||
<image class="image" src="/static/czzx_header_bg.png" mode=""></image>
|
||||
</view>
|
||||
<view class="bildLeft">
|
||||
<text>我的余额</text>
|
||||
<view>{{shopUserInfo.amount||0}}</view>
|
||||
@@ -217,7 +220,19 @@
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
|
||||
position:relative;
|
||||
.bg{
|
||||
position:absolute;
|
||||
left:0;
|
||||
right:0;
|
||||
top:0;
|
||||
bottom:0;
|
||||
z-index:-1;
|
||||
.image{
|
||||
width:100%;
|
||||
height:100%;
|
||||
}
|
||||
}
|
||||
.bildLeft,
|
||||
.bildRight {
|
||||
font-weight: 400;
|
||||
|
||||
@@ -175,6 +175,7 @@ export const useCartsStore = defineStore('cart',
|
||||
// 订单费用汇总
|
||||
const orderCostSummary = computed(() => {
|
||||
allGoods.value = getAllGoodsList()
|
||||
console.log('allGoods.value',allGoods.value);
|
||||
const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
|
||||
allGoods.value,
|
||||
dinnerType.value,
|
||||
|
||||
@@ -116,7 +116,10 @@
|
||||
if (name == '周期福利') {
|
||||
model.title = '周期福利';
|
||||
modelContent.value =
|
||||
`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分,${memberLevel.value.cycleRewardCouponList.length}张优惠券`;
|
||||
`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分`;
|
||||
if (memberLevel.value.cycleRewardCouponList && memberLevel.value.cycleRewardCouponList.length) {
|
||||
modelContent.value += `,${memberLevel.value.cycleRewardCouponList.length}张优惠券`
|
||||
}
|
||||
}
|
||||
if (name == '会员说明') {
|
||||
model.title = '会员说明';
|
||||
|
||||
Reference in New Issue
Block a user