From 8f7852f834930328aed0c1ed7db2cfbd578bc28f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 10 Oct 2025 15:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/coupon/list.vue        | 37 ++++++++++++++++++++-----------
 pages/order/coupon.vue            |  3 ++-
 pages/user/member/billDetails.vue | 19 ++++++++++++++--
 stores/carts.js                   |  1 +
 user/vip/vip.vue                  |  5 ++++-
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/components/coupon/list.vue b/components/coupon/list.vue
index b2255d2..4e8b11f 100644
--- a/components/coupon/list.vue
+++ b/components/coupon/list.vue
@@ -5,28 +5,31 @@
 				<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 class="left" style="min-width: 162rpx;">
-								<couponIcon :item="item.coupon" />
-								<!-- <view class="red font-16 font-700" style="width: 122rpx;">第二件半价券</view> -->
-								<view></view>
-							</view>
-
-							<view class="u-flex-1 u-p-l-26 ">
-								<view class="color-333 font-16">
-									{{item.coupon.title }}
+						<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> -->
+									<view></view>
 								</view>
-								<view class="color-999 font-12 u-m-t-8">
-									有效期至：{{item.coupon.validEndTime||''}}
+
+								<view class="u-flex-1 u-p-l-26 ">
+									<view class="color-333 font-16">
+										{{item.coupon.title }}
+									</view>
+									<view class="color-999 font-12 u-m-t-8">
+										有效期至：{{item.coupon.validEndTime||''}}
+									</view>
 								</view>
 							</view>
 						</view>
+
 					</view>
 				</scroll-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
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index c776f0e..60c5b3b 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -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;
diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue
index 74becd8..c2ccedf 100644
--- a/pages/user/member/billDetails.vue
+++ b/pages/user/member/billDetails.vue
@@ -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;
diff --git a/stores/carts.js b/stores/carts.js
index a34b206..ce77dd9 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -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,
diff --git a/user/vip/vip.vue b/user/vip/vip.vue
index 9f6271f..694b4a2 100644
--- a/user/vip/vip.vue
+++ b/user/vip/vip.vue
@@ -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 = '会员说明';