From 4d7c388f744bdc9992d1ac6e942be1ce453b2c06 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 24 Dec 2025 15:56:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=AF=A6=E6=83=85=E6=80=BB=E6=95=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 distribution/income-details/index.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/distribution/income-details/index.vue b/distribution/income-details/index.vue
index cebd4e1..8369648 100644
--- a/distribution/income-details/index.vue
+++ b/distribution/income-details/index.vue
@@ -50,8 +50,8 @@
         style="align-items: baseline; justify-content: flex-end"
       >
         <text class="color-666 font-12"> 总计：</text>
-        <text class="font-16 color-333 font-700" v-if="centerUserInfo">
-          {{ centerUserInfo.totalIncome }}</text
+        <text class="font-16 color-333 font-700" >
+          {{ totalIncome }}</text
         >
       </view>
 
@@ -113,6 +113,7 @@
         <scroll-view
           class="popup-list"
           direction="vertical"
+		  :scroll-y="true"
           @scrollend="scrollBottom"
         >
           <view
@@ -301,6 +302,7 @@ async function centerUser() {
 }
 onShow(() => {});
 
+
 onLoad(async (opt) => {
   await getCouponShopsAjax();
 
@@ -314,13 +316,24 @@ onLoad(async (opt) => {
   }
   if (opt.shopId) {
     querForm.value.shopId = opt.shopId;
-    const findItem = couponShops.value.find((item) => item.id == opt.shopId);
+    const findItem = shopList.value.find((item) => item.shopId == opt.shopId);
     querForm.value.shopName = findItem.shopName || "";
   }
   centerUser();
   getIncomeDetailsAjax();
 });
 
+const totalIncome=computed(()=>{
+	if(!querForm.value.shopId){
+		return centerUserInfo.value?(centerUserInfo.value.totalIncome||0):0;
+	}
+	const findItem = shopList.value.find((item) => item.shopId ==  querForm.value.shopId );
+	if(findItem){
+		return findItem.income||0
+	}
+	return 0
+})
+
 watch(
   () => querForm.value.status,
   (newVal, oldVal) => {

From 158a025ba194dee4b92222e2e46a2f8a6f86a845 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 24 Dec 2025 17:31:09 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm-order.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 813a544..2c5cabd 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1034,7 +1034,7 @@
 		console.log("跳转到加菜页面");
 		const arr= getCurrentPages()
 		console.log(arr);
-		if(arr[arr.length-1]&&arr[arr.length-1].route=='pages/product/index'){
+		if(arr.length>=2&&arr[arr.length-2]&&arr[arr.length-2].route=='pages/product/index'){
 			back();
 		}else{
 			uni.cache.set('tableCode',listinfo.tableCode)

From e645aa5516802ef420aed7ec27a1def5a72ccdd3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 24 Dec 2025 17:59:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E4=BF=A1=E6=81=AF=E6=B8=A9=E6=9F=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm-order.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 2c5cabd..dc6d290 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1146,6 +1146,14 @@
 
 			}
 		}
+		
+		//获取台桌信息
+		let tableRes = await getTableInfo({
+			tableCode: options.tableCode || "",
+		});
+		console.log("tableRes", tableRes);
+		listinfo.tableName = tableRes?tableRes.name:'';
+		
 		//获取店铺信息
 		const shopInfoRes = await APIusershopInfodetail({
 			shopId: options.shopId,

From edd10edf9fc21779a246baf49f1f7016bed27278 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 24 Dec 2025 18:47:41 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=94=E9=99=A4=E4=B8=8B=E6=9E=B6=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/index.vue | 109 +++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/pages/product/index.vue b/pages/product/index.vue
index 63dcd80..702eef8 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -52,8 +52,8 @@
 
 
 							<view class="relative">
-								<image @click.stop="getProductImgs(item)" class="panelfiveitemimage" :src="item.coverImg"
-									mode="aspectFill"></image>
+								<image @click.stop="getProductImgs(item)" class="panelfiveitemimage"
+									:src="item.coverImg" mode="aspectFill"></image>
 								<view class="limitDiscount" v-if="showLimitDiscount(item)">
 									限时折扣{{ limitDiscountCountdown }}</view>
 								<!-- <view class="limitDiscount" v-if="item.is_time_discount">
@@ -197,8 +197,8 @@
 							<view class="goods" @click="clickspecifications(item1, index, index1)"
 								v-for="(item1, index1) in item.productList" :key="item1.id">
 								<view class="relative">
-									<image class="goodsImg" @click.stop="getProductImgs(item1)" v-if="item1.coverImg != null"
-										:lazy-load="true" 
+									<image class="goodsImg" @click.stop="getProductImgs(item1)"
+										v-if="item1.coverImg != null" :lazy-load="true"
 										:src="`${item1.coverImg}${!item1.imgLoad ? '?x-oss-process=image/resize,m_lfit,w_150,h_150' : ''}`"
 										mode="aspectFill"></image>
 									<image class="goodsImg"
@@ -671,8 +671,8 @@
 	import {
 		useNavbarStore
 	} from '@/stores/navbarStore';
-	
-	
+
+
 	import {
 		useWebSocket
 	} from '@/stores/carts-websocket.js';
@@ -1269,9 +1269,9 @@
 	//预览图
 	const showPrveImg = ref(false);
 	const prveImgsList = ref([]);
-	
-	function updateShowPrveImg(e){
-		showPrveImg.value=e
+
+	function updateShowPrveImg(e) {
+		showPrveImg.value = e
 	}
 
 	function prveImgs(images) {
@@ -1285,14 +1285,14 @@
 	}
 
 	async function getProductImgs(item) {
-		console.log('getProductImgs',item)
+		console.log('getProductImgs', item)
 		let res = await APIminiAppinfo(item.id);
 		prveImgs(res.images);
 	}
 
 	//获取多规格数据
 	const clickspecifications = async (item, index, indexs, type) => {
-		console.log('clickspecifications',item);
+		console.log('clickspecifications', item);
 		// 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
 		// if (
 		//   item.isSoldStock == 1 ||
@@ -1586,11 +1586,11 @@
 
 	function cartInit(arr) {
 		const result = []
-		console.log('cartInitArr',arr);
-		console.log('allGoodsArr',allGoodsArr);
+		console.log('cartInitArr', arr);
+		console.log('allGoodsArr', allGoodsArr);
 		cartStore.carts = arr.map(v => {
 			const goods = allGoodsArr.find(g => g.id == v.product_id)
-			const goodsSkuList = goods?goods.skuList : []
+			const goodsSkuList = goods ? goods.skuList : []
 			const findSku = goodsSkuList.find(sku => sku.id == v.sku_id)
 			const memberPrice = findSku ? findSku.memberPrice : 0
 			const is_time_discount = limitUtils.canUseLimitTimeDiscount({
@@ -1598,7 +1598,7 @@
 					memberPrice
 				}, cartStore.limitTimeDiscount, shopInfo,
 				shopUserInfo.value, 'product_id');
-			if(!goods){
+			if (!goods) {
 				useSocket.sendMessage({
 					id: v.id,
 					operate_type: "del",
@@ -1613,7 +1613,7 @@
 				is_time_discount: is_time_discount ? 1 : 0,
 				memberPrice
 			}
-		}).filter(v=>v)
+		}).filter(v => v)
 
 		for (let cart of arr) {
 			const findItem = cartStore.carts.find(v => v.id == cart.id)
@@ -1790,7 +1790,7 @@
 				});
 			}
 
-		
+
 
 			//除去p 每次返回都回执消息
 			await websocketsendMessage({
@@ -2084,11 +2084,11 @@
 		}
 		return currentTime >= startTime && currentTime <= endTime;
 	});
-	let allGoodsArr=[]
+	let allGoodsArr = []
 	// 列表请求
 	const productqueryProduct = async () => {
 		cartStore.goodsIsloading = false;
-		allGoodsArr=[]
+		allGoodsArr = []; // 确保声明过（建议用ref/let声明，避免全局隐式变量）
 		try {
 			shopProductList.hots = await productminiApphotsquery();
 			shopProductList.productInfo = await APIgroupquery();
@@ -2100,40 +2100,45 @@
 			setTimeout(() => {
 				uni.pro.switchTab('index/index');
 			}, 1000);
+			return; // 出错直接返回，避免后续逻辑
 		}
-		if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
-			//TODO handle the exception
-			//第一步：将所有商品的 cartNumber 初始化为 0
-			shopProductList.productInfo.forEach((group) => {
-				group.productList.forEach(async (product) => {
-					product.cartNumber = 0;
-					product.isSaleTimeshow = await isProductAvailable(product.days, product
-						.startTime, product.endTime);
-						
-						allGoodsArr.push(product)
 
+		if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
+			// 第一步：处理productInfo（替换forEach为for...of，支持await）
+			for (const group of shopProductList.productInfo) {
+				for (const product of group.productList) {
+					product.cartNumber = 0;
+					// 等待异步函数执行完成后，再push
+					product.isSaleTimeshow = await isProductAvailable(
+						product.days,
+						product.startTime,
+						product.endTime
+					);
+					allGoodsArr.push(product);
 					cartStore.setGoodsMap(product.id, product);
-				});
-			});
-			shopProductList.hots.forEach(async (i) => {
+				}
+			}
+
+			// 第二步：处理hots（同理替换forEach为for...of）
+			for (const i of shopProductList.hots) {
 				i.cartNumber = 0;
 				i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
-				allGoodsArr.push(i)
+				allGoodsArr.push(i);
 				cartStore.setGoodsMap(i.id, i);
-			});
-			console.log('shopProductList', shopProductList);
-			
-			if(cartStore.carts.length>0){
-				cartInit(cartStore.carts)
 			}
-			
+
+			// 此时所有异步操作完成，allGoodsArr已有数据
+			console.log('allGoodsArr', allGoodsArr);
+			console.log('shopProductList', shopProductList);
+
+			if (cartStore.carts.length > 0) {
+				cartInit(cartStore.carts);
+			}
+
 			cartStore.goodsIsloading = true;
 			scrollTopSize.value = 0;
 			topArr.value = [];
-			// userStore.actionsAPIuser()
-			// 数据可以更新
 			isDataLoaded.value = true;
-			// 历史订单
 			Historicalorders();
 			updateProductQuantities();
 		} else {
@@ -2381,7 +2386,7 @@
 			tableCode: uni.cache.get('tableCode')
 		});
 		oldOrder.value = res;
-		if (res && res.id && shopInfo.registerType == 'after'&&!e.noJump) {
+		if (res && res.id && shopInfo.registerType == 'after' && !e.noJump) {
 			toHistory();
 			return;
 		}
@@ -2441,8 +2446,8 @@
 			idKey: 'id'
 		});
 	}
-	
-	function watchEmit(){
+
+	function watchEmit() {
 		uni.$off('updateProductIndex')
 		uni.$on('updateProductIndex', function(data) {
 			getNewUserDiscount()
@@ -2496,12 +2501,12 @@
 		});
 		if (res && typeof res == 'object') {
 			newUserDiscount.value = res;
-			cartStore.consumeDiscount=res
-			cartStore.newUserDiscount=res.amount
-		}else{
+			cartStore.consumeDiscount = res
+			cartStore.newUserDiscount = res.amount
+		} else {
 			newUserDiscount.value = null;
-			cartStore.consumeDiscount={}
-			cartStore.newUserDiscount=0
+			cartStore.consumeDiscount = {}
+			cartStore.newUserDiscount = 0
 		}
 	}
 
@@ -2561,8 +2566,8 @@
 		return 0
 	})
 	const oldOrder = ref(null);
-	
-	
+
+
 	// 限时折扣
 	async function getLimitDiscount() {
 		const limitRes = await limitTimeDiscountapi.getConfig({

From 113193b142412d879276f01bfb3018f9ee10ca98 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 25 Dec 2025 11:35:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E6=99=BA=E6=85=A7=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=88=A0=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E5=AF=B9=E5=BA=94=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/paymentMethod copy.vue  |  260 -----
 components/paymentMethod.vue       |   22 +-
 pages/order/confirm-order-back.vue | 1407 ----------------------------
 pages/order/confirm-order.vue      |   21 +-
 pages/order/detail.vue             |    1 -
 pages/product/index.vue            |   29 +-
 stores/carts.js                    |    5 +-
 7 files changed, 48 insertions(+), 1697 deletions(-)
 delete mode 100644 components/paymentMethod copy.vue
 delete mode 100644 pages/order/confirm-order-back.vue

diff --git a/components/paymentMethod copy.vue b/components/paymentMethod copy.vue
deleted file mode 100644
index 84e0447..0000000
--- a/components/paymentMethod copy.vue	
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-	<!-- 支付方式 -->
-	<view class="paymentMethod">
-		<view class="paymentMethod_content">
-			<view class="paymentMethod_title">支付方式</view>
-			<up-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChanges" :size="28"
-				placement="column">
-				<block v-for="(item,index) in paymentMethodList" :key="index">
-					<view class="method_list" @click="groupChanges(item.type)" :class="{disabled:returnDisabled(item)}"
-						v-if="(index+1) == radiovalue?!changeFreeenable:true">
-						<view class="method_list_top">
-							<view class="method_list_top_left">
-								<image class="icon" :src="item.url" mode="aspectFill" />
-								<view class="method_list_top_cen">
-									<view class="name"> {{ item.name }} </view>
-									<view class="method_list_bom" v-if="item.type == 1">
-										<text class="balance">
-											当前余额￥{{orderVIP?(orderVIP.amount||0):0}}</text>
-										<text class="topUpNow" @click="goRecharge">去充值</text>
-									</view>
-								</view>
-							</view>
-							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18" :name="item.type">
-							</up-radio>
-						</view>
-					</view>
-				</block>
-			</up-radio-group>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose
-	} from 'vue'
-
-	const props = defineProps({
-		rechargeFreeChecked: {
-			type: Boolean,
-			default: false
-		},
-		payAmount: {
-			type: Number,
-			default: 0
-		},
-		freeCheck: {
-			type: Boolean,
-			default: false
-		},
-		changeFreeenable: {
-			type: Boolean,
-			default: false
-		},
-		disablePayType: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		}
-
-	});
-
-	function returnDisabled(item) {
-		if (props.disablePayType.includes(item.name)) {
-			return true
-		}else{
-			return false
-		}
-	}
-
-	const orderVIP = ref(null)
-	const emits = defineEmits(['customevent', 'groupChange']);
-	watchEffect(() => {
-		orderVIP.value = uni.cache.get('orderVIP')
-	})
-
-	const orderVIPfun = (data) => {
-		orderVIP.value = data
-	}
-
-	const paymentMethodList = ref([
-		// #ifdef MP-WEIXIN
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		// #endif
-		// #ifdef MP-ALIPAY
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-		// #endif
-		{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		}
-	])
-
-
-	const paymentMethodName = ref([{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		},
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-	])
-
-	const radiovalue = ref(2) // 支付方式
-
-	const ispws = ref(false) // 输入支付密码
-
-	const storeInfo = ref({})
-
-	// * 监听支付方式切换
-	const groupChanges = (type) => {
-		if (props.freeCheck && type == 1) {
-			return;
-		}
-		const item=paymentMethodList.value.find(v=>v.type==type)
-		if(item&&returnDisabled(item)){
-			 uni.showToast({
-				title:"当前支付方式不可用",
-				icon:'none'
-			})
-			return
-		}
-		// if (props.payAmount <= 0 && type != 1) {
-		// 	return;
-		// }
-		radiovalue.value = type;
-		let name = paymentMethodName.value[type - 1].name;
-
-		emits("groupChange", paymentMethodName.value[type - 1])
-	}
-
-	// 去充值
-	const goRecharge = () => {
-		if (orderVIP.value.isVip) {
-			uni.navigateTo({
-				url: '/pages/user/member/czzx?shopId=' + orderVIP.value.shopId
-			})
-			return
-		}
-		uni.navigateTo({
-			url: '/user/vip/buy-vip?shopId=' + orderVIP.value.shopId
-		})
-
-		// uni.pro.navigateTo('user/member/index', {
-		// 	shopId: orderVIP.value.shopId
-		// })
-	}
-	// 将方法暴露给父组件
-	defineExpose({
-		groupChanges,
-		orderVIPfun
-	});
-</script>
-
-<style lang="scss">
-	.paymentMethod {
-		box-sizing: border-box;
-		margin-top: 30rpx;
-		border-radius: 18rpx;
-
-		.paymentMethod_content {
-			background-color: #fff;
-			border-radius: 22rpx;
-			padding: 30rpx 30rpx 0 30rpx;
-			box-sizing: border-box;
-
-			.paymentMethod_title {
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #333333;
-				box-sizing: border-box;
-			}
-
-			.method_list {
-				padding: 40rpx 0;
-				box-sizing: border-box;
-				&.disabled{
-					opacity: .6;
-				}
-				.method_list_top {
-					display: flex;
-					justify-content: space-between;
-
-					.method_list_top_left {
-						display: flex;
-						align-items: center;
-
-						.icon {
-							width: 54.67rpx !important;
-							height: 48rpx !important;
-							margin-right: 22rpx;
-						}
-
-						.name {
-							font-size: 32rpx;
-							font-weight: 500;
-							color: #333;
-						}
-
-						.method_list_top_cen {
-							display: flex;
-							flex-direction: column;
-						}
-					}
-
-				}
-
-				.method_list_bom {
-					display: flex;
-					align-items: center;
-
-					.balance {
-						margin-right: 20rpx;
-						font-size: 24rpx;
-					}
-
-					.topUpNow {
-						color: #FF803D;
-						font-size: 28rpx;
-					}
-				}
-			}
-
-			.method_list:nth-child(odd) {
-				border-bottom: 2rpx solid #e5e5e5;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue
index 65a219b..2a26f9e 100644
--- a/components/paymentMethod.vue
+++ b/components/paymentMethod.vue
@@ -15,7 +15,7 @@
 									<view class="name"> {{ item.name }} </view>
 									<view class="method_list_bom" v-if="item.name == '余额支付'">
 										<text class="balance">
-											当前余额￥{{ orderVIP ? orderVIP.amount || 0 : 0 }}</text>
+											当前余额￥{{ shopUserInfo ? shopUserInfo.amount || 0 : 0 }}</text>
 										<text class="topUpNow" @click="goRecharge">去充值</text>
 									</view>
 								</view>
@@ -66,6 +66,14 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  shopUserInfo:{
+	  type: Object,
+	  default: () => {
+		  return{
+			 amount:0
+		  }
+	  },
+  }
 });
 
 // 工具函数 - 深拷贝对象（切断引用）
@@ -77,15 +85,10 @@ function returnDisabled(item) {
   return props.disablePayType.includes(item.name);
 }
 
-const orderVIP = ref(null);
 const emits = defineEmits(["customevent", "groupChange"]);
-watchEffect(() => {
-  orderVIP.value = uni.cache.get("orderVIP");
-});
 
-const orderVIPfun = (data) => {
-  orderVIP.value = data;
-};
+
+
 
 // 支付方式列表（保持不变）
 const paymentMethodList = ref([
@@ -207,13 +210,12 @@ const goRecharge = () => {
     return;
   }
   uni.navigateTo({
-    url: `/pages/user/member/czzx?shopId=${orderVIP.value?.shopId || ''}`,
+    url: `/pages/user/member/czzx?shopId=${props.shopUserInfo?.shopId || ''}`,
   });
 };
 
 defineExpose({
   groupChanges,
-  orderVIPfun,
 });
 </script>
 
diff --git a/pages/order/confirm-order-back.vue b/pages/order/confirm-order-back.vue
deleted file mode 100644
index 50e940e..0000000
--- a/pages/order/confirm-order-back.vue
+++ /dev/null
@@ -1,1407 +0,0 @@
-<template>
-	<view class="container">
-		<up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
-		<view class="headStatus">
-			<view class="status">
-
-				<up-icon v-if="listinfo.status =='done'||listinfo.status =='unpaid'||!listinfo.id"
-					name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
-				<view class="statusName" v-if="listinfo.status == 'unpaid'||!listinfo.id">待支付</view>
-				<view class="statusName" v-if="listinfo.status=='done'">已完成</view>
-				<view class="statusName" v-if="listinfo.status=='refund'">退单</view>
-				<view class="statusName" v-if="listinfo.status=='part-refund'">部分退单</view>
-				<view class="statusName" v-if="listinfo.status=='cancelled'">取消订单</view>
-			</view>
-			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
-			<view class="time" v-if="listinfo.paidTime && (listinfo.status!='cancelled' ||listinfo.status!='unpaid')">
-				付款时间：{{listinfo.paidTime}}
-			</view>
-		</view>
-
-		<view class="wxQrcode" v-if="shopQrcode">
-			<view class="left">
-				<text class="title">扫码加好友，优惠多多</text>
-				<text>优惠活动多</text>
-				<text>充值有好礼</text>
-				<text>会员享低价</text>
-				<text>长按保存，微信内扫一扫加好友</text>
-			</view>
-			<!-- #ifdef MP-WEIXIN -->
-			<u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
-			<!-- #endif -->
-			<!-- #ifdef MP-ALIPAY -->
-			<image style="height: 150rpx;width: 150rpx;" :src="shopQrcode" @longpress="saveImage(shopQrcode)"
-				mode="aspectFill"></image>
-			<!-- #endif -->
-		</view>
-
-
-		{{cartStore.orderCostSummary}}
-
-		<!-- 详情 -->
-		<orderInfo :useVipPrice="cartStore.useVipPrice" :packfee="packfee" :shifu="shifu" :nowCarts="cartStore.carts"
-			ref="orderInfoAfterRef" :freeCheck="freeCheck" :listinfo="listinfo" :orderVIP="orderVIP"
-			:ordershopUserInfo='ordershopUserInfo' @istype="istype" @clickPointsamount='clickPointsamount'
-			@learcoupons="learcoupons" :isBwc='isBwc'>
-		</orderInfo>
-		<!-- 霸王餐 -->
-		<rechargeFree :freeDineConfig="orderVIP.freeDineConfig" :payAmount="listinfo.totalPrices"
-			v-if="(listinfo.status == 'unpaid'||!listinfo.id) && orderVIP.freeDineConfig.enable"
-			@changeFree="changeFree">
-		</rechargeFree>
-		<!-- 支付方式 -->
-		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
-			:changeFreeenable="isBwc" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-		</paymentMethodes>
-		<view class="fixedview">
-			<view class="flex-between" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-				<view class="fixedview_one flex-start">
-					<view class="fixedview_oneone"> 实付金额： </view>
-					<view class="fixedview_onetow">
-						<text>¥</text>{{listinfo.totalCost}}
-					</view>
-				</view>
-				<view class="flex-colum-end u-flex u-flex-y-center">
-
-					<view class="u-m-r-30 u-flex u-flex-y-center">
-						<template v-if="ordershopUserInfo.registerType=='before'">
-							<up-button shape="circle" v-if="!listinfo.id" @click="toJiacai" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-						</template>
-						<template v-else>
-							<up-button v-if="!cartStore.isEmpty" shape="circle" @click="onlyCreateOrder" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
-									<text class="u-font-32 color-main ">仅下单</text>
-								</view>
-							</up-button>
-							<up-button v-else shape="circle" @click="toJiacai" plain :custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-						</template>
-					</view>
-					<view class="fixedview_tow" @tap="$u.debounce(istoricalorders,1000)">
-						{{paymentmethod.paymentBtnText}}
-					</view>
-					<!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
-						取消订单
-					</view> -->
-				</view>
-			</view>
-		</view>
-		<view style="width: 100%;height: 200rpx;color: #fff; color: #fff;">
-		</view>
-		<payPassword ref="payPasswordref" :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
-	</view>
-</template>
-<script setup>
-	import {
-		back
-	} from '@/utils/uniapp.js'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-
-	function onback() {
-		closeSocket()
-		back()
-	}
-	const customStyle = {
-		'width': '180rpx',
-		'height': '70rpx',
-		'background': 'FFFFFF',
-		'border-radius': '106rpx',
-		'border': '2rpx solid #E8AD7B'
-	}
-	import {
-		ref,
-		reactive,
-		computed,
-		onMounted,
-		onUnmounted,
-		watchEffect,
-		nextTick,
-		watch,
-		onBeforeMount,
-		onBeforeUnmount
-	} from 'vue';
-	import {
-		getTableInfo
-	} from '@/common/api/shop/index.js'
-	import {
-		APIgetOrderById,
-		APIputuserorder,
-		APIhistoryOrder
-	} from '@/common/api/order/index.js'
-	import {
-		APIshopUserInfo
-	} from '@/common/api/member.js'
-	import {
-		APImemberPointsmyPoints,
-		APImemberPointscalcUsablePoints
-	} from '@/common/api/shop/index.js'
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	import {
-		useWebSocket
-	} from '@/stores/carts-websocket.js';
-	const cartStore = useCartsStore()
-	async function onMessage(Message) {
-		cartStore.onMessage(Message, cartsSocket)
-		listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1
-		if (Message.operate_type == "init") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "cleanup") {
-			listinfo.totalCost = 0;
-			youhuiReset()
-			if (listinfo.id) {
-				let res = await APIgetOrderById({
-					orderId: listinfo.id
-				})
-				if (noPayStatus[res.status]) {
-					uni.showToast({
-						title: noPayStatus[res.status],
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1000);
-					return;
-				}
-			}
-		}
-		if (Message.operate_type == "del") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "edit") {
-			youhuiReset()
-		}
-		if (Message.operate_type == 'clearOrder') {
-			youhuiReset()
-		}
-		if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-			.operate_type == 'product_update') {
-			youhuiReset()
-		}
-		return Message
-	}
-	let cartsSocket = null
-	cartStore.goodsInit()
-	const socketInitPar = {
-		type: 'shopping',
-		operate_type: 'init',
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId'),
-	}
-
-	function socketInit() {
-		cartsSocket = useWebSocket();
-		cartsSocket.connect(socketInitPar, onMessage);
-	}
-	const noPayStatus = {
-		cancelled: "订单已取消",
-		done: "订单已关闭",
-	};
-
-
-
-	function youhuiReset() {
-		listinfo.pointsDiscountAmount = 0;
-		listinfo.pointsNum = 0;
-		listinfo.pointsDiscountAmount = 0
-		listinfo.Productroll = 0
-		uniqueIds.value = []
-		try {
-			orderInfoAfterRef.value?.IntegralInputclose();
-		} catch {
-
-		}
-	}
-
-
-	// 结账管理
-	import {
-		Memberpay
-	} from '@/stores/pay.js';
-
-	const storeMemberpay = Memberpay();
-
-
-
-	import {
-		productStore
-	} from '@/stores/user.js';
-	const storeuser = productStore();
-
-	import payPassword from '@/components/payPassword.vue'
-	import orderInfo from './components/orderInfo.vue'
-	// import orderInfoBefore from '../components/orderInfoBefore.vue'
-	import rechargeFree from './components/rechargeFree.vue'
-	import paymentMethodes from '@/components/paymentMethod.vue'; //支付方式
-	import {
-		onShow,
-		onBackPress
-	} from '@dcloudio/uni-app';
-	import {
-		onHide
-	} from '@dcloudio/uni-app';
-	// 输入支付密码
-	const ispws = ref(false)
-
-
-	// 会员信息
-	const orderVIP = ref(uni.cache.get('orderVIP'))
-	// 商品订单关联的店铺信息
-	const ordershopUserInfo = ref(uni.cache.get('shopInfo'))
-
-
-	cartStore.updateData('orderVIP', orderVIP.value)
-	cartStore.updateData('shopInfo', ordershopUserInfo.value)
-	// 是否显示商家二维码信息
-	const shopQrcode = ref(ordershopUserInfo.shopInfo || false)
-
-	// 霸王餐
-	const isBwc = ref(false)
-	// 订单详情
-	const listinfo = reactive({
-		combinedArray: [],
-		Productroll: 0,
-		coupondiscountAmount: 0,
-		pointsDiscountAmount: 0,
-		packFeess: 0,
-		totalPrices: 0,
-		Seatcharge: 0,
-		pointsNum: 0,
-		id: null
-	})
-
-
-
-	//判断是否是打包商品
-	const is_type = ref(0)
-	//打包商品切换
-	const istype = (newValue) => {
-		is_type.value = newValue;
-	};
-	//积分
-
-	const freeCheck = ref(false)
-	let backtimer = null
-	let historyTotalPrices = 0;
-	// * 获取订单详情接口
-	const orderorderInfo = async () => {
-		console.log('listinfo.id', listinfo.id);
-		let res = listinfo.id ? await APIgetOrderById({
-			orderId: listinfo.id
-		}) : await APIhistoryOrder({
-			tableCode: options.tableCode
-		})
-		if (res && res.tableCode) {
-			socketInitPar.table_code = res.tableCode
-			let tableRes = await getTableInfo({
-				tableCode: options.tableCode
-			})
-			console.log(tableRes);
-			listinfo.tableName = tableRes.name;
-		} else {
-			if (options.tableCode) {
-				socketInitPar.table_code = options.tableCode
-				let tableRes = await getTableInfo({
-					tableCode: options.tableCode
-				})
-				console.log(tableRes);
-				listinfo.tableName = tableRes.name;
-			}
-		}
-		socketInit()
-		console.log(res);
-		getOrderInfoAfterCalcInit(res)
-	}
-
-	//拿到订单数据后续初始化处理
-	function getOrderInfoAfterCalcInit(res) {
-		if (res && res.id) {
-			Object.assign(listinfo, res);
-			// 历史订单
-			if (listinfo.detailMap) {
-				let combinedArray = [];
-				for (const key in listinfo.detailMap) {
-					if (listinfo.detailMap.hasOwnProperty(key)) {
-						let subArray = listinfo.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				listinfo.combinedArray = combinedArray
-				listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray)
-				// 计算购物车商品费用
-				historyTotalPrices = cartStore.getTotalTotalPrices(listinfo
-					.combinedArray, isBwc.value) * 1
-
-				listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1
-				// 餐位费listinfo.seatNum
-				listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum)
-			}
-			if (listinfo.discountInfo) {
-				const discountObj = JSON.parse(listinfo.discountInfo);
-				const tempArray = [];
-				for (const [key, value] of Object.entries(discountObj)) {
-					tempArray.push({
-						name: key,
-						amount: value
-					});
-				}
-				listinfo.discountInfo = tempArray;
-			}
-			// 回填先质控
-			listinfo.pointsDiscountAmount = 0
-			// console.log(listinfo)
-
-		} else {
-			listinfo.totalPrices = cartStore.totalPrice * 1
-		}
-
-		// uni.showToast({
-		// 	title:'订单已取消或已付款',
-		// 	icon:'none'
-		// })
-		// backtimer=setTimeout(()=>{
-		// 	const arr=getCurrentPages()
-		// 	if(arr.length<=1){
-		// 		toJiacai()
-		// 	}else{
-		// 		uni.navigateBack({delta:1})
-		// 	}
-		// },1000)
-	}
-
-
-	// 监听价格算法
-	watchEffect(async () => {
-		if (listinfo.combinedArray.length > 0 || cartStore.carts.length > 0) {
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge
-			// try {
-			let historyOrderPackFee = is_type.value != 0 ? listinfo.packFeess : 0;
-			let nowCartPackFee = is_type.value != 0 ? cartStore.totalPackFee * 1 : 0;
-			let seatFee = is_type.value == 0 ? listinfo.Seatcharge : 0;
-			let sum = cartStore.totalPackFee * 1 + historyOrderPackFee + listinfo.totalPrices + seatFee;
-			listinfo.originAmount = Math.round(sum * 100) / 100;
-
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
-			let sums = nowCartPackFee + historyOrderPackFee + listinfo.totalPrices + seatFee - (listinfo
-				.Productroll || 0) - (listinfo.coupondiscountAmount || 0) - (listinfo
-				.pointsDiscountAmount || 0);
-			listinfo.totalCost = Math.round(sums * 100) / 100;
-
-			// 总价格
-			// console.log(listinfo.combinedArray, listinfo.packFeess, listinfo.totalPrices, listinfo
-			// 	.Seatcharge, listinfo.Productroll, listinfo.coupondiscountAmount, sums) // 霸王餐
-			// console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value)
-			if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-				listinfo.totalCost = (parseFloat(listinfo.totalCost) * parseFloat(orderVIP.value
-					.freeDineConfig.rechargeTimes)).toFixed(2)
-			}
-			// 积分
-			if (listinfo.totalCost && (listinfo.status == 'unpaid' || !listinfo.id) && orderVIP.value.id) {
-				uni.$u.debounce(memberPointscalcUsablePoints, 500)
-			}
-			// } catch (error) {
-			// 	//TODO handle the exception
-			// }
-		}
-	});
-
-
-
-	const changeFree = (e) => {
-		isBwc.value = e
-
-		orderInfoAfterRef.value.bwcclear()
-		uniqueIds.value = [] // 筛选出商品卷的id
-		listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		listinfo.pointsNum = 0 // 商品卷总价价格
-		// 商品价格
-		listinfo.totalPrices = cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value)
-		// 支付方式切换
-		// #ifdef MP-WEIXIN
-		paymentMethodref.value.groupChanges(2)
-		// #endif
-		// #ifdef MP-ALIPAY
-		paymentMethodref.value.groupChanges(3)
-		// #endif
-
-
-	}
-
-	const saveImage = (url) => {
-		uni.saveImage({
-			url: url,
-			success: () => {
-				uni.showToast({
-					title: "保存成功",
-					icon: 'none'
-				})
-			},
-		});
-	}
-
-	//
-	const paymentMethodref = ref(null)
-
-	// 支付方式切换
-	const paymentmethod = reactive({
-		radiovalue: 2,
-		paymentBtnText: "微信支付",
-		payType: 'wechatPay'
-	})
-
-	const groupChange = async (e) => {
-		paymentmethod.radiovalue = e.type;
-		paymentmethod.paymentBtnText = e.name;
-		paymentmethod.payType = e.payType;
-	}
-
-	// * 去充值
-	const goRecharge = () => {
-		uni.pro.navigateTo('/pages/member/index', {
-			shopId: listinfo.shopId
-		})
-	}
-
-	// 操作下单时候
-	const orderInfoAfterRef = ref(null)
-
-	// 商品卷的id储存
-	const uniqueIds = ref([])
-
-	// 这是优惠卷传的值
-	const handleReturnData = async (data) => {
-		// 这是优惠卷
-		if (data.typeOrder == 1) {
-			if (data.item) {
-				// 优惠卷减去的金额
-				listinfo.coupondiscountAmount = data.item.discountAmount
-				uniqueIds.value.push(data.item.id)
-				orderInfoAfterRef.value.dataprocessing(data)
-			}
-		} else {
-			// 筛选出商品卷的id
-			// 商品卷总价价格
-			// uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
-			uniqueIds.value = [...uniqueIds.value, ...data.map(item => item.id)]
-			console.log(uniqueIds.value);
-			listinfo.Productroll = cartStore.getTotalProductroll(data).value
-			// TODO handle the exception
-			let res = {
-				Productroll: listinfo.Productroll,
-				uniqueIds: uniqueIds.value.length
-			}
-			orderInfoAfterRef.value.dataprocessing(res)
-
-		}
-
-	};
-
-	const learcoupons = (data) => {
-		if (data == 'product') {
-			uniqueIds.value = [] // 筛选出商品卷的id
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-			listinfo.Productroll = 0 // 商品卷总价价格
-			listinfo.pointsNum = 0 // 积分总价格
-		} else {
-			// 每次点击优惠卷删除优惠卷里的id 
-			if (listinfo.coupondiscountAmount != 0) {
-				uniqueIds.value.pop()
-			}
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		}
-	}
-
-	// 删除订单
-	const APIputuserorderclick = async () => {
-		await APIputuserorder(listinfo.id)
-		uni.showToast({
-			title: '删除成功',
-			icon: 'none'
-		})
-		uni.pro.switchTab('order/index')
-	}
-	async function onlyCreateOrder() {
-		await createOrder()
-		orderorderInfo()
-	}
-	// 生成订单
-	const createOrder = async () => {
-		const res = await storeMemberpay.actionscreateOrder({
-			dineMode: is_type.value == 0 ? 'dine-in' : 'take-out', //堂食 dine-in 外带 take-out 外卖 take-away
-			seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
-			// packFee: packFee.value, //打包费
-			packFee: packfee.value, //打包费
-			originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
-			remark: '', //备注
-			placeNum: listinfo.id ? (listinfo.placeNum * 1 + 1) : 1, //当前订单下单次数
-			waitCall: '', //是否等叫 0 否 1 等叫
-			orderId: listinfo.id || '',
-			userId: uni.cache.get('userInfo').id || '' //
-		})
-		// 清空购物车
-		if (res) {
-			Object.assign(listinfo, res)
-			getOrderInfoAfterCalcInit(res)
-			cartsSocket.sendMessage({
-				type: 'shopping',
-				table_code: uni.cache.get('tableCode'),
-				shop_id: uni.cache.get('shopId'),
-				operate_type: 'cleanup',
-			})
-			return res
-		} else {
-			uni.showToast({
-				title: '生成订单失败'
-			})
-		}
-
-	}
-
-	function isPayBefor() {
-		return ordershopUserInfo.value.registerType == 'before' ? true : false
-	}
-
-
-	function pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_lock'
-		})
-	}
-
-	function pay_unlock() {
-		clearInterval(payStatusTimer)
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_unlock'
-		})
-	}
-	async function search_pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'search_pay_lock'
-		})
-		return new Promise((relove, reject) => {
-			cartsSocket.socketTask.onMessage(res => {
-				relove(JSON.parse(res.data))
-			})
-		})
-	}
-	let payStatusTimer = null
-	let orderIsLock = true;
-	const istoricalorders = async () => {
-		//先付
-		if (isPayBefor()) {
-			console.log('isPayBefor');
-			// 购物车有数据
-			if (!cartStore.isEmpty) {
-				const res = await createOrder()
-				goToPay()
-			}
-
-
-		} else {
-			//后付
-
-			// 先调用历史订单
-			let APIhistoryOrderres = await APIhistoryOrder({
-				tableCode: listinfo.tableCode
-			})
-			// 判断是否有历史订单
-			if (APIhistoryOrderres.detailMap) {
-				let combinedArray = [];
-				for (const key in APIhistoryOrderres.detailMap) {
-					if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
-						let subArray = APIhistoryOrderres.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				// 判断支付之前是是否还有新加订单
-				if (listinfo.combinedArray.length === combinedArray.length) {
-					goToPay()
-				} else {
-					uni.showToast({
-						title: '你的订单已更新！',
-						icon: 'none'
-					})
-					orderorderInfo()
-				}
-			} else {
-				uni.showToast({
-					title: '你的小伙伴已提交订单~',
-					icon: 'none'
-				})
-				setTimeout(() => {
-					orderorderInfo()
-				}, 1000)
-			}
-		}
-
-
-
-	}
-
-	// * 去支付
-	const goToPay = async (isCreateOrder = false) => {
-		// 余额支付
-		if (paymentmethod.payType == 'accountPay') {
-			if (orderVIP.value.isVip == 0) {
-				uni.showModal({
-					title: '提示',
-					content: '您还不是会员,是否去注册会员？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.pro.navigateTo('user/member/index', {
-								shopId: orderVIP.value.shopId,
-								type: 'detail'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-			} else if (orderVIP.value.payPwd == '') {
-				uni.showModal({
-					title: '提示',
-					content: '您还未设置支付密码，是否去设置？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.pro.navigateTo('user/member/setPassword', {
-								shopId: orderVIP.value.shopId,
-								type: 'detail'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-				// } else if (orderVIP.value.amount == 0) {
-				// 	uni.showToast({
-				// 		title: '您的余额不足',
-				// 		icon: 'none'
-				// 	})
-				// } else {
-			} else {
-				ispws.value = true
-			}
-			return false
-		}
-
-		const canPayRes = await search_pay_lock()
-		console.log('canPayRes', canPayRes);
-		const canPay = canPayRes.status == 1 ? true : false;
-		console.log('canPay', canPay);
-		if (!canPay) {
-			uni.showToast({
-				title: '有人正在付款中！',
-				icon: 'none'
-			})
-			return
-		}
-		pay_lock()
-		payStatusTimer = setInterval(() => {
-			pay_lock()
-		}, 1000)
-
-		if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-			await storeMemberpay.actionspayltPayVip({
-				shopId: orderVIP.value.shopId,
-				shopUserId: orderVIP.value.id,
-				orderId: listinfo.id,
-				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-				amount: listinfo.totalCost, // 最终订单金额
-				returnUrl: '', //跳转地址
-				buyerRemark: '',
-				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
-			})
-
-			orderorderInfo()
-			return false;
-		} else {
-			console.log(' ordershopUserInfo.value', ordershopUserInfo.value);
-			let checkOrderPay = {
-				orderId: listinfo.id,
-				vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
-				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
-				originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
-				discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
-				discountAmount: 0, //手动优惠金额  写死0
-				productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额
-				fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额
-				couponList: uniqueIds.value, //用户使用的卡券
-				orderAmount: listinfo.totalCost, // 最终订单金额
-				roundAmount: 0, //抹零金额 减免多少钱
-				pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
-				pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
-				remark: '', //用户备注
-			}
-			console.log('topay checkOrderPay', checkOrderPay);
-			try {
-				await storeMemberpay.actionsltPayOrder({
-					checkOrderPay,
-					payType: paymentmethod.payType,
-					buyerRemark: '',
-					returnUrl: ''
-				})
-			} catch (error) {
-				pay_unlock()
-				//TODO handle the exception
-			}
-		}
-		pay_unlock()
-		orderorderInfo()
-	}
-
-	//002-获取订单可用积分及抵扣金额（支付页面使用）
-	const memberPointscalcUsablePoints = async () => {
-		let res = await APImemberPointscalcUsablePoints({
-			shopUserId: orderVIP.value.id,
-			orderAmount: listinfo.totalCost,
-		})
-		orderInfoAfterRef.value?.getCalcUsablePoints(res)
-	}
-	// 
-	const clickPointsamount = (Pointsamount) => {
-		listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount
-		listinfo.pointsNum = Pointsamount.pointsNum
-	}
-
-	const payPasswordref = ref(null)
-	// 余额支付
-	const accountPayevent = async (pwd) => {
-		ispws.value = false;
-		let checkOrderPay = {
-			userId: uni.cache.get('userInfo').id,
-			orderId: listinfo.id,
-			vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
-			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-			seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
-			originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
-			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
-			discountAmount: 0, //手动优惠金额  写死0
-			productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额
-			fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额
-			couponList: uniqueIds.value, //用户使用的卡券
-			orderAmount: listinfo.totalCost, // 最中订单金额
-			roundAmount: 0, //抹零金额 减免多少钱
-			pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
-			pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
-			remark: '', //用户备注
-		}
-		try {
-			await storeMemberpay.balancePayOrder({
-				checkOrderPay,
-				payType: paymentmethod.payType,
-				pwd: pwd,
-				shopUserId: orderVIP.value.id,
-				buyerRemark: '',
-				returnUrl: ''
-			})
-		} catch (error) {
-			//TODO handle the exception
-		}
-		orderorderInfo()
-	}
-
-	onBeforeUnmount(() => {
-		uni.$off('returnData', handleReturnData);
-		clearTimeout(backtimer)
-		clearInterval(payStatusTimer)
-		closeSocket()
-	});
-	onHide(() => {
-		closeSocket()
-		clearInterval(payStatusTimer)
-	})
-
-	function closeSocket() {
-
-		// cartsSocket.closeExistingConnection()
-	}
-
-	onShow(() => {
-		if (cartsSocket) {
-			cartsSocket.connect()
-		}
-		try {
-			// 更新数据
-			if (orderVIP.value) {
-				orderVIP.value = uni.cache.get('orderVIP')
-				paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
-				if (listinfo.id && ordershopUserInfo.value.registerType != 'before') {
-					orderorderInfo()
-				}
-			}
-		} catch (error) {
-			//TODO handle the exception
-		}
-
-		orderorderInfo()
-		uni.$off('selCoupon')
-		uni.$on('selCoupon', function(data) {
-			console.log('selCoupon',data)
-		})
-
-	});
-	let options = {}
-
-	// 跳转到加菜页面
-	function toJiacai() {
-		back()
-		return
-		uni.navigateTo({
-			url: '/pages/product/index'
-		})
-	}
-	//打包费
-	const packfee = computed(() => {
-		const historyOrderPackfee = listinfo.packFeess ? listinfo.packFeess * 1 : 0;
-		const nowCartsPackFee = is_type.value ? cartStore.totalPackFee * 1 : 0;
-		const total = historyOrderPackfee + nowCartsPackFee
-		return total
-	})
-	//不计算各种折扣前的实付金额
-	const shifu = computed(() => {
-		const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
-		return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
-	})
-	//减去各种折扣后的金额
-	const lastPayMoney = computed(() => {
-		return shifu.value * 1
-	})
-
-
-	const payStatus = {
-		'unpaid': '待支付',
-		'done': '已完成',
-		'refund': '已退款',
-		'part-refund': '部分退款',
-		'cancelled': '已取消'
-	}
-	const navTitle = computed(() => {
-		if (!listinfo.id && !cartStore.isEmpty) {
-			return '待确认'
-		}
-		if (cartStore.isEmpty && listinfo.id) {
-			return payStatus[listinfo.status] || '待确认'
-		} else {
-			return '待确认'
-		}
-	})
-
-	async function init(opt) {
-		Object.assign(options, opt)
-		listinfo.id = options.orderId;
-		console.log('init', listinfo);
-		if (options.shopId) {
-			// 每次进来全局更新shopId
-			uni.cache.set('shopId', options.shopId)
-			uni.$on('returnData', handleReturnData);
-		}
-		// * 获取会员信息
-		await storeuser.actionsproductqueryProduct()
-		await nextTick()
-
-		orderVIP.value = uni.cache.get('orderVIP')
-		if (options.tableCode) {
-			socketInitPar.table_code = options.tableCode
-			socketInit()
-		} else {
-			orderorderInfo()
-		}
-
-	}
-	onLoad((opt) => {
-		init(opt)
-	})
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #F7F7F7;
-	}
-
-	.container {
-		padding: 32rpx 28rpx 32rpx 28rpx;
-	}
-
-	.headStatus {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 32rpx;
-		align-items: center;
-
-		.status {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-weight: bold;
-			font-size: 36rpx;
-			color: #333333;
-
-			.statusName {
-				margin-left: 16rpx;
-			}
-		}
-
-		.time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 18rpx;
-		}
-	}
-
-	.wxQrcode {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		padding: 32rpx 24rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 32rpx;
-
-		.left {
-			display: flex;
-			flex-direction: column;
-		}
-
-		.title {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			margin-bottom: 16rpx;
-		}
-	}
-
-	.card_box {
-		background-color: #fff;
-		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		position: relative;
-		width: 100%;
-		height: 100%;
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
-		border-radius: 18rpx;
-
-		.card_head_box {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: absolute;
-			top: -22.5rpx;
-			padding: 0 44rpx;
-
-			.card_head_item {
-				width: 45rpx;
-				height: 45rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
-			}
-
-		}
-	}
-
-	.card {
-		// background-color: #fff;
-		border-radius: 20upx;
-		margin-bottom: 28upx;
-		position: relative;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			padding: 50rpx 0 32rpx 0;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.head_left {
-				.shopName {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.tableName {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-
-			.status {
-				text {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-
-		.number-wrap {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-top: 32rpx;
-
-			.t {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.number {
-				font-weight: bold;
-				font-size: 56rpx;
-				color: #333333;
-			}
-		}
-
-
-		.price {
-			.i {
-				font-size: 20upx;
-			}
-
-			.num {
-				font-size: 38upx;
-			}
-		}
-
-		.shop-box {
-			padding: 36rpx 34rpx 30rpx 34rpx;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.shop-head {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.shop-head-left {
-					display: flex;
-					align-items: center;
-
-					.tag-wrap {
-						width: 80rpx;
-						height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 10rpx 10rpx 10rpx 10rpx;
-						border: 2rpx solid #E3AD7F;
-						margin-right: 18rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.tag {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #E3AD7F;
-						}
-					}
-
-					.title {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-				}
-			}
-
-			.shop-info {
-				margin-top: 32rpx;
-
-				.item:nth-child(1) {
-					margin-top: 0;
-				}
-
-				.item {
-					padding: 32rpx 0 !important;
-					display: flex;
-
-					.cover {}
-
-					.info {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						padding-left: 16upx;
-
-						.productName {
-							font-weight: bold;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 20rpx;
-						}
-
-						.productSkuName {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 3;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						.n {
-							font-size: 24upx;
-							color: #999;
-						}
-					}
-
-					.price {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-						padding-left: 68rpx;
-
-						.priceAmount {
-							font-weight: 500;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 26rpx;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							margin-top: 22rpx;
-						}
-					}
-				}
-			}
-
-			.total-wrap {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				font-weight: 500;
-				font-size: 28rpx;
-
-				.price {
-					font-weight: bold;
-					font-size: 32rpx;
-				}
-			}
-		}
-
-
-
-		.order_footer {
-			display: flex;
-			flex-direction: column;
-			padding: 34rpx;
-			position: relative;
-
-			.order_footer_icon {
-				width: 100%;
-				position: absolute;
-				top: -22.5rpx;
-				left: 0;
-				display: flex;
-				justify-content: space-between;
-
-				.order_footer_left_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-left: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-				}
-
-				.order_footer_right_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-				}
-			}
-
-			.title {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.order-info {
-				.row {
-					display: flex;
-					justify-content: space-between;
-					padding-top: 32upx;
-
-					.t {
-						font-weight: normal;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.info {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
-				}
-			}
-		}
-
-
-	}
-
-	.pay-info-wrap {
-		padding: 0;
-		box-sizing: border-box;
-
-		.info-wrap {
-			padding: 64rpx 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-
-			.title {
-				align-self: center;
-				font-size: 32rpx;
-				color: #333;
-				font-weight: bold;
-			}
-		}
-
-		.info-content {
-			.pay-title {
-				display: flex;
-				align-items: flex-end;
-				justify-content: center;
-				font-weight: bold;
-				width: 100%;
-				font-size: 48rpx;
-				color: #333;
-				margin-top: 48rpx;
-
-				text {
-					font-size: 60rpx;
-					color: #333;
-				}
-			}
-
-			.pay-password {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: 64rpx;
-
-				.list {
-					width: 88rpx;
-					height: 88rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border: 2rpx solid #999;
-					border-radius: 8rpx;
-
-					text {
-						font-size: 32rpx;
-					}
-				}
-
-			}
-
-			.hint {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 100rpx;
-
-				text {
-					font-size: 28rpx;
-					color: #ccc;
-				}
-			}
-		}
-
-	}
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 999;
-
-		// height: 80rpx;
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 36rpx 70rpx 36rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.flex-colum-end {
-				.fixedview_tow {
-					background: #E3AD7F;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-
-				.fixedview_tows {
-					margin-top: 10rpx;
-					background: #c3c3c3;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-			}
-
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index dc6d290..1a41fe5 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -67,7 +67,7 @@
 		</rechargeFree>
 
 		<!-- 支付方式 -->
-		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
+		<paymentMethodes ref="paymentMethodref" :shopUserInfo="orderVIP" @groupChange="groupChange"
 			:disablePayType="disablePayType" :changeFreeenable="isBwc" v-model="paymentmethod"
 			v-if="listinfo.status == 'unpaid' || !listinfo.id">
 			<template #bottom>
@@ -203,6 +203,7 @@
 		useWebSocket
 	} from "@/stores/carts-websocket.js";
 	import * as chatApi from "@/http/php/chat";
+	import * as rechargeApi from '@/common/api/market/recharge.js'
 
 	import MsgListItem from '@/components/msg-list-item/msg-list-item.vue'
 
@@ -858,8 +859,6 @@
 				icon: "none",
 			});
 			const shopUserInfo = uni.cache.get("shopUserInfo");
-			console.log("shopUserInfo", shopUserInfo);
-			console.log("listinfo", listinfo);
 			if (shopUserInfo) {
 				if (shopUserInfo.userId == listinfo.userId) {
 					pay_unlock();
@@ -1011,7 +1010,6 @@
 			// 更新数据
 			if (orderVIP.value) {
 				orderVIP.value = uni.cache.get("orderVIP");
-				paymentMethodref.value.orderVIPfun(uni.cache.get("orderVIP"));
 				if (listinfo.id && ordershopUserInfo.value.registerType != "before") {
 					orderorderInfo();
 				}
@@ -1113,10 +1111,11 @@
 	}
 
 	const limitTimeDiscountRes = ref(null)
+	const rechargeConfig=ref(null)
 	async function init(opt) {
-		await storeuser.actionsproductqueryProduct();
-
-		console.log("init");
+		const res1= await storeuser.actionsproductqueryProduct();
+		orderVIP.value=res1
+		console.log('orderVIP',orderVIP.value)
 		cartStore.clearOrderConfig();
 		Object.assign(options, opt);
 		listinfo.id = options.orderId;
@@ -1158,6 +1157,11 @@
 		const shopInfoRes = await APIusershopInfodetail({
 			shopId: options.shopId,
 		});
+		//智慧充值
+		const rechargeConfigRes=await rechargeApi.config({shopId: options.shopId})
+		if(rechargeConfigRes&&typeof rechargeConfigRes ==='object'){
+			rechargeConfig.value=rechargeConfigRes
+		}
 		//获取积分配置
 		pointsApi.pointsConfig().then(res => {
 			cartStore.setPointDeductionRule(res);
@@ -1282,6 +1286,9 @@
 		if (!isCanUseCharge.value) {
 			arr.add("余额支付");
 		}
+		if(rechargeConfig.value&&!rechargeConfig.value.isEnable){
+			arr.add("余额支付");
+		}
 
 		return Array.from(arr);
 	});
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index ceb99b8..617e81d 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -583,7 +583,6 @@
 				console.log(uni.cache.get('orderVIP'))
 				orderVIP.value = uni.cache.get('orderVIP')
 				ordershopUserInfo.value = orderVIP.value.shopInfo
-				paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
 				if (orderId.value) {
 					orderorderInfo()
 				}
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 702eef8..6c5bab0 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1585,11 +1585,10 @@
 	// 返回商品对应sku数据
 
 	function cartInit(arr) {
+	
 		const result = []
-		console.log('cartInitArr', arr);
-		console.log('allGoodsArr', allGoodsArr);
 		cartStore.carts = arr.map(v => {
-			const goods = allGoodsArr.find(g => g.id == v.product_id)
+			const goods = cartStore.allGoodsArr.find(g => g.id == v.product_id)
 			const goodsSkuList = goods ? goods.skuList : []
 			const findSku = goodsSkuList.find(sku => sku.id == v.sku_id)
 			const memberPrice = findSku ? findSku.memberPrice : 0
@@ -1599,6 +1598,13 @@
 				}, cartStore.limitTimeDiscount, shopInfo,
 				shopUserInfo.value, 'product_id');
 			if (!goods) {
+				console.log('删除未匹配到的商品', {
+					id: v.id,
+					operate_type: "del",
+					table_code: uni.cache.get('tableCode'),
+					shop_id: uni.cache.get('shopId'),
+					type: "shopping",
+				})
 				useSocket.sendMessage({
 					id: v.id,
 					operate_type: "del",
@@ -1647,7 +1653,7 @@
 				isLoading.value = false;
 				return false;
 			}
-			console.log('product index 收到消息', Message);
+
 			// 检查消息是否已经处理过
 			if (processedMessageIds.has(Message.msg_id)) {
 				return;
@@ -2084,11 +2090,11 @@
 		}
 		return currentTime >= startTime && currentTime <= endTime;
 	});
-	let allGoodsArr = []
+	const allGoodsArr = ref([])
 	// 列表请求
 	const productqueryProduct = async () => {
 		cartStore.goodsIsloading = false;
-		allGoodsArr = []; // 确保声明过（建议用ref/let声明，避免全局隐式变量）
+		allGoodsArr.value=[]
 		try {
 			shopProductList.hots = await productminiApphotsquery();
 			shopProductList.productInfo = await APIgroupquery();
@@ -2114,7 +2120,7 @@
 						product.startTime,
 						product.endTime
 					);
-					allGoodsArr.push(product);
+					allGoodsArr.value.push(product);
 					cartStore.setGoodsMap(product.id, product);
 				}
 			}
@@ -2123,14 +2129,15 @@
 			for (const i of shopProductList.hots) {
 				i.cartNumber = 0;
 				i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
-				allGoodsArr.push(i);
+				allGoodsArr.value.push(i);
 				cartStore.setGoodsMap(i.id, i);
 			}
 
 			// 此时所有异步操作完成，allGoodsArr已有数据
-			console.log('allGoodsArr', allGoodsArr);
-			console.log('shopProductList', shopProductList);
-
+			// console.log('allGoodsArr', allGoodsArr);
+			// console.log('shopProductList', shopProductList);
+			console.log('cartStore.carts', cartStore.carts)
+			cartStore.allGoodsArr=allGoodsArr.value
 			if (cartStore.carts.length > 0) {
 				cartInit(cartStore.carts);
 			}
diff --git a/stores/carts.js b/stores/carts.js
index 824a79a..1579900 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -39,6 +39,9 @@ export const useCartsStore = defineStore("cart", () => {
 	);
 	//用户信息
 	const shopUserInfo = ref(uni.cache.get("shopUserInfo") || {});
+	
+	//全部的商品列表
+	const allGoodsArr=ref([])
 
 	const consumeDiscount = ref({});
 
@@ -754,6 +757,6 @@ export const useCartsStore = defineStore("cart", () => {
 		//限时折扣
 		limitTimeDiscount,
 		shopUserInfo,
-		socketSendMsg,
+		socketSendMsg,allGoodsArr
 	};
 });
\ No newline at end of file

From 9b78ee0f4819271252e18f2c7dc04eac6597baec Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 25 Dec 2025 19:40:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/birthday-modal.vue     | 3 ++-
 pages/user/member/billDetails.vue | 3 +++
 userPackage/order/detail.vue      | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/birthday-modal.vue b/components/birthday-modal.vue
index 0d8d86b..c46ada8 100644
--- a/components/birthday-modal.vue
+++ b/components/birthday-modal.vue
@@ -55,7 +55,7 @@
                 </template>
               </view>
               <!-- 优惠券名称与领取按钮 -->
-              <view class="u-flex u-row-between u-m-t-16">
+              <view class="u-flex u-row-between u-m-t-16 u-col-center">
                 <view>
                   <text class="title">{{ item.couponInfo.title }}</text>
                   <text class="num">x{{ item.num }}</text>
@@ -507,6 +507,7 @@ function close() {
   outline: none;
   margin: 0;
   cursor: pointer;
+  white-space: nowrap;
   &:active {
     background: #f07080; // 点击深色反馈
   }
diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue
index 236656c..83f44b5 100644
--- a/pages/user/member/billDetails.vue
+++ b/pages/user/member/billDetails.vue
@@ -60,6 +60,9 @@
 							<text v-if="item.bizCode == 'cashback'">
 								消费返现
 							</text>
+							<text v-if="item.bizCode == 'cashback_refund'">
+								消费返现扣减
+							</text>
 							<text v-if="item.bizCode == 'freeIn'">
 								霸王餐充值
 							</text>
diff --git a/userPackage/order/detail.vue b/userPackage/order/detail.vue
index 74555ed..a73ae05 100644
--- a/userPackage/order/detail.vue
+++ b/userPackage/order/detail.vue
@@ -716,9 +716,10 @@
 		const index = item.packageInfo.tieredDiscount.findIndex(v => v.peopleNum==nowStep.value.peopleNum)
 		if (index != -1) {
 			const percent= (index + 1) / item.packageInfo.tieredDiscount.length * 100
-			return percent>=100?100:0;
+			return percent>=100?100:percent;
+		}else{
+			return 0
 		}
-		return 0
 	})
 	const nowPrice = computed(() => {
 		if (!item.packageInfo) {