From a93999c041e940761ef5b2af8a835b51a949dffa Mon Sep 17 00:00:00 2001
From: yindongqi <yin_dongqi@163.com>
Date: Sun, 13 Apr 2025 21:23:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E3=80=81=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在分销中心页面添加导航栏并优化UI显示
- 在购物车页面增加打包费计算和显示
- 在订单详情页优化订单状态显示和导航逻辑
---
 pages/cart/cart.vue                           |  303 ++-
 pages/components/pages/fenxiao/fenxiao.vue    |   71 +-
 .../pages/fenxiao/fenxiaorequestform.vue      |   24 +-
 pages/components/pages/invoice/invoice.vue    |  142 +-
 pages/components/pages/orders/detail.vue      |  913 ++++---
 pages/components/pages/pay/pay.vue            | 1532 ++++++-----
 pages/menu/menu.vue                           | 2413 +++++++++--------
 pages/mine/mine.vue                           |    6 +-
 pages/order/order.vue                         |   20 +-
 9 files changed, 2824 insertions(+), 2600 deletions(-)

diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index b2bb275..634af85 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,58 +1,67 @@
 <template>
-	<uv-navbar
-	  :fixed="false"
-	  :title="title"
-	  left-arrow
-	  @leftClick="$onClickLeft"
-	/>
-	<view  class="cart-popup">
-		 <view class="top flex justify-between">
-		   <text>已点{{ getCartGoodsNumber }}份</text>
-		   <text @tap="handleCartClear">清空</text>
-		 </view>
-		 <scroll-view class="cart-list" scroll-y>
-		  <view class="wrapper">
-		   <uv-empty mode="car" v-if="cart.length == 0"></uv-empty>
-		   <view class="item" v-for="(item, index) in cart" :key="index">
-			<view class="left">
-			 <view class="name">{{ item.name }}</view>
-			 <view class="props">{{ item.valueStr }}</view>
+	<uv-navbar :fixed="false" :title="title" left-arrow @leftClick="$onClickLeft" />
+	<view class="cart-popup">
+		<view class="top flex justify-between">
+			<text>已点{{ getCartGoodsNumber }}份</text>
+			<text @tap="handleCartClear">清空</text>
+		</view>
+		<scroll-view class="cart-list" scroll-y>
+			<view class="wrapper">
+				<uv-empty mode="car" v-if="cart.length == 0"></uv-empty>
+				<view class="item" v-for="(item, index) in cart" :key="index">
+					<view class="left">
+						<view class="name">{{ item.name }}</view>
+						<view class="props">{{ item.valueStr }}</view>
+					</view>
+					<view class="center">
+						<text>￥{{ item.price }}</text>
+					</view>
+					<view class="right">
+						<button type="default" plain size="mini" class="btn" hover-class="none"
+							@tap="handleCartItemReduce(index)">
+							<view class="iconfont iconsami-select" style="color: white;"></view>
+						</button>
+						<view class="number">{{ item.number }}</view>
+						<button type="primary" class="btn" size="min" hover-class="none"
+							@tap="handleCartItemAdd(index)">
+							<view class="iconfont iconadd-select"></view>
+						</button>
+					</view>
+				</view>
 			</view>
-			<view class="center">
-			 <text>￥{{ item.price }}</text>
-			</view>
-			<view class="right">
-			 <button type="default" plain size="mini" class="btn" hover-class="none"
-			  @tap="handleCartItemReduce(index)">
-			  <view class="iconfont iconsami-select" style="color: white;"></view>
-			 </button>
-			 <view class="number">{{ item.number }}</view>
-			 <button type="primary" class="btn" size="min" hover-class="none"
-			  @tap="handleCartItemAdd(index)">
-			  <view class="iconfont iconadd-select"></view>
-			 </button>
-			</view>
-		   </view>		
-		  </view>
-		 </scroll-view>
-	 </view>
-	 <view class="fixed-bottom flex justify-between align-center bg-white ">
-	 	<view class="mx-2 ont-weight-light">应付:<text class="text-danger">￥{{ getCartGoodsPrice }}</text></view>
-	 	<view ><uv-button style="background-color: #52ac41;" type="warning" color="#52ac41" :customStyle="customStyle" size="large" text="去结算" @click="toPay"></uv-button></view>
-	 </view>
-	 <uv-toast ref="uToast"></uv-toast>
+		</scroll-view>
+	</view>
+	<view class="fixed-bottom flex justify-between align-center bg-white ">
+		<view class="mx-2 ont-weight-light">
+			<view>商品总价: ￥{{ (getCartGoodsPrice - getPackingFee).toFixed(2) }}</view>
+			<view>打包费: ￥{{ getPackingFee.toFixed(2) }}</view>
+			<view>应付: <text class="text-danger">￥{{ getCartGoodsPrice }}</text></view>
+		</view>
+		<view>
+			<uv-button 
+				style="background-color: #52ac41;" 
+				type="warning" 
+				color="#52ac41" 
+				:customStyle="customStyle" 
+				size="large" 
+				text="去结算" 
+				@click="toPay">
+			</uv-button>
+		</view>
+	</view>
+	<uv-toast ref="uToast"></uv-toast>
 </template>
 
 <script setup>
 import {
-  ref,
-  computed
+	ref,
+	computed
 } from 'vue'
 import { useMainStore } from '@/store/store'
 import { storeToRefs } from 'pinia'
-import { onLoad,onShow} from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 const main = useMainStore()
-const { orderType,address, store,location,isLogin } = storeToRefs(main)
+const { orderType, address, store, location, isLogin } = storeToRefs(main)
 const title = ref('购物车')
 const cart = ref([])
 const uToast = ref()
@@ -65,23 +74,33 @@ onShow(() => {
 	cart.value = uni.getStorageSync('cart')
 })
 const getCartGoodsNumber = computed(() => { //计算购物车总数
-	if(cart.value.length == 0) {
+	if (cart.value.length == 0) {
 		return 0
 	}
 	return cart.value.reduce((acc, cur) => acc + cur.number, 0)
 })
-const getCartGoodsPrice = computed(() =>{ //计算购物车总价
-	if(cart.value.length == 0) {
+const getCartGoodsPrice = computed(() => {
+	//计算购物车总价（商品价格+打包费）
+	if (cart.value.length == 0) {
 		return 0
 	}
-	let price = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0);
-	return parseFloat(price).toFixed(2);
+	let total = cart.value.reduce((acc, cur) => {
+		const itemPrice = cur.price * cur.number;
+		const boxPrice = (cur.boxFee || 0) * cur.number;
+		return acc + itemPrice + boxPrice;
+	}, 0);
+	return parseFloat(total).toFixed(2);
 })
-const customStyle = computed(() =>{ 
+
+const getPackingFee = computed(() => {
+	// 计算打包费（根据每个商品的boxFee计算）
+	return cart.value.reduce((acc, cur) => acc + cur.number * (cur.boxFee || 0), 0);
+});
+const customStyle = computed(() => {
 	return {
-		  paddingLeft:'60rpx',
-		  paddingRight:'60rpx'
-		}
+		paddingLeft: '60rpx',
+		paddingRight: '60rpx'
+	}
 })
 const handleCartItemAdd = (index) => {
 	cart.value[index].number += 1
@@ -113,9 +132,9 @@ const handleCartClear = () => { //清空购物车
 	})
 }
 const toPay = () => {
-	
-	if(cart.value.length == 0){
-		uToast.value.show({message:'请先去点餐哦',type: 'error'});
+
+	if (cart.value.length == 0) {
+		uToast.value.show({ message: '请先去点餐哦', type: 'error' });
 		return;
 	}
 
@@ -126,12 +145,12 @@ const toPay = () => {
 		return
 	} else {
 		if (store.value.status == 0) {
-			uToast.value.show({message:'不在店铺营业时间内',type: 'error'});
+			uToast.value.show({ message: '不在店铺营业时间内', type: 'error' });
 			return;
 		}
 		// 判断当前是否在配送范围内
 		if (orderType.value == 'takeout' && store.value.distance < store.value.far) {
-			uToast.value.show({message:'选中的地址不在配送范围',type: 'error'});
+			uToast.value.show({ message: '选中的地址不在配送范围', type: 'error' });
 			return;
 		}
 
@@ -151,97 +170,99 @@ const toPay = () => {
 
 <style lang="scss" scoped>
 .cart-popup {
-		.top {
-			background-color: $bg-color-primary;
-			//color: $color-primary;
-			color: #5A5B5C;
-			padding: 10rpx 30rpx;
-			font-size: 24rpx;
-			text-align: right;
-		}
-		.cart-list {
-			background-color: #ffffff;
-			width: 100%;
-			overflow: hidden;
-			min-height: 1vh;
-			max-height: 60vh;
-	
-			.wrapper {
-				height: 100%;
+	.top {
+		background-color: $bg-color-primary;
+		//color: $color-primary;
+		color: #5A5B5C;
+		padding: 10rpx 30rpx;
+		font-size: 24rpx;
+		text-align: right;
+	}
+
+	.cart-list {
+		background-color: #ffffff;
+		width: 100%;
+		overflow: hidden;
+		min-height: 1vh;
+		max-height: 60vh;
+
+		.wrapper {
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30rpx;
+			margin-bottom: 156rpx;
+
+			.item {
 				display: flex;
-				flex-direction: column;
-				padding: 0 30rpx;
-				margin-bottom: 156rpx;
-	
-				.item {
+				justify-content: space-between;
+				align-items: center;
+				padding: 30rpx 0;
+				position: relative;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					width: 100%;
+					background-color: $border-color;
+					height: 2rpx;
+					transform: scaleY(0.6);
+				}
+
+				.left {
+					flex: 1;
 					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					padding: 30rpx 0;
-					position: relative;
-	
-					&::after {
-						content: ' ';
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						width: 100%;
-						background-color: $border-color;
-						height: 2rpx;
-						transform: scaleY(0.6);
+					flex-direction: column;
+					overflow: hidden;
+					margin-right: 30rpx;
+
+					.name {
+						font-size: $font-size-sm;
+						color: $text-color-base;
 					}
-	
-					.left {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
+
+					.props {
+						color: $text-color-assist;
+						font-size: 24rpx;
 						overflow: hidden;
-						margin-right: 30rpx;
-	
-						.name {
-							font-size: $font-size-sm;
-							color: $text-color-base;
-						}
-						.props {
-							color: $text-color-assist;
-							font-size: 24rpx;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
+						text-overflow: ellipsis;
+						white-space: nowrap;
 					}
-	
-					.center {
-						margin-right: 120rpx;
+				}
+
+				.center {
+					margin-right: 120rpx;
+					font-size: $font-size-base;
+				}
+
+				.right {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.btn {
+						width: 46rpx;
+						height: 46rpx;
+						border-radius: 100%;
+						padding: 0;
+						text-align: center;
+						line-height: 46rpx;
+						background-color: #52ac41;
+						border-color: #ffffff;
+					}
+
+					.number {
 						font-size: $font-size-base;
-					}
-	
-					.right {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-	
-						.btn {
-							width: 46rpx;
-							height: 46rpx;
-							border-radius: 100%;
-							padding: 0;
-							text-align: center;
-							line-height: 46rpx;
-							background-color: #52ac41;
-							border-color: #ffffff;
-						}
-	
-						.number {
-							font-size: $font-size-base;
-							width: 46rpx;
-							height: 46rpx;
-							text-align: center;
-							line-height: 46rpx;
-						}
+						width: 46rpx;
+						height: 46rpx;
+						text-align: center;
+						line-height: 46rpx;
 					}
 				}
 			}
 		}
 	}
+}
 </style>
diff --git a/pages/components/pages/fenxiao/fenxiao.vue b/pages/components/pages/fenxiao/fenxiao.vue
index aca3747..b02ba9d 100644
--- a/pages/components/pages/fenxiao/fenxiao.vue
+++ b/pages/components/pages/fenxiao/fenxiao.vue
@@ -1,12 +1,13 @@
 <template>
-  <view class="page flex-col">
+  <uv-navbar :fixed="false" title="分销中心" left-arrow @leftClick="$onClickLeft" />
+  <view class="page flex-col" v-if="isDistributor">
     <!-- 头部导航 -->
     <view class="flex-col">
-      <view class="flex-row">
+      <!-- <view class="flex-row">
         <view class="flex-row">
           <text class="header-title">分销中心</text>
         </view>
-      </view>
+      </view> -->
 
       <!-- 用户信息 -->
       <view class="user-info">
@@ -17,17 +18,11 @@
           </view>
           <view class="flex-row" style="align-items: center">
             <text class="user-id">ID: {{ userId }}</text>
-            <text class="invite-code" @tap="showInviteCodePopup"
-              >复查邀请码</text
-            >
+            <text class="invite-code" @tap="showInviteCodePopup">邀请码</text>
           </view>
         </view>
         <view class="share-btn" @tap="share">
-          <image
-            class="share-icon"
-            src="/static/images/share.png"
-            mode="aspectFill"
-          ></image>
+          <image class="share-icon" src="/static/images/share.png" mode="aspectFill"></image>
           <text class="share-text">分享</text>
         </view>
       </view>
@@ -60,26 +55,15 @@
     <!-- 佣金明细 -->
     <view class="details-list flex-col">
       <view class="details-title">
-        <text>佣金明细</text>
-        <text style="margin-top: 6rpx; font-size: 22rpx; color: #999999"
-          >佣金将于每月15日结算至您的银行卡账号中</text
-        >
+        <text>佣金明细 </text>
+        <text style="margin-top: 6rpx; font-size: 22rpx; color: #999999">（佣金将于每月15日结算至您的银行卡账号中）</text>
       </view>
 
       <!-- 佣金明细列表 -->
       <view v-if="commissionList.length > 0">
-        <view
-          v-for="(item, index) in commissionList"
-          :key="index"
-          class="detail-item"
-          @tap="addCommission"
-        >
+        <view v-for="(item, index) in commissionList" :key="index" class="detail-item" @tap="addCommission">
           <view class="detail-left">
-            <image
-              class="user-avatar"
-              :src="item.avatar"
-              mode="aspectFill"
-            ></image>
+            <image class="user-avatar" :src="item.avatar" mode="aspectFill"></image>
             <view class="detail-info">
               <text class="detail-name">{{ item.name }}</text>
               <text class="detail-date">下单日期: {{ item.date }}</text>
@@ -104,28 +88,14 @@
     </view>
 
     <!-- 邀请码弹窗 -->
-    <view
-      class="invite-popup-mask"
-      v-if="showInvitePopup"
-      @tap="closeInviteCodePopup"
-    >
+    <view class="invite-popup-mask" v-if="showInvitePopup" @tap="closeInviteCodePopup">
       <view class="invite-popup-content" @tap.stop>
         <view class="invite-popup-box">
-          <image
-            class="invite-popup-avatar"
-            :src="userAvatar"
-            mode="aspectFill"
-          ></image>
-          <view class="invite-popup-id">会员ID: {{ userId }}</view>
+          <image class="invite-popup-avatar" :src="userAvatar" mode="aspectFill"></image>
+          <view class="invite-popup-id">分销员ID: {{ userId }}</view>
           <view class="invite-popup-qrcode-container">
-            <uv-qrcode
-              ref="qrcode"
-              canvas-id="qrcode"
-              :value="userId"
-              :size="260"
-              background-color="#FFFFFF"
-              foreground-color="#000000"
-            ></uv-qrcode>
+            <uv-qrcode ref="qrcode" canvas-id="qrcode" :value="userId" :size="260" background-color="#FFFFFF"
+              foreground-color="#000000"></uv-qrcode>
           </view>
         </view>
       </view>
@@ -143,6 +113,9 @@ import { getDistributorInfo, getCommissionList } from "@/api/distributor";
 const main = useMainStore();
 const { isLogin } = storeToRefs(main);
 
+//是否是分销商
+const isDistributor = ref(false);
+
 // 用户信息
 const userAvatar = ref("/static/images/avatar.png");
 const userName = ref("爱喝汤的小力");
@@ -192,11 +165,12 @@ onLoad((options) => {
 
 // 获取分销员数据
 const getCommissionData = async () => {
-  
+
 
   // 修改getDistributorInfo调用，传入spreadUid参数
   let data = await getDistributorInfo({ id: spreadUid.value });
   if (data) {
+    isDistributor.value = true;
     userName.value = data.name || "爱喝汤的小力";
     userId.value = data.id || "1234567890";
     totalCommission.value = data.totalCommission || "0.00";
@@ -207,8 +181,9 @@ const getCommissionData = async () => {
 
 //获取分销员的订单明细
 const getOrderCommissionList = async () => {
-  let data = await getCommissionList({distributorId: userId.value, page: 1, limit: 10 });
+  let data = await getCommissionList({ distributorId: userId.value, page: 1, limit: 10 });
   if (data) {
+    
     commissionList.value = data.map(item => ({
       avatar: item.avatar || '/static/images/avatar.png',
       name: item.realName || '用户',
@@ -334,7 +309,7 @@ const closeInviteCodePopup = () => {
   margin-bottom: 10rpx;
 }
 
-.invite-popup-qrcode-container >>> .uqrcode {
+.invite-popup-qrcode-container>>>.uqrcode {
   margin: 0 auto;
 }
 </style>
diff --git a/pages/components/pages/fenxiao/fenxiaorequestform.vue b/pages/components/pages/fenxiao/fenxiaorequestform.vue
index 2bafce4..457a099 100644
--- a/pages/components/pages/fenxiao/fenxiaorequestform.vue
+++ b/pages/components/pages/fenxiao/fenxiaorequestform.vue
@@ -1,7 +1,7 @@
 <template>
   <uv-navbar
 	  :fixed="false"
-	  title="填写信息"
+	  title="申请成为分销员"
 	  left-arrow
 	  @leftClick="$onClickLeft"    
 	/>
@@ -20,24 +20,24 @@
     <view class="form-container" style=" padding: 40rpx 20rpx;  border-radius: 20rpx;">
       <!-- 姓名 -->
       <view class="form-item" style="">
-        <text class="form-label">姓名</text>
+        <text class="form-label">姓名<text style="color: red;"> *</text></text>
         <input
           class="form-input"
           type="text"
           v-model="formData.name"
-          placeholder="请输入"
+          placeholder="请输入姓名"
           placeholder-class="placeholder"
         />
       </view>
 
       <!-- 电话 -->
       <view class="form-item">
-        <text class="form-label">电话</text>
+        <text class="form-label">电话<text style="color: red;"> *</text></text>
         <input
           class="form-input"
           type="number"
           v-model="formData.phone"
-          placeholder="请输入"
+          placeholder="请输入电话"
           placeholder-class="placeholder"
           maxlength="11"
         />
@@ -50,43 +50,43 @@
           class="form-input"
           type="text"
           v-model="formData.workUnit"
-          placeholder="请输入"
+          placeholder="请输入工作单位"
           placeholder-class="placeholder"
         />
       </view>
 
       <!-- 银行卡号 -->
       <view class="form-item">
-        <text class="form-label">银行卡号</text>
+        <text class="form-label">银行卡号<text style="color: red;"> *</text></text>
         <input
           class="form-input"
           type="number"
           v-model="formData.bankCardNumber"
-          placeholder="请输入"
+          placeholder="请输入银行卡号（结算佣金时需要）"
           placeholder-class="placeholder"
         />
       </view>
 
       <!-- 收款人姓名 -->
       <view class="form-item">
-        <text class="form-label">收款人</text>
+        <text class="form-label">开户名<text style="color: red;"> *</text></text>
         <input
           class="form-input"
           type="text"
           v-model="formData.recipientName"
-          placeholder="请输入"
+          placeholder="请输入开户名（结算佣金时需要）"
           placeholder-class="placeholder"
         />
       </view>
 
       <!-- 开户行 -->
       <view class="form-item">
-        <text class="form-label">开户行</text>
+        <text class="form-label">开户行<text style="color: red;"> *</text></text>
         <input
           class="form-input"
           type="text"
           v-model="formData.bankName"
-          placeholder="请输入"
+          placeholder="请输入开户行（结算佣金时需要）"
           placeholder-class="placeholder"
         />
       </view>
diff --git a/pages/components/pages/invoice/invoice.vue b/pages/components/pages/invoice/invoice.vue
index 8c1f6b4..9ee120b 100644
--- a/pages/components/pages/invoice/invoice.vue
+++ b/pages/components/pages/invoice/invoice.vue
@@ -1,10 +1,5 @@
 <template>
-	<uv-navbar
-	  :fixed="false"
-	  title="开票信息管理"
-	  left-arrow
-	  @leftClick="$onClickLeft"
-	/>
+	<uv-navbar :fixed="false" title="开票信息管理" left-arrow @leftClick="$onClickLeft" />
 	<view class="container">
 		<view class="bg-white invoice-form">
 			<!-- 发票类型选择 -->
@@ -12,7 +7,7 @@
 				<text class="label">发票类型</text>
 				<view class="radio-group">
 					<view class="radio-item" @click="invoiceType = 'company'">
-						<radio :checked="invoiceType === 'company'" color="#52ac41"  />
+						<radio :checked="invoiceType === 'company'" color="#52ac41" />
 						<text>企业单位</text>
 					</view>
 					<view class="radio-item" @click="invoiceType = 'personal'">
@@ -25,85 +20,50 @@
 			<!-- 企业单位表单 -->
 			<block v-if="invoiceType === 'company'">
 				<view class="form-item">
-					<text class="label">发票抬头</text>
-					<input 
-						type="text" 
-						placeholder="请输入发票抬头(必填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.invoiceTitle"
-					/>
+					<text class="label">发票抬头<text class="required"> *</text></text>
+					<input type="text" placeholder="请输入发票抬头(必填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.invoiceTitle" />
 				</view>
-				
+
 				<view class="form-item">
-					<text class="label">税号</text>
-					<input 
-						type="text" 
-						placeholder="请写纳税人识别号(必填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.taxNumber"
-					/>
+					<text class="label">税号<text class="required"> *</text></text>
+					<input type="text" placeholder="请写纳税人识别号(必填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.taxNumber" />
 				</view>
-				
+
 				<view class="form-item">
 					<text class="label">单位地址</text>
-					<input 
-						type="text" 
-						placeholder="公司地址(选填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.companyAddress"
-					/>
+					<input type="text" placeholder="公司地址(选填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.companyAddress" />
 				</view>
-				
+
 				<view class="form-item">
 					<text class="label">电话号码</text>
-					<input 
-						type="text" 
-						placeholder="公司电话(选填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.companyPhone"
-					/>
+					<input type="text" placeholder="公司电话(选填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.companyPhone" />
 				</view>
-				
+
 				<view class="form-item">
 					<text class="label">开户银行</text>
-					<input 
-						type="text" 
-						placeholder="开户银行(选填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.bankName"
-					/>
+					<input type="text" placeholder="开户银行(选填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.bankName" />
 				</view>
-				
+
 				<view class="form-item">
 					<text class="label">银行账户</text>
-					<input 
-						type="text" 
-						placeholder="银行账户(选填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="companyForm.bankAccount"
-					/>
+					<input type="text" placeholder="银行账户(选填)" placeholderClass="placeholder" class="input-field"
+						v-model="companyForm.bankAccount" />
 				</view>
 			</block>
 
 			<!-- 个人/非企业单位表单 -->
 			<block v-else>
 				<view class="form-item">
-					<text class="label">发票抬头<text class="required">*</text></text>
-					<input 
-						type="text" 
-						placeholder="请输入个人发票抬头(必填)" 
-						placeholderClass="placeholder"
-						class="input-field"
-						v-model="personalForm.invoiceTitle"
-					/>
+					<text class="label">发票抬头<text class="required"> *</text></text>
+					<input type="text" placeholder="请输入个人发票抬头(必填)" placeholderClass="placeholder" class="input-field"
+						v-model="personalForm.invoiceTitle" />
 				</view>
-				
+
 				<!-- <view class="form-item">
 					<text class="label">税号</text>
 					<input 
@@ -136,7 +96,7 @@ const invoiceType = ref('company')
 
 // 企业单位表单数据
 const companyForm = reactive({
-	userId: '123',
+	userId: '',
 	invoiceTitle: '',  // 发票抬头
 	taxNumber: '',    // 纳税人识别号
 	companyAddress: '', // 单位地址
@@ -147,7 +107,7 @@ const companyForm = reactive({
 
 // 个人/非企业单位表单数据
 const personalForm = reactive({
-	userId: '123',
+	userId: '',
 	invoiceTitle: '', // 个人发票抬头
 	// taxNumber: ''    // 个人税号（可能为空）
 })
@@ -176,7 +136,7 @@ const submitInvoice = async () => {
 				})
 				return
 			}
-			
+
 			// 构建提交数据
 			const params = {
 				userId: companyForm.userId,
@@ -188,17 +148,17 @@ const submitInvoice = async () => {
 				bankName: companyForm.bankName,
 				bankAccount: companyForm.bankAccount
 			}
-			
+
 			// 提交企业发票信息
 			uni.showLoading({
 				title: '提交中...'
 			})
-			
+
 			// 调用接口提交数据
 			const data = await createInvoiceApplication(params)
-			
+
 			uni.hideLoading()
-			
+
 			if (data) {
 				uni.showToast({
 					title: '提交成功',
@@ -223,7 +183,7 @@ const submitInvoice = async () => {
 				})
 				return
 			}
-			
+
 			// 构建提交数据
 			const params = {
 				userId: personalForm.userId,
@@ -231,17 +191,17 @@ const submitInvoice = async () => {
 				invoiceTitle: personalForm.invoiceTitle,
 				// taxNumber: personalForm.taxNumber || ''
 			}
-			
+
 			// 提交个人发票信息
 			uni.showLoading({
 				title: '提交中...'
 			})
-			
+
 			// 调用接口提交数据
 			const data = await createInvoiceApplication(params)
-			
+
 			uni.hideLoading()
-			
+
 			if (data) {
 				uni.showToast({
 					title: '提交成功',
@@ -286,16 +246,16 @@ const getUserInvoice = async (id) => {
 		uni.showLoading({
 			title: '加载中...'
 		})
-		
+
 		const data = await getUserInvoiceInfo(id)
-		
+
 		if (data) {
 			console.log('获取到发票信息:', data)
-			
+
 			// 根据返回的发票类型设置当前选中的类型
 			if (data.invoiceType === 'enterprise') {
 				invoiceType.value = 'company'
-				
+
 				// 填充企业发票信息
 				companyForm.userId = data.userId || userInfo.value?.uid || ''
 				companyForm.invoiceTitle = data.invoiceTitle || ''
@@ -306,7 +266,7 @@ const getUserInvoice = async (id) => {
 				companyForm.bankAccount = data.bankAccount || ''
 			} else if (data.invoiceType === 'individual') {
 				invoiceType.value = 'personal'
-				
+
 				// 填充个人发票信息
 				personalForm.userId = data.userId || userInfo.value?.uid || ''
 				personalForm.invoiceTitle = data.invoiceTitle || ''
@@ -327,10 +287,24 @@ const getUserInvoice = async (id) => {
 	}
 }
 
-onLoad(() => {
+onLoad((option) => {
 	// 获取用户信息
 	console.log('用户ID:', member.value.id)
-	
+
+	// 接收传入的userId参数
+	if (option.userId) {
+		companyForm.userId = option.userId
+		personalForm.userId = option.userId
+	} else {
+		uni.showToast({
+			title: '未获取到用户ID，请重新进入',
+			icon: 'none'
+		})
+		setTimeout(() => {
+			uni.navigateBack()
+		}, 3000)
+	}
+
 	// 获取用户发票信息
 	getUserInvoice(member.value.id)
 })
diff --git a/pages/components/pages/orders/detail.vue b/pages/components/pages/orders/detail.vue
index ceb38f7..ad4b291 100644
--- a/pages/components/pages/orders/detail.vue
+++ b/pages/components/pages/orders/detail.vue
@@ -1,418 +1,543 @@
 <template>
-	<uv-navbar
-	  :fixed="false"
-	  :title="title"
-	  left-arrow
-	  @leftClick="$onClickLeft"
-	/>
-	<view class="container" style="padding:20rpx;">
-		<view style="padding-bottom: 100rpx;">
-			<view class="bg-white">
-				<view class="section">
-					<!-- store info begin -->
-					<list-cell :hover="false">
-						<view class="w-100 d-flex align-items-center">
-							<view class="d-flex flex-column w-60">
-								<view class="w-100 font-size-lg text-color-base text-truncate">{{ order.shop.name }}</view>
-							</view>
-							<view class="d-flex justify-content-end align-items-center w-40">
-								<view class="iconfont-yshop icon-mobile"  @click="makePhoneCall(order.shop)" style="font-size: 45rpx;margin-right: 40rpx;"></view>
-								<view class="iconfont-yshop icon-location"  @click="openLocation(order.shop)" style="font-size: 45rpx;"></view>
-							</view>
-						</view>
-					</list-cell>
-					<!-- store info end -->
-					<list-cell :hover="false" padding="50rpx 30rpx">
-						<view class="w-100 d-flex flex-column">
-							<view v-if="order.paid == 0" class="d-flex align-items-center just-content-center mb-40">
-								<view class="font-size-lg text-color-error">订单未支付</view>
-							</view>
-							<view v-if="order.paid > 0" class="d-flex align-items-center just-content-center">
-								<view class="sort-num">{{ order.numberId }}</view>
-							</view>
-							<!-- steps begin -->
-							<view v-if="order.paid > 0" class="d-flex just-content-center">
-								<view class="steps d-flex flex-column w-80">
-									<view class="steps__img-column">
-										<view class="steps__img-column-item">
-											<view class="iconfont-yshop icon-lamp"></view>
-										</view>
-										<view class="steps__img-column-item">
-											<view class="iconfont-yshop icon-daojishi" v-if="{active: order.paid == 1 && order.status == 0}"></view>
-											<view class="iconfont-yshop icon-daojishi unactive" v-else></view>
-										</view>
-										<view class="steps__img-column-item" v-if="order.orderType == 'takeout'">
-											<view class="iconfont-yshop icon-takeout" v-if="order.status == 1"></view>
-											<view class="iconfont-yshop icon-takeout unactive" v-else></view>
-										</view>
-										<view class="steps__img-column-item" >
-											<view class="iconfont-yshop icon-doorbell" v-if="order.status >= 2"></view>
-											<view class="iconfont-yshop icon-doorbell unactive" v-else></view>
-										</view>
-									</view>
-									<view class="steps__text-column">
-										<view class="steps__text-column-item active">
-											<view class="steps__column-item-line bg-transparent"></view>
-											<view class="steps__text-column-item-text">已下单</view>
-											<view class="steps__column-item-line"></view>
-										</view>
-										<view class="steps__text-column-item activ"  :class="{active: order.paid == 1}">
-											<view class="steps__column-item-line"></view>
-											<view class="steps__text-column-item-text">制作中</view>
-											<view class="steps__column-item-line"></view>
-										</view>
-										<view class="steps__text-column-item" :class="{active: order.status == 1}" v-if="order.orderType == 'takeout'">
-											<view class="steps__column-item-line"></view>
-											<view class="steps__text-column-item-text">配送中</view>
-											<view class="steps__column-item-line bg-transparent"></view>
-										</view>
-										<view class="steps__text-column-item" :class="{active: order.status >= 2}">
-											<view class="steps__column-item-line"></view>
-											<view class="steps__text-column-item-text">
-												{{ order.orderType == 'takeout' ? '已送达' : '请取餐' }}
-											</view>
-											<view class="steps__column-item-line bg-transparent"></view>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- steps end -->
-							<view v-if="order.status==0 && order.paid > 0" class="d-flex just-content-center align-items-center font-size-base text-color-assist mb-40">
-								您前面还有 <text class="text-color-primary mr-10 ml-10" style="color: #52ac41;">{{order.preNum}}</text> 单待制作
-							</view>
-							<!-- goods begin -->
-							<view class="w-100 d-flex flex-column position-relative mt-30" style="margin-bottom: -40rpx;">
-								<view class="w-100 d-flex align-items-center mb-40" v-for="(good, index) in order.products" :key="index">
-									<view class="d-flex flex-column w-60 overflow-hidden">
-										<view class="font-size-lg text-color-base mb-10 text-truncate">{{ good.title }}</view>
-										<view class="font-size-sm text-color-assist text-truncate">{{ good.spec }}</view>
-									</view>
-									<view class="d-flex w-40 align-items-center justify-content-between pl-30">
-										<view class="font-size-base text-color-base">x{{ good.number }}</view>
-										<view class="font-size-base text-color-base font-weight-bold">￥{{ good.price }}</view>
-									</view>
-								</view>
-							</view>
-							<!-- goods end -->
-						</view>
-					</list-cell>
-				</view>
-				<view class="section">
-					<!-- goods begin -->
-					<list-cell :hover="false" padding="30rpx 30rpx">
-						<view class="w-100 d-flex flex-column position-relative">
-							<view class="w-100 d-flex align-items-center mb-40" v-for="(good, index) in order.cartInfo" :key="index">
-								<image :src="good.image" mode="aspectFill" class="image"></image>
-								<view class="d-flex flex-column w-60 overflow-hidden">
-									<view class="font-size-lg text-color-base mb-10 text-truncate">{{ good.title }}</view>
-									<view class="font-size-sm text-color-assist text-truncate">{{ good.spec }}</view>
-								</view>
-								<view class="d-flex w-40 align-items-center justify-content-between pl-30">
-									<view class="font-size-base text-color-base">x{{ good.number }}</view>
-									<view class="font-size-base text-color-base font-weight-bold">￥{{ good.price }}</view>
-								</view>
-							</view>
-						</view>
-					</list-cell>
-					<!-- goods end -->
-					<!-- payment and amount begin -->
-					<list-cell :hover="false" padding="50rpx 30rpx">
-						<view class="w-100 d-flex flex-column">
-							<view class="pay-cell">
-								<view>支付方式</view>
-								<view class="font-weight-bold">{{ order.statusDto.payType }}</view>
-							</view>
-							<view class="pay-cell">
-								<view>订单金额</view>
-								<view class="font-weight-bold">￥{{ order.totalPrice }}</view>
-							</view>
-							<view class="pay-cell" v-if="order.orderType == 'takeout'">
-								<view>配送费</view>
-								<view class="font-weight-bold">￥{{ order.payPostage }}</view>
-							</view>
-							<view class="pay-cell">
-								<view>优惠金额</view>
-								<view class="font-weight-bold">￥{{ order.couponPrice }}</view>
-							</view>
-							<view class="pay-cell">
-								<view>实付金额</view>
-								<view class="font-weight-bold">￥{{ order.payPrice }}</view>
-							</view>
-						</view>
-					</list-cell>
-					<!-- payment and amount end -->
-				</view>
-				<view class="section">
-					<!-- order info begin -->
-					<list-cell :hover="false" padding="50rpx 30rpx">
-						<view class="w-100 d-flex flex-column">
-							<view class="pay-cell">
-								<view>下单时间</view>
-								<view class="font-weight-bold">{{ formatDateTime(order.createTime )}}</view>
-							</view>
-							<view class="pay-cell">
-								<view>下单门店</view>
-								<view class="font-weight-bold">{{ order.shop.name }}</view>
-							</view>
-							<view class="pay-cell">
-								<view>订单号</view>
-								<view class="font-weight-bold">{{ order.id }}</view>
-							</view>
-						</view>
-					</list-cell>
-					<!-- order info end --> 
-				</view>
-				<!-- order other info begin -->
-				<list-cell :hover="false" padding="50rpx 30rpx 20rpx" last>
-					<view class="w-100 d-flex flex-column">
-						<view class="pay-cell">
-							<view>享用方式</view>
-							<view class="font-weight-bold">{{order.orderType == 'takein' ? '自取' : '外卖'}}</view>
-						</view>
-						<view class="pay-cell">
-							<view>取餐时间</view>
-							<view class="font-weight-bold">{{order.getTime ? formatDateTime(order.getTime) : '立即取餐'}}</view>
-						</view>
-						<view class="pay-cell">
-							<view>制作完成时间</view>
-							<view class="font-weight-bold">{{ order.deliveryTime ? formatDateTime(order.deliveryTime) : '无' }}</view>
-						</view>
-						<view class="pay-cell">
-							<view>备注</view>
-							<view class="font-weight-bold">{{ order.remark ? order.remark : '无' }}</view>
-						</view>
-					</view>
-				</list-cell>
-				<!-- order other info end -->
-			</view>
-			<view class="fixed-bottom flex justify-end bg-white p-2" v-if="order.paid > 0 && order.refundStatus == 0">
-				<view class="mr-1"><uv-button type="success" v-if="order.status < 2" :plain="true" size="small" text="确认收到餐" @click="receive(order)"></uv-button></view>
-				<!-- <view><uv-button type="warning" :plain="true" size="small" text="申请退款" @click="refund(order)"></uv-button></view> -->
-			</view>
-		</view>
-	</view>
+  <uv-navbar
+    :fixed="false"
+    :title="title"
+    left-arrow
+    @leftClick="$onClickLeft"
+  />
+  <view class="container" style="padding: 20rpx">
+    <view style="padding-bottom: 100rpx">
+      <view class="bg-white">
+        <view class="section">
+          <!-- store info begin -->
+          <list-cell :hover="false">
+            <view class="w-100 d-flex align-items-center">
+              <view class="d-flex flex-column w-60">
+                <view
+                  class="w-100 font-size-lg text-color-base text-truncate"
+                  >{{ order.shop.name }}</view
+                >
+              </view>
+              <view class="d-flex justify-content-end align-items-center w-40">
+                <view
+                  class="iconfont-yshop icon-mobile"
+                  @click="makePhoneCall(order.shop)"
+                  style="font-size: 45rpx; margin-right: 40rpx"
+                ></view>
+                <view
+                  class="iconfont-yshop icon-location"
+                  @click="openLocation(order.shop)"
+                  style="font-size: 45rpx"
+                ></view>
+              </view>
+            </view>
+          </list-cell>
+          <!-- store info end -->
+          <list-cell :hover="false" padding="50rpx 30rpx">
+            <view class="w-100 d-flex flex-column">
+              <view
+                v-if="order.paid == 0"
+                class="d-flex align-items-center just-content-center mb-40"
+              >
+                <view class="font-size-lg text-color-error">订单未支付</view>
+              </view>
+              <view
+                v-if="order.paid > 0"
+                class="d-flex align-items-center just-content-center"
+              >
+                <view class="sort-num">{{ order.numberId }}</view>
+              </view>
+              <!-- steps begin -->
+              <view v-if="order.paid > 0" class="d-flex just-content-center">
+                <view class="steps d-flex flex-column w-80">
+                  <view class="steps__img-column">
+                    <view class="steps__img-column-item">
+                      <view class="iconfont-yshop icon-lamp"></view>
+                    </view>
+                    <view class="steps__img-column-item">
+                      <view
+                        class="iconfont-yshop icon-daojishi"
+                        v-if="{ active: order.paid == 1 && order.status == 0 }"
+                      ></view>
+                      <view
+                        class="iconfont-yshop icon-daojishi unactive"
+                        v-else
+                      ></view>
+                    </view>
+                    <view
+                      class="steps__img-column-item"
+                      v-if="order.orderType == 'takeout'"
+                    >
+                      <view
+                        class="iconfont-yshop icon-takeout"
+                        v-if="order.status == 1"
+                      ></view>
+                      <view
+                        class="iconfont-yshop icon-takeout unactive"
+                        v-else
+                      ></view>
+                    </view>
+                    <view class="steps__img-column-item">
+                      <view
+                        class="iconfont-yshop icon-doorbell"
+                        v-if="order.status >= 2"
+                      ></view>
+                      <view
+                        class="iconfont-yshop icon-doorbell unactive"
+                        v-else
+                      ></view>
+                    </view>
+                  </view>
+                  <view class="steps__text-column">
+                    <view class="steps__text-column-item active">
+                      <view
+                        class="steps__column-item-line bg-transparent"
+                      ></view>
+                      <view class="steps__text-column-item-text">已下单</view>
+                      <view class="steps__column-item-line"></view>
+                    </view>
+                    <view
+                      class="steps__text-column-item activ"
+                      :class="{ active: order.paid == 1 }"
+                    >
+                      <view class="steps__column-item-line"></view>
+                      <view class="steps__text-column-item-text">制作中</view>
+                      <view class="steps__column-item-line"></view>
+                    </view>
+                    <view
+                      class="steps__text-column-item"
+                      :class="{ active: order.status == 1 }"
+                      v-if="order.orderType == 'takeout'"
+                    >
+                      <view class="steps__column-item-line"></view>
+                      <view class="steps__text-column-item-text">配送中</view>
+                      <view
+                        class="steps__column-item-line bg-transparent"
+                      ></view>
+                    </view>
+                    <view
+                      class="steps__text-column-item"
+                      :class="{ active: order.status >= 2 }"
+                    >
+                      <view class="steps__column-item-line"></view>
+                      <view class="steps__text-column-item-text">
+                        {{ order.orderType == "takeout" ? "已送达" : "请取餐" }}
+                      </view>
+                      <view
+                        class="steps__column-item-line bg-transparent"
+                      ></view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <!-- steps end -->
+              <view
+                v-if="order.status == 0 && order.paid > 0"
+                class="d-flex just-content-center align-items-center font-size-base text-color-assist mb-40"
+              >
+                您前面还有
+                <text
+                  class="text-color-primary mr-10 ml-10"
+                  style="color: #52ac41"
+                  >{{ order.preNum }}</text
+                >
+                单待制作
+              </view>
+              <!-- goods begin -->
+              <view
+                class="w-100 d-flex flex-column position-relative mt-30"
+                style="margin-bottom: -40rpx"
+              >
+                <view
+                  class="w-100 d-flex align-items-center mb-40"
+                  v-for="(good, index) in order.products"
+                  :key="index"
+                >
+                  <view class="d-flex flex-column w-60 overflow-hidden">
+                    <view
+                      class="font-size-lg text-color-base mb-10 text-truncate"
+                      >{{ good.title }}</view
+                    >
+                    <view
+                      class="font-size-sm text-color-assist text-truncate"
+                      >{{ good.spec }}</view
+                    >
+                  </view>
+                  <view
+                    class="d-flex w-40 align-items-center justify-content-between pl-30"
+                  >
+                    <view class="font-size-base text-color-base"
+                      >x{{ good.number }}</view
+                    >
+                    <view
+                      class="font-size-base text-color-base font-weight-bold"
+                      >￥{{ good.price }}</view
+                    >
+                  </view>
+                </view>
+              </view>
+              <!-- goods end -->
+            </view>
+          </list-cell>
+        </view>
+        <view class="section">
+          <!-- goods begin -->
+          <list-cell :hover="false" padding="30rpx 30rpx">
+            <view class="w-100 d-flex flex-column position-relative">
+              <view
+                class="w-100 d-flex align-items-center mb-40"
+                v-for="(good, index) in order.cartInfo"
+                :key="index"
+              >
+                <image
+                  :src="good.image"
+                  mode="aspectFill"
+                  class="image"
+                ></image>
+                <view class="d-flex flex-column w-60 overflow-hidden">
+                  <view
+                    class="font-size-lg text-color-base mb-10 text-truncate"
+                    >{{ good.title }}</view
+                  >
+                  <view class="font-size-sm text-color-assist text-truncate">{{
+                    good.spec
+                  }}</view>
+                </view>
+                <view
+                  class="d-flex w-40 align-items-center justify-content-between pl-30"
+                >
+                  <view class="font-size-base text-color-base"
+                    >x{{ good.number }}</view
+                  >
+                  <view class="font-size-base text-color-base font-weight-bold"
+                    >￥{{ good.price }}</view
+                  >
+                </view>
+              </view>
+            </view>
+          </list-cell>
+          <!-- goods end -->
+          <!-- payment and amount begin -->
+          <list-cell :hover="false" padding="50rpx 30rpx">
+            <view class="w-100 d-flex flex-column">
+              <view class="pay-cell">
+                <view>支付方式</view>
+                <view class="font-weight-bold">{{
+                  order.statusDto.payType
+                }}</view>
+              </view>
+              <view class="pay-cell">
+                <view>订单金额</view>
+                <view class="font-weight-bold">￥{{ order.totalPrice }}</view>
+              </view>
+              <view class="pay-cell" v-if="order.orderType == 'takeout'">
+                <view>配送费</view>
+                <view class="font-weight-bold">￥{{ order.payPostage }}</view>
+              </view>
+              <view class="pay-cell">
+                <view>优惠金额</view>
+                <view class="font-weight-bold">￥{{ order.couponPrice }}</view>
+              </view>
+              <view class="pay-cell">
+                <view>实付金额</view>
+                <view class="font-weight-bold">￥{{ order.payPrice }}</view>
+              </view>
+            </view>
+          </list-cell>
+          <!-- payment and amount end -->
+        </view>
+        <view class="section">
+          <!-- order info begin -->
+          <list-cell :hover="false" padding="50rpx 30rpx">
+            <view class="w-100 d-flex flex-column">
+              <view class="pay-cell">
+                <view>下单时间</view>
+                <view class="font-weight-bold">{{
+                  formatDateTime(order.createTime)
+                }}</view>
+              </view>
+              <view class="pay-cell">
+                <view>下单门店</view>
+                <view class="font-weight-bold">{{ order.shop.name }}</view>
+              </view>
+              <view class="pay-cell">
+                <view>订单号</view>
+                <view class="font-weight-bold">{{ order.id }}</view>
+              </view>
+            </view>
+          </list-cell>
+          <!-- order info end -->
+        </view>
+        <!-- order other info begin -->
+        <list-cell :hover="false" padding="50rpx 30rpx 20rpx" last>
+          <view class="w-100 d-flex flex-column">
+            <view class="pay-cell">
+              <view>享用方式</view>
+              <view class="font-weight-bold">{{
+                order.orderType == "takein" ? "自取" : "外卖"
+              }}</view>
+            </view>
+            <view class="pay-cell">
+              <view>取餐时间</view>
+              <view class="font-weight-bold">{{
+                order.getTime ? formatDateTime(order.getTime) : "立即取餐"
+              }}</view>
+            </view>
+            <view class="pay-cell">
+              <view>制作完成时间</view>
+              <view class="font-weight-bold">{{
+                order.deliveryTime ? formatDateTime(order.deliveryTime) : "无"
+              }}</view>
+            </view>
+            <view class="pay-cell">
+              <view>备注</view>
+              <view class="font-weight-bold">{{
+                order.remark ? order.remark : "无"
+              }}</view>
+            </view>
+          </view>
+        </list-cell>
+        <!-- order other info end -->
+      </view>
+      <view
+        class="fixed-bottom flex justify-end bg-white p-2"
+        v-if="order.paid > 0 && order.refundStatus == 0"
+      >
+        <view class="mr-1"
+          ><uv-button
+            type="success"
+            v-if="order.status < 2"
+            :plain="true"
+            size="small"
+            text="确认收到餐"
+            @click="receive(order)"
+          ></uv-button
+        ></view>
+        <!-- <view><uv-button type="warning" :plain="true" size="small" text="申请退款" @click="refund(order)"></uv-button></view> -->
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-import {
-  ref
-} from 'vue'
-import { onLoad} from '@dcloudio/uni-app'
-import { formatDateTime } from '@/utils/util'
-import {
-  orderDetail,
-  orderReceive,
-} from '@/api/order'
-const title = ref('订单详情')
+import { ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { formatDateTime } from "@/utils/util";
+import { orderDetail, orderReceive } from "@/api/order";
+const title = ref("订单详情");
 const order = ref({
-	shop:{name:''},
-	statusDto:{payType:''}
-})
-const numForMading = ref(5)
+  shop: { name: "" },
+  statusDto: { payType: "" },
+});
+const numForMading = ref(5);
 
 onLoad((option) => {
-	detail(option.id);
-})
+  detail(option.id);
+});
 
-const detail =  async(id) => {
-	let data = await orderDetail(id);
-	if (data) {
-		order.value = data;
-	}
-}
+const detail = async (id) => {
+  let data = await orderDetail(id);
+  if (data) {
+    order.value = data;
+  }
+};
 const openLocation = () => {
-	let shop = order.value.shop;
-	uni.openLocation({
-		address: shop.addressMap + shop.address + " " + shop.name,
-		latitude: parseFloat(shop.lat),
-		longitude: parseFloat(shop.lng),
-		fail(res) {
-			console.log(res);
-		}
-	});
-}
-const makePhoneCall = () =>{
-	let shop = order.value.shop;
-	uni.makePhoneCall({
-		phoneNumber: shop.mobile,
-		fail(res) {
-			console.log(res)
-		}
-	})
-}
+  let shop = order.value.shop;
+  uni.openLocation({
+    address: shop.addressMap + shop.address + " " + shop.name,
+    latitude: parseFloat(shop.lat),
+    longitude: parseFloat(shop.lng),
+    fail(res) {
+      console.log(res);
+    },
+  });
+};
+const makePhoneCall = () => {
+  let shop = order.value.shop;
+  uni.makePhoneCall({
+    phoneNumber: shop.mobile,
+    fail(res) {
+      console.log(res);
+    },
+  });
+};
 
 // 确认收到货
-const receive  = async(order) => {
-	let data = await orderReceive({uni:order.orderId});
-	if (data) {
-		// await getOrders(true)
-		uni.redirectTo({
-			url: '/pages/order/order'
-		})
-	}
-}
+const receive = async (order) => {
+  let data = await orderReceive({ uni: order.orderId });
+  if (data) {
+    // await getOrders(true)
+    uni.redirectTo({
+      url: "/pages/components/pages/orders/detail?id=" + order.orderId,
+    });
+  }
+};
 //提交退款
 const refund = (order) => {
-	uni.navigateTo({
-		url: '/pages/components/pages/orders/refund?orderId=' + order.orderId + '&payPrice=' + order.payPrice + '&totalPrice=' + order.totalPrice
-	})
-}
-
+  uni.navigateTo({
+    url:
+      "/pages/components/pages/orders/refund?orderId=" +
+      order.orderId +
+      "&payPrice=" +
+      order.payPrice +
+      "&totalPrice=" +
+      order.totalPrice,
+  });
+};
 </script>
 
 <style lang="scss" scoped>
-	.image {
-		width: 120rpx;
-		height: 120rpx;
-		margin-right: 30rpx;
-		border-radius: 8rpx;
-	}
-
-
-.pay-cell {
-	width: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: $font-size-base;
-	color: $text-color-base;
-	margin-bottom: 40rpx;
-
-	&:nth-last-child(1) {
-		margin-bottom: 0;
-	}
+.image {
+  width: 120rpx;
+  height: 120rpx;
+  margin-right: 30rpx;
+  border-radius: 8rpx;
 }
 
+.pay-cell {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: $font-size-base;
+  color: $text-color-base;
+  margin-bottom: 40rpx;
 
+  &:nth-last-child(1) {
+    margin-bottom: 0;
+  }
+}
 
 /* #ifdef H5 */
-	page {
-		min-height: 100%;
-		background-color: $bg-color;
-	}
-	/* #endif */
-	.order-box {
-		padding: 20rpx;
-		/* #ifdef H5 */
-		margin-bottom: 100rpx;
-		/* #endif */
-	}
-	
-	.drinks-img {
-		width: 260rpx;
-		height: 260rpx;
-	}
-	
-	.tips {
-		margin: 60rpx 0 80rpx;
-		line-height: 48rpx;
-	}
+page {
+  min-height: 100%;
+  background-color: $bg-color;
+}
+/* #endif */
+.order-box {
+  padding: 20rpx;
+  /* #ifdef H5 */
+  margin-bottom: 100rpx;
+  /* #endif */
+}
 
-	
-	@mixin arch {
-		content: "";
-		position: absolute;
-		background-color: $bg-color;
-		width: 30rpx;
-		height: 30rpx;
-		bottom: -15rpx;
-		z-index: 10;
-		border-radius: 100%;
-	}
-	
-	.section {
-		position: relative;
-		
-		&::before {
-			@include arch;
-			left: -15rpx;
-		}
-		
-		&::after {
-			@include arch;
-			right: -15rpx;
-		}
-	}
-	
-	.pay-cell {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-size: $font-size-base;
-		color: $text-color-base;
-		margin-bottom: 40rpx;
+.drinks-img {
+  width: 260rpx;
+  height: 260rpx;
+}
 
-		&:nth-last-child(1) {
-			margin-bottom: 0;
-		}
-	}
-	
-	.sort-num {
-		font-size: 64rpx;
-		font-weight: bold;
-		color: $text-color-base;
-		line-height: 2;
-	}
-	
-	.steps__img-column {
-		display: flex;
-		margin: 30rpx 0;
-		
-		.steps__img-column-item {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			
-			image {
-				width: 80rpx;
-				height: 80rpx;
-			}
-			.unactive {
-				color: #919293;
-			}
-		}
-	}
-	
-	.steps__text-column {
-		display: flex;
-		margin-bottom: 40rpx;
-		
-		.steps__text-column-item {
-			flex: 1;
-			display: inline-flex;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-size: $font-size-base;
-			color: $text-color-assist;
-			
-			&.active {
-				color: $text-color-base;
-				font-weight: bold;
-				
-				.steps__column-item-line {
-					background-color: $text-color-base;
-				}
-			}
-			
-			.steps__column-item-line{
-				flex: 1;
-				height: 2rpx;
-				background-color: #919293;
-				transform: scaleY(0.5);
-			}
-			
-			.steps__text-column-item-text {
-				margin: 0 8px;
-			}
-		}
-	}
-	.icon-lamp, .icon-daojishi, .icon-takeout, .icon-doorbell{
-		font-size: 60rpx;
-	}
-	.iconfont-yshop {
-		color: #52ac41;
-	}
+.tips {
+  margin: 60rpx 0 80rpx;
+  line-height: 48rpx;
+}
+
+@mixin arch {
+  content: "";
+  position: absolute;
+  background-color: $bg-color;
+  width: 30rpx;
+  height: 30rpx;
+  bottom: -15rpx;
+  z-index: 10;
+  border-radius: 100%;
+}
+
+.section {
+  position: relative;
+
+  &::before {
+    @include arch;
+    left: -15rpx;
+  }
+
+  &::after {
+    @include arch;
+    right: -15rpx;
+  }
+}
+
+.pay-cell {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: $font-size-base;
+  color: $text-color-base;
+  margin-bottom: 40rpx;
+
+  &:nth-last-child(1) {
+    margin-bottom: 0;
+  }
+}
+
+.sort-num {
+  font-size: 64rpx;
+  font-weight: bold;
+  color: $text-color-base;
+  line-height: 2;
+}
+
+.steps__img-column {
+  display: flex;
+  margin: 30rpx 0;
+
+  .steps__img-column-item {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    image {
+      width: 80rpx;
+      height: 80rpx;
+    }
+    .unactive {
+      color: #919293;
+    }
+  }
+}
+
+.steps__text-column {
+  display: flex;
+  margin-bottom: 40rpx;
+
+  .steps__text-column-item {
+    flex: 1;
+    display: inline-flex;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: $font-size-base;
+    color: $text-color-assist;
+
+    &.active {
+      color: $text-color-base;
+      font-weight: bold;
+
+      .steps__column-item-line {
+        background-color: $text-color-base;
+      }
+    }
+
+    .steps__column-item-line {
+      flex: 1;
+      height: 2rpx;
+      background-color: #919293;
+      transform: scaleY(0.5);
+    }
+
+    .steps__text-column-item-text {
+      margin: 0 8px;
+    }
+  }
+}
+.icon-lamp,
+.icon-daojishi,
+.icon-takeout,
+.icon-doorbell {
+  font-size: 60rpx;
+}
+.iconfont-yshop {
+  color: #52ac41;
+}
 </style>
diff --git a/pages/components/pages/pay/pay.vue b/pages/components/pages/pay/pay.vue
index 5f2df6d..68c153a 100644
--- a/pages/components/pages/pay/pay.vue
+++ b/pages/components/pages/pay/pay.vue
@@ -1,117 +1,115 @@
 <template>
-	<uv-navbar
-	  :fixed="false"
-	  :title="title"
-	  left-arrow
-	  @leftClick="$onClickLeft"
-	/>
-	<view class="container position-relative">
-		<view style="margin-bottom: 130rpx;">
-			<view class="section-1">
-				<template v-if="store.distance > 0">
-					<list-cell class="location">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">{{ orderType == 'takeout' ? '外卖配送' : '点餐自取' }}</view>
-							<uv-switch activeColor="#52ac41" v-model="active" @change="takout">
-							</uv-switch>
-						</view>
-					</list-cell>
-				</template>
+  <uv-navbar :fixed="false" :title="title" left-arrow @leftClick="$onClickLeft" />
+  <view class="container position-relative">
+    <view style="margin-bottom: 130rpx">
+      <view class="section-1">
+        <template v-if="store.distance > 0">
+          <list-cell class="location">
+            <view class="flex-fill d-flex justify-content-between align-items-center">
+              <view class="store-name flex-fill">{{
+                orderType == "takeout" ? "外卖配送" : "点餐自取"
+              }}</view>
+              <uv-switch activeColor="#52ac41" v-model="active" @change="takout">
+              </uv-switch>
+            </view>
+          </list-cell>
+        </template>
 
-				<template v-if="orderType == 'takeout'">
-					<list-cell @click="chooseAddress">
-						<view v-if="address.realName" class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center justify-content-between mb-10">
-								<view class="font-size-lg text-color-base">
-									{{ address.address + ' ' + address.detail }}
-								</view>
-								<image src="/static/images/navigator-1.png" class="arrow"></image>
-							</view>
-							<view class="d-flex text-color-assist font-size-sm align-items-center">
-								<view class="mr-10">{{ address.realName }}</view>
-								<view>{{ address.phone }}</view>
-							</view>
-						</view>
-						<view v-else class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">选择收货地址</view>
-							<image src="/static/images/navigator-1.png" class="arrow"></image>
-						</view>
-					</list-cell>
-				</template>
-			</view>
+        <template v-if="orderType == 'takeout'">
+          <list-cell @click="chooseAddress">
+            <view v-if="address.realName" class="w-100 d-flex flex-column">
+              <view class="d-flex align-items-center justify-content-between mb-10">
+                <view class="font-size-lg text-color-base">
+                  {{ address.address + " " + address.detail }}
+                </view>
+                <image src="/static/images/navigator-1.png" class="arrow"></image>
+              </view>
+              <view class="d-flex text-color-assist font-size-sm align-items-center">
+                <view class="mr-10">{{ address.realName }}</view>
+                <view>{{ address.phone }}</view>
+              </view>
+            </view>
+            <view v-else class="flex-fill d-flex justify-content-between align-items-center">
+              <view class="store-name flex-fill">选择收货地址</view>
+              <image src="/static/images/navigator-1.png" class="arrow"></image>
+            </view>
+          </list-cell>
+        </template>
+      </view>
 
-			<view class="section-1">
-				<template>
-					<list-cell class="location" @click="goToShop">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">{{ store.name }}</view>
-							<image src="/static/images/navigator-1.png" class="arrow"></image>
-						</view>
-					</list-cell>
-				</template>
+      <view class="section-1">
+        <template>
+          <list-cell class="location">
+            <view class="flex-fill d-flex justify-content-between align-items-center">
+              <view class="store-name flex-fill">{{ store.name }}</view>
+              <!-- <image src="/static/images/navigator-1.png" class="arrow"></image> -->
+            </view>
+          </list-cell>
+        </template>
 
-				<template>
-					<list-cell arrow class="meal-time" v-if="orderType == 'takein'">
-						<view class="flex-fill d-flex justify-content-between align-items-center"
-							@click="takeinTIme = !takeinTIme">
-							<view class="title">取餐时间</view>
-							<view class="time">
-								{{ takeinRange[defaultSelector[0]].name }}
-								<u-picker v-model="takeinTIme" :range="takeinRange" range-key="name" mode="selector"
-									@cancel="takeinCancelTime" @confirm="takeinConfirmTime"
-									:default-selector="defaultSelector"></u-picker>
-							</view>
-						</view>
-					</list-cell>
-					<list-cell class="contact" last :hover="false" v-if="orderType == 'takein'">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="title flex-fill">联系电话</view>
-							<view class="time"><input class="text-right" placeholder="请输入手机号码" :value="member.mobile" />
-							</view>
-							<button class="contact-tip font-size-sm">自动填写</button>
-						</view>
-					</list-cell>
-				</template>
-				<template v-if="orderType == 'takeout'">
-					<list-cell>
-						<view class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center font-size-base text-color-base">
-								<view class="flex-fill">预计送达时间</view>
-								<view class="mr-10">
-									{{ defaultTime }}
-									<u-picker :default-time="defaultTime" v-model="takeoutTIme" :params="paramsTime"
-										mode="time" @cancel="cancelTime" @confirm="choiceTime"></u-picker>
-								</view>
-							</view>
-						</view>
-					</list-cell>
-				</template>
-			</view>
-			<!-- 购物车列表 begin -->
-			<view class="section-2">
-				<view class="cart d-flex flex-column">
-					<list-cell last v-for="(item, index) in cart" :key="index">
-						<view class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center mb-10">
-								<view
-									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
-									<image style="width: 80rpx;height: 80rpx;" mode="aspectFill" :src="item.image">
-									</image>
-								</view>
-								<view class="name-and-props overflow-hidden">
-									<view class="text-color-base font-size-lg">{{ item.name }}</view>
-								</view>
-								<view
-									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
-									<view>x{{ item.number }}</view>
-									<view>￥{{ item.price }}</view>
-								</view>
-							</view>
-							<view class="text-truncate font-size-base text-color-assist">{{ item.valueStr }}</view>
-						</view>
-					</list-cell>
-				</view>
-<!-- <list-cell>
+        <template>
+          <list-cell arrow class="meal-time" v-if="orderType == 'takein'">
+            <view class="flex-fill d-flex justify-content-between align-items-center" @click="takeinTIme = !takeinTIme">
+              <view class="title">取餐时间</view>
+              <view class="time">
+                {{ takeinRange[defaultSelector[0]].name }}
+                <u-picker v-model="takeinTIme" :range="takeinRange" range-key="name" mode="selector"
+                  @cancel="takeinCancelTime" @confirm="takeinConfirmTime"
+                  :default-selector="defaultSelector"></u-picker>
+              </view>
+            </view>
+          </list-cell>
+          <list-cell class="contact" last :hover="false" v-if="orderType == 'takein'">
+            <view class="flex-fill d-flex justify-content-between align-items-center">
+              <view class="title flex-fill">联系电话</view>
+              <view class="time"><input class="text-right" placeholder="请输入手机号码" :value="member.mobile" />
+              </view>
+              <!-- <button class="contact-tip font-size-sm" @click="fillMobile">自动填写</button> -->
+            </view>
+          </list-cell>
+        </template>
+        <template v-if="orderType == 'takeout'">
+          <list-cell>
+            <view class="w-100 d-flex flex-column">
+              <view class="d-flex align-items-center font-size-base text-color-base">
+                <view class="flex-fill">预计送达时间</view>
+                <view class="mr-10">
+                  {{ defaultTime }}
+                  <u-picker :default-time="defaultTime" v-model="takeoutTIme" :params="paramsTime" mode="time"
+                    @cancel="cancelTime" @confirm="choiceTime"></u-picker>
+                </view>
+              </view>
+            </view>
+          </list-cell>
+        </template>
+      </view>
+      <!-- 购物车列表 begin -->
+      <view class="section-2">
+        <view class="cart d-flex flex-column">
+          <list-cell last v-for="(item, index) in cart" :key="index">
+            <view class="w-100 d-flex flex-column">
+              <view class="d-flex align-items-center mb-10">
+                <view class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
+                  <image style="width: 80rpx; height: 80rpx" mode="aspectFill" :src="item.image">
+                  </image>
+                </view>
+                <view class="name-and-props overflow-hidden">
+                  <view class="text-color-base font-size-lg">{{
+                    item.name
+                  }}</view>
+                </view>
+                <view class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
+                  <view>x{{ item.number }}</view>
+                  <view>￥{{ item.price }}</view>
+                </view>
+              </view>
+              <view class="text-truncate font-size-base text-color-assist">{{
+                item.valueStr
+              }}</view>
+            </view>
+          </list-cell>
+        </view>
+        <!-- <list-cell>
   <view class="flex-fill d-flex justify-content-between align-items-center">
     <view class="text-color-base">分销员ID</view>
     <input 
@@ -124,47 +122,59 @@
   </view>
 </list-cell> -->
 
-<!-- <list-cell>
+        <!-- <list-cell>
   <view v-if="orderType == 'takeout'"class="flex-fill d-flex justify-content-between align-items-center">
     <view class="text-color-base">餐盒费:({{ store.canheDesc}})</view>    
 	<view>￥{{ store.canhePrice }}</view>
   </view>
 </list-cell> -->
+        <list-cell>
+          <view class="flex-fill d-flex justify-content-between align-items-center">
+            <view class="text-color-base">打包费</view>
+            <view>￥{{ getPackingFee.toFixed(2) }}</view>
+          </view>
+        </list-cell>
 
-				<list-cell arrow @click="goToPackages">
-					<view class="flex-fill d-flex justify-content-between align-items-center">
-						<view class="text-color-base">优惠券</view>
-						<!-- <view v-if="orderType == 'takeout'">餐盒费￥({{ store.canheDesc}}){{ store.canhePrice }}</view> -->
-						
-						<view v-if="coupons == 0" class="text-color-base">暂无可用</view>
-						<view v-else-if="coupon.title" class="text-color-danger">
-							{{ coupon.title }}(满{{ coupon.least }}减{{ coupon.value }})
-						</view>
-						<view v-else class="text-color-primary">可用优惠券{{ coupons }}张</view>
-					</view>
-					
-				</list-cell>
-				<list-cell last>
-					<view class="flex-fill d-flex justify-content-end align-items-center">
-						<view>
-							总计￥{{ total }}
-							<text v-if="orderType == 'takeout'">,配送费￥{{ store.deliveryPrice }}</text>
-							
-							<text v-if="coupon.value">,￥-{{ coupon.value }}</text>
-							,实付
-						</view>
-						<view class="font-size-extra-lg font-weight-bold">￥{{ amount }}</view>
-					</view>
-				</list-cell>
-			</view>
-			<!-- 购物车列表 end -->
-			<view class="d-flex align-items-center justify-content-start font-size-sm text-color-warning"
-				style="padding: 20rpx 0;">
-			</view>
-			<!-- 支付方式 begin -->
-			<view class="payment">
-				<list-cell last :hover="false"><text>支付方式</text></list-cell>
-				<!-- <list-cell>
+        <list-cell v-if="orderType == 'takeout'">
+          <view class="flex-fill d-flex justify-content-between align-items-center">
+            <view class="text-color-base">配送费</view>
+            <view>￥{{ store.deliveryPrice }}</view>
+          </view>
+        </list-cell>
+
+        <list-cell arrow @click="goToPackages">
+          <view class="flex-fill d-flex justify-content-between align-items-center">
+            <view class="text-color-base">优惠券</view>
+            <!-- <view v-if="orderType == 'takeout'">餐盒费￥({{ store.canheDesc}}){{ store.canhePrice }}</view> -->
+
+            <view v-if="coupons == 0" class="text-color-base">暂无可用</view>
+            <view v-else-if="coupon.title" class="text-color-danger">
+              {{ coupon.title }}(满{{ coupon.least }}减{{ coupon.value }})
+            </view>
+            <view v-else class="text-color-primary">可用优惠券{{ coupons }}张</view>
+          </view>
+        </list-cell>
+        <list-cell last>
+          <view class="flex-fill d-flex justify-content-end align-items-center">
+            <view>
+              总计￥{{ total }}
+              <!-- <text v-if="orderType == 'takeout'">,配送费￥{{ store.deliveryPrice }}</text> -->
+
+              <text v-if="coupon.value">,￥-{{ coupon.value }}</text>
+              ,实付
+            </view>
+            <view class="font-size-extra-lg font-weight-bold">￥{{ amount }}</view>
+          </view>
+        </list-cell>
+      </view>
+      <!-- 购物车列表 end -->
+      <view class="d-flex align-items-center justify-content-start font-size-sm text-color-warning"
+        style="padding: 20rpx 0">
+      </view>
+      <!-- 支付方式 begin -->
+      <view class="payment">
+        <list-cell last :hover="false"><text>支付方式</text></list-cell>
+        <!-- <list-cell>
 					<view class="d-flex align-items-center justify-content-between w-100 disabled"
 						@click="setPayType('yue')">
 						<view class="iconfont iconbalance line-height-100 payment-icon"></view>
@@ -175,673 +185,721 @@
 						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
 					</view>
 				</list-cell> -->
-				<list-cell last>
-					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('weixin')">
-						<view class="iconfont iconwxpay line-height-100 payment-icon" style="color: #52ac41"></view>
-						<view class="flex-fill">微信支付</view>
-						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" style="color: #52ac41;" v-if="payType == 'weixin'">
-						</view>
-						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
-					</view>
-				</list-cell>
-				<!-- #ifdef H5 -->
-				<list-cell>
-					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('alipay')">
-						<view class="iconfont-yshop icon-alipay line-height-100 payment-icon" style="color:#07b4fd" ></view>
-						<view class="flex-fill">支付宝</view>
-						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'alipay'" ></view>
-						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else ></view>     
-					</view>
-				</list-cell>
-				<!-- #endif -->
-			</view>
-			<!-- 支付方式 end -->
-			<!-- 备注 begin -->
-			<list-cell  last @click="goToRemark">
-				<view class="d-flex flex-fill align-items-center justify-content-between overflow-hidden" style="margin-bottom: 110rpx;">
-					<view class="flex-shrink-0 mr-20">备注</view>
-					<view class="text-color-primary flex-fill text-truncate text-right" style="color: #52ac41">{{ form.remark || '备注' }}
-					</view>
-				</view>
-			</list-cell>
-			<!-- 备注 end -->
-		</view>
-		<!-- 付款栏 begin -->
-		<view style="z-index: 1;"
-			class="w-100 pay-box position-fixed fixed-bottom d-flex align-items-center justify-content-between bg-white">
-			<view class="font-size-sm" style="margin-left: 20rpx;">合计：</view>
-			<view class="font-size-lg flex-fill">￥{{ amount }}</view>
-			<view class="bg-primary h-100 d-flex align-items-center just-content-center text-color-white font-size-base"
-				style="padding: 0 60rpx; background-color: #52ac41;" @tap="debounce(submit, 500)">付款</view>
-		</view>
-		<!-- 付款栏 end -->
-		<modal :show="ensureAddressModalVisible" custom :mask-closable="false" :radius="'0rpx'" width="90%">
-			<view class="modal-content">
-				<view class="d-flex justify-content-end">
-					<image src="/static/images/pay/close.png" style="width: 40rpx; height: 40rpx;"
-						@tap="ensureAddressModalVisible = false"></image>
-				</view>
-				<view class="d-flex just-content-center align-items-center" style="margin-bottom: 40px;">
-					<view class="font-size-extra-lg text-color-base">请再次确认下单地址</view>
-				</view>
-				<view
-					class="d-flex font-size-base text-color-base font-weight-bold align-items-center justify-content-between mb-20">
-					<view>{{ address.realName }}</view>
-					<view>{{ address.phone }}</view>
-				</view>
-				<view class="d-flex font-size-sm text-color-assist align-items-center justify-content-between mb-40">
-					<view style="max-width: 60%;">{{ address.address + address.detail }}</view>
-					<button type="primary" size="mini" plain class="change-address-btn" style="white-space: nowrap;"
-						@click="chooseAddress">修改地址</button>
-				</view>
-				<button type="primary" class="pay_btn" @tap="debounce(pay, 500)">确认并付款</button>
-			</view>
-		</modal>
-		<uv-toast ref="uToast"></uv-toast>
-	</view>
+        <list-cell last>
+          <view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('weixin')">
+            <view class="iconfont iconwxpay line-height-100 payment-icon" style="color: #52ac41"></view>
+            <view class="flex-fill">微信支付</view>
+            <view class="iconfont line-height-100 checkbox checked iconradio-button-on" style="color: #52ac41"
+              v-if="payType == 'weixin'">
+            </view>
+            <view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
+          </view>
+        </list-cell>
+        <!-- #ifdef H5 -->
+        <list-cell>
+          <view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('alipay')">
+            <view class="iconfont-yshop icon-alipay line-height-100 payment-icon" style="color: #07b4fd"></view>
+            <view class="flex-fill">支付宝</view>
+            <view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'alipay'">
+            </view>
+            <view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
+          </view>
+        </list-cell>
+        <!-- #endif -->
+      </view>
+      <!-- 支付方式 end -->
+      <!-- 备注 begin -->
+      <list-cell last @click="goToRemark">
+        <view class="d-flex flex-fill align-items-center justify-content-between overflow-hidden"
+          style="margin-bottom: 110rpx">
+          <view class="flex-shrink-0 mr-20">备注</view>
+          <view class="text-color-primary flex-fill text-truncate text-right" style="color: #52ac41">{{ form.remark ||
+            "备注" }}
+          </view>
+        </view>
+      </list-cell>
+      <!-- 备注 end -->
+    </view>
+    <!-- 付款栏 begin -->
+    <view style="z-index: 1"
+      class="w-100 pay-box position-fixed fixed-bottom d-flex align-items-center justify-content-between bg-white">
+      <view class="font-size-sm" style="margin-left: 20rpx">合计：</view>
+      <view class="font-size-lg flex-fill">￥{{ amount }}</view>
+      <view class="bg-primary h-100 d-flex align-items-center just-content-center text-color-white font-size-base"
+        style="padding: 0 60rpx; background-color: #52ac41" @tap="debounce(submit, 500)">付款</view>
+    </view>
+    <!-- 付款栏 end -->
+    <modal :show="ensureAddressModalVisible" custom :mask-closable="false" :radius="'0rpx'" width="90%">
+      <view class="modal-content">
+        <view class="d-flex justify-content-end">
+          <image src="/static/images/pay/close.png" style="width: 40rpx; height: 40rpx"
+            @tap="ensureAddressModalVisible = false"></image>
+        </view>
+        <view class="d-flex just-content-center align-items-center" style="margin-bottom: 40px">
+          <view class="font-size-extra-lg text-color-base">请再次确认下单地址</view>
+        </view>
+        <view
+          class="d-flex font-size-base text-color-base font-weight-bold align-items-center justify-content-between mb-20">
+          <view>{{ address.realName }}</view>
+          <view>{{ address.phone }}</view>
+        </view>
+        <view class="d-flex font-size-sm text-color-assist align-items-center justify-content-between mb-40">
+          <view style="max-width: 60%">{{
+            address.address + address.detail
+          }}</view>
+          <button type="primary" size="mini" plain class="change-address-btn" style="white-space: nowrap"
+            @click="chooseAddress">
+            修改地址
+          </button>
+        </view>
+        <button type="primary" class="pay_btn" @tap="debounce(pay, 500)">
+          确认并付款
+        </button>
+      </view>
+    </modal>
+    <uv-toast ref="uToast"></uv-toast>
+  </view>
 </template>
 
 <script setup>
-import {
-  ref,
-  computed,
-  nextTick
-} from 'vue'
-import { useMainStore } from '@/store/store'
-import { storeToRefs } from 'pinia'
-import { onLoad,onShow ,onPullDownRefresh,onHide} from '@dcloudio/uni-app'
-import { formatDateTime,isWeixin } from '@/utils/util'
-import  debounce  from '@/uni_modules/uv-ui-tools/libs/function/debounce'
+import { ref, computed, nextTick } from "vue";
+import { useMainStore } from "@/store/store";
+import { storeToRefs } from "pinia";
+import { onLoad, onShow, onPullDownRefresh, onHide } from "@dcloudio/uni-app";
+import { formatDateTime, isWeixin } from "@/utils/util";
+import debounce from "@/uni_modules/uv-ui-tools/libs/function/debounce";
 
-import {
-  orderSubmit,
-  payUnify,
-  getWechatConfig
-} from '@/api/order'
-import {
-  couponCount
-} from '@/api/coupon'
+import { orderSubmit, payUnify, getWechatConfig } from "@/api/order";
+import { couponCount } from "@/api/coupon";
 // #ifdef H5
-import * as jweixin from 'weixin-js-sdk'
+import * as jweixin from "weixin-js-sdk";
 // #endif
-const main = useMainStore()
-const { orderType,address, store,location,isLogin,member,mycoupon } = storeToRefs(main)
-const distributorId = ref(null) // 分销商ID
-const active = ref(false)
-const title = ref('支付')
-const jsStr = ref('')
-const cart = ref([])
+const main = useMainStore();
+const { orderType, address, store, location, isLogin, member, mycoupon } =
+  storeToRefs(main);
+const distributorId = ref(null); // 分销商ID
+const active = ref(false);
+const title = ref("支付");
+const jsStr = ref("");
+const cart = ref([]);
 const form = ref({
-	remark: ''
-})
-const  ensureAddressModalVisible = ref(false)
-const  takeoutTIme = ref(false) // 外卖取餐时间picker
+  remark: "",
+});
+const ensureAddressModalVisible = ref(false);
+const takeoutTIme = ref(false); // 外卖取餐时间picker
 const paramsTime = ref({
-	year: false,
-	month: false,
-	day: false,
-	hour: true,
-	minute: true,
-	second: false
-})
-const defaultTime = ref('00:00')
-const takeinTIme = ref(false) // 到店自取时间selector
-const takeinRange = ref([{
-		name: '立即用餐',
-		value: 0
-	},
-	{
-		name: '10分钟后',
-		value: 10
-	},
-	{
-		name: '20分钟后',
-		value: 20
-	},
-	{
-		name: '30分钟后',
-		value: 30
-	},
-	{
-		name: '40分钟后',
-		value: 40
-	},
-	{
-		name: '50分钟后',
-		value: 50
-	}
-])
-const defaultSelector = ref([0])
-const payType = ref('weixin') // 付款方式
-const coupons = ref(0) // 可用优惠券数量
-const coupon = ref(main.mycoupon) // 选中的
+  year: false,
+  month: false,
+  day: false,
+  hour: true,
+  minute: true,
+  second: false,
+});
+const defaultTime = ref("00:00");
+const takeinTIme = ref(false); // 到店自取时间selector
+const takeinRange = ref([
+  {
+    name: "立即用餐",
+    value: 0,
+  },
+  {
+    name: "10分钟后",
+    value: 10,
+  },
+  {
+    name: "20分钟后",
+    value: 20,
+  },
+  {
+    name: "30分钟后",
+    value: 30,
+  },
+  {
+    name: "40分钟后",
+    value: 40,
+  },
+  {
+    name: "50分钟后",
+    value: 50,
+  },
+]);
+const defaultSelector = ref([0]);
+const payType = ref("weixin"); // 付款方式
+const coupons = ref(0); // 可用优惠券数量
+const coupon = ref(main.mycoupon); // 选中的
 const subscribeMss = ref({
-	'takein': '',
-	'takeout': '',
-	'takein_made': '',
-	'takeout_made': ''
-})// 微信订阅信息
-const uToast = ref()
+  takein: "",
+  takeout: "",
+  takein_made: "",
+  takeout_made: "",
+}); // 微信订阅信息
+const uToast = ref();
 
-const total = computed(() =>{
-	return cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0);
-})
-const amount = computed(() =>{
-	let amount = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0);
-	// 加配送费
-	if (store.value.distance > 0 && orderType.value == 'takeout') {
-		amount += parseFloat(store.value.deliveryPrice);
-	}
+// 在script部分添加打包费计算属性
+const getPackingFee = computed(() => {
+  // 计算打包费（根据每个商品的boxFee计算）
+  return cart.value.reduce((acc, cur) => acc + cur.number * (cur.boxFee || 0), 0);
+});
 
-	
-	// 减去优惠券
-	if (main.mycoupon.hasOwnProperty('id')) {
-		amount -= parseFloat(main.mycoupon.value);
-	}
-	return amount.toFixed(2);
-})
+// 修改total计算属性
+const total = computed(() => {
+  let total = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0) + getPackingFee.value;
+
+  // 加配送费
+  if (store.value.distance > 0 && orderType.value == "takeout") {
+    total += parseFloat(store.value.deliveryPrice);
+  }
+
+  return total.toFixed(2);
+});
+
+// 修改amount计算属性
+const amount = computed(() => {
+  let amount = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0) + getPackingFee.value;
+
+  // 加配送费
+  if (store.value.distance > 0 && orderType.value == "takeout") {
+    amount += parseFloat(store.value.deliveryPrice);
+  }
+
+  // 减去优惠券
+  if (main.mycoupon.hasOwnProperty("id")) {
+    amount -= parseFloat(main.mycoupon.value);
+  }
+  return amount.toFixed(2);
+});
 
 onShow(() => {
-	coupon.value = main.mycoupon
-	let date = new Date(new Date().getTime() + 3600000); // 一个小时后
-	let hour = date.getHours();
-	let minute = date.getMinutes();
-	if (hour < 10) {
-		hour = '0' + hour;
-	}
-	if (minute < 10) {
-		minute = '0' + minute;
-	}
-	defaultTime.value = hour + ':' + minute;
-	
-	console.log('member:',member.value)
-	
-	if(orderType.value == 'takeout'){
-		active.value = true
-	}else{
-		active.value = false
-	}
-	
-	getCoupons();
-	
-	let paytype = uni.getStorageSync('paytype');
-	payType.value = paytype ? paytype : 'weixin';
-	
-})
-onHide(() => {
-	subscribeMss.value = [];
-	coupons.value = 0;
-})
-onLoad((option) => {
-	cart.value = uni.getStorageSync('cart')
-	if(option.remark) {
-		form.value.remark = option.remark
-	}
-})
+  coupon.value = main.mycoupon;
+  let date = new Date(new Date().getTime() + 3600000); // 一个小时后
+  let hour = date.getHours();
+  let minute = date.getMinutes();
+  if (hour < 10) {
+    hour = "0" + hour;
+  }
+  if (minute < 10) {
+    minute = "0" + minute;
+  }
+  defaultTime.value = hour + ":" + minute;
 
-const getSubscribeMss = async() => {
-	 let data = []
-	if (data) {
-		subscribeMss.value = data;
-	}
-}
+  console.log("member:", member.value);
+
+  if (orderType.value == "takeout") {
+    active.value = true;
+  } else {
+    active.value = false;
+  }
+
+  getCoupons();
+
+  let paytype = uni.getStorageSync("paytype");
+  payType.value = paytype ? paytype : "weixin";
+});
+onHide(() => {
+  subscribeMss.value = [];
+  coupons.value = 0;
+});
+onLoad((option) => {
+  cart.value = uni.getStorageSync("cart");
+  if (option.remark) {
+    form.value.remark = option.remark;
+  }
+});
+
+const getSubscribeMss = async () => {
+  let data = [];
+  if (data) {
+    subscribeMss.value = data;
+  }
+};
 // 更改支付方式
 const setPayType = (paytype) => {
-	payType.value = 'weixin';
-	payType.value= paytype;
-	uni.setStorage({
-		key: 'paytype',
-		data: paytype
-	})
-}
-const getCoupons = async() => {
-	//0=通用,1=自取,2=外卖
-	let type = orderType.value == 'takein' ? 1 : 2;
-	let data = await couponCount({
-		shop_id: store.value.id ? store.value.id : 0,
-		type: type
-	});
-	if (data) {
-		coupons.value = data;
-	}
-}
+  payType.value = "weixin";
+  payType.value = paytype;
+  uni.setStorage({
+    key: "paytype",
+    data: paytype,
+  });
+};
+const getCoupons = async () => {
+  //0=通用,1=自取,2=外卖
+  let type = orderType.value == "takein" ? 1 : 2;
+  let data = await couponCount({
+    shop_id: store.value.id ? store.value.id : 0,
+    type: type,
+  });
+  if (data) {
+    coupons.value = data;
+  }
+};
 // 选择时间
 const choiceTime = (value) => {
-	let hour = value.hour;
-	let minute = value.minute;
+  let hour = value.hour;
+  let minute = value.minute;
 
-	let date = new Date(new Date().getTime() + 3600000); // 一个小时后
-	let nowhour = date.getHours();
-	let nowminute = date.getMinutes();
+  let date = new Date(new Date().getTime() + 3600000); // 一个小时后
+  let nowhour = date.getHours();
+  let nowminute = date.getMinutes();
 
-	if ((hour * 60 * 60 + minute * 60) * 1000 - 3600000 < (nowhour * 60 * 60 + nowminute * 60) * 1000) {
-		uToast.value.show({
-			message: '请至少选择一个小时之后',
-			type: 'error'
-		});
-		return
-	}
+  if (
+    (hour * 60 * 60 + minute * 60) * 1000 - 3600000 <
+    (nowhour * 60 * 60 + nowminute * 60) * 1000
+  ) {
+    uToast.value.show({
+      message: "请至少选择一个小时之后",
+      type: "error",
+    });
+    return;
+  }
 
-	if (hour < 10) {
-		hour = '0' + hour;
-	}
-	if (minute < 10) {
-		minute = '0' + minute;
-	}
-	defaultTime,value = hour + ':' + minute;
-	takeoutTIme.value = false;
-}
+  if (hour < 10) {
+    hour = "0" + hour;
+  }
+  if (minute < 10) {
+    minute = "0" + minute;
+  }
+  defaultTime, (value = hour + ":" + minute);
+  takeoutTIme.value = false;
+};
 const cancelTime = (value) => {
-	takeoutTIme.value = false;
-}
+  takeoutTIme.value = false;
+};
 // 到店自取-取消选择取餐时间
 const takeinCancelTime = (value) => {
-	takeinTIme.value = false;
-}
+  takeinTIme.value = false;
+};
 // 到店自取-选择取餐时间
 const takeinConfirmTime = (value) => {
-	defaultSelector.value = value;
-}
+  defaultSelector.value = value;
+};
 // 是否外卖开关
 const takout = (value) => {
-	let type = 'takeout';
-	if (value == false) {
-		type = 'takein';
-	}
-	main.SET_ORDER_TYPE(type);
+  let type = "takeout";
+  if (value == false) {
+    type = "takein";
+  }
+  main.SET_ORDER_TYPE(type);
 
-	// 如果存在优惠券看看需不需要清除
-	if (coupon.value.hasOwnProperty('type')) {
-		//0=通用,1=自取,2=外卖
-		if (coupon.value.type != 0) {
-			if (coupon.value.type == 1 && orderType.value == 'takeout') {
-				coupon.value = {};
-			}
-			if (coupon.value.type == 2 && orderType.value == 'takeint') {
-				coupon.value = {};
-			}
-		}
-	}
-	subscribeMss.value = [];
-	coupons.value = 0;
-	getCoupons();
-}
+  // 如果存在优惠券看看需不需要清除
+  if (coupon.value.hasOwnProperty("type")) {
+    //0=通用,1=自取,2=外卖
+    if (coupon.value.type != 0) {
+      if (coupon.value.type == 1 && orderType.value == "takeout") {
+        coupon.value = {};
+      }
+      if (coupon.value.type == 2 && orderType.value == "takeint") {
+        coupon.value = {};
+      }
+    }
+  }
+  subscribeMss.value = [];
+  coupons.value = 0;
+  getCoupons();
+};
 const goToRemark = () => {
-	uni.navigateTo({
-		url: '/pages/components/pages/remark/remark?remark=' + form.value.remark
-	});
-}
+  uni.navigateTo({
+    url: "/pages/components/pages/remark/remark?remark=" + form.value.remark,
+  });
+};
 const chooseAddress = () => {
-	uni.navigateTo({
-		url: '/pages/components/pages/address/address?is_choose=true&scene=pay'
-	});
-}
+  uni.navigateTo({
+    url: "/pages/components/pages/address/address?is_choose=true&scene=pay",
+  });
+};
 const goToPackages = () => {
-	let newamount = amount.value;
-	let coupon_id = coupon.value.id ? coupon.value.id : 0;
-	let type = orderType.value == 'takein' ? 1 : 2;
-	let shop_id = store.value.id;
-	uni.navigateTo({
-		url: '/pages/components/pages/packages/index?amount=' + newamount + '&coupon_id=' + coupon_id +
-			'&shop_id=' + shop_id + '&type=' + type
-	});
-}
+  let newamount = amount.value;
+  let coupon_id = coupon.value.id ? coupon.value.id : 0;
+  let type = orderType.value == "takein" ? 1 : 2;
+  let shop_id = store.value.id;
+  uni.navigateTo({
+    url:
+      "/pages/components/pages/packages/index?amount=" +
+      newamount +
+      "&coupon_id=" +
+      coupon_id +
+      "&shop_id=" +
+      shop_id +
+      "&type=" +
+      type,
+  });
+};
 const goToShop = () => {
-	uni.navigateTo({
-		url: `/pages/components/pages/shop/shop`
-	});
-}
+  uni.navigateTo({
+    url: `/pages/components/pages/shop/shop`,
+  });
+};
 const submit = () => {
-	if (orderType.value == 'takeout') {
-		// 外卖类型
-		if (typeof address.value.id == 'undefined') {
-			uToast.value.show({
-				message: '请选择收货地址',
-				type: 'error'
-			});
-			return
-		}
+  if (orderType.value == "takeout") {
+    // 检查是否有商品可以单独配送
+    const hasAloneSell = cart.value.some(item => item.aloneSell === 1);
+    if (!hasAloneSell) {
+      uToast.value.show({
+        message: "所选商品不能单独配送",
+        type: "error",
+      });
+      return;
+    }
 
-		// 起送价钱
-		if (store.value.min_price > total.value) {
-			uToast.value.show({
-				message: '本店外卖起送价为￥' + store.value.min_price,
-				type: 'error'
-			});
-			return
-		}
+    // 外卖类型
+    if (typeof address.value.id == "undefined") {
+      uToast.value.show({
+        message: "请选择收货地址",
+        type: "error",
+      });
 
-		pay();
+      return;
+    }
 
-	} else {
-		pay();
-	}
-}
-const pay = async() => {
-	let that = this;
-	// #ifdef MP-WEIXIN
-	await new Promise(function(revolve) {
-		//订阅号信息id
-		 let subscribeMss = ['8qDIfzfL19eFT-qG1PRQJBbzZSTxpzUDo3nDa1bxc3M'];
+    // 起送价钱
+    if (store.value.min_price > total.value) {
+      uToast.value.show({
+        message: "本店外卖起送价为￥" + store.value.min_price,
+        type: "error",
+      });
+      return;
+    }
 
-		// wx.showModal({  // 显示微信模态对话框
-		//   title: '温馨提示',  // 对话框标题
-		//   content: '为更好的促进您与商家的交流，小程序需要在您成交时向您发送消息',  // 对话框内容
-		//   confirmText: "同意",  // 确认按钮文本
-		//   cancelText: "拒绝",  // 取消按钮文本
-		//   success: function(res) {  // 用户点击按钮后的回调
-		//     if (res.confirm) {  // 如果用户点击了"同意"
-		//       uni.requestSubscribeMessage({  // 调用uni-app的订阅消息API
-		//         tmplIds: subscribeMss,  // 订阅消息模板ID数组
-		//         complete(res) {  // 订阅完成回调
-		//           console.log(res,"打印11111111111111111")  // 打印订阅结果
-		//           revolve(true)  // 解析Promise，继续执行后续逻辑
-		//         }
-		//       });
-		//     } else {  // 如果用户点击了"拒绝"
-		//       revolve(true)  // 仍然解析Promise，继续执行后续逻辑
-		//     }
-		//   }
-		// })
-		revolve(true)
-	});
-	
+    pay();
+  } else {
+    pay();
+  }
+};
+const pay = async () => {
+  let that = this;
+  // #ifdef MP-WEIXIN
+  await new Promise(function (revolve) {
+    //订阅号信息id
+    let subscribeMss = ["8qDIfzfL19eFT-qG1PRQJBbzZSTxpzUDo3nDa1bxc3M"];
 
-	// #endif
-	uni.showLoading({
-		title: '加载中'
-	});
+    // wx.showModal({  // 显示微信模态对话框
+    //   title: '温馨提示',  // 对话框标题
+    //   content: '为更好的促进您与商家的交流，小程序需要在您成交时向您发送消息',  // 对话框内容
+    //   confirmText: "同意",  // 确认按钮文本
+    //   cancelText: "拒绝",  // 取消按钮文本
+    //   success: function(res) {  // 用户点击按钮后的回调
+    //     if (res.confirm) {  // 如果用户点击了"同意"
+    //       uni.requestSubscribeMessage({  // 调用uni-app的订阅消息API
+    //         tmplIds: subscribeMss,  // 订阅消息模板ID数组
+    //         complete(res) {  // 订阅完成回调
+    //           console.log(res,"打印11111111111111111")  // 打印订阅结果
+    //           revolve(true)  // 解析Promise，继续执行后续逻辑
+    //         }
+    //       });
+    //     } else {  // 如果用户点击了"拒绝"
+    //       revolve(true)  // 仍然解析Promise，继续执行后续逻辑
+    //     }
+    //   }
+    // })
+    revolve(true);
+  });
 
-	let data = {
-		orderType: orderType.value, // 购买类型:takein=自取,takeout=外卖
-		addressId:orderType.value == 'takeout' ? address.value.id : 0, // 外卖配送地址
-		shopId: store.value.id, // 店铺id
-		mobile: member.value.mobile, // 联系电话
-		gettime: takeinRange.value[defaultSelector.value[0]].value, // 取餐时间
-		payType: payType.value, // 支付类型
-		remark: form.value.remark, // 备注
-		productId: [],
-		spec: [],
-		number: [],
-		couponId: coupon.value.id ? coupon.value.id : 0, // 优惠券id
-		distributorId: distributorId.value ? distributorId.value : null, // 分销商id
-	};
+  // #endif
+  uni.showLoading({
+    title: "加载中",
+  });
 
-	cart.value.forEach((item, index) => {
-		data.productId.push(item.id);
-		data.spec.push(item.valueStr.replace(/,/g, '|'));
-		//data.spec.push(item.valueStr);
-		data.number.push(item.number);
-	});
+  let data = {
+    orderType: orderType.value, // 购买类型:takein=自取,takeout=外卖
+    addressId: orderType.value == "takeout" ? address.value.id : 0, // 外卖配送地址
+    shopId: store.value.id, // 店铺id
+    mobile: member.value.mobile, // 联系电话
+    gettime: takeinRange.value[defaultSelector.value[0]].value, // 取餐时间
+    payType: payType.value, // 支付类型
+    remark: form.value.remark, // 备注
+    productId: [],
+    spec: [],
+    number: [],
+    couponId: coupon.value.id ? coupon.value.id : 0, // 优惠券id
+    distributorId: distributorId.value ? distributorId.value : null, // 分销商id
+  };
 
-	//console.log(data);
-	let order = await orderSubmit(data);
-	if (!order) {
-		uni.hideLoading();
-		return;
-	}
-	
-	main.DEL_COUPON()
+  cart.value.forEach((item, index) => {
+    data.productId.push(item.id);
+    data.spec.push(item.valueStr.replace(/,/g, "|"));
+    //data.spec.push(item.valueStr);
+    data.number.push(item.number);
+  });
 
+  if (!data.orderType || !data.shopId || data.shopId == "undefined" || data.shopId == null) {
+    uToast.value.show({
+      message: "订单信息不完整，请重新下单",
+      type: "error"
+    });
+    setTimeout(() => {
+      uni.switchTab({
+        url: "/pages/menu/menu"
+      });
+    }, 3000);
+    return;
+  }
 
-	if (payType.value == 'weixin') {
-		// 微信支付
-		weixinPay(order);
-	} else if (payType.value == 'yue') {
-		// 余额支付
-		balancePay(order);
-	} else if (payType.value == 'alipay') {
-		// 余额支付
-		aliPay(order);
-	} 
-	uni.hideLoading()
-	return
-}
-const balancePay = async(order) => {
-	let from = 'routine'
-	// #ifdef H5
-	from = 'h5'
-	// #endif
-	let pay = await payUnify({
-		uni: order.orderId,
-		from: from,
-		paytype: 'yue'
-	});
+  //console.log(data);
+  let order = await orderSubmit(data);
+  if (!order) {
+    uni.hideLoading();
+    return;
+  }
 
-	uni.hideLoading();
-	if (!pay) {
-		return;
-	}
+  main.DEL_COUPON();
 
-	member.value.money -= amount.value
-	main.SET_MEMBER(member.value)
-	uni.removeStorageSync('cart');
-	uni.switchTab({
-		url: '/pages/order/order',
-		fail(res) {
-			console.log(res);
-		}
-	});
-}
-const weixinPay = async(order) => {
-	let from = 'routine'
-	// #ifdef H5
-	from = 'h5'
-	if(isWeixin()){
-		from = 'wechat'
-	}
-	
-	// #endif
-	//let that = this;
-	let data = await payUnify({
-		uni: order.orderId,
-		from: from,
-		paytype: 'weixin'
-	});
-	console.log('param2:',data)
-	if (!data) {
-		uni.hideLoading();
-		return;
-	}
-	if (data.trade_type == 'MWEB') {
-		// #ifdef H5
-		// 微信外的H5
-		console.log('data:',data)
-		location.href = data.data;
-		// #endif
-		console.log('data1:',data)
-	} else if (data.trade_type == 'JSAPI') {
-		console.log('param:',data)
+  if (payType.value == "weixin") {
+    // 微信支付
+    weixinPay(order);
+  } else if (payType.value == "yue") {
+    // 余额支付
+    balancePay(order);
+  } else if (payType.value == "alipay") {
+    // 余额支付
+    aliPay(order);
+  }
+  uni.hideLoading();
+  return;
+};
+const balancePay = async (order) => {
+  let from = "routine";
+  // #ifdef H5
+  from = "h5";
+  // #endif
+  let pay = await payUnify({
+    uni: order.orderId,
+    from: from,
+    paytype: "yue",
+  });
 
-		// #ifdef MP-WEIXIN
-		uni.requestPayment({
-			provider: 'wxpay',
-			timeStamp: data.data.timeStamp,
-			nonceStr: data.data.nonceStr,
-			package: data.data.package,
-			signType: 'MD5',
-			paySign: data.data.paySign,
-			success: function(res) {
+  uni.hideLoading();
+  if (!pay) {
+    return;
+  }
 
-				uni.removeStorageSync('cart');
-				uni.switchTab({
-					url: `/pages/order/order?t=${Date.now()}` 
-				});
-			},
-			fail: function(err) {
-				console.log('fail:' + JSON.stringify(err));
-			}
-		});
-		// #endif
-	} else if (data.trade_type == 'W-JSAPI'){
-		//公众号支付
-	
-		
-	}else if (data.trade_type == 'APP') {
+  member.value.money -= amount.value;
+  main.SET_MEMBER(member.value);
+  uni.removeStorageSync("cart");
+  uni.switchTab({
+    url: "/pages/order/order",
+    fail(res) {
+      console.log(res);
+    },
+  });
+};
+const weixinPay = async (order) => {
+  let from = "routine";
+  // #ifdef H5
+  from = "h5";
+  if (isWeixin()) {
+    from = "wechat";
+  }
 
-	}
-}
-const aliPay = async(order) => {
+  // #endif
+  //let that = this;
+  let data = await payUnify({
+    uni: order.orderId,
+    from: from,
+    paytype: "weixin",
+  });
+  console.log("param2:", data);
+  if (!data) {
+    uni.hideLoading();
+    return;
+  }
+  if (data.trade_type == "MWEB") {
+    // #ifdef H5
+    // 微信外的H5
+    console.log("data:", data);
+    location.href = data.data;
+    // #endif
+    console.log("data1:", data);
+  } else if (data.trade_type == "JSAPI") {
+    console.log("param:", data);
 
-	// #ifdef H5
-	//let that = this;
-	if(isWeixin()){
-		uni.showToast({
-			title: '请普通浏览器打开进行支付宝支付~',
-			icon: 'none'
-		})
-		return
-	}
-	let data = await payUnify({
-		uni: order.orderId,
-		from: 'h5',
-		paytype: 'alipay'
-	});
+    // #ifdef MP-WEIXIN
+    uni.requestPayment({
+      provider: "wxpay",
+      timeStamp: data.data.timeStamp,
+      nonceStr: data.data.nonceStr,
+      package: data.data.package,
+      signType: "MD5",
+      paySign: data.data.paySign,
+      success: function (res) {
+        uni.removeStorageSync("cart");
+        uni.switchTab({
+          url: `/pages/order/order`,
+        });
+      },
+      fail: function (err) {
+        console.log("fail:" + JSON.stringify(err));
+      },
+    });
+    // #endif
+  } else if (data.trade_type == "W-JSAPI") {
+    //公众号支付
+  } else if (data.trade_type == "APP") {
+  }
+};
+const aliPay = async (order) => {
+  // #ifdef H5
+  //let that = this;
+  if (isWeixin()) {
+    uni.showToast({
+      title: "请普通浏览器打开进行支付宝支付~",
+      icon: "none",
+    });
+    return;
+  }
+  let data = await payUnify({
+    uni: order.orderId,
+    from: "h5",
+    paytype: "alipay",
+  });
 
-	console.log('data:',data.data)
+  console.log("data:", data.data);
   // 支付宝支付，这里只要提交表单
-	let form = data.data
-	const div = document.createElement('formdiv');
-	div.innerHTML = form;
-	document.body.appendChild(div);      
-	//document.forms[0].setAttribute('target', ' self');
-	document.forms[0].submit();
-	//div.remove();
-
-// #endif
-
-
-}
-
-
+  let form = data.data;
+  const div = document.createElement("formdiv");
+  div.innerHTML = form;
+  document.body.appendChild(div);
+  //document.forms[0].setAttribute('target', ' self');
+  document.forms[0].submit();
+  //div.remove();
 
+  // #endif
+};
 
+const fillMobile = () => {
+  if (member.value && member.value.mobile) {
+    member.value.mobile = member.value.mobile;
+  } else {
+    uToast.value.show({
+      message: "未获取到手机号",
+      type: "error"
+    });
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		padding: 30rpx;
-	}
+.container {
+  padding: 30rpx;
+}
 
-	.arrow {
-		width: 50rpx;
-		height: 50rpx;
-		position: relative;
-		margin-right: -10rpx;
-	}
+.arrow {
+  width: 50rpx;
+  height: 50rpx;
+  position: relative;
+  margin-right: -10rpx;
+}
 
-	.location {
-		.store-name {
-			font-size: $font-size-lg;			
-		}
+.location {
+  .store-name {
+    font-size: $font-size-lg;
+  }
 
-		.iconfont {
-			font-size: 50rpx;
-			line-height: 100%;
-			color: $color-primary;
-			// color: #52ac41;
-		}
-	}
+  .iconfont {
+    font-size: 50rpx;
+    line-height: 100%;
+    color: $color-primary;
+    // color: #52ac41;
+  }
+}
 
-	.section-1 {
-		margin-bottom: 30rpx;
+.section-1 {
+  margin-bottom: 30rpx;
 
-		.contact {
-			.contact-tip {
-				margin-left: 10rpx;
-				// border: 2rpx solid $color-primary;
-				border: 2rpx solid #52ac41;
-				
-				padding: 6rpx 10rpx;
-				// color: $color-primary;
-				color: #52ac41;
-			}
-		}
-	}
+  .contact {
+    .contact-tip {
+      margin-left: 10rpx;
+      // border: 2rpx solid $color-primary;
+      border: 2rpx solid #52ac41;
 
-	.section-2 {
-		.name-and-props {
-			width: 65%;
-		}
-	}
+      padding: 6rpx 10rpx;
+      // color: $color-primary;
+      color: #52ac41;
+    }
+  }
+}
 
-	.payment {
-		margin-bottom: 30rpx;
+.section-2 {
+  .name-and-props {
+    width: 65%;
+  }
+}
 
-		.disabled {
-			color: $text-color-grey;
-		}
+.payment {
+  margin-bottom: 30rpx;
 
-		.payment-icon {
-			font-size: 44rpx;
-			margin-right: 10rpx;
-		}
+  .disabled {
+    color: $text-color-grey;
+  }
 
-		.checkbox {
-			font-size: 36rpx;
-			margin-left: 10rpx;
-		}
+  .payment-icon {
+    font-size: 44rpx;
+    margin-right: 10rpx;
+  }
 
-		.checked {
-			color: $color-primary;
-		}
-	}
+  .checkbox {
+    font-size: 36rpx;
+    margin-left: 10rpx;
+  }
 
-	.pay-box {
-		box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
-		height: 100rpx;
-	}
+  .checked {
+    color: $color-primary;
+  }
+}
 
-	.modal-content {
-		.change-address-btn {
-			line-height: 2;
-			padding: 0 1em;
-		}
+.pay-box {
+  box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+  height: 100rpx;
+}
 
-		.pay_btn {
-			width: 100%;
-			border-radius: 50rem !important;
-			line-height: 3;
-		}
-	}
+.modal-content {
+  .change-address-btn {
+    line-height: 2;
+    padding: 0 1em;
+  }
 
-	.choice {
-		background-color: $bg-color-grey;
-		border-radius: 38rpx;
-		display: flex;
-		align-items: center;
-		font-size: $font-size-sm;
-		padding: 0 38rpx;
-		color: $text-color-assist;
+  .pay_btn {
+    width: 100%;
+    border-radius: 50rem !important;
+    line-height: 3;
+  }
+}
 
-		.dinein,
-		.takeout {
-			width: 50%;
-			position: relative;
-			display: flex;
-			align-items: center;
+.choice {
+  background-color: $bg-color-grey;
+  border-radius: 38rpx;
+  display: flex;
+  align-items: center;
+  font-size: $font-size-sm;
+  padding: 0 38rpx;
+  color: $text-color-assist;
 
-			&.active {
-				padding: 14rpx 38rpx;
-				color: #ffffff;
-				background-color: $color-primary;
-				border-radius: 38rpx;
-			}
-		}
+  .dinein,
+  .takeout {
+    width: 50%;
+    position: relative;
+    display: flex;
+    align-items: center;
 
-		.takeout {
-			margin-left: 20rpx;
-			height: 100%;
-			flex: 1;
-			padding: 14rpx 0;
-		}
+    &.active {
+      padding: 14rpx 38rpx;
+      color: #ffffff;
+      background-color: $color-primary;
+      border-radius: 38rpx;
+    }
+  }
 
-		.dinein.active {
-			//margin-left: -38rpx;
-		}
+  .takeout {
+    margin-left: 20rpx;
+    height: 100%;
+    flex: 1;
+    padding: 14rpx 0;
+  }
 
-		.takeout.active {
-			//margin-right: -38rpx;
-		}
-	}
+  .dinein.active {
+    //margin-left: -38rpx;
+  }
+
+  .takeout.active {
+    //margin-right: -38rpx;
+  }
+}
 </style>
diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue
index cb46c52..32a584e 100644
--- a/pages/menu/menu.vue
+++ b/pages/menu/menu.vue
@@ -55,27 +55,28 @@
 					<!-- <view class="" style=" width: 95%; height: 85%; border-radius: 26px;  background-color: lightgray;">
 					</view> -->
 					<!-- {{ ads.list[0].image }} -->
-					<image :src="ads.list[0].image" mode="aspectFill" class="shop-banner" style="background-color:lightgray;  border-radius: 2ch;"></image>
+					<image :src="ads.list[0].image" mode="aspectFill" class="shop-banner"
+						style="background-color:lightgray;  border-radius: 2ch;"></image>
 				</view>
 
 
 				<!-- #ifdef H5 -->
 				<view class="content" :style="{
-					height: 'calc(100vh - ' + (headerHeight + (store.notice ? 0 : 60) + footerHeight) + 'rpx)', 
-					paddingBottom: '160rpx'
-				}">
-				<!-- #endif -->
-					<!-- #ifndef H5 -->
-					<view class="content" :style="{
-					height: 'calc(100vh - ' + (headerHeight + (store.notice ? 0 : 60) + footerHeight) + 'rpx)', 
+					height: 'calc(100vh - ' + (headerHeight + (store.notice ? 0 : 60) + footerHeight) + 'rpx)',
 					paddingBottom: '160rpx'
 				}">
 					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view class="content" :style="{
+						height: 'calc(100vh - ' + (headerHeight + (store.notice ? 0 : 60) + footerHeight) + 'rpx)',
+						paddingBottom: '160rpx'
+					}">
+						<!-- #endif -->
 						<scroll-view class="menu-sidebar" :scroll-into-view="menuScrollIntoView" scroll-with-animation
 							scroll-y>
 							<view class="sidebar-wrapper">
 								<view class="menu-category" :id="`menu-${item.id}`"
-									:class="{'current': item.id === currentCateId}" v-for="(item, index) in goods"
+									:class="{ 'current': item.id === currentCateId }" v-for="(item, index) in goods"
 									:key="index" @tap="handleMenuTap(item.id)">
 									<text>{{ item.name }}</text>
 									<view class="category-badge" v-if="menuCartNum(item.id) > 0">
@@ -100,10 +101,10 @@
 										<view class="category-items">
 											<!-- 商品 begin -->
 											<view class="good-card" v-for="(good, key) in item.goodsList" :key="key"
-												:class="{'sold-out': good.stock <= 0}">
+												:class="{ 'sold-out': good.stock <= 0 }">
 												<image mode="aspectFill" :src="good.image" class="good-image"
-												@tap="showGoodDetailModal(item, good)"></image>
-											<!-- 	<image mode="aspectFill"
+													@tap="showGoodDetailModal(item, good)"></image>
+												<!-- 	<image mode="aspectFill"
 													src="https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG62414071ec6e0e4e00603407efd42e53.png"
 													class="good-image" @tap="showGoodDetailModal(item, good)"></image> -->
 												<!-- https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNG62414071ec6e0e4e00603407efd42e53.png -->
@@ -163,8 +164,9 @@
 						</view>
 						<scroll-view class="modal-body" scroll-y>
 							<view v-if="good.image" class="modal-image">
-								
-								<image mode="aspectFill" style="width: 100%; height: 100%;  border-radius: 22rpx;" :src="good.image"></image>
+
+								<image mode="aspectFill" style="width: 100%; height: 100%;  border-radius: 22rpx;"
+									:src="good.image"></image>
 							</view>
 
 							<view class="modal-content">
@@ -220,11 +222,23 @@
 				<uv-popup ref="popup" mode="bottom" class="cart-popup">
 					<template #default>
 						<view class="cart-popup-container">
+
 							<view class="popup-header">
+
 								<text @tap="handleCartClear">清空</text>
 							</view>
+
 							<scroll-view class="cart-items" scroll-y>
 								<view class="items-wrapper">
+									<!-- 添加打包费行 -->
+									<view class="cart-item packing-fee" @tap="toPackingFeeDetail">
+										<view class="item-info">
+											<view class="item-name">打包费</view>
+										</view>
+										<view class="item-price">
+											<text>￥{{ getPackingFee }}</text>
+										</view>
+									</view>
 									<view class="cart-item" v-for="(item, index) in cart" :key="index">
 										<view class="item-info">
 											<view class="item-name">{{ item.name }}</view>
@@ -253,1239 +267,1282 @@
 			</view>
 
 		<!--轻提示-->
-				<view class="loading" v-if="loading">
-					<uv-loading-icon color="#DA5650" size=40 mode="circle"></uv-loading-icon>
-					<button type="primary" style="z-index: 3001;position: absolute;top: 650rpx;" @click="init"
-						class="cu-btn bg-red">刷新</button>
-				</view>
-				<uv-toast ref="uToast"></uv-toast>
-		</layout>
+		<view class="loading" v-if="loading">
+			<uv-loading-icon color="#DA5650" size=40 mode="circle"></uv-loading-icon>
+			<button type="primary" style="z-index: 3001;position: absolute;top: 650rpx;" @click="init"
+				class="cu-btn bg-red">刷新</button>
+		</view>
+		<uv-toast ref="uToast"></uv-toast>
+	</layout>
 </template>
 
 <script setup>
-	import {
-		ref,
-		computed,
-		nextTick
-	} from "vue";
-	import {
-		useMainStore
-	} from "@/store/store";
-	import {
-		storeToRefs
-	} from "pinia";
-	import {
-		onLoad,
-		onShow,
-		onPullDownRefresh,
-		onHide
-	} from "@dcloudio/uni-app";
-	import {
-		formatDateTime,
-		kmUnit
-	} from "@/utils/util";
-	import {
-		shopNearby,
-		menuGoods
-	} from "@/api/goods";
-	import {
-		menuAds
-	} from "@/api/market";
-	const main = useMainStore();
-	const {
-		orderType,
-		address,
-		store,
-		location,
-		isLogin
-	} = storeToRefs(main);
-	const title = ref("点餐");
-	const text = ref("滚动通知");
+import {
+	ref,
+	computed,
+	nextTick
+} from "vue";
+import {
+	useMainStore
+} from "@/store/store";
+import {
+	storeToRefs
+} from "pinia";
+import {
+	onLoad,
+	onShow,
+	onPullDownRefresh,
+	onHide
+} from "@dcloudio/uni-app";
+import {
+	formatDateTime,
+	kmUnit
+} from "@/utils/util";
+import {
+	shopNearby,
+	menuGoods
+} from "@/api/goods";
+import {
+	menuAds
+} from "@/api/market";
+const main = useMainStore();
+const {
+	orderType,
+	address,
+	store,
+	location,
+	isLogin
+} = storeToRefs(main);
+const title = ref("点餐");
+const text = ref("滚动通知");
 
-	const goods = ref([]);
-	const ads = ref([]);
-	const loading = ref(true);
-	const currentCateId = ref(0);
-	const cateScrollTop = ref(0);
-	const menuScrollIntoView = ref("");
-	const cart = ref([]);
-	const goodDetailModalVisible = ref(false);
-	const good = ref({});
-	const category = ref({});
-	const cartPopupVisible = ref(false);
-	const sizeCalcState = ref(false);
-	const newValue = ref([]);
-	const shopAd = ref(
-		"https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNGca115cd446d280796935fea74b5cd20f.png"
-	);
-	const isCartShow = ref(true);
-	const popup = ref();
-	const headerHeight = ref(300); // 头部区域高度（rpx）
-	const footerHeight = ref(100); // 底部区域高度（rpx）
+const goods = ref([]);
+const ads = ref([]);
+const loading = ref(true);
+const currentCateId = ref(0);
+const cateScrollTop = ref(0);
+const menuScrollIntoView = ref("");
+const cart = ref([]);
+const goodDetailModalVisible = ref(false);
+const good = ref({});
+const category = ref({});
+const cartPopupVisible = ref(false);
+const sizeCalcState = ref(false);
+const newValue = ref([]);
+const shopAd = ref(
+	"https://lanhu-oss-2537-2.lanhuapp.com/FigmaDDSSlicePNGca115cd446d280796935fea74b5cd20f.png"
+);
+const isCartShow = ref(true);
+const popup = ref();
+const headerHeight = ref(300); // 头部区域高度（rpx）
+const footerHeight = ref(100); // 底部区域高度（rpx）
 
-	const newkmUnit = computed(() => (param) => {
-		console.log("param:", param);
-		return "10km";
-	});
-	const goodCartNum = computed(() => {
-		//计算单个饮品添加到购物车的数量
-		return (id) =>
-			cart.value.reduce((acc, cur) => {
-				if (cur.id === id) {
-					return (acc += cur.number);
-				}
-				return acc;
-			}, 0);
-	});
-	const menuCartNum = computed(() => {
-		return (id) =>
-			cart.value.reduce((acc, cur) => {
-				if (cur.cate_id === id) {
-					return (acc += cur.number);
-				}
-				return acc;
-			}, 0);
-	});
-	const getCartGoodsNumber = computed(() => {
-		//计算购物车总数
-		return cart.value.reduce((acc, cur) => acc + cur.number, 0);
-	});
-	const getCartGoodsPrice = computed(() => {
-		//计算购物车总价
-		let price = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0);
-		return parseFloat(price).toFixed(2);
-	});
-	const disabledPay = computed(() => {
-		//是否达到起送价
-		return orderType.value == "takeout" &&
-			getCartGoodsPrice < parseFloat(store.value.min_price) ?
-			true :
-			false;
-	});
-	const spread = computed(() => {
-		//差多少元起送
-		if (orderType.value != "takeout") return;
-		return parseFloat((store.value.min_price - getCartGoodsPrice).toFixed(2));
-	});
-
-	// 监听自定义事件
-	uni.$on("refreshMenu", () => {
-		// 在这里执行onLoad逻辑
-		console.log("refreshMenu1:", store.value.id);
-		init();
-	});
-
-	onPullDownRefresh(() => {
-		init();
-	});
-	onLoad(() => {
-		init();
-		refreshCart();
-		nextTick(() => {
-			if (goods.value.length > 0) {
-				currentCateId.value = goods.value[0].id;
+const newkmUnit = computed(() => (param) => {
+	console.log("param:", param);
+	return "10km";
+});
+const goodCartNum = computed(() => {
+	//计算单个饮品添加到购物车的数量
+	return (id) =>
+		cart.value.reduce((acc, cur) => {
+			if (cur.id === id) {
+				return (acc += cur.number);
 			}
-		});
-	});
-	onHide(() => {
-		// 重新进入要重新计算页面高度，否则有问题
-		sizeCalcState.value = false;
-	});
-	onShow(() => {
-		//init();
-		refreshCart();
-		shopAd.value = uni.getStorageSync("shopAd");
-		// 初始化页面高度计算
-		nextTick(() => {
-			calcLayoutHeights();
-		});
-	});
-
-	const openCartShow = () => {
-		isCartShow.value = false;
-	};
-	const in_array = (search, array) => {
-		for (var i in array) {
-			if (array[i] == search) {
-				return true;
+			return acc;
+		}, 0);
+});
+const menuCartNum = computed(() => {
+	return (id) =>
+		cart.value.reduce((acc, cur) => {
+			if (cur.cate_id === id) {
+				return (acc += cur.number);
 			}
+			return acc;
+		}, 0);
+});
+const getCartGoodsNumber = computed(() => {
+	//计算购物车总数
+	return cart.value.reduce((acc, cur) => acc + cur.number, 0);
+});
+// const getCartGoodsPrice = computed(() => {
+// 	//计算购物车总价
+// 	let price = cart.value.reduce((acc, cur) => acc + cur.number * cur.price, 0);
+// 	return parseFloat(price).toFixed(2);
+// });
+const getCartGoodsPrice = computed(() => {
+	//计算购物车总价（商品价格+餐饮盒费用）
+	let total = cart.value.reduce((acc, cur) => {
+		const itemPrice = cur.price * cur.number;
+		const boxPrice = (cur.boxFee || 0) * cur.number; // 计算每个商品的餐饮盒费用
+		return acc + itemPrice + boxPrice;
+	}, 0);
+	return parseFloat(total).toFixed(2);
+});
+const disabledPay = computed(() => {
+	//是否达到起送价
+	return orderType.value == "takeout" &&
+		getCartGoodsPrice < parseFloat(store.value.min_price) ?
+		true :
+		false;
+});
+const spread = computed(() => {
+	//差多少元起送
+	if (orderType.value != "takeout") return;
+	return parseFloat((store.value.min_price - getCartGoodsPrice).toFixed(2));
+});
+
+// 监听自定义事件
+uni.$on("refreshMenu", () => {
+	// 在这里执行onLoad逻辑
+	console.log("refreshMenu1:", store.value.id);
+	init();
+});
+
+onPullDownRefresh(() => {
+	init();
+});
+onLoad(() => {
+	init();
+	refreshCart();
+	nextTick(() => {
+		if (goods.value.length > 0) {
+			currentCateId.value = goods.value[0].id;
 		}
-		return false;
-	};
-	const selectShop = () => {
-		uni.navigateTo({
-			url: "/pages/components/pages/shop/shop",
+	});
+});
+onHide(() => {
+	// 重新进入要重新计算页面高度，否则有问题
+	sizeCalcState.value = false;
+});
+onShow(() => {
+	//init();
+	refreshCart();
+	shopAd.value = uni.getStorageSync("shopAd");
+	// 初始化页面高度计算
+	nextTick(() => {
+		calcLayoutHeights();
+	});
+});
+
+const openCartShow = () => {
+	// isCartShow.value = false;
+};
+const in_array = (search, array) => {
+	for (var i in array) {
+		if (array[i] == search) {
+			return true;
+		}
+	}
+	return false;
+};
+const selectShop = () => {
+	uni.navigateTo({
+		url: "/pages/components/pages/shop/shop",
+	});
+};
+const uToast = ref();
+const init = async () => {
+	//页面初始化
+	loading.value = true;
+
+	//return
+	let error = {},
+		result = location.value;
+	console.log("result:", result);
+	if (!location.value.hasOwnProperty("latitude")) {
+		console.log("result1:", location.value);
+		uni.getLocation({
+			type: "wgs84",
+			success: function (res) {
+				console.log("location1:", res);
+
+				result = {
+					latitude: res.latitude,
+					longitude: res.longitude,
+				};
+				getShopList(result);
+			},
+			fail: function (res) {
+				uni.showToast({
+					title: "获取位置失败，请检查是否开启相关权限",
+					duration: 2000,
+					icon: "error",
+				});
+				// 默认地为你为北京地址
+				result = {
+					latitude: 39.91999,
+					longitude: 116.45627,
+				};
+				getShopList(result);
+			},
+			complete: function (res) { },
 		});
-	};
-	const uToast = ref();
-	const init = async () => {
-		//页面初始化
-		loading.value = true;
 
-		//return
-		let error = {},
-			result = location.value;
-		console.log("result:", result);
-		if (!location.value.hasOwnProperty("latitude")) {
-			console.log("result1:", location.value);
-			uni.getLocation({
-				type: "wgs84",
-				success: function(res) {
-					console.log("location1:", res);
+		return;
+	}
 
-					result = {
-						latitude: res.latitude,
-						longitude: res.longitude,
-					};
-					getShopList(result);
-				},
-				fail: function(res) {
-					uni.showToast({
-						title: "获取位置失败，请检查是否开启相关权限",
-						duration: 2000,
-						icon: "error",
-					});
-					// 默认地为你为北京地址
-					result = {
-						latitude: 39.91999,
-						longitude: 116.45627,
-					};
-					getShopList(result);
-				},
-				complete: function(res) {},
-			});
+	getShopList(result);
+};
+const getShopList = async (res) => {
+	console.log("location9:", res);
+	if (res) {
+		main.SET_LOCATION(res);
 
-			return;
+		let shop_id = 0;
+		if (store.value.id) {
+			shop_id = store.value.id;
 		}
 
-		getShopList(result);
-	};
-	const getShopList = async (res) => {
-		console.log("location9:", res);
-		if (res) {
-			main.SET_LOCATION(res);
+		let shop = await shopNearby({
+			lat: res.latitude,
+			lng: res.longitude,
+			shop_id: shop_id,
+			kw: "",
+		});
+		if (shop) {
+			//广告图
+			getAds(shop.id);
 
-			let shop_id = 0;
-			if (store.value.id) {
-				shop_id = store.value.id;
-			}
-
-			let shop = await shopNearby({
-				lat: res.latitude,
-				lng: res.longitude,
-				shop_id: shop_id,
-				kw: "",
-			});
-			if (shop) {
-				//广告图
-				getAds(shop.id);
-
-				shop.notice =
-					shop.status == 1 ?
+			shop.notice =
+				shop.status == 1 ?
 					shop.notice :
 					"店铺营业时间为:" +
 					formatDateTime(shop.startTime, "hh:mm") +
 					" - " +
 					formatDateTime(shop.endTime, "hh:mm") +
 					"，不在营业时间内无法下单";
-				// 设置店铺信息
-				main.SET_STORE(shop);
-				let mygoods = await menuGoods({
-					shopId: shop.id,
+			// 设置店铺信息
+			main.SET_STORE(shop);
+			let mygoods = await menuGoods({
+				shopId: shop.id,
+			});
+			if (mygoods) {
+				goods.value = mygoods;
+				refreshCart();
+
+				// 设置初始分类
+				if (mygoods.length > 0) {
+					currentCateId.value = mygoods[0].id;
+				}
+
+				// 数据加载完成后，重新计算布局
+				nextTick(() => {
+					calcLayoutHeights();
 				});
-				if (mygoods) {
-					goods.value = mygoods;
-					refreshCart();
 
-					// 设置初始分类
-					if (mygoods.length > 0) {
-						currentCateId.value = mygoods[0].id;
-					}
-
-					// 数据加载完成后，重新计算布局
-					nextTick(() => {
-						calcLayoutHeights();
-					});
-
-					loading.value = false;
-				}
-				console.log("goods:", mygoods);
-				console.log("goods:", goods.value);
-				// loading.value = false;
-				// uni.stopPullDownRefresh();
+				loading.value = false;
 			}
-		}
-		uni.stopPullDownRefresh();
-	};
-	const refreshCart = () => {
-		if (goods.value && goods.value.length > 0) {
-			let newGoods = goods.value;
-			cart.value = [];
-			let newCart = uni.getStorageSync("cart") || [];
-			let tmpCart = [];
-			if (newCart) {
-				for (let i in newCart) {
-					for (let ii in newGoods) {
-						for (let iii in newGoods[ii].goodsList) {
-							if (newCart[i].id == newGoods[ii].goodsList[iii].id) {
-								tmpCart.push(newCart[i]);
-							}
-						}
-					}
-				}
-				cart.value = tmpCart;
-				cartPopupVisible.value = false;
-			}
-		}
-	};
-	const getAds = async (shop_id) => {
-		let data = await menuAds({
-			shop_id: shop_id ? shop_id : 0
-		});
-		if (data) {
-			ads.value = data;
-			console.log("ads1111:", ads.value);
+			console.log("goods:", mygoods);
+			console.log("goods:", goods.value);
+			// loading.value = false;
+			// uni.stopPullDownRefresh();
 		}
 	}
-	const takout = (force = false) => {
-		if (orderType.value == "takeout" && force == false) return;
-		main.SET_ORDER_TYPE("takeout");
-
-		if (!isLogin.value) {
-			uni.navigateTo({
-				url: "/pages/components/pages/login/login",
-			});
-			return;
-		}
-	};
-	const takein = (force = false) => {
-		if (orderType.value == "takein" && force == false) return;
-		main.SET_ORDER_TYPE("takein");
-
-		if (!isLogin.value) {
-			uni.navigateTo({
-				url: "/pages/components/pages/login/login",
-			});
-			return;
-		}
-	};
-	const handleMenuTap = (id) => {
-		//点击菜单项事件
-		if (!sizeCalcState.value) {
-			calcSize();
-		}
-
-		currentCateId.value = id;
-		// nextTick(() => cateScrollTop.value = goods.value.find(item => item.id == id).top)
-		menuScrollIntoView.value = `menu-${id}`;
-
-		// 查找对应的分类区域并滚动到该位置
-		const category = goods.value.find((item) => item.id === id);
-		if (category && category.top !== undefined) {
-			// 使用nextTick确保DOM更新后再滚动
-			nextTick(() => {
-				cateScrollTop.value = category.top;
-				// 强制触发滚动以确保位置正确
-				const goodsContainer = uni
-					.createSelectorQuery()
-					.select("#goodsContainer");
-				if (goodsContainer) {
-					goodsContainer
-						.boundingClientRect((data) => {
-							if (data) {
-								console.log(
-									"Scrolling to category:",
-									id,
-									"at position:",
-									category.top
-								);
-							}
-						})
-						.exec();
-				}
-			});
-		}
-	};
-	const handleGoodsScroll = ({
-		detail
-	}) => {
-		//商品列表滚动事件
-		if (!sizeCalcState.value) {
-			calcSize();
-		}
-		console.log("scrollTop:", detail);
-		const {
-			scrollTop
-		} = detail;
-		let tabs = goods.value.filter((item) => item.top <= scrollTop).reverse();
-		if (tabs.length > 0) {
-			currentCateId.value = tabs[0].id;
-		}
-	};
-	const calcSize = () => {
-		let h = 0;
-
-		// 更精确计算每个分类的位置
-		goods.value.forEach((item, index) => {
-			let view = uni.createSelectorQuery().select(`#cate-${item.id}`);
-			view
-				.fields({
-						size: true,
-						rect: true,
-					},
-					(data) => {
-						if (data) {
-							// 对于第一个分类，顶部位置为0
-							if (index === 0) {
-								item.top = 0;
-							} else {
-								item.top = h;
-							}
-							h += data.height;
-							item.bottom = h;
-							console.log(
-								`Category ${item.id} calculated: top=${item.top}, height=${data.height}, bottom=${item.bottom}`
-							);
+	uni.stopPullDownRefresh();
+};
+const refreshCart = () => {
+	if (goods.value && goods.value.length > 0) {
+		let newGoods = goods.value;
+		cart.value = [];
+		let newCart = uni.getStorageSync("cart") || [];
+		let tmpCart = [];
+		if (newCart) {
+			for (let i in newCart) {
+				for (let ii in newGoods) {
+					for (let iii in newGoods[ii].goodsList) {
+						if (newCart[i].id == newGoods[ii].goodsList[iii].id) {
+							tmpCart.push(newCart[i]);
 						}
 					}
-				)
-				.exec();
+				}
+			}
+			cart.value = tmpCart;
+			cartPopupVisible.value = false;
+		}
+	}
+};
+const getAds = async (shop_id) => {
+	let data = await menuAds({
+		shop_id: shop_id ? shop_id : 0
+	});
+	if (data) {
+		ads.value = data;
+	}
+}
+const takout = (force = false) => {
+	if (orderType.value == "takeout" && force == false) return;
+	main.SET_ORDER_TYPE("takeout");
+
+	if (!isLogin.value) {
+		uni.navigateTo({
+			url: "/pages/components/pages/login/login",
 		});
-		sizeCalcState.value = true;
-	};
+		return;
+	}
+};
+const takein = (force = false) => {
+	if (orderType.value == "takein" && force == false) return;
+	main.SET_ORDER_TYPE("takein");
 
-	// 增强页面布局高度计算的准确性
-	const calcLayoutHeights = () => {
-		// 获取系统信息
-		const systemInfo = uni.getSystemInfoSync();
-		const rpxRatio = 750 / systemInfo.windowWidth;
+	if (!isLogin.value) {
+		uni.navigateTo({
+			url: "/pages/components/pages/login/login",
+		});
+		return;
+	}
+};
+const handleMenuTap = (id) => {
+	//点击菜单项事件
+	if (!sizeCalcState.value) {
+		calcSize();
+	}
 
-		// 获取头部区域高度
-		const headerQuery = uni.createSelectorQuery().select(".nav");
-		headerQuery
-			.boundingClientRect((data) => {
-				if (data) {
-					// 将px转换为rpx
-					headerHeight.value = data.height * rpxRatio;
-					console.log("Header height:", headerHeight.value);
+	currentCateId.value = id;
+	// nextTick(() => cateScrollTop.value = goods.value.find(item => item.id == id).top)
+	menuScrollIntoView.value = `menu-${id}`;
+
+	// 查找对应的分类区域并滚动到该位置
+	const category = goods.value.find((item) => item.id === id);
+	if (category && category.top !== undefined) {
+		// 使用nextTick确保DOM更新后再滚动
+		nextTick(() => {
+			cateScrollTop.value = category.top;
+			// 强制触发滚动以确保位置正确
+			const goodsContainer = uni
+				.createSelectorQuery()
+				.select("#goodsContainer");
+			if (goodsContainer) {
+				goodsContainer
+					.boundingClientRect((data) => {
+						if (data) {
+							console.log(
+								"Scrolling to category:",
+								id,
+								"at position:",
+								category.top
+							);
+						}
+					})
+					.exec();
+			}
+		});
+	}
+};
+const handleGoodsScroll = ({
+	detail
+}) => {
+	//商品列表滚动事件
+	if (!sizeCalcState.value) {
+		calcSize();
+	}
+	console.log("scrollTop:", detail);
+	const {
+		scrollTop
+	} = detail;
+	let tabs = goods.value.filter((item) => item.top <= scrollTop).reverse();
+	if (tabs.length > 0) {
+		currentCateId.value = tabs[0].id;
+	}
+};
+const calcSize = () => {
+	let h = 0;
+
+	// 更精确计算每个分类的位置
+	goods.value.forEach((item, index) => {
+		let view = uni.createSelectorQuery().select(`#cate-${item.id}`);
+		view
+			.fields({
+				size: true,
+				rect: true,
+			},
+				(data) => {
+					if (data) {
+						// 对于第一个分类，顶部位置为0
+						if (index === 0) {
+							item.top = 0;
+						} else {
+							item.top = h;
+						}
+						h += data.height;
+						item.bottom = h;
+						console.log(
+							`Category ${item.id} calculated: top=${item.top}, height=${data.height}, bottom=${item.bottom}`
+						);
+					}
 				}
-			})
+			)
 			.exec();
+	});
+	sizeCalcState.value = true;
+};
 
-		// 获取底部购物车栏高度
-		const footerQuery = uni.createSelectorQuery().select(".cart-bar");
-		footerQuery
-			.boundingClientRect((data) => {
-				if (data) {
-					// 将px转换为rpx
-					footerHeight.value = data ? data.height * rpxRatio : 100;
-					console.log("Footer height:", footerHeight.value);
-				} else {
-					// 如果没有购物车栏，设置一个默认值
-					footerHeight.value = 100;
-				}
+// 增强页面布局高度计算的准确性
+const calcLayoutHeights = () => {
+	// 获取系统信息
+	const systemInfo = uni.getSystemInfoSync();
+	const rpxRatio = 750 / systemInfo.windowWidth;
 
-				// 重新计算各个分类的位置
-				nextTick(() => {
-					sizeCalcState.value = false;
-					calcSize();
-				});
-			})
-			.exec();
-	};
-	// const calcSize = () => {
-	// 	let h = 10
-	// 	let view = uni.createSelectorQuery().select('#ads')
-	// 	if (view) {
-	// 		view.fields({
-	// 			size: true
-	// 		}, data => {
-	// 			if (data) {
-	// 				h += Math.floor(data.height)
-	// 			}
-	// 		}).exec()
-	// 	}
-	// 	goods.value.forEach(item => {
-	// 		let view = uni.createSelectorQuery().select(`#cate-${item.id}`)
-	// 		view.fields({
-	// 			size: true
-	// 		}, data => {
-	// 			console.log('h3:',h)
-	// 			item.top = h
-	// 			h += data.height
-	// 			item.bottom = h
-	// 		}).exec()
-	// 	})
-	// 	sizeCalcState.value = true
-	// }
-	const handleAddToCart = (cate, newGood, num) => {
-		//添加到购物车
-		const index = cart.value.findIndex((item) => {
-			if (newGood) {
-				return item.id === newGood.id && item.props_text === good.value.valueStr;
+	// 获取头部区域高度
+	const headerQuery = uni.createSelectorQuery().select(".nav");
+	headerQuery
+		.boundingClientRect((data) => {
+			if (data) {
+				// 将px转换为rpx
+				headerHeight.value = data.height * rpxRatio;
+				console.log("Header height:", headerHeight.value);
+			}
+		})
+		.exec();
+
+	// 获取底部购物车栏高度
+	const footerQuery = uni.createSelectorQuery().select(".cart-bar");
+	footerQuery
+		.boundingClientRect((data) => {
+			if (data) {
+				// 将px转换为rpx
+				footerHeight.value = data ? data.height * rpxRatio : 100;
+				console.log("Footer height:", footerHeight.value);
 			} else {
-				return item.id === newGood.id;
+				// 如果没有购物车栏，设置一个默认值
+				footerHeight.value = 100;
 			}
-		});
-		if (index > -1) {
-			cart.value[index].number += num;
-		} else {
-			cart.value.push({
-				id: newGood.id,
-				cate_id: cate.id,
-				name: newGood.storeName,
-				price: newGood.price,
-				number: num,
-				image: newGood.image,
-				valueStr: good.value.valueStr,
+
+			// 重新计算各个分类的位置
+			nextTick(() => {
+				sizeCalcState.value = false;
+				calcSize();
 			});
-		}
-		uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-	};
-	const handleReduceFromCart = (item, good) => {
-		const index = cart.value.findIndex((item) => item.id === good.id);
-		cart.value[index].number -= 1;
-		if (cart.value[index].number <= 0) {
-			cart.value.splice(index, 1);
-		}
-		uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-	};
-	const showGoodDetailModal = (item, newGood) => {
-		isCartShow.value = true;
-		good.value = JSON.parse(
-			JSON.stringify({
-				...newGood,
-				number: 1,
-			})
-		);
-		category.value = JSON.parse(JSON.stringify(item));
-		goodDetailModalVisible.value = true;
-		console.log("goodDetailModalVisible:", goodDetailModalVisible.value);
-		changePropertyDefault(0, 0, true);
-	};
-	const closeGoodDetailModal = () => {
-		//关闭饮品详情模态框
-		goodDetailModalVisible.value = false;
-		category.value = {};
-		good.value = {};
-	};
-	const changePropertyDefault = (index, key, isDefault) => {
-		//改变默认属性值
-		let valueStr = "";
-		console.log("good:", good.value);
-		if (isDefault) {
-			newValue.value = [];
-			for (let i = 0; i < good.value.productAttr.length; i++) {
-				newValue.value[i] = good.value.productAttr[i].attrValueArr[0];
-			}
-
-			valueStr = newValue.value.join(",");
+		})
+		.exec();
+};
+// const calcSize = () => {
+// 	let h = 10
+// 	let view = uni.createSelectorQuery().select('#ads')
+// 	if (view) {
+// 		view.fields({
+// 			size: true
+// 		}, data => {
+// 			if (data) {
+// 				h += Math.floor(data.height)
+// 			}
+// 		}).exec()
+// 	}
+// 	goods.value.forEach(item => {
+// 		let view = uni.createSelectorQuery().select(`#cate-${item.id}`)
+// 		view.fields({
+// 			size: true
+// 		}, data => {
+// 			console.log('h3:',h)
+// 			item.top = h
+// 			h += data.height
+// 			item.bottom = h
+// 		}).exec()
+// 	})
+// 	sizeCalcState.value = true
+// }
+const handleAddToCart = (cate, newGood, num) => {
+	console.log("handleAddToCart121212:", cate, newGood, num);
+	//添加到购物车
+	const index = cart.value.findIndex((item) => {
+		if (newGood) {
+			return item.id === newGood.id && item.props_text === good.value.valueStr;
 		} else {
-			newValue.value[index] = good.value.productAttr[index].attrValueArr[key];
-			// 	//valueStr = newValue.value.join(',')
-			// }
-			valueStr = newValue.value.join(",");
-			// let productValue = good.value.productValue[valueStr]
-			// if(!productValue) {
-			// 	let skukey = JSON.parse(JSON.stringify(newValue.value))
-			// 	skukey.sort((a, b) => a.localeCompare(b))
-			// 	//console.log('skukey:',skukey)
-			// 	valueStr = skukey.join(',')
-			// 	productValue = good.value.productValue[valueStr]
+			return item.id === newGood.id;
+		}
+	});
+
+	// 计算餐饮盒费用（假设每个商品需要1个餐饮盒，每个0.5元）
+	const boxFee = newGood.boxFee || 0; // 如果没有设置boxFee则默认0.5元
+
+
+	if (index > -1) {
+		cart.value[index].number += num;
+	} else {
+		cart.value.push({
+			id: newGood.id,
+			cate_id: cate.id,
+			name: newGood.storeName,
+			price: newGood.price,
+			number: num,
+			image: newGood.image,
+			valueStr: good.value.valueStr,
+			boxFee: boxFee, // 添加餐饮盒费用
+			aloneSell: newGood.aloneSell,
+		});
+	}
+	uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+};
+const handleReduceFromCart = (item, good) => {
+	const index = cart.value.findIndex((item) => item.id === good.id);
+	cart.value[index].number -= 1;
+	if (cart.value[index].number <= 0) {
+		cart.value.splice(index, 1);
+	}
+	uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+};
+const showGoodDetailModal = (item, newGood) => {
+	isCartShow.value = true;
+	good.value = JSON.parse(
+		JSON.stringify({
+			...newGood,
+			number: 1,
+		})
+	);
+	category.value = JSON.parse(JSON.stringify(item));
+	goodDetailModalVisible.value = true;
+	console.log("goodDetailModalVisible:", goodDetailModalVisible.value);
+	changePropertyDefault(0, 0, true);
+};
+const closeGoodDetailModal = () => {
+	//关闭饮品详情模态框
+	goodDetailModalVisible.value = false;
+	category.value = {};
+	good.value = {};
+};
+const changePropertyDefault = (index, key, isDefault) => {
+	//改变默认属性值
+	let valueStr = "";
+	console.log("good:", good.value);
+	if (isDefault) {
+		newValue.value = [];
+		for (let i = 0; i < good.value.productAttr.length; i++) {
+			newValue.value[i] = good.value.productAttr[i].attrValueArr[0];
 		}
 
-		let productValue = good.value.productValue[valueStr];
-		good.value.number = 1;
-		good.value.price = parseFloat(productValue.price).toFixed(2);
-		good.value.stock = productValue.stock;
-		good.value.image = productValue.image ? productValue.image : good.value.image;
-		good.value.valueStr = valueStr;
-	};
-	const handlePropertyAdd = () => {
-		good.value.number += 1;
-	};
-	const handlePropertyReduce = () => {
-		if (good.value.number === 1) return;
-		good.value.number -= 1;
-	};
-	const handleAddToCartInModal = () => {
-		if (good.value.stock <= 0) {
+		valueStr = newValue.value.join(",");
+	} else {
+		newValue.value[index] = good.value.productAttr[index].attrValueArr[key];
+		// 	//valueStr = newValue.value.join(',')
+		// }
+		valueStr = newValue.value.join(",");
+		// let productValue = good.value.productValue[valueStr]
+		// if(!productValue) {
+		// 	let skukey = JSON.parse(JSON.stringify(newValue.value))
+		// 	skukey.sort((a, b) => a.localeCompare(b))
+		// 	//console.log('skukey:',skukey)
+		// 	valueStr = skukey.join(',')
+		// 	productValue = good.value.productValue[valueStr]
+	}
+
+	let productValue = good.value.productValue[valueStr];
+	good.value.number = 1;
+	good.value.price = parseFloat(productValue.price).toFixed(2);
+	good.value.stock = productValue.stock;
+	good.value.image = productValue.image ? productValue.image : good.value.image;
+	good.value.valueStr = valueStr;
+};
+const handlePropertyAdd = () => {
+	good.value.number += 1;
+};
+const handlePropertyReduce = () => {
+	if (good.value.number === 1) return;
+	good.value.number -= 1;
+};
+const handleAddToCartInModal = () => {
+	if (good.value.stock <= 0) {
+		uToast.value.show({
+			message: "商品库存不足",
+			type: "error"
+		});
+		return;
+	}
+	handleAddToCart(category.value, good.value, good.value.number);
+	closeGoodDetailModal();
+};
+const openCartPopup = () => {
+	//打开/关闭购物车列表popup
+	popup.value.open();
+};
+const handleCartClear = () => {
+	//清空购物车
+	uni.showModal({
+		title: "提示",
+		content: "确定清空购物车么",
+		success: ({
+			confirm
+		}) => {
+			if (confirm) {
+				popup.value.close();
+				cart.value = [];
+				uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+			}
+		},
+	});
+};
+const handleCartItemAdd = (index) => {
+	cart.value[index].number += 1;
+	uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+};
+const handleCartItemReduce = (index) => {
+	if (cart.value[index].number === 1) {
+		cart.value.splice(index, 1);
+	} else {
+		cart.value[index].number -= 1;
+	}
+	if (!cart.value.length) {
+		cartPopupVisible.value = false;
+	}
+	uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+};
+const toPay = () => {
+	if (!isLogin.value) {
+		uni.navigateTo({
+			url: "/pages/components/pages/login/login",
+		});
+		return;
+	} else {
+		if (store.value.status == 0) {
 			uToast.value.show({
-				message: "商品库存不足",
+				message: "不在店铺营业时间内",
 				type: "error"
 			});
 			return;
 		}
-		handleAddToCart(category.value, good.value, good.value.number);
-		closeGoodDetailModal();
-	};
-	const openCartPopup = () => {
-		//打开/关闭购物车列表popup
-		popup.value.open();
-	};
-	const handleCartClear = () => {
-		//清空购物车
-		uni.showModal({
-			title: "提示",
-			content: "确定清空购物车么",
-			success: ({
-				confirm
-			}) => {
-				if (confirm) {
-					popup.value.close();
-					cart.value = [];
-					uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-				}
-			},
-		});
-	};
-	const handleCartItemAdd = (index) => {
-		cart.value[index].number += 1;
-		uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-	};
-	const handleCartItemReduce = (index) => {
-		if (cart.value[index].number === 1) {
-			cart.value.splice(index, 1);
-		} else {
-			cart.value[index].number -= 1;
-		}
-		if (!cart.value.length) {
-			cartPopupVisible.value = false;
-		}
-		uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-	};
-	const toPay = () => {
-		if (!isLogin.value) {
-			uni.navigateTo({
-				url: "/pages/components/pages/login/login",
+		// 判断当前是否在配送范围内
+		if (
+			orderType.value == "takeout" &&
+			store.value.distance < store.value.far
+		) {
+			uToast.value.show({
+				message: "选中的地址不在配送范围",
+				type: "error"
 			});
 			return;
-		} else {
-			if (store.value.status == 0) {
-				uToast.value.show({
-					message: "不在店铺营业时间内",
-					type: "error"
-				});
-				return;
-			}
-			// 判断当前是否在配送范围内
-			if (
-				orderType.value == "takeout" &&
-				store.value.distance < store.value.far
-			) {
-				uToast.value.show({
-					message: "选中的地址不在配送范围",
-					type: "error"
-				});
-				return;
-			}
-
-			uni.showLoading({
-				title: "加载中",
-			});
-			uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
-
-			uni.navigateTo({
-				url: "/pages/components/pages/pay/pay",
-			});
 		}
 
-		uni.hideLoading();
-	};
+		uni.showLoading({
+			title: "加载中",
+		});
+		uni.setStorageSync("cart", JSON.parse(JSON.stringify(cart.value)));
+
+		uni.navigateTo({
+			url: "/pages/components/pages/pay/pay",
+		});
+	}
+
+	uni.hideLoading();
+};
+
+const getPackingFee = computed(() => {
+	// 计算打包费（根据每个商品的boxFee计算）
+	return cart.value.reduce((acc, cur) => acc + cur.number * (cur.boxFee || 0), 0);
+});
+
+const toPackingFeeDetail = () => {
+	// uni.navigateTo({
+	// 	url: "/pages/components/pages/packing-fee/packing-fee"
+	// });
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "./common.css";
+@import "./common.css";
 
-	/* #ifdef H5 */
-	page {
-		height: auto;
-		min-height: 100%;
-	}
+/* #ifdef H5 */
+page {
+	height: auto;
+	min-height: 100%;
+}
 
-	/* #endif */
+/* #endif */
 
-	.container {
-		overflow: hidden;
+.container {
+	overflow: hidden;
+	position: relative;
+	background-color: #ffffff;
+}
+
+.loading {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	image {
+		width: 260rpx;
+		height: 260rpx;
 		position: relative;
-		background-color: #ffffff;
-	}
-
-	.loading {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		image {
-			width: 260rpx;
-			height: 260rpx;
-			position: relative;
-			margin-top: -200rpx;
-			/* #ifdef h5 */
-			margin-top: 0;
-			/* #endif */
-		}
-	}
-
-	.flex-row {
-		display: flex;
-		flex-direction: row;
-	}
-
-	.justify-between {
-		justify-content: space-between;
-	}
-
-	.align-center {
-		align-items: center;
-	}
-
-	.shop-banner {
-		width: 100%;
-		height: 250rpx;
-		object-fit: cover;
-	}
-
-	.notice-bar {
-		height: 60rpx;
-		background-color: #ffffff;
-	}
-
-	.main {
-		position: relative;
-	}
-
-	.nav {
-		background-color: #ffffff;
-		padding: 20rpx;
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
-	}
-
-	.header {
-		padding: 10rpx 0;
-	}
-
-	.store-info {
-		flex: 1;
-	}
-
-	.store-logo {
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 8rpx;
-	}
-
-	.store-name {
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #000;
-	}
-
-	.store-location {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 4rpx;
-	}
-
-	.order-type {
-		background-color: #f7f3e9;
-		border-radius: 50rpx;
-		overflow: hidden;
-		border: 1px solid #fff;
-		height: 60rpx;
-	}
-
-	.dinein,
-	.takeout {
-		padding: 0 20rpx;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 24rpx;
-	}
-
-	.dinein.active {
-		background-color: #52ac41;
-		color: #fff;
-	}
-
-	.takeout.active {
-		background-color: #52ac41;
-		color: #fff;
-	}
-
-	.content {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		padding-bottom: 160rpx;
-	}
-
-	.menu-sidebar {
-		width: 170rpx;
-		height: 100%;
-		background-color: #f9faf7;
-	}
-
-	.sidebar-wrapper {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.menu-category {
-		width: 100%;
-		height: 148rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		box-shadow: inset 0px -1px 0px 0px rgba(249, 246, 239, 1);
-		color: #717171;
-		font-size: 24rpx;
-		text-align: center;
-	}
-
-	.menu-category.current {
-		background-image: linear-gradient(270deg,
-				rgba(255, 255, 255, 1) 0,
-				rgba(243, 203, 90, 1) 100%);
-		color: #000;
-		font-weight: 600;
-		font-size: 24rpx;
-	}
-
-	.menu-category.current:before {
-		content: "";
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 10rpx;
-		height: 100%;
-		background-color: #52ac41;
-	}
-
-	.category-badge {
-		position: absolute;
-		top: 10rpx;
-		right: 10rpx;
-		background-color: #eab729;
-		color: #fff;
-		border-radius: 50%;
-		width: 32rpx;
-		height: 32rpx;
-		font-size: 22rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.goods-container {
-		flex: 1;
-		height: 100%;
-	}
-
-	.goods-wrapper {
-		padding: 20rpx;
-	}
-
-	.category-section {
-		margin-bottom: 40rpx;
-	}
-
-	.category-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		margin-bottom: 20rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.category-icon {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 10rpx;
-	}
-
-	.good-card {
-		display: flex;
-		margin-bottom: 30rpx;
-		border-radius: 12rpx;
-		padding: 20rpx;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-	}
-
-	.good-image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 8rpx;
-		object-fit: cover;
-	}
-
-	.good-details {
-		flex: 1;
-		margin-left: 20rpx;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.good-name {
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #000;
-		margin-bottom: 8rpx;
-	}
-
-	.good-description {
-		font-size: 22rpx;
-		color: #999;
-		margin-bottom: 30rpx;
-	}
-
-	.price-action {
-		margin-top: auto;
-	}
-
-	.good-price {
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #000;
-	}
-
-	.action-buttons {
-		display: flex;
-		align-items: center;
-	}
-
-	.spec-button {
-		height: 50rpx;
-		line-height: 50rpx;
-		padding: 0 20rpx;
-		font-size: 24rpx;
-		background-color: #52ac41;
-		border-radius: 25rpx;
-	}
-
-	.item-badge {
-		background-color: #eab729;
-		color: #fff;
-		border-radius: 50%;
-		width: 36rpx;
-		height: 36rpx;
-		font-size: 22rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-left: 10rpx;
-	}
-
-	.sold-out-label {
-		color: #999;
-		font-size: 24rpx;
-	}
-
-	.good-card.sold-out {
-		opacity: 0.7;
-	}
-
-	.cart-bar {
-		position: fixed;
-		bottom: 30rpx;
-		left: 0;
-		width: calc(100% - 80rpx);
-		height: 100rpx;
-		background-color: #f7f3e9;
-		display: flex;
-		align-items: center;
-		padding: 0 20rpx;
-		box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
-		border-radius: 50rpx;
-		margin: 0 40rpx;
-		z-index: 10;
-		border: 2px solid #fff;
-	}
-
-	.cart-icon-container {
-		position: relative;
-	}
-
-	.cart-icon {
-		width: 84rpx;
-		height: 84rpx;
-	}
-
-	.cart-badge {
-		position: absolute;
-		top: 0;
-		right: -10rpx;
-		background-color: #eab729;
-		color: #000;
-		border-radius: 50%;
-		min-width: 32rpx;
-		height: 32rpx;
-		font-size: 22rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 0 6rpx;
-	}
-
-	.cart-total {
-		font-size: 40rpx;
-		font-weight: 500;
-		margin-left: 20rpx;
-	}
-
-	.checkout-button {
-		height: 100rpx;
-		line-height: 100rpx;
-		background-color: #52ac41;
-		color: #fff;
-		font-size: 32rpx;
-		border-radius: 50rpx;
-		margin-left: auto;
-		width: 192rpx;
-	}
-
-	/* 商品详情模态框 */
-	.good-detail-modal {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.modal-header {
-		padding: 20rpx;
-		display: flex;
-		justify-content: flex-end;
-	}
-
-	.close-button image {
-		width: 40rpx;
-		height: 40rpx;
-	}
-
-	.modal-body {
-		flex: 1;
-		overflow-y: auto;
-	}
-
-	.modal-image {
-		width: 100%;
-		height: 400rpx;
-		padding: 10rpx;
-	}
-
-	.modal-image image {
-		width: 100%;
-		height: 100%;
-		object-fit: cover;
-	}
-
-	.modal-content {
-		padding: 20rpx;
-	}
-
-	.good-basic-info {
-		margin-bottom: 30rpx;
-	}
-
-	.good-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		margin-bottom: 10rpx;
-	}
-
-	.good-subtitle {
-		font-size: 24rpx;
-		color: #999;
-	}
-
-	.points-info {
-		color: #f00;
-	}
-
-	.good-properties {
-		margin-bottom: 30rpx;
-	}
-
-	.property-item {
-		margin-bottom: 20rpx;
-	}
-
-	.property-name {
-		font-size: 28rpx;
-		font-weight: 500;
-		margin-bottom: 15rpx;
-	}
-
-	.property-values {
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.property-value {
-		padding: 10rpx 20rpx;
-		background-color: #f5f5f5;
-		border-radius: 6rpx;
-		margin-right: 15rpx;
-		margin-bottom: 15rpx;
-		font-size: 24rpx;
-	}
-
-	.property-value.selected {
-		background-color: #52ac41;
-		color: #fff;
-	}
-
-	.modal-footer {
-		padding: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-top: 1px solid #eee;
-	}
-
-	.price-info {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.final-price {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #000;
-	}
-
-	.selected-props {
-		font-size: 22rpx;
-		color: #999;
-		margin-top: 5rpx;
-	}
-
-	.quantity-control {
-		display: flex;
-		align-items: center;
-	}
-
-	.stock-info {
-		font-size: 24rpx;
-		color: #999;
-		margin-right: 15rpx;
-	}
-
-	.quantity-button {
-		width: 60rpx;
-		height: 60rpx;
-		padding: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 50%;
-	}
-
-	.quantity-number {
-		width: 60rpx;
-		text-align: center;
-		font-size: 28rpx;
-	}
-
-	.add-cart-button {
-		height: 100rpx;
-		line-height: 100rpx;
-		background-color: #52ac41;
-		color: #fff;
-		font-size: 32rpx;
-		text-align: center;
-	}
-
-	/* 购物车popup */
-	.cart-popup-container {
-		max-height: 70vh;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.popup-header {
-		height: 80rpx;
-		line-height: 80rpx;
-		padding: 0 30rpx;
-		background-color: #f7f7f7;
-		color: #52ac41;
-		font-size: 26rpx;
-		text-align: right;
-	}
-
-	.cart-items {
-		max-height: calc(70vh - 80rpx);
-	}
-
-	.items-wrapper {
-		padding: 20rpx 30rpx;
-	}
-
-	.cart-item {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 1px solid #eee;
-	}
+		margin-top: -200rpx;
+		/* #ifdef h5 */
+		margin-top: 0;
+		/* #endif */
+	}
+}
+
+.flex-row {
+	display: flex;
+	flex-direction: row;
+}
+
+.justify-between {
+	justify-content: space-between;
+}
+
+.align-center {
+	align-items: center;
+}
+
+.shop-banner {
+	width: 100%;
+	height: 250rpx;
+	object-fit: cover;
+}
+
+.notice-bar {
+	height: 60rpx;
+	background-color: #ffffff;
+}
+
+.main {
+	position: relative;
+}
+
+.nav {
+	background-color: #ffffff;
+	padding: 20rpx;
+	box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+}
+
+.header {
+	padding: 10rpx 0;
+}
+
+.store-info {
+	flex: 1;
+}
+
+.store-logo {
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 8rpx;
+}
+
+.store-name {
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #000;
+}
+
+.store-location {
+	font-size: 24rpx;
+	color: #999;
+	margin-top: 4rpx;
+}
+
+.order-type {
+	background-color: #f7f3e9;
+	border-radius: 50rpx;
+	overflow: hidden;
+	border: 1px solid #fff;
+	height: 60rpx;
+}
+
+.dinein,
+.takeout {
+	padding: 0 20rpx;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 24rpx;
+}
+
+.dinein.active {
+	background-color: #52ac41;
+	color: #fff;
+}
+
+.takeout.active {
+	background-color: #52ac41;
+	color: #fff;
+}
+
+.content {
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	padding-bottom: 160rpx;
+}
+
+.menu-sidebar {
+	width: 170rpx;
+	height: 100%;
+	background-color: #f9faf7;
+}
+
+.sidebar-wrapper {
+	display: flex;
+	flex-direction: column;
+}
+
+.menu-category {
+	width: 100%;
+	height: 148rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	box-shadow: inset 0px -1px 0px 0px rgba(249, 246, 239, 1);
+	color: #717171;
+	font-size: 24rpx;
+	text-align: center;
+}
+
+.menu-category.current {
+	background-image: linear-gradient(270deg,
+			rgba(255, 255, 255, 1) 0,
+			rgba(243, 203, 90, 1) 100%);
+	color: #000;
+	font-weight: 600;
+	font-size: 24rpx;
+}
+
+.menu-category.current:before {
+	content: "";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 10rpx;
+	height: 100%;
+	background-color: #52ac41;
+}
+
+.category-badge {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	background-color: #eab729;
+	color: #fff;
+	border-radius: 50%;
+	width: 32rpx;
+	height: 32rpx;
+	font-size: 22rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.goods-container {
+	flex: 1;
+	height: 100%;
+}
+
+.goods-wrapper {
+	padding: 20rpx;
+}
+
+.category-section {
+	margin-bottom: 40rpx;
+}
+
+.category-title {
+	font-size: 32rpx;
+	font-weight: 600;
+	margin-bottom: 20rpx;
+	display: flex;
+	align-items: center;
+}
+
+.category-icon {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 10rpx;
+}
+
+.good-card {
+	display: flex;
+	margin-bottom: 30rpx;
+	border-radius: 12rpx;
+	padding: 20rpx;
+	background-color: #fff;
+	box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+.good-image {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 8rpx;
+	object-fit: cover;
+}
+
+.good-details {
+	flex: 1;
+	margin-left: 20rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.good-name {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #000;
+	margin-bottom: 8rpx;
+}
+
+.good-description {
+	font-size: 22rpx;
+	color: #999;
+	margin-bottom: 30rpx;
+}
+
+.price-action {
+	margin-top: auto;
+}
+
+.good-price {
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #000;
+}
+
+.action-buttons {
+	display: flex;
+	align-items: center;
+}
+
+.spec-button {
+	height: 50rpx;
+	line-height: 50rpx;
+	padding: 0 20rpx;
+	font-size: 24rpx;
+	background-color: #52ac41;
+	border-radius: 25rpx;
+}
+
+.item-badge {
+	background-color: #eab729;
+	color: #fff;
+	border-radius: 50%;
+	width: 36rpx;
+	height: 36rpx;
+	font-size: 22rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-left: 10rpx;
+}
+
+.sold-out-label {
+	color: #999;
+	font-size: 24rpx;
+}
+
+.good-card.sold-out {
+	opacity: 0.7;
+}
+
+.cart-bar {
+	position: fixed;
+	bottom: 30rpx;
+	left: 0;
+	width: calc(100% - 80rpx);
+	height: 100rpx;
+	background-color: #f7f3e9;
+	display: flex;
+	align-items: center;
+	padding: 0 20rpx;
+	box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+	border-radius: 50rpx;
+	margin: 0 40rpx;
+	z-index: 10;
+	border: 2px solid #fff;
+}
+
+.cart-icon-container {
+	position: relative;
+}
+
+.cart-icon {
+	width: 84rpx;
+	height: 84rpx;
+}
+
+.cart-badge {
+	position: absolute;
+	top: 0;
+	right: -10rpx;
+	background-color: #eab729;
+	color: #000;
+	border-radius: 50%;
+	min-width: 32rpx;
+	height: 32rpx;
+	font-size: 22rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 0 6rpx;
+}
+
+.cart-total {
+	font-size: 40rpx;
+	font-weight: 500;
+	margin-left: 20rpx;
+}
+
+.checkout-button {
+	height: 100rpx;
+	line-height: 100rpx;
+	background-color: #52ac41;
+	color: #fff;
+	font-size: 32rpx;
+	border-radius: 50rpx;
+	margin-left: auto;
+	width: 192rpx;
+}
+
+/* 商品详情模态框 */
+.good-detail-modal {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.modal-header {
+	padding: 20rpx;
+	display: flex;
+	justify-content: flex-end;
+}
+
+.close-button image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.modal-body {
+	flex: 1;
+	overflow-y: auto;
+}
+
+.modal-image {
+	width: 100%;
+	height: 400rpx;
+	padding: 10rpx;
+}
+
+.modal-image image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+}
+
+.modal-content {
+	padding: 20rpx;
+}
+
+.good-basic-info {
+	margin-bottom: 30rpx;
+}
+
+.good-title {
+	font-size: 32rpx;
+	font-weight: 600;
+	margin-bottom: 10rpx;
+}
+
+.good-subtitle {
+	font-size: 24rpx;
+	color: #999;
+}
+
+.points-info {
+	color: #f00;
+}
+
+.good-properties {
+	margin-bottom: 30rpx;
+}
+
+.property-item {
+	margin-bottom: 20rpx;
+}
+
+.property-name {
+	font-size: 28rpx;
+	font-weight: 500;
+	margin-bottom: 15rpx;
+}
+
+.property-values {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.property-value {
+	padding: 10rpx 20rpx;
+	background-color: #f5f5f5;
+	border-radius: 6rpx;
+	margin-right: 15rpx;
+	margin-bottom: 15rpx;
+	font-size: 24rpx;
+}
+
+.property-value.selected {
+	background-color: #52ac41;
+	color: #fff;
+}
+
+.modal-footer {
+	padding: 20rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-top: 1px solid #eee;
+}
+
+.price-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.final-price {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #000;
+}
+
+.selected-props {
+	font-size: 22rpx;
+	color: #999;
+	margin-top: 5rpx;
+}
+
+.quantity-control {
+	display: flex;
+	align-items: center;
+}
+
+.stock-info {
+	font-size: 24rpx;
+	color: #999;
+	margin-right: 15rpx;
+}
+
+.quantity-button {
+	width: 60rpx;
+	height: 60rpx;
+	padding: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 50%;
+}
+
+.quantity-number {
+	width: 60rpx;
+	text-align: center;
+	font-size: 28rpx;
+}
+
+.add-cart-button {
+	height: 100rpx;
+	line-height: 100rpx;
+	background-color: #52ac41;
+	color: #fff;
+	font-size: 32rpx;
+	text-align: center;
+}
+
+/* 购物车popup */
+.cart-popup-container {
+	max-height: 70vh;
+	display: flex;
+	flex-direction: column;
+}
+
+.popup-header {
+	height: 80rpx;
+	line-height: 80rpx;
+	padding: 0 30rpx;
+	background-color: #f7f7f7;
+	color: #52ac41;
+	font-size: 26rpx;
+	text-align: right;
+}
+
+// 添加打包费样式
+.packing-fee {
+	border-bottom: 1px dashed #eee;
+	padding: 20rpx 0;
 
 	.item-info {
 		flex: 1;
 	}
 
-	.item-name {
-		font-size: 28rpx;
-		color: #000;
-		margin-bottom: 5rpx;
-	}
-
-	.item-properties {
-		font-size: 22rpx;
-		color: #999;
-	}
-
 	.item-price {
 		font-size: 28rpx;
-		font-weight: 500;
+		color: #999;
 		padding: 0 20rpx;
 	}
+}
 
-	.item-controls {
-		display: flex;
-		align-items: center;
-	}
+.cart-items {
+	max-height: calc(70vh - 80rpx);
+}
 
-	.item-quantity {
-		width: 60rpx;
-		text-align: center;
-		font-size: 28rpx;
-	}
+.items-wrapper {
+	padding: 20rpx 30rpx;
+}
 
-	button[size="mini"] {
-		min-width: 60rpx !important;
-		width: 60rpx !important;
-		height: 60rpx !important;
-		padding: 0 !important;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.cart-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx 0;
+	border-bottom: 1px solid #eee;
+}
 
-	button[type="primary"] {
-		background-color: #52ac41 !important;
-	}
+.item-info {
+	flex: 1;
+}
 
-	.image_3 {
-		width: 48rpx;
-		height: 6rpx;
-		margin: 194rpx 0 0 319rpx;
-	}
+.item-name {
+	font-size: 28rpx;
+	color: #000;
+	margin-bottom: 5rpx;
+}
+
+.item-properties {
+	font-size: 22rpx;
+	color: #999;
+}
+
+.item-price {
+	font-size: 28rpx;
+	font-weight: 500;
+	padding: 0 20rpx;
+}
+
+.item-controls {
+	display: flex;
+	align-items: center;
+}
+
+.item-quantity {
+	width: 60rpx;
+	text-align: center;
+	font-size: 28rpx;
+}
+
+button[size="mini"] {
+	min-width: 60rpx !important;
+	width: 60rpx !important;
+	height: 60rpx !important;
+	padding: 0 !important;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+button[type="primary"] {
+	background-color: #52ac41 !important;
+}
+
+.image_3 {
+	width: 48rpx;
+	height: 6rpx;
+	margin: 194rpx 0 0 319rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index a6e3941..cc418da 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -239,7 +239,7 @@ const serv = (item) => {
         return;
       }
       if (item.pages === "/pages/components/pages/fenxiao/fenxiao") {
-        if (member.value.spreadUid === 0 || member.value.spreadUid === null || member.value.spreadUid === '0') {
+        if (member.value.spreadUid === 0 || member.value.spreadUid === null || member.value.spreadUid === '0' || member.value.spreadUid === "") {
           uni.navigateTo({
             url: `/pages/components/pages/fenxiao/fenxiaorequestform?id=${member.value.id}`,
           });
@@ -248,6 +248,10 @@ const serv = (item) => {
             url: `${item.pages}?spreadUid=${member.value.spreadUid}`,
           });
         }
+      } else if(item.pages === "/pages/components/pages/invoice/invoice") {
+        uni.navigateTo({
+          url: `/pages/components/pages/invoice/invoice?userId=${member.value.id}`,
+        });
       } else {
         uni.navigateTo({
           url: item.pages,
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 03ae629..b6f80a5 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -128,14 +128,19 @@
 import { ref, computed } from "vue";
 import { useMainStore } from "@/store/store";
 import { storeToRefs } from "pinia";
-import { onLoad, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
+import {
+  onLoad,
+  onPullDownRefresh,
+  onReachBottom,
+  onShow,
+} from "@dcloudio/uni-app";
 import { formatDateTime, kmUnit } from "@/utils/util";
 import { orderGetOrders, orderReceive } from "@/api/order";
 import { applyInvoice } from "@/api/order";
 
 // 确保导入payUnify方法
-import { payUnify } from '@/api/order';
-import { isWeixin } from '@/utils/util';
+import { payUnify } from "@/api/order";
+import { isWeixin } from "@/utils/util";
 
 const main = useMainStore();
 const { isLogin } = storeToRefs(main);
@@ -181,10 +186,15 @@ onLoad(() => {
   if (!isLogin.value) {
     uni.navigateTo({ url: "/pages/components/pages/login/login" });
   }
-  getOrders(false);
+  onShow();
+});
+onShow(() => {
+  if (isLogin.value) {
+    getOrders(true); // 每次显示页面时刷新订单数据
+  }
 });
 onPullDownRefresh(() => {
-  getOrders(false);
+  getOrders(true);
 });
 onReachBottom(() => {
   getOrders(false);