diff --git a/common/api/market/exchange.js b/common/api/market/exchange.js
new file mode 100644
index 0000000..5ec7b26
--- /dev/null
+++ b/common/api/market/exchange.js
@@ -0,0 +1,18 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const exchange = (data) => {
+    return request({
+        url: prveUrl + '/user/redemption/exchange',
+        method: 'post',
+        data: data
+    })
+}
+export const redemption = (data) => {
+    return request({
+        url: prveUrl + '/user/redemption',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/common/api/market/limitTimeDiscount.js b/common/api/market/limitTimeDiscount.js
new file mode 100644
index 0000000..9d861d0
--- /dev/null
+++ b/common/api/market/limitTimeDiscount.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const getConfig = (data) => {
+    return request({
+        url: prveUrl + '/user/limitTimeDiscount',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/common/api/market/suggest.js b/common/api/market/suggest.js
new file mode 100644
index 0000000..a478c40
--- /dev/null
+++ b/common/api/market/suggest.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const getGoods = (data) => {
+    return request({
+        url: prveUrl + '/user/suggest',
+        method: 'get',
+        data: data
+    })
+}
diff --git a/components/birthday-modal.vue b/components/birthday-modal.vue
index bd0ff83..0d8d86b 100644
--- a/components/birthday-modal.vue
+++ b/components/birthday-modal.vue
@@ -260,7 +260,7 @@ const getCouponPopupAjax = async () => {
   try {
     const shopId = uni.cache.get("shopId");
     const res = await birthdayGiftApi.config({ shopId });
-    if (res.length) {
+    if (res&&res.length) {
       // 处理有效期格式（固定有效期规则）
       allCoupons.value = res.map((item) => {
         if (item.validType === "fixed") {
diff --git a/components/goods-price.vue b/components/goods-price.vue
new file mode 100644
index 0000000..407c91f
--- /dev/null
+++ b/components/goods-price.vue
@@ -0,0 +1,56 @@
+<template>
+  <text v-if="limitDiscount && limitDiscount.id" class="limit-price">
+    {{ returnPrice() }}
+  </text>
+  <text v-else>
+    <text v-if="shopInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1" class="memberPrice">
+      {{ cart.memberPrice || cart.salePrice }}
+    </text>
+    <text v-else class="salePrice">{{ cart.salePrice }}</text>
+  </text>
+</template>
+
+<script setup>
+import BigNumber from "bignumber.js";
+import * as orderUtils from "@/utils/order-utils.js";
+
+
+function returnPrice(){
+  return orderUtils.returnPrice({
+    goods:props.cart,
+    shopInfo:props.shopInfo,
+    limitTimeDiscountRes:props.limitDiscount,
+    shopUserInfo:props.shopUserInfo,
+    idKey:props.idKey
+  })
+}
+
+const props = defineProps({
+  //购物车
+  cart: {
+    type: Object,
+    default: () => {},
+  },
+  idKey:{
+    type: String,
+    default: 'id',
+  },
+  //限时折扣
+  limitDiscount: {
+    type: Object,
+    default: () => {},
+  },
+  //店铺用户信息
+  shopUserInfo: {
+    type: Object,
+    default: () => {},
+  },
+  //店铺信息
+  shopInfo: {
+    type: Object,
+    default: () => {},
+  },
+});
+</script>
+
+<style scoped lang="scss"></style>
\ No newline at end of file
diff --git a/components/modal-list.vue b/components/modal-list.vue
index c3e637e..49d1714 100644
--- a/components/modal-list.vue
+++ b/components/modal-list.vue
@@ -51,7 +51,6 @@ const wechatAcQrcode = ref("");
 const userinfo = uni.cache.get("userInfo") || {};
 const codeVal = ref(userinfo.wechatAcQrcode || "");
 function qrcodeResult(e) {
-  console.log("qrcodeResult", e);
   wechatAcQrcode.value = e;
 }
 </script>
diff --git a/components/official-account.vue b/components/official-account.vue
index d757766..7ac27ba 100644
--- a/components/official-account.vue
+++ b/components/official-account.vue
@@ -1,6 +1,5 @@
 <template>
   <view>
-
     <up-popup :show="show" bgColor="transparent" mode="center" @close="close">
       <view class="container">
         <view class="content">
@@ -32,7 +31,7 @@
 <script setup>
 import _ from "lodash";
 import dayjs from "dayjs";
-import { onMounted, ref } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { string } from "../uni_modules/uview-plus/libs/function/test";
 
 const bgUrl = ref(
@@ -65,7 +64,7 @@ function init() {
     show.value = true;
   }
 }
-
+watch(() => props.wechatAcQrcode, init);
 onMounted(() => {
   init();
 });
diff --git a/components/order-finish-modal.vue b/components/order-finish-modal.vue
index d89c603..8f6e73a 100644
--- a/components/order-finish-modal.vue
+++ b/components/order-finish-modal.vue
@@ -37,14 +37,7 @@ const userinfo = uni.cache.get("userInfo") || {};
 const codeVal = ref(userinfo.wechatAcQrcode || "");
 console.log("codeVal", codeVal.value);
 function qrcodeResult(e) {
-  console.log("qrcodeResult", e);
   wechatAcQrcode.value = e;
 }
 </script>
 
-<style lang="scss">
-.qrcode {
-  position: fixed;
-  transform: translateX(200vw, 200vh);
-}
-</style>
\ No newline at end of file
diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue
index e9ea361..3a9d438 100644
--- a/components/paymentMethod.vue
+++ b/components/paymentMethod.vue
@@ -162,12 +162,10 @@ const radiovalue = defineModel({
 watch(
   () => props.disablePayType,
   (newval) => {
-    console.log('禁止支付方式', newval);
 
     const canUsePayType = paymentMethodList.value.filter((item) => {
       return  !newval.includes(item.name);
     });
-    console.log('可用支付方式', canUsePayType);
     if (canUsePayType.find((v) => v.type == radiovalue.value.type)) {
       return;
     }
diff --git a/components/wechat-ac-qrcode.vue b/components/wechat-ac-qrcode.vue
index 9db8e26..3de074f 100644
--- a/components/wechat-ac-qrcode.vue
+++ b/components/wechat-ac-qrcode.vue
@@ -28,7 +28,6 @@ onMounted(() => {
 });
 const emit = defineEmits(["generate"]);
 function qrcodeResult(e) {
-  console.log(e);
   emit("generate", e.img.tempFilePath);
 }
 </script>
@@ -37,8 +36,10 @@ function qrcodeResult(e) {
 .qrcode-box {
   position: relative;
   overflow: hidden;
+  left: -400px;
   width: 1px;
   height: 1px;
   opacity: 0;
+  z-index: -1;
 }
 </style>
\ No newline at end of file
diff --git a/distribution/index.vue b/distribution/index.vue
new file mode 100644
index 0000000..abbe98b
--- /dev/null
+++ b/distribution/index.vue
@@ -0,0 +1,39 @@
+<template>
+  <view>
+    <view class="top">
+      <up-navbar
+        bg-color="transparent"
+        title="分销中心"
+        @leftClick="back"
+        :fixed="false"
+      ></up-navbar>
+      <image class="top_bg" src="/distribution/static/top_bg.png"></image>
+      <view class="top_content"></view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+function back() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
+</script>
+
+<style scoped lang="scss">
+.top{
+    position: relative;
+    .top_content{
+        position: absolute;
+        left: 28rpx;
+        right: 28rpx;
+        bottom: 0;
+        padding: 32rpx 28rpx;
+    }
+}
+.top_bg {
+  width: 100%;
+  height: 530rpx;
+}
+</style>
\ No newline at end of file
diff --git a/distribution/static/top_bg.png b/distribution/static/top_bg.png
new file mode 100644
index 0000000..bbccede
Binary files /dev/null and b/distribution/static/top_bg.png differ
diff --git a/pages.json b/pages.json
index e1661c8..a1eb4d4 100644
--- a/pages.json
+++ b/pages.json
@@ -203,45 +203,55 @@
 			}
 		},
 		{
-			"path" : "pages/user/member/czzx-shop-list",
-			"style" : 
-			{
-				"navigationBarTitleText" : "适用门店"
+			"path": "pages/user/member/czzx-shop-list",
+			"style": {
+				"navigationBarTitleText": "适用门店"
 			}
 		}
 	],
 	"subPackages": [{
-		"root": "user",
-		"pages": [{
-				"path": "vip/vip",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
+			"root": "user",
+			"pages": [{
+					"path": "vip/vip",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "vip/buy-vip",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "score/list",
+					"style": {
+						"navigationBarTitleText": "积分门店"
+					}
+				},
+				{
+					"path": "exchange/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
 				}
-			},
-			{
-				"path": "vip/buy-vip",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "score/list",
-				"style": {
-					"navigationBarTitleText": "积分门店"
-				}
-			},
-			{
-				"path": "exchange/index",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
-				}
-			}
 
-		]
-	}],
+			]
+		},
+		{
+			"root": "distribution",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "分销中心",
+					"navigationStyle": "custom"
+				}
+			}, ]
+		}
+	],
 	"uniIdRouter": {},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
index 7537e83..0c4d823 100644
--- a/pages/order/components/order-item.vue
+++ b/pages/order/components/order-item.vue
@@ -1,474 +1,545 @@
 <template>
-	<view class="card_item">
-		<!-- <view class="head">
-			<view class="head_left">
-				<text class="placeNum">当前购物车</text>
-			</view>
-		</view> -->
-		<!-- 订单详情 -->
-		<view class="shop-info">
-			<view class="item" v-for="item in nowCarts" :key="item.id">
-				<view class="cover">
-					<up-image width="76" height="76" radius="16" :src="item.productImg"
-						v-if="item.productId!=-999"></up-image>
-					<up-image width="76" height="76" radius="16"
-						:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
-						mode="heightFix" v-else></up-image>
-				</view>
-				<view class="info">
-					<text class="productName">{{item.productName}}</text>
-					<text class="productSkuName" v-if="item.skuName">{{item.skuName}}</text>
-				</view>
+  <view class="card_item">
+    <!-- 订单详情 -->
+    <view class="shop-info">
+      <view class="item" v-for="item in nowCarts" :key="item.id">
+        <view class="cover">
+          <view class="limitDiscount" v-if="showLimitDiscount(item)"
+            >限时折扣</view
+          >
 
-				<view class="price">
-					<view class="priceAmount">
-						<text v-if="changeFreeenable">{{item.price}}</text>
-						<text v-else>
-							￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
-						</text>
-					</view>
-					<view class="num">x{{item.num}}</view>
-				</view>
-			</view>
-		</view>
+          <up-image
+            width="76"
+            height="76"
+            radius="6"
+            :src="item.productImg"
+            v-if="item.productId != -999"
+          ></up-image>
+          <up-image
+            width="76"
+            height="76"
+            radius="6"
+            :src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
+            mode="heightFix"
+            v-else
+          ></up-image>
+        </view>
+        <view class="info">
+          <text class="productName">{{ item.productName }}</text>
+          <text class="productSkuName" v-if="item.skuName">{{
+            item.skuName
+          }}</text>
+          <template v-if="showLimitDiscount(item)">
+            <text
+              class="limitDiscount-time"
+              v-if="limitDiscount.useTimeType == 'all'"
+            >
+              限时折扣：00：00-24：00
+            </text>
+            <text
+              class="limitDiscount-time"
+              v-if="
+                limitDiscount.useTimeType == 'custom' &&
+                limitDiscount.useStartTime &&
+                limitDiscount.useEndTime
+              "
+            >
+              限时折扣：{{ limitDiscount.useStartTime }}-{{
+                limitDiscount.useEndTime
+              }}
+            </text>
+          </template>
+        </view>
 
-		<!--<view class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">未付款</view>
-		 <view class="totalAmount">
-			<view class="label">小计￥</view>
-			<view class="price"> {{item.totalAmount}} </view>
-		</view> -->
-
-		<!-- <view class="semicircle_icon" v-if="index > 0">
-			<view class="semicircle_left_icon"></view>
-			<view class="semicircle_right_icon"></view>
-		</view> -->
-	</view>
+        <view class="price">
+          <view class="priceAmount">
+            ¥
+            <goodsPrice
+              :cart="item"
+              :limitDiscount="limitDiscount"
+              :shopUserInfo="shopUserInfo"
+              :shopInfo="shopInfo"
+              idKey="product_id"
+            ></goodsPrice>
+            <view class="old-price" v-if="showLimitDiscount(item)">¥{{ item.salePrice }}</view>
+          </view>
+          <view class="num">x{{ item.num }}</view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose,
-		onMounted
-	} from 'vue'
-	const props = defineProps({
-		changeFreeenable: {
-			type: Boolean,
-			default: false
-		},
-		useVipPrice: {
-			type: Boolean,
-			default: false
-		},
-		nowCarts: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		}
-	})
-	onMounted(() => {
-		console.log('props.nowCarts');
-		console.log(props.nowCarts);
-	})
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+  inject,
+  onMounted,
+} from "vue";
+import goodsPrice from "@/components/goods-price.vue";
+import * as orderUtils from "@/utils/order-utils.js";
+
+const props = defineProps({
+  changeFreeenable: {
+    type: Boolean,
+    default: false,
+  },
+  useVipPrice: {
+    type: Boolean,
+    default: false,
+  },
+  nowCarts: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+  limitDiscount: {
+    type: Object,
+    default: () => {},
+  },
+});
+const shopUserInfo = inject("shopUserInfo");
+const shopInfo = inject("shopInfo");
+
+function showLimitDiscount(item) {
+  if (!props.limitDiscount || !props.li) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    props.limitDiscount,
+    shopInfo.value,
+    shopUserInfo.value,
+    "id"
+  );
+}
+onMounted(() => {
+  console.log("props.nowCarts");
+  console.log(props.nowCarts);
+});
+
+const showOldPrice = computed(() => {});
 </script>
 
 <style lang="scss" scoped>
-	.card_item {
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		padding: 0 34rpx;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			// padding: 32rpx 0;
-
-			.head_left {
-				display: flex;
-				align-items: center;
-
-				.placeNum {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-					margin-right: 32rpx;
-					flex-shrink: 0;
-				}
-
-				.placeTime {
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #666666;
-					flex-shrink: 0;
-				}
-			}
-
-		}
-
-		.shop-info {
-			padding-top: 28rpx;
-		
-			.item:nth-child(1) {
-				margin-top: 0;
-			}
-
-			.item {
-				margin-bottom: 32rpx;
-				display: flex;
-				&:last-child{
-						margin-bottom: 0;
-				}
-				.cover {}
-
-				.info {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					padding-left: 16upx;
-
-					.productName {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-						margin-top: 20rpx;
-					}
-
-					.productSkuName {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 3;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-
-					.n {
-						font-size: 24upx;
-						color: #999;
-					}
-				}
-
-				.price {
-					display: flex;
-					flex-direction: column;
-					align-items: flex-end;
-					padding-left: 68rpx;
-
-					.priceAmount {
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #333333;
-						margin-top: 26rpx;
-					}
-
-					.num {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-top: 22rpx;
-					}
-				}
-			}
-		}
-
-		.status {
-			align-self: flex-end;
-			width: 92rpx;
-			height: 40rpx;
-			line-height: 40rpx;
-			text-align: center;
-			background: #999999;
-			border-radius: 10rpx 10rpx 10rpx 10rpx;
-			font-weight: 400;
-			font-size: 22rpx;
-			color: #FFFFFF;
-			margin-top: 32rpx;
-		}
-
-		.totalAmount {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			align-items: flex-end;
-			padding: 32rpx 0;
-			border-bottom: 2rpx dashed #e5e5e5;
-
-			.label {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.price {
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #333333;
-			}
-		}
-
-		.semicircle_icon {
-			width: 100%;
-			position: absolute;
-			top: -22.5rpx;
-			left: 0;
-			display: flex;
-			justify-content: space-between;
-
-			.semicircle_left_icon {
-				width: 45rpx;
-				height: 45rpx;
-				margin-left: -22.5rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-			}
-
-			.semicircle_right_icon {
-				width: 45rpx;
-				height: 45rpx;
-				margin-right: -22.5rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-			}
-		}
-	}
-
-	.cell-item {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 32rpx 34rpx 0 34rpx;
-
-		.label {
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 32rpx;
-		}
-
-		.val {
-			display: flex;
-			align-items: flex-end;
-			padding-bottom: 32rpx;
-			border-bottom: 2rpx dashed #e5e5e5;
-
-			view:nth-child(1) {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-				margin-right: 42rpx;
-			}
-
-			view:nth-child(2) {
-				display: flex;
-				align-items: flex-end;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #333333;
-			}
-		}
-
-		.val.column {
-			display: flex;
-			flex-direction: column;
-
-			.productCoupon {
-				display: flex;
-				align-items: flex-end;
-				margin: 0 0 10rpx 0;
-
-				.name {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #999;
-					margin: 0;
-				}
-
-				.num {
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #999;
-					margin: 0 30rpx;
-					line-height: 20rpx;
-				}
-
-				.amount {
-					font-weight: bold;
-					font-size: 26rpx;
-					color: #333;
-				}
-			}
-		}
-	}
-
-	.favorable {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		padding-bottom: 26rpx;
-		padding-top: 26rpx;
-		border-bottom: 2rpx solid #E5E5E5;
-
-		.favorable_left {
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 16rpx;
-			}
-
-			.name {
-				font-size: 28rpx;
-				font-weight: 400rpx;
-				color: #333;
-			}
-		}
-
-		.favorable_right {
-			display: flex;
-			align-items: center;
-
-			.favorable_right_text {
-				font-size: 24rpx;
-				color: #999;
-				font-weight: 400rpx;
-			}
-
-		}
-
-		.favorable_right {
-			.column {
-				display: flex;
-				flex-direction: column;
-				align-items: flex-end;
-
-				.favorable_right_text {
-					margin-bottom: 10rpx;
-
-					text:nth-child(1) {
-						font-size: 26rpx;
-						color: #999;
-					}
-
-					text:nth-child(2) {
-						font-size: 26rpx;
-						color: #999;
-						margin: 0 30rpx;
-					}
-
-					text:nth-child(3) {
-						font-size: 26rpx;
-						color: #333;
-
-					}
-				}
-			}
-		}
-
-		.favorable_right.column {
-			align-items: flex-start;
-		}
-	}
-
-	.favorable.column {
-		align-items: flex-start;
-	}
-
-	.cell-item.column {
-		align-items: flex-start;
-	}
-
-	.total-wrap {
-		width: 100%;
-		display: flex;
-		justify-content: flex-end;
-		align-items: flex-end;
-		padding: 0 34rpx;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-		margin-top: 64rpx;
-
-		.price {
-			font-weight: bold;
-			font-size: 36rpx;
-		}
-	}
-
-
-
-	.order_footer {
-		display: flex;
-		flex-direction: column;
-		padding: 34rpx;
-		position: relative;
-
-
-
-	}
-
-
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 54rpx 102rpx 54rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.fixedview_tow {
-				width: 140rpx;
-				height: 56rpx;
-				line-height: 56rpx;
-				text-align: center;
-				background: #E3AD7F;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
+.card_item {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  padding: 0 34rpx;
+
+  .head {
+    display: flex;
+    justify-content: space-between;
+    // padding: 32rpx 0;
+
+    .head_left {
+      display: flex;
+      align-items: center;
+
+      .placeNum {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+        margin-right: 32rpx;
+        flex-shrink: 0;
+      }
+
+      .placeTime {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666666;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  .shop-info {
+    padding-top: 28rpx;
+
+    .item:nth-child(1) {
+      margin-top: 0;
+    }
+
+    .item {
+      margin-bottom: 32rpx;
+      display: flex;
+      &:last-child {
+        margin-bottom: 0;
+      }
+      .cover {
+      }
+
+      .info {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding-left: 16upx;
+
+        .productName {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+          margin-top: 20rpx;
+        }
+
+        .productSkuName {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 3;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .n {
+          font-size: 24upx;
+          color: #999;
+        }
+      }
+
+      .price {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        padding-left: 68rpx;
+
+        .priceAmount {
+          font-weight: 700;
+          font-size: 28rpx;
+          color: #333333;
+          margin-top: 26rpx;
+        }
+
+        .num {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          margin-top: 22rpx;
+        }
+      }
+    }
+  }
+
+  .status {
+    align-self: flex-end;
+    width: 92rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    background: #999999;
+    border-radius: 10rpx 10rpx 10rpx 10rpx;
+    font-weight: 400;
+    font-size: 22rpx;
+    color: #ffffff;
+    margin-top: 32rpx;
+  }
+
+  .totalAmount {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    padding: 32rpx 0;
+    border-bottom: 2rpx dashed #e5e5e5;
+
+    .label {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .price {
+      font-weight: bold;
+      font-size: 36rpx;
+      color: #333333;
+    }
+  }
+
+  .semicircle_icon {
+    width: 100%;
+    position: absolute;
+    top: -22.5rpx;
+    left: 0;
+    display: flex;
+    justify-content: space-between;
+
+    .semicircle_left_icon {
+      width: 45rpx;
+      height: 45rpx;
+      margin-left: -22.5rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+    }
+
+    .semicircle_right_icon {
+      width: 45rpx;
+      height: 45rpx;
+      margin-right: -22.5rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+}
+
+.cell-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 34rpx 0 34rpx;
+
+  .label {
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+    padding-bottom: 32rpx;
+  }
+
+  .val {
+    display: flex;
+    align-items: flex-end;
+    padding-bottom: 32rpx;
+    border-bottom: 2rpx dashed #e5e5e5;
+
+    view:nth-child(1) {
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      margin-right: 42rpx;
+    }
+
+    view:nth-child(2) {
+      display: flex;
+      align-items: flex-end;
+      font-weight: bold;
+      font-size: 36rpx;
+      color: #333333;
+    }
+  }
+
+  .val.column {
+    display: flex;
+    flex-direction: column;
+
+    .productCoupon {
+      display: flex;
+      align-items: flex-end;
+      margin: 0 0 10rpx 0;
+
+      .name {
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #999;
+        margin: 0;
+      }
+
+      .num {
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #999;
+        margin: 0 30rpx;
+        line-height: 20rpx;
+      }
+
+      .amount {
+        font-weight: bold;
+        font-size: 26rpx;
+        color: #333;
+      }
+    }
+  }
+}
+
+.favorable {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  padding-bottom: 26rpx;
+  padding-top: 26rpx;
+  border-bottom: 2rpx solid #e5e5e5;
+
+  .favorable_left {
+    display: flex;
+    align-items: center;
+
+    .icon {
+      width: 40rpx;
+      height: 40rpx;
+      margin-right: 16rpx;
+    }
+
+    .name {
+      font-size: 28rpx;
+      font-weight: 400rpx;
+      color: #333;
+    }
+  }
+
+  .favorable_right {
+    display: flex;
+    align-items: center;
+
+    .favorable_right_text {
+      font-size: 24rpx;
+      color: #999;
+      font-weight: 400rpx;
+    }
+  }
+
+  .favorable_right {
+    .column {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+
+      .favorable_right_text {
+        margin-bottom: 10rpx;
+
+        text:nth-child(1) {
+          font-size: 26rpx;
+          color: #999;
+        }
+
+        text:nth-child(2) {
+          font-size: 26rpx;
+          color: #999;
+          margin: 0 30rpx;
+        }
+
+        text:nth-child(3) {
+          font-size: 26rpx;
+          color: #333;
+        }
+      }
+    }
+  }
+
+  .favorable_right.column {
+    align-items: flex-start;
+  }
+}
+
+.favorable.column {
+  align-items: flex-start;
+}
+
+.cell-item.column {
+  align-items: flex-start;
+}
+
+.total-wrap {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  padding: 0 34rpx;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #333333;
+  margin-top: 64rpx;
+
+  .price {
+    font-weight: bold;
+    font-size: 36rpx;
+  }
+}
+
+.order_footer {
+  display: flex;
+  flex-direction: column;
+  padding: 34rpx;
+  position: relative;
+}
+
+.fixedview {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 54rpx 102rpx 54rpx;
+    background: #ffffff;
+
+    .fixedview_one {
+      display: flex;
+      align-items: flex-end;
+
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .fixedview_tow {
+      width: 140rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      text-align: center;
+      background: #e3ad7f;
+      border-radius: 12rpx 12rpx 12rpx 12rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #ffffff;
+    }
+  }
+}
+
+.cover {
+  position: relative;
+}
+
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
+.limitDiscount-time {
+  color: #ff534b;
+  font-size: 20rpx;
+  line-height: 25rpx;
+}
+.old-price {
+  font-size: 24rpx;
+  color: #999;
+  font-weight: 400;
+  text-decoration: line-through;
+  text-align: right;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index 37ad662..893eddd 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -45,62 +45,66 @@
       </view>
 
       <view class="card">
-        <orderItemVue
+        <!-- <orderItemVue
           :useVipPrice="useVipPrice"
           v-if="nowCarts.length"
           :nowCarts="nowCarts"
+          :limitDiscount="cartStore.limitTimeDiscount"
+        ></orderItemVue> -->
+        <orderItemVue
+          :useVipPrice="useVipPrice"
+          v-if="cartStore.allGoods.length"
+          :nowCarts="cartStore.allGoods"
+          :limitDiscount="cartStore.limitTimeDiscount"
         ></orderItemVue>
-        <!-- 订单头部 -->
-        <view
-          class="card_item"
-          v-for="(value, key) in listinfo.detailMap"
-          :key="key"
-        >
-          <!-- <view class="head">
-						<view class="head_left">
-							<text class="placeNum" v-if="key!=0">第{{key}}次下单</text>
-						</view>
-					</view> -->
-          <!-- 订单详情 -->
-          <view class="shop-info">
-            <view class="item" v-for="item in value" :key="item.id">
-              <view class="cover">
-                <up-image
-                  width="76"
-                  height="76"
-                  radius="16"
-                  :src="item.productImg"
-                  v-if="item.productId != -999"
-                ></up-image>
-                <up-image
-                  width="76"
-                  height="76"
-                  radius="16"
-                  :src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
-                  mode="heightFix"
-                  v-else
-                ></up-image>
-              </view>
-              <view class="info">
-                <text class="productName">{{ item.productName }}</text>
-                <text class="productSkuName" v-if="item.skuName">{{
-                  item.skuName
-                }}</text>
-              </view>
-              <view class="price">
-                <view class="priceAmount">
-                  <text v-if="isBwc">{{ item.price }}</text>
-                  <text v-else>
-                    ￥{{
-                      useVipPrice ? item.memberPrice || item.price : item.price
-                    }}
-                  </text>
+        <template v-if="false">
+          <view
+            class="card_item"
+            v-for="(value, key) in listinfo.detailMap"
+            :key="key"
+          >
+            <view class="shop-info">
+              <view class="item" v-for="item in value" :key="item.id">
+                <view class="cover">
+                  <up-image
+                    width="76"
+                    height="76"
+                    radius="6"
+                    :src="item.productImg"
+                    v-if="item.productId != -999"
+                  ></up-image>
+                  <up-image
+                    width="76"
+                    height="76"
+                    radius="6"
+                    :src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
+                    mode="heightFix"
+                    v-else
+                  ></up-image>
+                </view>
+                <view class="info">
+                  <text class="productName">{{ item.productName }}</text>
+                  <text class="productSkuName" v-if="item.skuName">{{
+                    item.skuName
+                  }}</text>
+                </view>
+                <view class="price">
+                  <view class="priceAmount">
+                    <text v-if="isBwc">{{ item.price }}</text>
+                    <text v-else>
+                      ￥{{
+                        useVipPrice
+                          ? item.memberPrice || item.price
+                          : item.price
+                      }}
+                    </text>
+                  </view>
+                  <view class="num">x{{ item.num }}</view>
                 </view>
-                <view class="num">x{{ item.num }}</view>
               </view>
             </view>
           </view>
-        </view>
+        </template>
 
         <view
           class="total-wrap u-m-t-30"
@@ -154,7 +158,7 @@
           "
         >
           <view class="u-m-t-40 u-p-l-20 u-p-r-20">
-            <view class="youhui-item" v-if="discountActivity">
+            <view class="youhui-item" v-if="cartStore.orderCostSummary.fullReduction.actualAmount">
               <view class="u-flex align-center">
                 <image
                   src="/static/icon/coup.png"
@@ -165,13 +169,13 @@
               </view>
 
               <view class="red font-12 u-flex align-center"
-                >-￥{{ discountActivity.discountAmount }}</view
+                >-￥{{ cartStore.orderCostSummary.fullReduction.actualAmount }}</view
               >
             </view>
             <view class="youhui-item" v-if="newUserDiscount">
               <view class="u-flex align-center">
                 <image
-                  src="/static/icon/coup.png"
+                  src="/static/icon/newUserDiscount.png"
                   bgColor="#fff"
                   style="width: 40rpx; height: 34rpx"
                 ></image>
@@ -304,7 +308,10 @@
           </view>
         </block>
         <block v-else>
-          <view class="cell-item column" v-if="listinfo.discountInfo">
+          <view
+            class="cell-item column"
+            v-if="listinfo.discountInfo && listinfo.discountInfo != '{}'"
+          >
             <view class="label">优惠折扣</view>
             <view class="val column">
               <view
@@ -387,6 +394,7 @@ import {
   defineExpose,
   toRaw,
   onMounted,
+  provide,
   nextTick,
 } from "vue";
 import { returnHasCouponCanUse } from "@/utils/coupon.js";
@@ -588,8 +596,6 @@ const tabClick = (item, index) => {
 };
 cartStore.setDinnerType(tebtypeList[is_type.value].val);
 
-
-
 // 清空
 const bwcclear = () => {
   IntegralInputclose();
@@ -833,16 +839,13 @@ function calcDiscountActivity() {
   const res = discountActivityRes.value;
   const user = uni.cache.get("shopUserInfo");
 
-  //不与会员同享
-  if (!res.vipPriceShare && user.isVip) {
-    return;
-  }
-  console.log("calcDiscountActivity:originalPrice", originalPrice.value);
+  const usedFullReductionActivityFullAmount=cartStore.orderCostSummary.fullReduction.usedFullReductionActivityFullAmount;
+  console.log("usedFullReductionActivityFullAmount", usedFullReductionActivityFullAmount);
 
   if (res && res.thresholds && res.thresholds.length > 0) {
     const canUseThresholds = res.thresholds
       .filter((v) => {
-        return originalPrice.value >= v.fullAmount;
+        return usedFullReductionActivityFullAmount >= v.fullAmount;
       })
       .sort((a, b) => {
         return b.discountAmount - a.discountAmount;
@@ -859,9 +862,7 @@ function calcDiscountActivity() {
   }
   console.log("当前满减门槛", discountActivity.value);
 
-  if (discountActivity.value) {
-    cartStore.fullReductionActivities = [discountActivityRes.value];
-  }
+  
 }
 async function getDiscountActivity() {
   const res = await discountActivityApi.config({
@@ -871,6 +872,8 @@ async function getDiscountActivity() {
     return;
   }
   discountActivityRes.value = res;
+  cartStore.fullReductionActivities = [res];
+
   calcDiscountActivity();
 }
 onMounted(async () => {
@@ -1174,6 +1177,7 @@ onMounted(async () => {
           display: flex;
 
           .cover {
+            position: relative;
           }
 
           .info {
@@ -1561,4 +1565,19 @@ onMounted(async () => {
 .align-center {
   align-items: center;
 }
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 3cfe696..7d6cf3b 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -223,7 +223,7 @@
       @close="ispws = false"
     />
     <!-- 私域引流配置 -->
-    <OrderFinshModal v-model="showDrainage" ></OrderFinshModal>
+    <OrderFinshModal v-model="showDrainage"></OrderFinshModal>
   </view>
 </template>
 <script setup>
@@ -243,8 +243,10 @@ import {
   watch,
   onBeforeMount,
   onBeforeUnmount,
+  provide,
 } from "vue";
-
+provide("shopUserInfo", ref(uni.cache.get("shopUserInfo")));
+provide("shopInfo", ref(uni.cache.get("shopInfo")));
 import { getTableInfo } from "@/common/api/shop/index.js";
 import {
   APIgetOrderById,
@@ -278,8 +280,8 @@ const cartStore = useCartsStore();
 
 //充值相关start
 //充值和余额支付是否可用
-const isCanUseCharge = ref(false);
-function updateIsShow(e){
+const isCanUseCharge = ref(true);
+function updateIsShow(e) {
   isCanUseCharge.value = e;
 }
 const rechargeItem = ref({
@@ -437,20 +439,22 @@ let historyTotalPrices = 0;
 // * 获取订单详情接口
 const orderorderInfo = async () => {
   console.log("listinfo.id", listinfo.id);
+  if (!listinfo.id && !options.tableCode) {
+    return;
+  }
   let res = listinfo.id
     ? await APIgetOrderById({
         orderId: listinfo.id,
       })
     : await APIhistoryOrder({
-        tableCode: options.tableCode||"",
+        tableCode: options.tableCode || "",
       });
   orderRemarker.value = res.remark;
   Object.assign(listinfo, res);
   if (res && res.tableCode) {
     socketInitPar.table_code = res.tableCode;
     let tableRes = await getTableInfo({
-      tableCode: options.tableCode||"",
-
+      tableCode: options.tableCode || "",
     });
     console.log(tableRes);
     listinfo.tableName = tableRes.name;
@@ -458,7 +462,7 @@ const orderorderInfo = async () => {
     if (options.tableCode) {
       socketInitPar.table_code = options.tableCode;
       let tableRes = await getTableInfo({
-        tableCode: options.tableCode||"",
+        tableCode: options.tableCode || "",
       });
       console.log(tableRes);
       listinfo.tableName = tableRes.name;
@@ -634,8 +638,17 @@ const createOrder = async () => {
     placeNum: listinfo.id ? listinfo.placeNum * 1 + 1 : 1, //当前订单下单次数
     waitCall: "", //是否等叫 0 否 1 等叫
     orderId: listinfo.id || "",
-    tableCode: options.tableCode||'',
+    tableCode: options.tableCode || "",
     userId: uni.cache.get("userInfo").id || "", //
+    limitRate: (cartStore.limitTimeDiscount&&cartStore.limitTimeDiscount.id)
+      ? {
+          id: cartStore.limitTimeDiscount.id,
+          discountRate: cartStore.limitTimeDiscount.discountRate,
+          discountPriority: cartStore.limitTimeDiscount.discountPriority,
+          foodType: cartStore.limitTimeDiscount.foodType,
+          foods: cartStore.limitTimeDiscount.foods,
+        }
+      : null,
   });
   // 清空购物车
   if (res) {
@@ -716,7 +729,18 @@ function returnPayParams() {
         : "",
     remark: orderRemarker.value, //用户备注
     discountActAmount: cartStore.orderCostSummary.fullReduction.actualAmount, //满减抵扣金额
+    discountActId:cartStore.orderCostSummary.fullReduction.usedActivity?cartStore.orderCostSummary.fullReduction.usedActivity.id:null,
     userId: uni.cache.get("userInfo").id || "", //
+    limitRate: (cartStore.limitTimeDiscount&&cartStore.limitTimeDiscount.id)
+      ? {
+          id: cartStore.limitTimeDiscount.id,
+          discountRate: cartStore.limitTimeDiscount.discountRate,
+          discountPriority: cartStore.limitTimeDiscount.discountPriority,
+          foodType: cartStore.limitTimeDiscount.foodType,
+          foods: cartStore.limitTimeDiscount.foods,
+        }
+      : null,
+      vipDiscountAmount: cartStore.orderCostSummary.vipDiscountAmount, //会员折扣减免金额
   };
   return {
     isBwc: isBwc.value,
@@ -919,7 +943,6 @@ const goToPay = async (payParams) => {
   orderorderInfo();
 };
 
-
 //
 const clickPointsamount = (Pointsamount) => {
   listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount;
@@ -1063,9 +1086,13 @@ async function init(opt) {
     if (res) {
       uni.cache.set("tableCode", res.tableCode);
       uni.cache.set("tableCode", res.seatNum);
-      options.tableCode = res.tableCode||'';
+      options.tableCode = res.tableCode || "";
       cartStore.setSeatFeeConfig("personCount", res.seatNum);
       cartStore.setDinnerType(res.dineMode || "dine-in");
+      cartStore.setOldOrder(res);
+      if(res.limitRate){
+        cartStore.limitTimeDiscount=res.limitRate
+      }
       orderRemarker.value = res.remark;
       Object.assign(listinfo, res);
     }
@@ -1162,7 +1189,7 @@ const disablePayType = computed(() => {
   // if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
   //   arr.add("微信支付");
   // }
-  if(!isCanUseCharge.value){
+  if (!isCanUseCharge.value) {
     arr.add("余额支付");
   }
 
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 60c5b3b..baf85c6 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -328,7 +328,8 @@ function formatCoupon(){
 			goodsOrderPrice,
 			user,
 			selCoupon:selCoupon,
-			shopInfo
+			shopInfo,
+			limitTimeDiscount:cartStore.limitTimeDiscount
 		});
 		const { canUse, reason } = canuseResult;
 		if (coupon.type == 2) {
@@ -353,7 +354,7 @@ function formatCoupon(){
 	}
 	//商品券
 	canUseGoodsCoupon = canUseGoodsCoupon.map((v) => {
-		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo);
+		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo,cartStore.limitTimeDiscount);
 		return {
 			...v,
 			discount,
@@ -362,7 +363,7 @@ function formatCoupon(){
 	});
 	//非商品券
 	canUseDiscountCoupon = canUseDiscountCoupon.map((v) => {
-		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo);
+		const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, quansSelArr.value, shopInfo,cartStore.limitTimeDiscount);
 		return {
 			...v,
 			discount,
@@ -518,7 +519,7 @@ watch(
 		let goodsCoupon = newval.filter((v) => v.type == 2);
 		let otherCoupon = newval.filter((v) => v.type != 2);
 		goodsCoupon = goodsCoupon.map((v) => {
-			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, [], shopInfo);
+			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, [], shopInfo,cartStore.limitTimeDiscount);
 			return {
 				...v,
 				discount,
@@ -526,7 +527,7 @@ watch(
 			};
 		});
 		otherCoupon = otherCoupon.map((v) => {
-			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, goodsCoupon, shopInfo);
+			const discount = UTILS.returnCouponDiscount(canDikouGoodsArr, v, user, goodsOrderPrice, goodsCoupon, shopInfo,cartStore.limitTimeDiscount);
 			return {
 				...v,
 				discount,
diff --git a/pages/product/components/recommend-goods-modal.vue b/pages/product/components/recommend-goods-modal.vue
new file mode 100644
index 0000000..1c47c5a
--- /dev/null
+++ b/pages/product/components/recommend-goods-modal.vue
@@ -0,0 +1,196 @@
+<template>
+  <up-overlay :show="show">
+    <view class="box" v-if="SelData">
+      <view class="bg-fff u-p-30 item">
+        <view class="u-flex coverImg">
+          <up-image
+          width="204rpx"
+          height="228rpx"
+          radius="6"
+          :src="SelData.goods.coverImg"
+        ></up-image>
+        <view class="limitDiscount" v-if="showLimitDiscount(SelData.goods)"
+                  >限时折扣</view
+                >
+        </view>
+    
+        <view class="u-flex-1 u-p-l-36">
+          <view class="u-flex u-col-center justify-between u-m-t-10">
+            <view class="u-line-1 font-16 color-333 font-bold u-p-r-16">{{
+              SelData.title
+            }}</view>
+            <up-icon
+              size="20"
+              name="close-circle"
+              color="#666"
+              @click="close"
+            ></up-icon>
+          </view>
+          <view class="color-333 font-14 u-m-t-32 u-line-1">{{
+            SelData.guideDetail
+          }}</view>
+          <view class="u-flex justify-between u-m-t-30">
+            <view class="price"
+              >¥
+              <GoodsPrice
+                :limitDiscount="cartStore.limitTimeDiscount"
+                :cart="SelData.goods"
+                :shopUserInfo="shopUserInfo"
+                :shopInfo="shopInfo"
+              ></GoodsPrice
+            ></view>
+            <view class="buy" @click="buy">立即下单</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </up-overlay>
+</template>
+<script setup>
+import * as orderUtils from "@/utils/order-utils.js";
+import GoodsPrice from "@/components/goods-price.vue";
+import * as suggestApi from "@/common/api/market/suggest.js";
+import { ref, onMounted, inject, watch } from "vue";
+const cartStore = inject("cartStore");
+const shopUserInfo = inject("shopUserInfo");
+const shopInfo = inject("shopInfo");
+
+function showLimitDiscount(item) {
+  if (!cartStore.limitTimeDiscount) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    cartStore.limitTimeDiscount,
+    shopInfo,
+    shopUserInfo.value,
+    "id"
+  );
+}
+
+
+const show = ref(false);
+
+let timer = null;
+
+function taskEnd() {
+  clearInterval(timer);
+  show.value = false;
+}
+function statTime() {
+  clearInterval(timer);
+  timer = setTimeout(() => {
+    const item = list.value[nowIndex.value];
+    if (item) {
+      SelData.value = item;
+      show.value = true;
+    } else {
+      taskEnd();
+    }
+  }, suggestTime.value * 1000);
+}
+
+const list = ref([]);
+const SelData = ref(null);
+const nowIndex = ref(0);
+function close() {
+  suggestTime.value = 30;
+  taskEnd();
+  nowIndex.value += 1;
+  if (nowIndex.value == list.value.length) {
+    return;
+  }
+  statTime();
+}
+const suggestTime = ref(100);
+
+const emits = defineEmits(["onBuyClick"]);
+function buy() {
+  emits("onBuyClick", SelData.value.goods);
+}
+onMounted(() => {
+  suggestApi
+    .getGoods({
+      shopId: uni.cache.get("shopId"),
+    })
+    .then((res) => {
+      if (res) {
+        suggestTime.value = res.suggestTime;
+        list.value = (res.list || [])
+          .map((v) => {
+            return {
+              ...v,
+              goods: cartStore.returnGoods(v.foods),
+            };
+          })
+          .filter((v) => v.goods);
+          console.log('list.value ', list.value )
+        startWatch();
+      }
+    });
+});
+
+function startWatch() {
+  watch(
+    () => cartStore.isEmpty,
+    (newval) => {
+      if (newval && list.value.length) {
+        statTime();
+      } else {
+        clearInterval(timer);
+        nowIndex.value = 0;
+        show.value = false;
+      }
+    },
+    {
+      immediate: true,
+    }
+  );
+}
+</script>
+<style scoped lang="scss">
+.box {
+  position: fixed;
+  z-index: 100;
+  left: 30rpx;
+  right: 30rpx;
+  bottom: calc(var(--safe-area-inset-bottom) + 0px);
+  .item {
+    padding: 32rpx 28rpx;
+    border-radius: 16rpx;
+    background: #fff;
+    box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.05);
+    display: flex;
+  }
+  .price {
+    font-size: 40rpx;
+    color: #333;
+  }
+  .buy {
+    padding: 4rpx 28rpx;
+    border-radius: 36rpx;
+    background: #e8ad7b;
+    color: #ffffff;
+    font-size: 28rpx;
+    line-height: 48rpx;
+  }
+}
+.coverImg{
+  position: relative;
+}
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index 04c9986..912e7ea 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -1,836 +1,917 @@
 <template>
-	<view>
-		<up-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
-			@close="close">
-			<view class="cart-list-wrap">
-				<!-- 	<view class="cart-header flex-between">
+  <view>
+    <up-popup
+      :show="showCart"
+      :round="20"
+      :safeAreaInsetBottom="false"
+      :zIndex="98"
+      :overlayStyle="{ zIndex: 98 }"
+      @close="close"
+    >
+      <view class="cart-list-wrap">
+        <!-- 	<view class="cart-header flex-between">
 					<view class="num">已点 {{ cartLists_count }} 份</view>
 					<view class="clear" @click="cartclear">
 						<up-icon name="trash" color="#999"></up-icon>
 						<text class="t">清空</text>
 					</view>
 				</view> -->
-				<scroll-view scroll-y class="scroll-view">
-					<view class="list-wrap">
-						<view v-if="cartList.length>0">
-							<view class="ShoppingCart flex-between">
-								<view>
-									购物车
-								</view>
-								<view class="flex-between" @click="cartclear">
-									<up-icon name="trash" color="#999" size="20"></up-icon>
-									<text class="clear-btn">清空购物车</text>
-								</view>
+        <scroll-view scroll-y class="scroll-view">
+          <view class="list-wrap">
+            <view v-if="cartList.length > 0">
+              <view class="ShoppingCart flex-between">
+                <view> 购物车 </view>
+                <view class="flex-between" @click="cartclear">
+                  <up-icon name="trash" color="#999" size="20"></up-icon>
+                  <text class="clear-btn">清空购物车</text>
+                </view>
+              </view>
+              <view
+                class="shop-item"
+                v-for="(item, index) in cartList"
+                :key="item.id"
+              >
+                <view class="shop-item-content">
+                  <view class="cover" v-if="item.productId != -999">
+                    <view class="limit-discount" v-if="showLimitDiscount(item)">
+                      限时折扣
+                    </view>
+                    <up-image
+                      :src="item.coverImg"
+                      width="124rpx"
+                      height="124rpx"
+                      mode="aspectFill"
+                      radius="10"
+                    ></up-image>
+                  </view>
+                  <view class="info">
+                    <view class="name">
+                      {{
+                        item.cartListinfo.is_temporary == 1
+                          ? "临时菜"
+                          : item.name
+                      }}
+                    </view>
+                    <view class="select-sku-wrap" v-if="item.type == 'sku'">
+                      <text v-for="i in item.skuList" :key="i.id">
+                        {{ item.cartListinfo.sku_id == i.id ? i.name : "" }}
+                      </text>
+                    </view>
+                    <view class="select-sku-wrap" v-if="item.type == 'package'">
+                      <view
+                        v-for="(a, b) in dataprocessing(item.cartListinfo)"
+                        :key="b"
+                      >
+                        <!-- <view>{{a.title}}</view> -->
+                        <text
+                          v-for="i in a.goods"
+                          :key="i.proId"
+                          style="margin-left: 4rpx"
+                        >
+                          {{ i.proName }}
+                        </text>
+                      </view>
+                    </view>
+                    <view class="price-wrap" style="padding-top: 0">
+                      <view class="price">
+                        <text class="i">¥</text>
+                        <goodsPrice
+                          :limitDiscount="limitDiscount"
+                          :cart="item"
+                          :shopUserInfo="shopUserInfo"
+                          :shopInfo="shopInfo"
+                        ></goodsPrice>
 
-							</view>
-							<view class="shop-item" v-for="(item,index) in cartList" :key="item.id">
-								<view class="shop-item-content">
-									<view class="cover" v-if="item.productId!=-999">
-										<up-image :src="item.coverImg" width="80" radius="10" height="80"></up-image>
-									</view>
-									<view class="info">
-										<view class="name"> {{item.cartListinfo.is_temporary == 1?'临时菜' :item.name }}
-										</view>
-										<view class="select-sku-wrap" v-if="item.type == 'sku'">
-											<text v-for="i in item.skuList" :key="i.id">
-												{{item.cartListinfo.sku_id == i.id? i.name:"" }}
-											</text>
-										</view>
-										<view class="select-sku-wrap" v-if="item.type == 'package'">
-											<view v-for="(a,b) in dataprocessing(item.cartListinfo)" :key="b">
-												<!-- <view>{{a.title}}</view> -->
-												<text v-for="i in a.goods" :key="i.proId" style="margin-left: 4rpx;">
-													{{i.proName }}
-												</text>
-											</view>
-										</view>
-										<view class="price-wrap" style="padding-top: 0;">
-											<view class="price">
-												<text class="i">￥</text>
-												<!-- 会员价与价格 -->
-												<text class="price" v-if="item.type == 'sku'">
-													<text v-for="i in item.skuList" :key="i.id">
-														<!--  -->
-														{{item.cartListinfo.sku_id == i.id?(shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(i.memberPrice || i.salePrice):i.salePrice):''}}
-													</text>
-												</text>
-												<text class="price" v-else>
-													{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice || item.salePrice):item.salePrice}}
-												</text>
-												<!-- <text class="originalprice"
+                        <text
+                          class="originalprice"
+                          >{{ item.salePrice }}</text
+                        >
+
+                        <!-- <text class="originalprice"
 													v-if="item.originPrice">¥{{item.originPrice}}</text>
 												<text class="unit" v-if="item.unitName">/{{item.unitName}}</text> -->
-											</view>
+                      </view>
 
-
-											<view class="operation-wrap">
-												<view class="btn">
-													<up-icon color="#E8AD7B" name="minus-circle" size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'-')"></view>
-												</view>
-												<text class="num">{{ ifcartNumber(item) }}</text>
-												<view class="btn" v-if="item.type !='package'">
-													<!-- <up-icon name="plus-circle-fill"
+                      <view class="operation-wrap">
+                        <view class="btn">
+                          <up-icon
+                            color="#E8AD7B"
+                            name="minus-circle"
+                            size="18"
+                          ></up-icon>
+                          <view
+                            class="btnClick"
+                            @click="cartListadd(item, '-')"
+                          ></view>
+                        </view>
+                        <text class="num">{{ ifcartNumber(item) }}</text>
+                        <view class="btn" v-if="item.type != 'package'">
+                          <!-- <up-icon name="plus-circle-fill"
 														:color="{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? '#CECECE' : '#E9AB7A'"
 														size="25"></up-icon> -->
-													<up-icon name="plus-circle-fill" color="#E8AD7B"
-														size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'+')"></view>
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						
-					</view>
-				</scroll-view>
-			</view>
-		</up-popup>
-	</view>
-
+                          <up-icon
+                            name="plus-circle-fill"
+                            color="#E8AD7B"
+                            size="18"
+                          ></up-icon>
+                          <view
+                            class="btnClick"
+                            @click="cartListadd(item, '+')"
+                          ></view>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </up-popup>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		defineProps,
-		computed,
-		defineEmits
-	} from 'vue';
-	import {
-		productStore
-	} from '@/stores/user.js';
+import { ref, defineProps, computed, defineEmits, watch } from "vue";
+import { productStore } from "@/stores/user.js";
+import goodsPrice from "@/components/goods-price.vue";
+import * as orderUtils from "@/utils/order-utils.js";
 
-	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'close', 'clickcancelOrder']);
+// 定义自定义事件
+const emits = defineEmits(["customevent", "close", "clickcancelOrder"]);
 
-	const props = defineProps({
-		cartList: {
-			type: Array
-		},
-		cartLists_count: {
-			type: Number,
-			default: 0
-		},
-		showCart: {
-			type: Boolean
-		},
-		orderinfo: {
-			type: Object,
-			default: {
-				detailMap: {}
-			}
-		},
+const props = defineProps({
+  cartList: {
+    type: Array,
+  },
+  cartLists_count: {
+    type: Number,
+    default: 0,
+  },
+  showCart: {
+    type: Boolean,
+  },
+  orderinfo: {
+    type: Object,
+    default: {
+      detailMap: {},
+    },
+  },
+  //限时折扣
+  limitDiscount: {
+    type: Object,
+    default: {},
+  },
+});
 
-	});
-	const shopInfo = uni.cache.get('shopInfo')
 
-	// 定义 ifcartNumber 计算属性方法
-	const ifcartNumber = computed(() => {
-		return (item) => {
-			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-			if (!item || typeof item.cartNumber !== 'string') {
-				return 0;
-			}
-			let numValue = parseFloat(item.cartNumber);
-			if (isNaN(numValue)) {
-				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-				return 0;
-			}
-			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-			if (item.type === 'weight') {
-				// 如果类型是称重重量，将值保留两位小数
-				return parseFloat(numValue.toFixed(2));
-			} else {
-				// 如果类型是整数，将值转换为整数
-				return Math.round(numValue);
-			}
-			// 如果类型不匹配，返回原始值
-			return item.cartNumber;
-		};
-	})
+function showLimitDiscount(item){
+  if (!props.limitDiscount||!props.limitDiscount.id) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    props.limitDiscount,
+    shopInfo.value,
+    shopUserInfo.value,
+    "id"
+  );
+}
 
-	const close = () => {
-		emits("close", false)
-	}
-	// 购物车加减
-	const cartListadd = async (item, i) => {
-		// 是否起售 如果小于或者大于都是1
-		const cartNumberFloat = parseFloat(item.cartNumber);
-		const suitNum = item.suitNum >= cartNumberFloat && i == '-' ? item.cartNumber : 1;
+watch(
+  () => props.cartList,
+  (newCartList) => {
+    console.log("购物车数据变化", newCartList);
+  },
+  {
+    deep: true,
+  }
+);
+const shopInfo = ref(uni.cache.get("shopInfo"));
+const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
 
-		emits('customevent', {
-			id: item.cartListId ? item.cartListId : '',
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: calculateValue(item.cartNumber, i, suitNum) == 'del' ? 'del' : item.cartListId &&
-				item.cartNumber > 0 ? 'edit' : 'add',
-			product_id: item.id,
-			sku_id: item.skuId,
-			number: await calculateValue(item.cartNumber, i, suitNum),
-			is_print: 1,
-			suitNum: item.suitNum,
-		})
-	}
+function returnRealPrice(cart) {
+  const price = orderUtils.returnPrice({
+    goods: cart,
+    shopInfo: shopInfo,
+    limitDiscount: props.limitDiscount.id ? props.limitDiscount : null,
+    shopUserInfo: shopUserInfo,
+  });
+  if (goods.name == "纯生纯生纯生") {
+    console.log("returnRealPrice", price);
+  }
+  return price;
+}
 
-	const dataprocessing = computed(() => {
-		return (item) => {
-			let res = null
-			try {
-				res = JSON.parse(item.pro_group_info)
-			} catch (error) {
-				//TODO handle the exception
-			}
-			return res
-		};
-	})
+// 定义 ifcartNumber 计算属性方法
+const ifcartNumber = computed(() => {
+  return (item) => {
+    // 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+    if (!item || typeof item.cartNumber !== "string") {
+      return 0;
+    }
+    let numValue = parseFloat(item.cartNumber);
+    if (isNaN(numValue)) {
+      // 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+      return 0;
+    }
+    // type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+    if (item.type === "weight") {
+      // 如果类型是称重重量，将值保留两位小数
+      return parseFloat(numValue.toFixed(2));
+    } else {
+      // 如果类型是整数，将值转换为整数
+      return Math.round(numValue);
+    }
+    // 如果类型不匹配，返回原始值
+    return item.cartNumber;
+  };
+});
 
-	const clickcancelOrder = (i, key) => {
-		emits('clickcancelOrder', {
-			i,
-			key
-		})
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'clearOrder',
-		})
-	}
+const close = () => {
+  emits("close", false);
+};
+// 购物车加减
+const cartListadd = async (item, i) => {
+  // 是否起售 如果小于或者大于都是1
+  const cartNumberFloat = parseFloat(item.cartNumber);
+  const suitNum =
+    item.suitNum >= cartNumberFloat && i == "-" ? item.cartNumber : 1;
 
-	const calculateValue = (cartNumber, i, step = 1) => {
-		if (i == '+') {
-			const result = parseFloat(cartNumber) + parseFloat(step);
-			return result.toFixed(2);
-		} else {
-			// 当减到0返回del
-			const result = parseFloat(cartNumber) - parseFloat(step);
-			return result == 0 ? 'del' : result.toFixed(2);
-		}
-	}
+  emits("customevent", {
+    id: item.cartListId ? item.cartListId : "",
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type:
+      calculateValue(item.cartNumber, i, suitNum) == "del"
+        ? "del"
+        : item.cartListId && item.cartNumber > 0
+        ? "edit"
+        : "add",
+    product_id: item.id,
+    sku_id: item.skuId,
+    number: await calculateValue(item.cartNumber, i, suitNum),
+    is_print: 1,
+    suitNum: item.suitNum,
+  });
+};
 
-	// 菜品备注修改
-	const productBlur = (item) => {
-		let params = {
-			"skuId": item.skuId,
-			"num": item.number, //数量
-			"type": item.type,
-			"isVip": item.isVip,
-			"productId": item.productId, //商品id
-			"note": item.note,
-			"shopId": this.shopId,
-			"userId": uni.cache.get('userInfo').id,
-			"tableId": this.tableCode,
-		}
-		this.$emit("addCart", params)
-	}
+const dataprocessing = computed(() => {
+  return (item) => {
+    let res = null;
+    try {
+      res = JSON.parse(item.pro_group_info);
+    } catch (error) {
+      //TODO handle the exception
+    }
+    return res;
+  };
+});
 
-	// 清空购物车
-	const cartclear = () => {
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'cleanup',
-		})
-	}
+const clickcancelOrder = (i, key) => {
+  emits("clickcancelOrder", {
+    i,
+    key,
+  });
+  emits("customevent", {
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "clearOrder",
+  });
+};
+
+const calculateValue = (cartNumber, i, step = 1) => {
+  if (i == "+") {
+    const result = parseFloat(cartNumber) + parseFloat(step);
+    return result.toFixed(2);
+  } else {
+    // 当减到0返回del
+    const result = parseFloat(cartNumber) - parseFloat(step);
+    return result == 0 ? "del" : result.toFixed(2);
+  }
+};
+
+// 菜品备注修改
+const productBlur = (item) => {
+  let params = {
+    skuId: item.skuId,
+    num: item.number, //数量
+    type: item.type,
+    isVip: item.isVip,
+    productId: item.productId, //商品id
+    note: item.note,
+    shopId: this.shopId,
+    userId: uni.cache.get("userInfo").id,
+    tableId: this.tableCode,
+  };
+  this.$emit("addCart", params);
+};
+
+// 清空购物车
+const cartclear = () => {
+  emits("customevent", {
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "cleanup",
+  });
+};
 </script>
 
 <style lang="scss">
-	.clear-btn{
-		color: #333;
-		font-size: 24rpx;
-		font-weight: 500;
-	}
-	.cart-list-wrap {
-		.cart-header {
-			display: flex;
-			height: 72rpx;
-			background-color: #F2F2F2;
-			align-items: center;
-			justify-content: space-between;
-			padding: 20upx 28rpx;
-			border-radius: 20upx 20upx 0 0;
-
-			.num {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.clear {
-				display: flex;
-				align-items: center;
-
-				.t {
-					font-size: 24upx;
-					color: #999;
-					margin-left: 4upx;
-				}
-			}
-		}
-
-		.scroll-view {
-			max-height: 60vh;
-			margin-bottom: 190rpx;
-
-			.list-wrap {
-				padding: 0 28rpx;
-
-				.ShoppingCart {
-					font-size: 30rpx;
-					text-align: left;
-					padding: 20rpx 0;
-					font-weight: 700;
-					border-bottom: 1rpx solid #cecece;
-					color: #000;
-
-				}
-
-				.shop-item:last-child {
-					border-bottom: 1rpx solid #cecece;
-					padding-bottom: 20rpx;
-				}
-
-				.shop-item {
-					margin-top: 15rpx;
-					display: flex;
-					flex-direction: column;
-
-					.shop-item-content {
-						display: flex;
-						justify-content: center;
-						align-items: center;
-					}
-
-					.shop-item-remark {
-						display: flex;
-						align-items: center;
-						padding-right: 180rpx;
-						margin-top: 10rpx;
-
-						.label {
-							font-size: 28rpx;
-							color: #666;
-							margin-right: 20rpx;
-						}
-
-					}
-
-					.langcover {
-						position: relative;
-					}
-
-					.langcover::after {
-						content: '加载中..';
-						position: absolute;
-						top: 0;
-						left: 0;
-						height: 100%;
-						width: 100%;
-						background-color: #e8e8e8;
-						color: #6b6b6b;
-						border-radius: 10rpx;
-						text-align: center;
-						line-height: 180rpx;
-						z-index: 1;
-					}
-
-					.info {
-						flex: 1;
-						padding-left: 20rpx;
-
-						.name {
-							font-size: 28upx;
-							font-weight: bold;
-							color: #333;
-							margin-bottom: 5rpx;
-						}
-
-						.select-sku-wrap {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-						}
-
-						.price-wrap {
-							margin-top: 16rpx;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-
-							.price {
-								display: flex;
-								align-items: flex-end;
-
-								.i,
-								.num {
-									font-weight: bold;
-									font-size: 32rpx;
-									color: #333333;
-								}
-
-								.i {
-									position: relative;
-									bottom: 4upx;
-								}
-
-								.price {
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: bold;
-									font-size: 36rpx;
-									color: #333333;
-								}
-
-								.originalprice {
-									margin-left: 10rpx;
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 20rpx;
-									text-decoration: line-through;
-								}
-
-								.unit {
-									font-family: Source Han Sans CN, Source Han Sans CN;
-									font-weight: 400;
-									font-size: 36rpx;
-									color: #333333;
-								}
-
-								.lineThrough {
-									font-weight: normal;
-									text-decoration: line-through;
-									color: #999 !important;
-									font-size: 24rpx !important;
-								}
-							}
-
-							.sku-wrap {
-								padding: 6upx 16upx;
-								background-color: #ffd100;
-								border-radius: 12upx;
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								position: relative;
-
-								.t {
-									font-size: 24upx;
-									font-weight: bold;
-								}
-
-								.dot {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									font-size: 20upx;
-									position: absolute;
-									padding: 2upx 12upx;
-									border-radius: 8upx;
-									background-color: #eb5232;
-									color: #fff;
-									position: absolute;
-									top: -14upx;
-									right: -8upx;
-								}
-
-							}
-
-							.operation-wrap {
-								display: flex;
-								align-items: center;
-
-								.num {
-									font-size: 32upx;
-									padding: 0 16upx;
-								}
-
-								.btn {
-									position: relative;
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									position: relative;
-
-									.btnClick {
-										width: 100rpx;
-										height: 100rpx;
-										position: absolute;
-										// bottom: 0;
-									}
-
-									.btnClick.l {
-										right: 0;
-									}
-
-									.btnClick.r {
-										left: 0;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.card {
-			position: relative;
-
-			.cardcalorders {
-				position: relative;
-				padding: 20rpx 0;
-				font-size: 35rpx;
-				font-weight: bold;
-				border-bottom: 1rpx solid #cecece;
-				color: #000;
-
-				.absolute {
-					position: absolute;
-					right: 0;
-					top: 2rpx;
-					font-size: 24rpx;
-				}
-			}
-
-			.card_item {
-				display: flex;
-				flex-direction: column;
-				position: relative;
-
-				.head {
-					display: flex;
-					justify-content: space-between;
-
-					.head_left {
-						width: 100%;
-						display: flex;
-						justify-content: space-between;
-						padding: 20rpx 0;
-						border-bottom: 1rpx solid #cecece;
-
-						.placeNum {
-							font-weight: 700;
-							font-size: 27rpx;
-							color: #3e3d3d;
-						}
-
-						.placeTime {
-							font-weight: 400;
-							font-size: 32rpx;
-							color: #999;
-
-							.t {
-								margin-left: 4rpx;
-								font-size: 24rpx;
-							}
-						}
-					}
-
-				}
-
-				.shop-info {
-					border-bottom: 2rpx dashed #e5e5e5;
-
-
-					.item {
-						margin: 30rpx 0;
-						display: flex;
-
-						.info {
-							flex: 1;
-							display: flex;
-							flex-direction: column;
-							padding-left: 16upx;
-
-							.productName {
-								font-weight: bold;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 20rpx;
-							}
-
-							.productSkuName {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								display: -webkit-box;
-								-webkit-box-orient: vertical;
-								-webkit-line-clamp: 3;
-								overflow: hidden;
-								text-overflow: ellipsis;
-							}
-
-							.n {
-								font-size: 24upx;
-								color: #999;
-							}
-						}
-
-						.price {
-							display: flex;
-							flex-direction: column;
-							align-items: flex-end;
-
-							.priceAmount {
-								font-weight: 500;
-								font-size: 28rpx;
-								color: #333333;
-								margin-top: 26rpx;
-							}
-
-							.num {
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #999999;
-								margin-top: 22rpx;
-							}
-						}
-					}
-				}
-
-				.status {
-					align-self: flex-end;
-					width: 92rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					text-align: center;
-					background: #999999;
-					border-radius: 10rpx 10rpx 10rpx 10rpx;
-					font-weight: 400;
-					font-size: 22rpx;
-					color: #FFFFFF;
-					margin-top: 32rpx;
-				}
-
-				.totalAmount {
-					width: 100%;
-					display: flex;
-					justify-content: flex-end;
-					align-items: flex-end;
-					padding: 32rpx 0;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					.label {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.price {
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.semicircle_icon {
-					width: 100%;
-					position: absolute;
-					top: -22.5rpx;
-					left: 0;
-					display: flex;
-					justify-content: space-between;
-
-					.semicircle_left_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-left: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-					}
-
-					.semicircle_right_icon {
-						width: 45rpx;
-						height: 45rpx;
-						margin-right: -22.5rpx;
-						background-color: #f9f9f9;
-						border-radius: 50%;
-						// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-					}
-				}
-			}
-
-			.cell-item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 32rpx 34rpx 0 34rpx;
-
-				.label {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-					padding-bottom: 32rpx;
-				}
-
-				.val {
-					display: flex;
-					align-items: flex-end;
-					padding-bottom: 32rpx;
-					border-bottom: 2rpx dashed #e5e5e5;
-
-					view:nth-child(1) {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-right: 42rpx;
-					}
-
-					view:nth-child(2) {
-						display: flex;
-						align-items: flex-end;
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
-				}
-
-				.val.column {
-					display: flex;
-					flex-direction: column;
-
-					.productCoupon {
-						display: flex;
-						align-items: flex-end;
-						margin: 0 0 10rpx 0;
-
-						.name {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 26rpx;
-							color: #999;
-							margin: 0 30rpx;
-							line-height: 20rpx;
-						}
-
-						.amount {
-							font-weight: bold;
-							font-size: 26rpx;
-							color: #333;
-						}
-					}
-				}
-			}
-
-			.favorable {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-				padding-bottom: 26rpx;
-				padding-top: 26rpx;
-				border-bottom: 2rpx solid #E5E5E5;
-
-				.favorable_left {
-					display: flex;
-					align-items: center;
-
-					.icon {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 16rpx;
-					}
-
-					.name {
-						font-size: 28rpx;
-						font-weight: 400rpx;
-						color: #333;
-					}
-				}
-
-				.favorable_right {
-					display: flex;
-					align-items: center;
-
-					.favorable_right_text {
-						font-size: 24rpx;
-						color: #999;
-						font-weight: 400rpx;
-					}
-
-				}
-
-				.favorable_right {
-					.column {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-
-						.favorable_right_text {
-							margin-bottom: 10rpx;
-
-							text:nth-child(1) {
-								font-size: 26rpx;
-								color: #999;
-							}
-
-							text:nth-child(2) {
-								font-size: 26rpx;
-								color: #999;
-								margin: 0 30rpx;
-							}
-
-							text:nth-child(3) {
-								font-size: 26rpx;
-								color: #333;
-
-							}
-						}
-					}
-				}
-
-				.favorable_right.column {
-					align-items: flex-start;
-				}
-			}
-
-			.favorable.column {
-				align-items: flex-start;
-			}
-
-			.cell-item.column {
-				align-items: flex-start;
-			}
-
-			.total-wrap {
-				width: 100%;
-				display: flex;
-				justify-content: flex-end;
-				align-items: flex-end;
-				padding: 0 34rpx;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				margin-top: 64rpx;
-
-				.price {
-					font-weight: bold;
-					font-size: 36rpx;
-				}
-			}
-
-			.order_footer {
-				display: flex;
-				flex-direction: column;
-				padding: 34rpx;
-				position: relative;
-			}
-
-		}
-
-	}
+.clear-btn {
+  color: #333;
+  font-size: 24rpx;
+  font-weight: 500;
+}
+.cart-list-wrap {
+  .cart-header {
+    display: flex;
+    height: 72rpx;
+    background-color: #f2f2f2;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20upx 28rpx;
+    border-radius: 20upx 20upx 0 0;
+
+    .num {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .clear {
+      display: flex;
+      align-items: center;
+
+      .t {
+        font-size: 24upx;
+        color: #999;
+        margin-left: 4upx;
+      }
+    }
+  }
+
+  .scroll-view {
+    max-height: 60vh;
+    margin-bottom: 190rpx;
+
+    .list-wrap {
+      padding: 0 28rpx;
+
+      .ShoppingCart {
+        font-size: 30rpx;
+        text-align: left;
+        padding: 20rpx 0;
+        font-weight: 700;
+        border-bottom: 1rpx solid #cecece;
+        color: #000;
+      }
+
+      .shop-item:last-child {
+        border-bottom: 1rpx solid #cecece;
+        padding-bottom: 20rpx;
+      }
+
+      .shop-item {
+        margin-top: 15rpx;
+        display: flex;
+        flex-direction: column;
+
+        .shop-item-content {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .cover {
+            position: relative;
+            .limit-discount {
+              position: absolute;
+              background: #cc5617;
+              font-size: 24rpx;
+              color: #fff;
+              border-radius: 20rpx 0 20rpx 0;
+              padding: 2rpx 10rpx;
+              z-index: 1;
+            }
+          }
+        }
+
+        .shop-item-remark {
+          display: flex;
+          align-items: center;
+          padding-right: 180rpx;
+          margin-top: 10rpx;
+
+          .label {
+            font-size: 28rpx;
+            color: #666;
+            margin-right: 20rpx;
+          }
+        }
+
+        .langcover {
+          position: relative;
+        }
+
+        .langcover::after {
+          content: "加载中..";
+          position: absolute;
+          top: 0;
+          left: 0;
+          height: 100%;
+          width: 100%;
+          background-color: #e8e8e8;
+          color: #6b6b6b;
+          border-radius: 10rpx;
+          text-align: center;
+          line-height: 180rpx;
+          z-index: 1;
+        }
+
+        .info {
+          flex: 1;
+          padding-left: 20rpx;
+
+          .name {
+            font-size: 28upx;
+            font-weight: bold;
+            color: #333;
+            margin-bottom: 5rpx;
+          }
+
+          .select-sku-wrap {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+          }
+
+          .price-wrap {
+            margin-top: 16rpx;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .price {
+              display: flex;
+              align-items: baseline;
+
+              .i,
+              .num {
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #333333;
+              }
+
+              .i {
+              }
+
+              .price {
+                font-family: Source Han Sans CN, Source Han Sans CN;
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #333333;
+              }
+
+              .originalprice {
+                color: #999;
+                margin-left: 10rpx;
+                font-weight: 400;
+                font-size: 24rpx;
+                text-decoration: line-through;
+              }
+
+              .unit {
+                font-family: Source Han Sans CN, Source Han Sans CN;
+                font-weight: 400;
+                font-size: 36rpx;
+                color: #333333;
+              }
+
+              .lineThrough {
+                font-weight: normal;
+                text-decoration: line-through;
+                color: #999 !important;
+                font-size: 24rpx !important;
+              }
+            }
+
+            .sku-wrap {
+              padding: 6upx 16upx;
+              background-color: #ffd100;
+              border-radius: 12upx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: relative;
+
+              .t {
+                font-size: 24upx;
+                font-weight: bold;
+              }
+
+              .dot {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 20upx;
+                position: absolute;
+                padding: 2upx 12upx;
+                border-radius: 8upx;
+                background-color: #eb5232;
+                color: #fff;
+                position: absolute;
+                top: -14upx;
+                right: -8upx;
+              }
+            }
+
+            .operation-wrap {
+              display: flex;
+              align-items: center;
+
+              .num {
+                font-size: 32upx;
+                padding: 0 16upx;
+              }
+
+              .btn {
+                position: relative;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                position: relative;
+
+                .btnClick {
+                  width: 100rpx;
+                  height: 100rpx;
+                  position: absolute;
+                  // bottom: 0;
+                }
+
+                .btnClick.l {
+                  right: 0;
+                }
+
+                .btnClick.r {
+                  left: 0;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .card {
+    position: relative;
+
+    .cardcalorders {
+      position: relative;
+      padding: 20rpx 0;
+      font-size: 35rpx;
+      font-weight: bold;
+      border-bottom: 1rpx solid #cecece;
+      color: #000;
+
+      .absolute {
+        position: absolute;
+        right: 0;
+        top: 2rpx;
+        font-size: 24rpx;
+      }
+    }
+
+    .card_item {
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      .head {
+        display: flex;
+        justify-content: space-between;
+
+        .head_left {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          padding: 20rpx 0;
+          border-bottom: 1rpx solid #cecece;
+
+          .placeNum {
+            font-weight: 700;
+            font-size: 27rpx;
+            color: #3e3d3d;
+          }
+
+          .placeTime {
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #999;
+
+            .t {
+              margin-left: 4rpx;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+
+      .shop-info {
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        .item {
+          margin: 30rpx 0;
+          display: flex;
+
+          .info {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            padding-left: 16upx;
+
+            .productName {
+              font-weight: bold;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 20rpx;
+            }
+
+            .productSkuName {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 3;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .n {
+              font-size: 24upx;
+              color: #999;
+            }
+          }
+
+          .price {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+
+            .priceAmount {
+              font-weight: 500;
+              font-size: 28rpx;
+              color: #333333;
+              margin-top: 26rpx;
+            }
+
+            .num {
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #999999;
+              margin-top: 22rpx;
+            }
+          }
+        }
+      }
+
+      .status {
+        align-self: flex-end;
+        width: 92rpx;
+        height: 40rpx;
+        line-height: 40rpx;
+        text-align: center;
+        background: #999999;
+        border-radius: 10rpx 10rpx 10rpx 10rpx;
+        font-weight: 400;
+        font-size: 22rpx;
+        color: #ffffff;
+        margin-top: 32rpx;
+      }
+
+      .totalAmount {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        align-items: flex-end;
+        padding: 32rpx 0;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        .label {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+
+        .price {
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .semicircle_icon {
+        width: 100%;
+        position: absolute;
+        top: -22.5rpx;
+        left: 0;
+        display: flex;
+        justify-content: space-between;
+
+        .semicircle_left_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-left: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+        }
+
+        .semicircle_right_icon {
+          width: 45rpx;
+          height: 45rpx;
+          margin-right: -22.5rpx;
+          background-color: #f9f9f9;
+          border-radius: 50%;
+          // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+        }
+      }
+    }
+
+    .cell-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx 34rpx 0 34rpx;
+
+      .label {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+        padding-bottom: 32rpx;
+      }
+
+      .val {
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 32rpx;
+        border-bottom: 2rpx dashed #e5e5e5;
+
+        view:nth-child(1) {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #999999;
+          margin-right: 42rpx;
+        }
+
+        view:nth-child(2) {
+          display: flex;
+          align-items: flex-end;
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #333333;
+        }
+      }
+
+      .val.column {
+        display: flex;
+        flex-direction: column;
+
+        .productCoupon {
+          display: flex;
+          align-items: flex-end;
+          margin: 0 0 10rpx 0;
+
+          .name {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0;
+          }
+
+          .num {
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #999;
+            margin: 0 30rpx;
+            line-height: 20rpx;
+          }
+
+          .amount {
+            font-weight: bold;
+            font-size: 26rpx;
+            color: #333;
+          }
+        }
+      }
+    }
+
+    .favorable {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 30rpx;
+      box-sizing: border-box;
+      padding-bottom: 26rpx;
+      padding-top: 26rpx;
+      border-bottom: 2rpx solid #e5e5e5;
+
+      .favorable_left {
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+
+        .name {
+          font-size: 28rpx;
+          font-weight: 400rpx;
+          color: #333;
+        }
+      }
+
+      .favorable_right {
+        display: flex;
+        align-items: center;
+
+        .favorable_right_text {
+          font-size: 24rpx;
+          color: #999;
+          font-weight: 400rpx;
+        }
+      }
+
+      .favorable_right {
+        .column {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+
+          .favorable_right_text {
+            margin-bottom: 10rpx;
+
+            text:nth-child(1) {
+              font-size: 26rpx;
+              color: #999;
+            }
+
+            text:nth-child(2) {
+              font-size: 26rpx;
+              color: #999;
+              margin: 0 30rpx;
+            }
+
+            text:nth-child(3) {
+              font-size: 26rpx;
+              color: #333;
+            }
+          }
+        }
+      }
+
+      .favorable_right.column {
+        align-items: flex-start;
+      }
+    }
+
+    .favorable.column {
+      align-items: flex-start;
+    }
+
+    .cell-item.column {
+      align-items: flex-start;
+    }
+
+    .total-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: flex-end;
+      padding: 0 34rpx;
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      margin-top: 64rpx;
+
+      .price {
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+    }
+
+    .order_footer {
+      display: flex;
+      flex-direction: column;
+      padding: 34rpx;
+      position: relative;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 412b7c2..99011b6 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -58,6 +58,9 @@
               v-for="(item, index) in shopProductList.hots"
               :key="index"
             >
+              <view class="limitDiscount" v-if="showLimitDiscount(item)"
+                >限时折扣</view
+              >
               <image
                 class="panelfiveitemimage"
                 :src="item.coverImg"
@@ -151,6 +154,10 @@
                     <text class="unit" v-if="item.unitName"
                       >/{{ item.unitName }}</text
                     >
+
+                    <text class="old-price" 
+                        >¥{{ item.salePrice }}</text
+                      >
                   </view>
                 </view>
                 <view class="panelfiveitemNum">
@@ -189,16 +196,21 @@
                       >¥</text
                     >
                     <!-- 会员价与价格 -->
-                    <text class="price">
-                      {{
-                        shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-                          ? item.memberPrice || item.salePrice
-                          : item.salePrice
-                      }}
-                    </text>
+                    <view class="price">
+                      <GoodsPrice
+                        :limitDiscount="limitTimeDiscountRes"
+                        :cart="item"
+                        :shopUserInfo="shopUserInfo"
+                        :shopInfo="shopInfo"
+                      ></GoodsPrice>
+                    </view>
+
                     <text class="unit" v-if="item.unitName"
                       >/{{ item.unitName }}</text
                     >
+                    <text class="old-price" 
+                        >¥{{ item.salePrice }}</text
+                      >
                     <!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
 											style="font-size: 16rpx;">「{{item.suitNum}}{{item.unitName}}起点」</text> -->
                   </view>
@@ -357,12 +369,16 @@
                     mode=""
                   ></image>
                 </view>
+
                 <view
                   v-if="index == '0'"
                   class="topSort"
                   :class="'c' + (index1 + 1)"
                   >TOP{{ index1 + 1 }}</view
                 >
+                <view class="limitDiscount" v-else-if="showLimitDiscount(item1)"
+                  >限时折扣</view
+                >
                 <view class="goods_right" style="overflow: hidden">
                   <view class="name">{{ item1.name }}</view>
                   <!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
@@ -417,16 +433,21 @@
                   <view v-else class="flex-between" style="flex-wrap: inherit">
                     <view class="money">
                       <view>￥</view>
-                      <text class="money_num">
-                        {{
-                          shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-                            ? item1.memberPrice || item1.salePrice
-                            : item1.salePrice
-                        }}
-                      </text>
+                      <view class="money_num">
+                        <GoodsPrice
+                          :limitDiscount="limitTimeDiscountRes"
+                          :cart="item1"
+                          :shopUserInfo="shopUserInfo"
+                          :shopInfo="shopInfo"
+                        ></GoodsPrice>
+                      </view>
                       <text class="money_num" v-if="item1.unitName"
                         >/{{ item1.unitName }}</text
                       >
+                      <text class="old-price" 
+                        >￥{{ item1.salePrice }}</text
+                      >
+
                       <!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
 												style="font-size: 14rpx;">
 												「{{item1.suitNum}}{{item1.unitName}}起点」
@@ -513,6 +534,7 @@
       :cartLists_count="cartLists_count"
       :cartList="matchedProducts"
       :showCart="showCart"
+      :limitDiscount="limitTimeDiscountRes"
       @customevent="websocketsendMessage"
       @close="showCart = !showCart"
       :orderinfo="orderinfo"
@@ -772,11 +794,23 @@
     </view>
     <Loading :isLoading="!useSocket.isConnected" />
     <ModalList></ModalList>
+    <recommendGoodsModal
+      v-if="isDataLoaded"
+      @onBuyClick="onBuyClick"
+    ></recommendGoodsModal>
   </view>
 </template>
 
 <script setup>
+//价格计算辅助函数
+import * as orderUtils from "@/utils/order-utils.js";
+import BigNumber from "bignumber.js";
+
+import GoodsPrice from "@/components/goods-price.vue";
+
+import * as limitTimeDiscountapi from "@/common/api/market/limitTimeDiscount.js";
 import ModalList from "@/components/modal-list.vue";
+import recommendGoodsModal from "./components/recommend-goods-modal.vue";
 import {
   ref,
   reactive,
@@ -784,6 +818,7 @@ import {
   watchEffect,
   getCurrentInstance,
   computed,
+  provide,
   watch,
 } from "vue";
 
@@ -805,6 +840,49 @@ import dayjs from "dayjs";
 import isBetween from "dayjs/plugin/isBetween";
 dayjs.extend(isBetween);
 
+//点单智能推荐
+function onBuyClick(item) {
+  console.log("onBuyClick", item);
+  console.log("shopProductList", shopProductList);
+  let index = -1;
+  let index1 = -1;
+  if (!item.isHot) {
+    if (
+      item.type == "sku" ||
+      (item.type == "package" && item.groupType == "1")
+    ) {
+      for (let i in shopProductList.productInfo) {
+        const cate = shopProductList.productInfo[i];
+        const goodsList = cate.productList;
+        const index1 = goodsList.findIndex((goods) => goods.id == item.id);
+        if (index1 > -1) {
+          index = i;
+          clickspecifications(item, index, index1);
+          break;
+        }
+      }
+    } else {
+      uni.$u.throttle(() => singleclick(item, "+"), 500);
+    }
+  } else {
+    if (
+      item.type == "sku" ||
+      (item.type == "package" && item.groupType == "1")
+    ) {
+      for (let i in shopProductList.hots) {
+        const goods = shopProductList.hots[i];
+        if (goods.id==item.id) {
+          index = i;
+          clickspecifications(item, index, index);
+          break;
+        }
+      }
+    } else {
+      uni.$u.throttle(() => singleclick(item, "+"), 500);
+    }
+  }
+}
+
 // 获取全局属性
 const { proxy } = getCurrentInstance();
 
@@ -852,8 +930,8 @@ store.updateNavbarConfig({
   isTransparent: false,
   hasPlaceholder: false, //是否要占位符
 });
-
-const shopInfo = uni.cache.get("shopInfo");
+const shopInfo = reactive({});
+Object.assign(shopInfo, uni.cache.get("shopInfo"));
 const shopTable = uni.cache.get("shopTable");
 const distance = uni.cache.get("distance"); //距离
 
@@ -1082,6 +1160,8 @@ const selectSpec = async (specType, option) => {
   }
 };
 
+const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
+
 // 监听 specifications 的变化
 watch(
   () => specifications.item.groupSnap,
@@ -1567,8 +1647,21 @@ const updateProductQuantities = () => {
 
 //websocket产值
 const websocketsendMessage = (data) => {
-  console.log(data);
-  uni.$u.debounce(useSocket.sendMessage(data), 500);
+  const sendData = { ...data, is_time_discount: 0 };
+  if (cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id && data.discount_sale_amount*1<=0) {
+    if (
+      orderUtils.canUseLimitTimeDiscount(
+        data,
+        cartStore.limitTimeDiscount,
+        shopInfo,
+        shopUserInfo.value,
+        "product_id"
+      )
+    ) {
+      sendData.is_time_discount = 1;
+    }
+  }
+  uni.$u.debounce(useSocket.sendMessage(sendData), 500);
 };
 
 // 用于记录已经处理过的消息的 msg_id
@@ -1627,6 +1720,7 @@ async function onMessage(Message) {
     // 初始化
     if (Message.operate_type == "init") {
       cartStore.carts = Message.data;
+      cartStore.limitTimeDiscount = Message.time_dis_info;
       uni.hideLoading();
       isLoading.value = false;
       // 初始化商品数量
@@ -1697,6 +1791,10 @@ async function onMessage(Message) {
         },
       });
     }
+    if (Message.operate_type == "time_discount_save") {
+      console.log("time_discount_save", Message.data);
+      cartStore.limitTimeDiscount = Message.data;
+    }
 
     //除去p 每次返回都回执消息
     await websocketsendMessage({
@@ -1835,35 +1933,6 @@ function combineOrderInfoDetailMap(orderinfo) {
 
 // 计算购物车商品费用
 const totalPrices = computed(() => {
-  // 待支付订单
-  let cartone = 0;
-  if (orderinfo.value) {
-    let combinedArray = [];
-    for (const key in orderinfo.value.detailMap) {
-      if (orderinfo.value.detailMap.hasOwnProperty(key)) {
-        let subArray = orderinfo.value.detailMap[key];
-        combinedArray = [...combinedArray, ...subArray];
-      }
-    }
-    // 购物车总数价格
-    cartone = combinedArray.reduce((total, item) => {
-      // 是否启用会员价 0否1是
-      if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-        // memberPrice会员价
-        return (
-          total +
-          parseFloat(item.memberPrice || item.price) *
-            parseFloat(item.num - item.returnNum)
-        );
-      } else {
-        // salePrice销售价
-        return (
-          total +
-          parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum)
-        );
-      }
-    }, 0);
-  }
   // 购物车总数价格
   let cart = 0;
   if (matchedProducts.value.length > 0) {
@@ -1877,6 +1946,18 @@ const totalPrices = computed(() => {
           }
         });
       }
+      if (limitTimeDiscountRes.value && limitTimeDiscountRes.value.id) {
+        //限时折扣
+        const price = orderUtils.returnPrice({
+          goods: item,
+          shopInfo,
+          limitTimeDiscountRes: limitTimeDiscountRes.value,
+          shopUserInfo: shopUserInfo.value,
+          idKey: "id",
+        });
+        console.log("限时折扣", item, price);
+        return total + parseFloat(price) * parseFloat(item.cartNumber);
+      }
       // 是否启用会员价 0否1是
       if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
         // memberPrice会员价
@@ -2059,6 +2140,7 @@ const productqueryProduct = async () => {
       );
       cartStore.setGoodsMap(i.id, i);
     });
+
     cartStore.goodsIsloading = true;
     scrollTopSize.value = 0;
     topArr.value = [];
@@ -2081,11 +2163,49 @@ const productqueryProduct = async () => {
   }
 };
 
+provide("cartStore", cartStore);
+provide("shopUserInfo", shopUserInfo);
+provide("shopInfo", shopInfo);
+
 onLoad(async (e) => {
   await proxy.$onLaunched;
 });
 
+const limitTimeDiscountRes = ref(null);
+
+function showLimitDiscount(item) {
+  if (!limitTimeDiscountRes.value) {
+    return false;
+  }
+  return orderUtils.canUseLimitTimeDiscount(
+    item,
+    limitTimeDiscountRes.value,
+    shopInfo,
+    shopUserInfo.value,
+    "id"
+  );
+}
+
 onShow(async () => {
+  limitTimeDiscountapi
+    .getConfig({
+      shopId: uni.cache.get("shopId"),
+    })
+    .then((res) => {
+      console.log("limitTimeDiscountapi", res);
+      if (res && typeof res == "object") {
+        limitTimeDiscountRes.value = res;
+        cartStore.limitTimeDiscount = res;
+        websocketsendMessage({
+          type: "shopping",
+          operate_type: "time_discount_save",
+          table_code: uni.cache.get("tableCode"),
+          shop_id: uni.cache.get("shopId"),
+          operate_type: "time_discount_save",
+          data: res,
+        });
+      }
+    });
   // 监听页面显示和隐藏
   useSocket.setOnMessage(onMessage);
   useSocket.onShowconnect();
@@ -2304,6 +2424,8 @@ function toHistory() {
 
       .panelfiveitemsex {
         .panelfiveitemsex_oen {
+          display: flex;
+          align-items: baseline;
           .tips {
             font-family: Source Han Sans CN, Source Han Sans CN;
             font-weight: 400;
@@ -2412,7 +2534,8 @@ function toHistory() {
     position: relative;
 
     .left {
-      width: 200rpx;
+      // width: 200rpx;
+      width: 156rpx;
       background-color: #f6f6f6;
       line-height: normal;
       box-sizing: border-box;
@@ -2554,6 +2677,7 @@ function toHistory() {
           width: 200rpx;
           height: 100%;
           position: absolute;
+          border-radius: 18rpx;
           top: 0;
           left: 0;
           z-index: 9;
@@ -2578,6 +2702,7 @@ function toHistory() {
           font-size: 24rpx;
           color: #ffffff;
           border-radius: 20rpx 0rpx 20rpx 0rpx;
+          z-index: 10;
         }
 
         .topSort.c1 {
@@ -2632,10 +2757,11 @@ function toHistory() {
 
           .money {
             font-weight: bold;
-            font-size: 24rpx;
+            font-size: 20rpx;
             color: #333;
             display: flex;
-            align-items: flex-end;
+            align-items: baseline;
+            white-space: nowrap;
 
             .money_num {
               font-size: 28rpx;
@@ -3073,4 +3199,25 @@ function toHistory() {
     height: 36rpx;
   }
 }
+.old-price {
+  color: #999;
+  font-size: 24rpx;
+  text-decoration: line-through;
+  margin-left: 8rpx;
+}
+.limitDiscount {
+  background-color: #cc5617;
+  padding: 2rpx 10rpx;
+  white-space: nowrap;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #ffffff;
+  border-radius: 20rpx 0rpx 20rpx 0rpx;
+  z-index: 9;
+  color: #fff;
+}
 </style>
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index 40106bf..72758e0 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="container">
 		<view class="header-wrap">
+			<view class="u-flex" style="justify-content: flex-end;">
+				<view @click="toExchangeCode" class="color-333 font-12 u-m-b-26 font-700">优惠券兑换码</view>
+			</view>
 			<view class="search-wrap">
 				<view class="input-wrap">
 					<view class="icon left">
@@ -137,7 +140,11 @@ onReachBottom(() => {
 		getCouponList();
 	}
 });
-
+function toExchangeCode(){
+	uni.navigateTo({
+		url: '/user/exchange/index'
+	})
+}
 const showDetail = ref(false);
 const selectListItem = ref('');
 const selectListItemDetails = ref([]);
diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue
index cb20610..3abc4d2 100644
--- a/pages/user/member/billDetails.vue
+++ b/pages/user/member/billDetails.vue
@@ -63,7 +63,9 @@
 							<text v-if="item.bizCode == 'freeIn'">
 								霸王餐充值
 							</text>
-							
+							<text v-if="item.bizCode == 'rechargeRedemption'">
+								兑换券充值
+							</text>
 						</view>
 						<view v-else>
 							{{item.content}}
diff --git a/pages/user/member/czzx.vue b/pages/user/member/czzx.vue
index 5b3ba7e..cf2712b 100644
--- a/pages/user/member/czzx.vue
+++ b/pages/user/member/czzx.vue
@@ -25,6 +25,7 @@
           <text class="n t">{{ shopUserInfo.amount || 0 }}</text>
         </view>
         <view class="right">
+          <text class="t" @click="toduihuan">兑换码</text>
           <text class="t" @click="toDetail">明细</text>
           <text class="t" @click="toPwd">密码设置</text>
         </view>
@@ -161,7 +162,7 @@ import * as rechargeApi from "@/common/api/market/recharge.js";
 import { recharge } from "@/common/api/order/index.js";
 import { joinMember } from "@/common/api/order/index.js";
 import { ref, onMounted, computed, reactive, watch } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app";
 import { pay } from "@/utils/pay.js";
 
 function toShopList() {
@@ -170,6 +171,12 @@ function toShopList() {
   });
 }
 
+function toduihuan() {
+  uni.navigateTo({
+    url: "/user/exchange/index",
+  });
+}
+
 function couponNum(list) {
   return list.reduce((prve, cur) => {
     return prve + cur.num;
@@ -285,7 +292,7 @@ const charge_money = computed(() => {
 });
 onLoad((opt) => {
   Object.assign(option, opt);
-  init();
+  // init();
 });
 
 watch(
@@ -296,6 +303,9 @@ watch(
     }
   }
 );
+onShow(() => {
+  init();
+});
 </script>
 
 <style scoped lang="scss">
@@ -367,7 +377,7 @@ watch(
     display: flex;
     justify-content: space-between;
     position: relative;
-    padding-top: 40upx;
+    padding-top: 20rpx;
 
     .left {
       display: flex;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index bb8bec0..d49ad0f 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -224,7 +224,7 @@
       <!-- <l-qrcode  :value="wechatAcQrcode"  @complete="e=>qrcodeResult(e)"/> -->
       <view
         class="qrcode u-flex u-col-center justify-between"
-        v-if="qrcode"
+        v-if="showQrcode"
       >
         <view>
           <view class="color-000 font-14 font-bold">扫码关注公众号</view>
@@ -259,10 +259,8 @@ import * as rechargeApi from "@/common/api/market/recharge.js";
 import { pointsShopList } from "@/common/api/account/points.js";
 
 
-const qrcode = ref("");
 
 function qrcodeResult(res) {
-  console.log("qrcodeResult", res);
   qrcode.value = res
 }
 
@@ -470,7 +468,14 @@ onShow(() => {
   getData();
 });
 
+const qrcode = ref("");
+const showQrcode = computed(() => {
 
+  const followIndex = uni.cache.get("followIndex");
+  if ( followIndex == "mine" && qrcode.value) {
+    return true;
+  }
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/static/icon/newUserDiscount.png b/static/icon/newUserDiscount.png
new file mode 100644
index 0000000..a43be67
Binary files /dev/null and b/static/icon/newUserDiscount.png differ
diff --git a/stores/carts.js b/stores/carts.js
index 4f6d3e4..56609f9 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -157,6 +157,8 @@ export const useCartsStore = defineStore("cart", () => {
   const isFreeDine = ref(false);
   // 商家霸王餐配置
   const freeDineConfig = ref(null);
+  //限时折扣
+  const limitTimeDiscount = ref(null);
   // 订单额外配置
   const orderExtraConfig = computed(() => ({
     // 引用扩展后的商家减免配置
@@ -173,6 +175,7 @@ export const useCartsStore = defineStore("cart", () => {
     currentDinnerType: dinnerType.value,
     isFreeDine: isFreeDine.value,
     freeDineConfig: freeDineConfig.value,
+    limitTimeDiscount: limitTimeDiscount.value,
   }));
 
   // 营销活动列表
@@ -191,6 +194,7 @@ export const useCartsStore = defineStore("cart", () => {
   // 订单费用汇总
   const orderCostSummary = computed(() => {
     allGoods.value = getAllGoodsList();
+    console.log("allGoods.value", allGoods.value);
     console.log("orderExtraConfig.value", orderExtraConfig.value);
     const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
       allGoods.value,
@@ -209,6 +213,11 @@ export const useCartsStore = defineStore("cart", () => {
 
   //商品数据Map
   const goodsMap = reactive({});
+
+  function returnGoods(product_id){
+    return goodsMap[product_id*1]
+  }
+
   //获取商品数据
   async function goodsInit() {
     goodsIsloading.value = true;
@@ -232,10 +241,6 @@ export const useCartsStore = defineStore("cart", () => {
     goodsMap[product_id] = data;
   }
 
-  //websocket回执
-  const websocketsendMessage = (data) => {
-    uni.$u.debounce(sendMessage(data), 500);
-  };
 
   const isLoading = ref(true);
 
@@ -348,6 +353,11 @@ export const useCartsStore = defineStore("cart", () => {
           icon: "none",
         });
       }
+      //获取限时折扣
+      // if(Message.operate_type == "time_discount_get"){
+      //   console.log("time_discount_get", Message.data);
+      //   limitTimeDiscount.value = Message.data;
+      // }
 
       if (Message.type == "no_suit_num") {
         uni.showModal({
@@ -394,6 +404,9 @@ export const useCartsStore = defineStore("cart", () => {
 
   //是否使用会员价
   const useVipPrice = computed(() => {
+    if (!orderVIP.value) {
+      return false;
+    }
     const isUse =
       orderVIP.value.isVip && shopInfo.value.isMemberPrice ? true : false;
     return isUse;
@@ -606,6 +619,10 @@ export const useCartsStore = defineStore("cart", () => {
     userPoints.value = 0;
     fullReductionActivities.value = [];
     isFreeDine.value = false;
+    oldOrder.value = {
+      detailMap: {},
+      originAmount: 0,
+    };
   }
 
   return {
@@ -616,7 +633,7 @@ export const useCartsStore = defineStore("cart", () => {
     carts,
     isEmpty,
     setGoodsMap,
-    goodsMap,
+    goodsMap:goodsMap,
     goodsIsloading,
     goodsInit,
     onMessage,
@@ -631,6 +648,8 @@ export const useCartsStore = defineStore("cart", () => {
     setUserPoints,
     setPointDeductionRule,
     setOldOrder,
+    //返回商品信息
+    returnGoods,
     //优惠券列表
     backendCoupons,
     allGoods,
@@ -652,5 +671,7 @@ export const useCartsStore = defineStore("cart", () => {
     isFreeDine, //是否使用霸王餐
     // 商家霸王餐配置
     freeDineConfig,
+    //限时折扣
+    limitTimeDiscount,
   };
 });
diff --git a/stores/pay.js b/stores/pay.js
index 26bb4cf..9314e96 100644
--- a/stores/pay.js
+++ b/stores/pay.js
@@ -228,8 +228,10 @@ export const Memberpay = defineStore('memberpay', {
 
 		// 生成订单
 		actionscreateOrder(data) {
+			console.log('actionscreateOrder:生成订单',data);	
 			return new Promise(async (resolve, reject) => {
 				let res = await APIcreateOrder({
+					...data,
 					orderId: data.orderId, //多次下单时使用
 					shopId: uni.cache.get('shopId'), //店铺Id
 					userId: uni.cache.get('userInfo').id || '', //
diff --git a/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
index c503a90..df6291e 100644
--- a/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
+++ b/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue
@@ -1,6 +1,7 @@
 <template>
 	<view @longtap.stop="longtap">
 		<canvas 
+		class="canvas"
 			:width="info.destWidth" 
 			:height="info.destHeight" 
 			:canvas-id="item.id" 
@@ -173,4 +174,9 @@
 		}
 	}
 </script>
-<!-- #endif -->
\ No newline at end of file
+<!-- #endif -->
+ <style scoped>
+.canvas{
+	opacity: 0;
+}
+</style>
\ No newline at end of file
diff --git a/user/exchange/components/confirm.vue b/user/exchange/components/confirm.vue
index 04d9acd..374c414 100644
--- a/user/exchange/components/confirm.vue
+++ b/user/exchange/components/confirm.vue
@@ -11,21 +11,21 @@
       <view class="box">
         <view class="u-flex top justify-between u-p-32">
           <text class="title">确认信息</text>
-          <up-icon name="close"></up-icon>
+          <up-icon name="close" @click="close"></up-icon>
         </view>
         <view class="info">
           <view class="color-333">兑换码包含内容如下:</view>
           <view class="u-m-t-32 u-flex u-col-center">
             <view class="color-333 font-bold small-title">店铺</view>
-            <text class="color-666 u-m-l-38">店铺名称</text>
+            <text class="color-666 u-m-l-38">{{data.shopName}}</text>
           </view>
           <view class="u-m-t-32 u-flex u-col-center">
             <view class="color-333 font-bold small-title">名称</view>
-            <text class="color-666 u-m-l-38">10张券兑换码</text>
+            <text class="color-666 u-m-l-38">{{data.name}}</text>
           </view>
-          <view class="u-m-t-32 u-flex u-col-center">
+          <view class="u-m-t-32 u-flex u-col-center" v-if="data.couponInfoList&&data.couponInfoList.length">
             <view class="color-333 font-bold small-title">优惠券</view>
-            <text class="color-666 u-m-l-38">优惠券名称*2、优惠券名称*1</text>
+            <text class="color-666 u-m-l-38">{{data.couponInfoList.map(item=>item.title+'*'+item.num).join('、')}}</text>
           </view>
           <view class="u-m-t-32 u-flex u-col-center" style="gap: 54rpx">
             <view class="cancel" @click="close">取消</view>
@@ -39,6 +39,13 @@
 
 <script setup>
 import { ref } from "vue";
+const props=defineProps({
+  //兑换码信息
+  data:{
+    type:Object,
+    default:()=>({}),
+  },
+})
 const show = defineModel({
   type: Boolean,
   default: false,
diff --git a/user/exchange/index.vue b/user/exchange/index.vue
index 890b8cc..013abd9 100644
--- a/user/exchange/index.vue
+++ b/user/exchange/index.vue
@@ -14,46 +14,92 @@
           <view class="input-box u-flex">
             <image class="icon" src="/user/static/duihuan.png"></image>
             <view class="u-flex-1">
-              <input placeholder="请输入兑换码" />
+              <input placeholder="请输入兑换码" v-model="code" />
             </view>
           </view>
         </view>
         <view class="u-flex justify-center u-m-t-24">
-          <button class="duihuan">确认兑换</button>
+          <button class="duihuan" @click="confirmExchange">确认兑换</button>
         </view>
       </view>
 
       <view class="desc">
         <view>兑换说明:</view>
         <view>
-          兑换说明： 1、请直接输入您获得的兑换码，点击立即兑换即可
+          1、请直接输入您获得的兑换码，点击立即兑换即可
+          <br />
           2、兑换码为一次性，兑换完成之后即失效
+          <br />
           3、兑换获得的奖励，将直接发送至您的账号，可直接前往余额或优惠券查看
+          <br />
           4、兑换码为赠品，不可转赠、不退不换
+          <br />
           5、兑换码需在有效期内完成兑换，过期即作废
         </view>
       </view>
     </view>
 
-    <confirmModal v-model="modal.confirm.show"></confirmModal>
-    <resultModal v-model="modal.result.show" :title="modal.result.title"></resultModal>
+    <confirmModal v-model="modal.confirm.show" :data="modal.confirm.data" @confirm="exchange"></confirmModal>
+    <resultModal
+      v-model="modal.result.show"
+      :title="modal.result.title"
+    ></resultModal>
   </view>
 </template>
 
 <script setup>
-import { result } from "lodash";
 import confirmModal from "./components/confirm.vue";
 import resultModal from "./components/result.vue";
-import { reactive } from "vue";
+import * as exchangeApi from "@/common/api/market/exchange.js";
+import { reactive, ref } from "vue";
 const modal = reactive({
   confirm: {
     show: false,
   },
-  result:{
-    show:true,
-    title:'该兑换码无效，请输入有效兑换码'
-  }
+  result: {
+    show: false,
+    title: "该兑换码无效，请输入有效兑换码",
+  },
 });
+
+const code = ref("");
+function confirmExchange() {
+  if (code.value == "") {
+    uni.showToast({
+      title: "请输入兑换码",
+      icon: "none",
+    });
+    return;
+  }
+  exchangeApi.redemption({
+    code: code.value,
+  }).then((res) => {
+    if (res) {
+      modal.confirm.show = true;
+      modal.confirm.data = res;
+    }
+  })
+}
+
+function exchange() {
+  exchangeApi
+    .exchange({
+      code: code.value,
+    })
+    .then((res) => {
+      if (res) {
+        modal.result.title = "兑换成功！奖励已发放至您的账户";
+        modal.result.show = true;
+        code.value = "";
+      }
+    })
+    .catch((err) => {
+      console.log("err,", err);
+      modal.result.title = err.message || "该兑换码无效，请输入有效兑换码";
+      modal.result.show = true;
+    });
+}
+
 function back() {
   uni.navigateBack();
 }
@@ -115,7 +161,6 @@ function back() {
   font-weight: 700;
 }
 .desc {
-  width: 662rpx;
   color: #666666;
   font-size: 24rpx;
   font-weight: 400;
diff --git a/user/vip/vip.vue b/user/vip/vip.vue
index 694b4a2..627d57b 100644
--- a/user/vip/vip.vue
+++ b/user/vip/vip.vue
@@ -270,10 +270,10 @@
 				return v;
 			});
 			tiaojian_menus = tiaojian_menus.filter(v => {
-				if (!state.isCostRewardPoints && v.name == '消费送积分') {
+				if (!res.memberLevel.isCostRewardPoints && v.name == '消费送积分') {
 					return false
 				}
-				if (!state.isCycleReward && v.name == '周期福利') {
+				if (!res.memberLevel.isCycleReward && v.name == '周期福利') {
 					return false
 				}
 				if (!res.memberLevel.cycleRewardCouponList || res.memberLevel.cycleRewardCouponList.length <=
diff --git a/utils/goods copy.ts b/utils/goods copy.ts
new file mode 100644
index 0000000..ae57477
--- /dev/null
+++ b/utils/goods copy.ts	
@@ -0,0 +1,1507 @@
+import { BigNumber } from "bignumber.js";
+
+// 配置BigNumber精度
+BigNumber.set({
+  DECIMAL_PLACES: 2,
+  ROUNDING_MODE: BigNumber.ROUND_DOWN, // 向下取整，符合业务需求
+});
+
+/**
+ * 购物车订单价格计算公共库
+ * 功能：覆盖订单全链路费用计算（商品价格、优惠券、积分、餐位费等），支持策略扩展
+ * 小数处理：使用bignumber.js确保精度，统一舍去小数点后两位（如 10.129 → 10.12，15.998 → 15.99）
+ * 扩展设计：优惠券/营销活动采用策略模式，新增类型仅需扩展策略，无需修改核心逻辑
+ * 关键规则：
+ * - 所有优惠券均支持指定门槛商品（后端foods字段：空字符串=全部商品，ID字符串=指定商品ID）
+ * - 与限时折扣/会员价同享规则：开启则门槛计算含对应折扣，关闭则用原价/非会员价
+ * 字段说明：
+ * - BaseCartItem.id：购物车项ID（唯一标识购物车中的条目）
+ * - BaseCartItem.product_id：商品ID（唯一标识商品，用于优惠券/活动匹配）
+ * - BaseCartItem.skuData.id：SKU ID（唯一标识商品规格）
+ */
+
+// ============================ 1. 基础类型定义（核心修正：明确ID含义） ============================
+/** 商品类型枚举 */
+export enum GoodsType {
+  NORMAL = "normal", // 普通商品
+  WEIGHT = "weight", // 称重商品
+  GIFT = "gift", // 赠菜（继承普通商品逻辑，标记用）
+  EMPTY = "", // 空字符串类型（后端未返回时默认归类为普通商品）
+  PACKAGE = "package", // 打包商品（如套餐/预打包商品，按普通商品逻辑处理，可扩展特殊规则）
+}
+
+/** 优惠券计算结果类型（新增细分字段） */
+interface CouponResult {
+  deductionAmount: number; // 抵扣金额
+  excludedProductIds: string[]; // 不适用商品ID列表（注意：是商品ID，非购物车ID）
+  usedCoupon: Coupon | undefined; // 实际使用的优惠券
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+}
+
+/** 兑换券计算结果类型（新增细分字段） */
+interface ExchangeCalculationResult {
+  deductionAmount: number;
+  excludedProductIds: string[]; // 不适用商品ID列表（商品ID）
+  productCouponDeduction: number; // 新增：兑换券属于商品券，同步记录
+}
+
+/** 优惠券类型枚举 */
+export enum CouponType {
+  FULL_REDUCTION = "full_reduction", // 满减券
+  DISCOUNT = "discount", // 折扣券
+  SECOND_HALF = "second_half", // 第二件半价券
+  BUY_ONE_GET_ONE = "buy_one_get_one", // 买一送一券
+  EXCHANGE = "exchange", // 商品兑换券
+}
+
+/** 后端返回的优惠券原始字段类型 */
+export interface BackendCoupon {
+  id?: number; // 自增主键（int64）
+  shopId?: number; // 店铺ID（int64）
+  syncId?: number; // 同步Id（int64）
+  type?: number; // 优惠券类型：1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券，5-消费送券，6-买一送一券，7-固定价格券，8-免配送费券
+  name?: string; // 券名称
+  useShopType?: string; // 可用门店类型：only-仅本店；all-所有门店，custom-指定门店
+  useShops?: string; // 可用门店（逗号分隔字符串，如"1,2,3"）
+  useType?: string; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  validType?: string; // 有效期类型：fixed（固定时间），custom（自定义时间）
+  validDays?: number; // 有效期(天)
+  validStartTime?: string; // 有效期开始时间（如"2024-01-01 00:00:00"）
+  validEndTime?: string; // 有效期结束时间
+  daysToTakeEffect?: number; // 隔天生效
+  useDays?: string; // 可用周期（如"周一,周二"）
+  useTimeType?: string; // 可用时间段类型：all-全时段，custom-指定时段
+  useStartTime?: string; // 可用开始时间（每日）
+  useEndTime?: string; // 可用结束时间（每日）
+  getType?: string; // 发放设置：不可自行领取/no，可领取/yes
+  getMode?: string; // 用户领取方式
+  giveNum?: number; // 总发放数量，-10086为不限量
+  getUserType?: string; // 可领取用户：全部/all，新用户一次/new，仅会员/vip
+  getLimit?: number; // 每人领取限量，-10086为不限量
+  useLimit?: number; // 每人每日使用限量，-10086为不限量
+  discountShare?: number; // 与限时折扣同享：0-否，1-是
+  vipPriceShare?: number; // 与会员价同享：0-否，1-是
+  ruleDetails?: string; // 附加规则说明
+  status?: number; // 状态：0-禁用，1-启用
+  useNum?: number; // 已使用数量
+  leftNum?: number; // 剩余数量
+  foods?: string; // 指定门槛商品（逗号分隔字符串，如"101,102"，此处为商品ID）
+  fullAmount?: number; // 使用门槛：满多少金额（元）
+  discountAmount?: number; // 使用门槛：减多少金额（元）
+  discountRate?: number; // 折扣%（如90=9折）
+  maxDiscountAmount?: number; // 可抵扣最大金额（元）
+  useRule?: string; // 使用规则：price_asc-价格低到高，price_desc-高到低
+  discountNum?: number; // 抵扣数量
+  otherCouponShare?: number; // 与其它优惠共享：0-否，1-是
+  createTime?: string; // 创建时间
+  updateTime?: string; // 更新时间
+}
+
+/** 营销活动类型枚举 */
+export enum ActivityType {
+  TIME_LIMIT_DISCOUNT = "time_limit_discount", // 限时折扣
+}
+
+/** 基础购物车商品项（核心修正：新增product_id，明确各ID含义） */
+export interface BaseCartItem {
+  id: string | number; // 购物车ID（唯一标识购物车中的条目，如购物车项主键）
+  product_id: string | number; // 商品ID（唯一标识商品，用于优惠券/活动匹配，必选）
+  salePrice: number; // 商品原价（元）
+  number: number; // 商品数量
+  product_type: GoodsType; // 商品类型
+  is_temporary?: boolean; // 是否临时菜（默认false）
+  is_gift?: boolean; // 是否赠菜（默认false）
+  returnNum?: number; // 退货数量（历史订单用，默认0）
+  memberPrice?: number; // 商品会员价（元，优先级：商品会员价 > 会员折扣）
+  discountSaleAmount?: number; // 商家改价后单价（元，优先级最高）
+  packFee?: number; // 单份打包费（元，默认0）
+  packNumber?: number; // 堂食打包数量（默认0）
+  activityInfo?: {
+    // 商品参与的营销活动（如限时折扣）
+    type: ActivityType;
+    discountRate: number; // 折扣率（如0.8=8折）
+    vipPriceShare: boolean; // 是否与会员优惠同享（默认false）
+  };
+  skuData?: {
+    // SKU扩展数据（可选）
+    id: string | number; // SKU ID（唯一标识商品规格，如颜色/尺寸）
+    memberPrice?: number; // SKU会员价
+    salePrice?: number; // SKU原价
+  };
+}
+
+/** 基础优惠券接口（所有券类型继承，包含统一门槛商品字段） */
+export interface BaseCoupon {
+  id: string | number; // 优惠券ID
+  type: CouponType; // 工具库字符串枚举（由后端couponType转换）
+  name: string; // 对应后端title
+  available: boolean; // 基于BackendCoupon字段计算的可用性
+  useShopType?: string; // only-仅本店；all-所有门店，custom-指定门店
+  useShops: string[]; // 可用门店ID列表
+  discountShare: boolean; // 与限时折扣同享：0-否，1-是（后端字段转换为布尔值）
+  vipPriceShare: boolean; // 与会员价同享：0-否，1-是（后端字段转换为布尔值）
+  useType?: string[]; // 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+  isValid: boolean; // 是否在有效期内
+  discountAmount?: number; // 减免金额 (满减券有)
+  fullAmount?: number; // 使用门槛：满多少金额
+  maxDiscountAmount?: number; // 可抵扣最大金额 元
+  applicableProductIds: string[]; // 门槛商品ID列表（空数组=全部商品，非空=指定商品ID）
+}
+
+/** 满减券（适配后端字段） */
+export interface FullReductionCoupon extends BaseCoupon {
+  type: CouponType.FULL_REDUCTION;
+  fullAmount: number; // 对应后端fullAmount（满减门槛）
+  discountAmount: number; // 对应后端discountAmount（减免金额）
+  maxDiscountAmount?: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 折扣券（适配后端字段） */
+export interface DiscountCoupon extends BaseCoupon {
+  type: CouponType.DISCOUNT;
+  discountRate: number; // 后端discountRate（%）转小数（如90→0.9）
+  maxDiscountAmount: number; // 对应后端maxDiscountAmount（最大减免）
+}
+
+/** 第二件半价券（适配后端字段） */
+export interface SecondHalfPriceCoupon extends BaseCoupon {
+  type: CouponType.SECOND_HALF;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 买一送一券（适配后端字段） */
+export interface BuyOneGetOneCoupon extends BaseCoupon {
+  type: CouponType.BUY_ONE_GET_ONE;
+  maxUseCountPerOrder?: number; // 对应后端useLimit（-10086=不限）
+}
+
+/** 商品兑换券（适配后端字段） */
+export interface ExchangeCoupon extends BaseCoupon {
+  type: CouponType.EXCHANGE;
+  deductCount: number; // 对应后端discountNum（抵扣数量）
+  sortRule: "low_price_first" | "high_price_first"; // 后端useRule转换
+}
+
+/** 所有优惠券类型联合 */
+export type Coupon =
+  | FullReductionCoupon
+  | DiscountCoupon
+  | SecondHalfPriceCoupon
+  | BuyOneGetOneCoupon
+  | ExchangeCoupon;
+
+/** 营销活动配置（如限时折扣，applicableProductIds为商品ID列表） */
+export interface ActivityConfig {
+  type: ActivityType;
+  applicableProductIds?: string[]; // 适用商品ID列表（与BaseCartItem.product_id匹配）
+  discountRate: number; // 折扣率（如0.8=8折）
+  vipPriceShare: boolean; // 是否与会员优惠同享
+}
+
+/** 积分抵扣规则 */
+export interface PointDeductionRule {
+  pointsPerYuan: number; // X积分=1元（如100=100积分抵1元）
+  maxDeductionAmount?: number; // 最大抵扣金额（元，默认不限）
+}
+
+/** 餐位费配置 */
+export interface SeatFeeConfig {
+  pricePerPerson: number; // 每人餐位费（元）
+  personCount: number; // 用餐人数（默认1）
+  isEnabled: boolean; // 是否启用餐位费（默认false）
+}
+/** 商家减免类型枚举 */
+export enum MerchantReductionType {
+  FIXED_AMOUNT = "fixed_amount", // 固定金额减免（如直接减 10 元）
+  DISCOUNT_RATE = "discount_rate", // 比例折扣减免（如打 9 折，即减免 10%）
+}
+
+/** 商家减免配置（新增，替代原单一金额字段） */
+export interface MerchantReductionConfig {
+  type: MerchantReductionType; // 减免类型（二选一）
+  fixedAmount?: number; // 固定减免金额（元，仅 FIXED_AMOUNT 生效，≥0）
+  discountRate?: number; // 折扣率（%，仅 DISCOUNT_RATE 生效，0-100，如 90 代表 9 折）
+}
+/**商家霸王餐配置 */
+export interface FreeDineConfig {
+  enable: boolean; //是否开启
+  rechargeThreshold: number; //订单满多少元可以使用
+  rechargeTimes: number; //充值多少倍免单
+  withCoupon: boolean; //与优惠券同享
+  withPoints: boolean; //与积分同享
+  useType?: string[]; //使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
+  useShopType?: string; //all 全部 part部分
+  shopIdList?: number[]; //可用门店id
+}
+
+//限时折扣配置
+export interface TimeLimitDiscountConfig {
+  /**
+   * 折扣优先级 limit-time/vip-price
+   */
+  discountPriority: string;
+  /**
+   * 折扣% 范围1-99
+   */
+  discountRate: number;
+  /**
+   * 参与商品
+   */
+  foods: string;
+  /**
+   * 参与商品 1全部 2部分
+   */
+  foodType: number;
+  /**
+   * 自增主键
+   */
+  id: number;
+  /**
+   * 店铺ID
+   */
+  shopId: number;
+  /**
+   * 可使用类型：堂食 dine-in  外带 take-out 外卖 take-away 配送 post
+   */
+  useType: string;
+  [property: string]: any;
+}
+
+/** 订单额外费用配置 */
+export interface OrderExtraConfig {
+  // merchantReduction: number;        // 商家减免金额（元，默认0）
+  // 替换原单一金额字段，支持两种减免形式
+  merchantReduction: MerchantReductionConfig;
+  additionalFee: number; // 附加费（元，如余额充值、券包，默认0）
+  pointDeductionRule: PointDeductionRule; // 积分抵扣规则
+  seatFeeConfig: SeatFeeConfig; // 餐位费配置
+  currentStoreId: string; // 当前门店ID（用于验证优惠券适用门店）
+  userPoints: number; // 用户当前积分（用于积分抵扣）
+  isMember: boolean; // 用户是否会员（用于会员优惠）
+  memberDiscountRate?: number; // 会员折扣率（如0.95=95折，无会员价时用）
+  newUserDiscount?: number; // 新用户减免金额（元，默认0）
+  fullReductionActivities: FullReductionActivity[]; // 当前店铺的满减活动列表（后端返回结构）
+  currentDinnerType: "dine-in" | "take-out" | "take-away" | "post"; // 当前就餐类型（匹配useType）
+  isFreeDine?: boolean; //是否霸王餐
+  freeDineConfig?: FreeDineConfig;
+  limitTimeDiscount?: TimeLimitDiscountConfig; //限时折扣
+}
+
+/** 订单费用汇总（修改：补充商家减免类型和明细） */
+export interface OrderCostSummary {
+  // 商品总件数
+  goodsTotal: number;
+  totalDiscountAmount: number;
+  goodsRealAmount: number; // 商品真实原价总和
+  goodsOriginalAmount: number; // 商品原价总和
+  goodsDiscountAmount: number; // 商品折扣金额
+  couponDeductionAmount: number; // 优惠券总抵扣
+  productCouponDeduction: number; // 商品优惠券抵扣
+  fullCouponDeduction: number; // 满减优惠券抵扣
+  pointDeductionAmount: number; // 积分抵扣金额
+  seatFee: number; // 餐位费
+  packFee: number; // 打包费
+  scoreMaxMoney: number; // 积分最大可抵扣金额
+  // 新增：商家减免明细
+  merchantReduction: {
+    type: MerchantReductionType; // 实际使用的减免类型
+    originalConfig: MerchantReductionConfig; // 原始配置（便于前端展示）
+    actualAmount: number; // 实际减免金额（计算后的值，≥0）
+  };
+  additionalFee: number; // 附加费
+  finalPayAmount: number; // 最终实付金额
+  couponUsed?: Coupon; // 实际使用的优惠券
+  pointUsed: number; // 实际使用的积分
+  newUserDiscount: number; // 新用户减免金额（元，默认0）
+  dinnerType?: "dine-in" | "take-out"; // 就餐类型（堂食/自取/配送/快递）
+  config: OrderExtraConfig; // 订单额外费用配置
+  //满减活动
+  fullReduction: {
+    usedActivity?: FullReductionActivity; // 实际使用的满减活动
+    usedThreshold?: FullReductionThreshold; // 实际使用的满减阈值（多门槛中选最优）
+    actualAmount: number; // 满减实际减免金额（元）
+  };
+  // 订单原支付金额
+  orderOriginFinalPayAmount: number; //订单原金额（包含打包费+餐位费）
+}
+
+/** 满减活动阈值（单条满减规则：满X减Y）- 对应 MkDiscountThresholdInsertGroupDefaultGroup */
+export interface FullReductionThreshold {
+  activityId?: number; // 关联满减活动ID
+  fullAmount?: number; // 满多少金额（元，必填）
+  discountAmount?: number; // 减多少金额（元，必填）
+}
+
+/** 满减活动主表 - 对应 Request 接口（后端真实字段） */
+export interface FullReductionActivity {
+  id?: number; // 自增主键（后端字段：id）
+  shopId?: number; // 店铺ID（后端字段：shopId）
+  status?: number; // 活动状态：1=未开始，2=进行中，3=已结束（后端字段：status）
+  sort?: number; // 排序值（越大优先级越高，后端字段：sort）
+  createTime?: string; // 创建时间（后端字段：createTime，格式如"2025-10-14 13:56:07"）
+  updateTime?: string; // 最新修改时间（后端字段：updateTime，用于优先级排序）
+  validStartTime?: string; // 有效期开始时间（后端字段：validStartTime，格式如"2025-10-14"）
+  validEndTime?: string; // 有效期结束时间（后端字段：validEndTime，格式如"2025-12-14"）
+  useType?: string; // 可使用类型（后端字段：useType，如"dine,pickup,deliv,express"）
+  useDays?: string; // 可用周期（后端字段：useDays，如"周一,周二,周三,周四,周五,周六,周日"）
+  useTimeType?: string; // 可用时间段类型（后端字段：useTimeType，all=全时段，custom=指定时段）
+  useStartTime?: string; // 每日可用开始时间（后端字段：useStartTime，如"09:00:00"，仅custom时有效）
+  useEndTime?: string; // 每日可用结束时间（后端字段：useEndTime，如"22:00:00"，仅custom时有效）
+  couponShare?: number; // 与优惠券同享：0=否，1=是（后端字段：couponShare）
+  discountShare?: number; // 与限时折扣同享：0=否，1=是（后端字段：discountShare）
+  vipPriceShare?: number; // 与会员价同享：0=否，1=是（后端字段：vipPriceShare）
+  pointsShare?: number; // 与积分抵扣同享：0=否，1=是（后端字段：pointsShare）
+  thresholds?: FullReductionThreshold[]; // 满减阈值列表（多门槛，后端字段：thresholds）
+  isDel?: boolean; // 是否删除：0=否，1=是（后端字段：isDel，默认false）
+}
+
+// 辅助枚举：星期映射（用于useDays校验）
+const WEEKDAY_MAP = {
+  周一: 1,
+  周二: 2,
+  周三: 3,
+  周四: 4,
+  周五: 5,
+  周六: 6,
+  周日: 0, // JS中getDay()返回0=周日
+};
+
+/**
+ * 辅助：校验当前时间是否在活动的「每日可用时段」内
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在时段内
+ */
+function isInDailyTimeRange(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 全时段无需校验
+  if (activity.useTimeType === "all") return true;
+  // 无时段配置则不通过
+  if (!activity.useStartTime || !activity.useEndTime) return false;
+
+  const [startHour, startMinute] = activity.useStartTime.split(":").map(Number);
+  const [endHour, endMinute] = activity.useEndTime.split(":").map(Number);
+  const currentHour = currentTime.getHours();
+  const currentMinute = currentTime.getMinutes();
+
+  // 转换为分钟数比较
+  const startTotalMin = startHour * 60 + startMinute;
+  const endTotalMin = endHour * 60 + endMinute;
+  const currentTotalMin = currentHour * 60 + currentMinute;
+
+  // 处理跨天场景（如23:00-02:00）
+  if (startTotalMin <= endTotalMin) {
+    return currentTotalMin >= startTotalMin && currentTotalMin <= endTotalMin;
+  } else {
+    return currentTotalMin >= startTotalMin || currentTotalMin <= endTotalMin;
+  }
+}
+
+/**
+ * 辅助：校验当前时间是否在活动的「可用周期」内（如周一至周日）
+ * @param activity 满减活动
+ * @param currentTime 当前时间
+ * @returns 是否在周期内
+ */
+function isInWeeklyCycle(
+  activity: FullReductionActivity,
+  currentTime: Date
+): boolean {
+  // 无周期配置则不通过
+  if (!activity.useDays) return false;
+  const currentWeekday = currentTime.getDay(); // 0=周日，1=周一...6=周六
+  const allowedWeekdays = activity.useDays
+    .split(",")
+    .map((day) => WEEKDAY_MAP[day as keyof typeof WEEKDAY_MAP]);
+  return allowedWeekdays.includes(currentWeekday);
+}
+
+/**
+ * 辅助：校验当前就餐类型是否在活动的「可用类型」内（如堂食/自取）
+ * @param activity 满减活动
+ * @param currentDinnerType 当前就餐类型
+ * @returns 是否匹配
+ */
+function isDinnerTypeMatch(
+  activity: FullReductionActivity,
+  currentDinnerType: string
+): boolean {
+  if (!activity.useType) return false;
+  const allowedTypes = activity.useType.split(",");
+  //满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
+  return true;
+}
+
+//判断商品是否可以使用限时折扣
+export function returnCanUseLimitTimeDiscount(
+  goods:BaseCartItem,
+  limitTimeDiscountRes:TimeLimitDiscountConfig|null|undefined,
+  useVipPrice:boolean,
+  idKey = "product_id"
+) {
+  if (!limitTimeDiscountRes || !limitTimeDiscountRes.id) {
+    return false;
+  }
+  const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  if (limitTimeDiscountRes.discountPriority == "limit-time") {
+    if (
+      limitTimeDiscountRes.foodType == 1 ||
+      canUseFoods.includes("" + goods[idKey])
+    ) {
+      return true;
+    }
+  }
+  if (
+    limitTimeDiscountRes.discountPriority == "vip-price" 
+    
+  ) {
+    
+    if(!useVipPrice){
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * 计算满减活动门槛
+ */
+export function calcFullReductionActivityFullAmount(goodsList: BaseCartItem[],fullReductionActivitie:FullReductionActivity|undefined,limitTimeDiscount:TimeLimitDiscountConfig|null|undefined
+,useVipPrice:boolean
+
+) {
+  if(!fullReductionActivitie){
+    return 0
+  }
+  let amount=0;
+  console.log('calcFullReductionActivityFullAmount')
+  console.log('fullReductionActivitie',fullReductionActivitie)
+  console.log('limitTimeDiscount',limitTimeDiscount)
+  for(let goods  of goodsList){
+    const canuseLimit=returnCanUseLimitTimeDiscount(goods,limitTimeDiscount,useVipPrice,"product_id")
+    console.log('canuseLimit',canuseLimit)
+    if(!fullReductionActivitie.discountShare){
+     const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+      amount+=goods.salePrice*availableNum
+    }
+  }
+}
+
+/**
+ * 筛选最优满减活动（对齐后端逻辑：状态→时间→周期→时段→就餐类型→排序→修改时间）
+ * @param activities 后端返回的满减活动列表
+ * @param currentShopId 当前店铺ID
+ * @param currentDinnerType 当前就餐类型（dine/pickup等）
+ * @param currentTime 当前时间（默认当前时间）
+ * @returns 最优满减活动（无符合条件则返回undefined）
+ */
+export function filterOptimalFullReductionActivity(
+  activities: FullReductionActivity[],
+  currentShopId: number,
+  currentDinnerType: string,
+  currentTime: Date = new Date()
+): FullReductionActivity | undefined {
+  if (!activities || !activities.length) return undefined;
+  // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
+  const baseEligible = activities.filter((activity) => {
+    return (
+      activity.isDel !== true && // 未删除
+      // activity.shopId === currentShopId && // 当前店铺
+      // activity.status === 2 && // 状态=2（进行中）
+      isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
+      activity.thresholds?.length // 至少有一个满减阈值
+    );
+  });
+  if (!baseEligible.length) return undefined;
+
+  // 第二步：时间筛选（有效期内+周期内+时段内）
+  const timeEligible = baseEligible.filter((activity) => {
+    // 1. 校验有效期（validStartTime ~ validEndTime）
+    if (activity.useTimeType == "all") {
+      return true;
+    }
+    if (!activity.validStartTime || !activity.validEndTime) return false;
+    const startDate = new Date(activity.validStartTime);
+    const endDate = new Date(activity.validEndTime);
+    // 处理有效期结束日期的23:59:59
+    endDate.setHours(23, 59, 59, 999);
+    if (currentTime < startDate || currentTime > endDate) return false;
+
+    // 2. 校验可用周期（如周一至周日）
+    if (!isInWeeklyCycle(activity, currentTime)) return false;
+
+    // 3. 校验每日可用时段（如09:00-22:00）
+    if (!isInDailyTimeRange(activity, currentTime)) return false;
+
+    return true;
+  });
+
+  if (!timeEligible.length) return undefined;
+
+  // 第三步：按优先级排序（需求规则）
+  return timeEligible.sort((a, b) => {
+    // 1. 先比排序值：排序值大的优先
+    if ((a.sort || 0) !== (b.sort || 0)) {
+      return (b.sort || 0) - (a.sort || 0);
+    }
+    // 2. 再比修改时间：最新修改的优先（时间戳降序）
+    const aUpdateTime = a.updateTime ? new Date(a.updateTime).getTime() : 0;
+    const bUpdateTime = b.updateTime ? new Date(b.updateTime).getTime() : 0;
+    return bUpdateTime - aUpdateTime;
+  })[0]; // 取最优活动
+}
+/**
+ * 折扣率格式化：后端discountRate（%）→ 工具库小数（如90→0.9）
+ */
+export function formatDiscountRate(backendDiscountRate?: number): number {
+  if (!backendDiscountRate || backendDiscountRate <= 0) return 1; // 默认无折扣（1=100%）
+  // 后端若为百分比（如90=9折），除以100；若已为小数（如0.9）直接返回
+  return backendDiscountRate >= 1
+    ? backendDiscountRate / 100
+    : backendDiscountRate;
+}
+
+/**
+ * 统一小数处理：舍去小数点后两位以后的数字（解决浮点数精度偏差）
+ * 如 10.129 → 10.12，1.01 → 1.01，1.0100000001 → 1.01
+ * @param num 待处理数字
+ * @returns 处理后保留两位小数的数字
+ */
+export function truncateToTwoDecimals(num: number | string): number {
+  return new BigNumber(num).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+}
+
+/**
+ * 判断商品是否为临时菜（临时菜不参与优惠券门槛和折扣计算）
+ * @param goods 商品项
+ * @returns 是否临时菜
+ */
+export function isTemporaryGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_temporary;
+}
+
+/**
+ * 判断商品是否为赠菜（赠菜不计入优惠券活动，但计打包费）
+ * @param goods 商品项
+ * @returns 是否赠菜
+ */
+export function isGiftGoods(goods: BaseCartItem): boolean {
+  return !!goods.is_gift;
+}
+/**
+ * 判断可用类型是否可用
+ */
+export function useTypeCanUse(useType: string[]) {
+  const arr = ["all", "dine-in", "take-out", "take-away", "post"];
+  return useType.some((item) => arr.includes(item));
+}
+
+/**
+ * 计算单个商品的会员价（优先级：SKU会员价 > 商品会员价 > 会员折扣率）
+ * @param goods 商品项
+ * @param isMember 是否会员
+ * @param memberDiscountRate 会员折扣率（如0.95=95折）
+ * @returns 会员价（元）
+ */
+export function calcMemberPrice(
+  goods: BaseCartItem,
+  isMember: boolean,
+  memberDiscountRate?: number
+): number {
+  if (!isMember) return truncateToTwoDecimals(goods.salePrice);
+
+  // 优先级：SKU会员价 > 商品会员价 > 商品原价（无会员价时用会员折扣）
+  const basePrice =
+    goods.skuData?.memberPrice ?? goods.memberPrice ?? goods.salePrice;
+
+  // 仅当无SKU会员价、无商品会员价时，才应用会员折扣率
+  if (memberDiscountRate && !goods.skuData?.memberPrice && !goods.memberPrice) {
+    return truncateToTwoDecimals(
+      new BigNumber(basePrice).multipliedBy(memberDiscountRate).toNumber()
+    );
+  }
+
+  return truncateToTwoDecimals(basePrice);
+}
+
+/**
+ * 过滤可参与优惠券计算的商品（排除临时菜、赠菜、已用兑换券的商品）
+ * @param goodsList 商品列表
+ * @param excludedProductIds 需排除的商品ID列表（商品ID，非购物车ID）
+ * @returns 可参与优惠券计算的商品列表
+ */
+export function filterCouponEligibleGoods(
+  goodsList: BaseCartItem[],
+  excludedProductIds: string[] = []
+): BaseCartItem[] {
+  return goodsList.filter(
+    (goods) =>
+      !isTemporaryGoods(goods) &&
+      !isGiftGoods(goods) &&
+      !excludedProductIds.includes(String(goods.product_id)) // 核心修正：用商品ID排除
+  );
+}
+
+/**
+ * 统一筛选门槛商品的工具函数（所有券类型复用，按商品ID匹配）
+ * @param baseEligibleGoods 基础合格商品（已排除临时菜/赠菜/已抵扣商品）
+ * @param applicableProductIds 优惠券指定的门槛商品ID数组
+ * @returns 最终参与优惠券计算的商品列表
+ */
+export function filterThresholdGoods(
+  baseEligibleGoods: BaseCartItem[],
+  applicableProductIds: string[]
+): BaseCartItem[] {
+  // 空数组=全部基础合格商品；非空=仅商品ID匹配的商品（转字符串兼容类型）
+  return applicableProductIds.length === 0
+    ? baseEligibleGoods
+    : baseEligibleGoods.filter((goods) =>
+        applicableProductIds.includes(String(goods.product_id))
+      ); // 核心修正：用商品ID匹配
+}
+
+/**
+ * 商品排序（用于商品兑换券：按价格/数量/加入顺序排序，按商品ID分组去重）
+ * @param goodsList 商品列表
+ * @param sortRule 排序规则（low_price_first/high_price_first）
+ * @param cartOrder 商品加入购物车的顺序（key=购物车ID，value=加入时间戳）
+ * @returns 排序后的商品列表
+ */
+export function sortGoodsForCoupon(
+  goodsList: BaseCartItem[],
+  sortRule: "low_price_first" | "high_price_first",
+  cartOrder: Record<string, number> = {}
+): BaseCartItem[] {
+  return [...goodsList].sort((a, b) => {
+    // 1. 按商品单价排序（优先级最高）
+    const priceA = a.skuData?.salePrice ?? a.salePrice;
+    const priceB = b.skuData?.salePrice ?? b.salePrice;
+    if (priceA !== priceB) {
+      return sortRule === "low_price_first" ? priceA - priceB : priceB - priceA;
+    }
+
+    // 2. 同价格按商品数量排序（降序，多的优先）
+    if (a.number !== b.number) {
+      return b.number - a.number;
+    }
+
+    // 3. 同价格同数量按加入购物车顺序（早的优先，用购物车ID匹配）
+    const orderA = cartOrder[String(a.id)] ?? Infinity;
+    const orderB = cartOrder[String(b.id)] ?? Infinity;
+    return orderA - orderB;
+  });
+}
+
+/**
+ * 计算优惠券门槛金额（根据同享规则，按商品ID匹配限时折扣）
+ * @param eligibleGoods 可参与优惠券的商品列表（已过滤临时菜/赠菜）
+ * @param coupon 优惠券（含discountShare/vipPriceShare配置）
+ * @param config 订单配置（会员信息）
+ * @param activities 全局营销活动（限时折扣，applicableProductIds为商品ID）
+ * @returns 满足优惠券门槛的金额基数
+ */
+export function calcCouponThresholdAmount(
+  eligibleGoods: BaseCartItem[],
+  coupon: BaseCoupon,
+  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
+  activities: ActivityConfig[] = []
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of eligibleGoods) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+
+    // 1. 基础金额：默认用商品原价（SKU原价优先）
+    const basePrice = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    let itemAmount = basePrice.multipliedBy(availableNum);
+
+    // 2. 处理「与会员价/会员折扣同享」规则：若开启，用会员价计算
+    if (coupon.vipPriceShare) {
+      const memberPrice = new BigNumber(
+        calcMemberPrice(goods, config.isMember, config.memberDiscountRate)
+      );
+      itemAmount = memberPrice.multipliedBy(availableNum);
+    }
+
+    // 3. 处理「与限时折扣同享」规则：若开启，叠加限时折扣（按商品ID匹配活动）
+    if (coupon.discountShare) {
+      const activity =
+        goods.activityInfo ??
+        activities.find(
+          (act) =>
+            act.type === ActivityType.TIME_LIMIT_DISCOUNT &&
+            (act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
+        );
+
+      if (activity) {
+        itemAmount = itemAmount.multipliedBy(activity.discountRate); // 叠加限时折扣
+      }
+    }
+
+    total = total.plus(itemAmount);
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+// ============================ 3. 商品核心价格计算（核心修正：按商品ID匹配营销活动） ============================
+/**
+ * 计算单个商品的实际单价（整合商家改价、会员优惠、营销活动折扣，按商品ID匹配活动）
+ * @param goods 商品项
+ * @param config 订单额外配置（含会员、活动信息）
+ * @returns 单个商品实际单价（元）
+ */
+export function calcSingleGoodsRealPrice(
+  goods: BaseCartItem,
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
+
+  //如果是增菜价格为0
+  if (goods.is_gift) {
+    return 0;
+  }
+
+  // 1. 优先级1：商家改价（改价后单价>0才生效）
+  if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
+    return truncateToTwoDecimals(goods.discountSaleAmount);
+  }
+  console.log("calcSingleGoodsRealPrice:goods", goods);
+
+  // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
+  const memberPrice = new BigNumber(
+    calcMemberPrice(goods, isMember, memberDiscountRate)
+  );
+
+  // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
+  let isActivityApplicable = false;
+  if (activity) {
+    if (activity.foodType == 1) {
+      isActivityApplicable = true;
+    } else {
+      const canUseGoods = activity.foods?.split(",") || [];
+      if (canUseGoods.find((v) => v == String(goods.product_id))) {
+        isActivityApplicable = true;
+      }
+    }
+  }
+  if (!activity || !isActivityApplicable) {
+    return memberPrice.toNumber();
+  }
+  //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
+  if (
+    activity.discountPriority == "limit-time" ||
+    (activity.discountPriority == "vip-price" && !isMember)
+  ) {
+    //限时折扣优先
+    return truncateToTwoDecimals(
+      new BigNumber(goods.salePrice)
+        .multipliedBy(activity.discountRate / 100)
+        .toNumber()
+    );
+  }
+  if (activity.discountPriority == "vip-price" && isMember) {
+    return memberPrice.toNumber();
+  }
+
+  // 处理活动与会员的同享/不同享逻辑
+  if (activity.vipPriceShare) {
+    // 同享：会员价基础上叠加工活动折扣
+    return truncateToTwoDecimals(
+      memberPrice.multipliedBy(activity.discountRate).toNumber()
+    );
+  } else {
+    // 不同享：取会员价和活动价的最小值（活动价用SKU原价计算）
+    const basePriceForActivity = new BigNumber(
+      goods.skuData?.salePrice ?? goods.salePrice
+    );
+    const activityPrice = basePriceForActivity.multipliedBy(
+      activity.discountRate
+    );
+
+    return truncateToTwoDecimals(
+      memberPrice.isLessThanOrEqualTo(activityPrice)
+        ? memberPrice.toNumber()
+        : activityPrice.toNumber()
+    );
+  }
+}
+
+/**
+ * 计算商品原价总和（所有商品：原价*数量，含临时菜、赠菜，用SKU原价优先）
+ * @param goodsList 商品列表
+ * @returns 商品原价总和（元）
+ */
+export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    let basePrice = new BigNumber(0);
+    if (goods.is_temporary) {
+      basePrice = new BigNumber(goods?.discountSaleAmount ?? 0);
+    } else if (goods.is_gift) {
+      basePrice = new BigNumber(0);
+    } else {
+      basePrice = new BigNumber(goods.skuData?.salePrice ?? goods.salePrice); // SKU原价优先
+    }
+
+    total = total.plus(basePrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品实际总价（所有商品：实际单价*数量，含临时菜、赠菜，按商品ID匹配活动）
+ * @param goodsList 商品列表
+ * @param config 订单额外配置（含会员、活动信息）
+ * @param activities 全局营销活动列表（如限时折扣，applicableProductIds为商品ID）
+ * @returns 商品实际总价（元）
+ */
+export function calcGoodsRealAmount(
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
+): number {
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (availableNum <= 0) continue;
+    const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
+    total = total.plus(realPrice.multipliedBy(availableNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算商品折扣总金额（商品原价总和 - 商品实际总价）
+ * @param goodsOriginalAmount 商品原价总和
+ * @param goodsRealAmount 商品实际总价
+ * @returns 商品折扣总金额（元，≥0）
+ */
+export function calcGoodsDiscountAmount(
+  goodsOriginalAmount: number,
+  goodsRealAmount: number
+): number {
+  const original = new BigNumber(goodsOriginalAmount);
+  const real = new BigNumber(goodsRealAmount);
+  const discount = original.minus(real);
+
+  return truncateToTwoDecimals(Math.max(0, discount.toNumber()));
+}
+/**
+ * 从满减活动的多门槛中，选择最优阈值（满金额最小且减免金额最大）
+ * @param thresholds 满减阈值列表（多门槛）
+ * @param baseAmount 满减计算基数（新客立减后的金额）
+ * @param goodsOriginalAmount 商品原价总和（discountShare=0时用）
+ * @param goodsRealAmount 商品折扣后总和（discountShare=1时用）
+ * @param discountShare 与限时折扣同享：0=否，1=是
+ * @returns 最优阈值（无符合条件则返回undefined）
+ */
+export function selectOptimalThreshold(
+  thresholds: FullReductionThreshold[] = [],
+  baseAmount: number,
+  goodsOriginalAmount: number,
+  goodsRealAmount: number,
+  discountShare: number = 0
+): FullReductionThreshold | undefined {
+  if (!thresholds.length) return undefined;
+
+  // 第一步：确定满减门槛基数（根据discountShare规则）
+  const thresholdBase = baseAmount;
+
+  // 第二步：筛选「满金额≤基数」且「减免金额>0」的有效阈值
+  const validThresholds = thresholds.filter((threshold) => {
+    const fullAmount = new BigNumber(threshold.fullAmount || 0);
+    const discountAmount = new BigNumber(threshold.discountAmount || 0);
+    return (
+      fullAmount.isLessThanOrEqualTo(thresholdBase) &&
+      discountAmount.isGreaterThan(0)
+    );
+  });
+
+  if (!validThresholds.length) return undefined;
+
+  // 找到抵扣金额最大的门槛项
+  const maxDiscountThreshold = validThresholds.reduce(
+    (maxItem, currentItem) => {
+      // 处理空值，默认抵扣金额为0
+      const maxDiscount = new BigNumber(maxItem?.discountAmount || 0);
+      const currentDiscount = new BigNumber(currentItem?.discountAmount || 0);
+
+      // 比较当前项和已存最大项的抵扣金额，保留更大的
+      return currentDiscount.gt(maxDiscount) ? currentItem : maxItem;
+    },
+    validThresholds[0] || null
+  ); // 初始值为数组第一项（若数组为空则返回null）
+  console.log("maxDiscountThreshold", maxDiscountThreshold);
+  return maxDiscountThreshold;
+}
+
+/**
+ * 计算满减实际减免金额（适配多门槛、同享规则）
+ * @param optimalActivity 最优满减活动
+ * @param optimalThreshold 最优满减阈值
+ * @param baseAmount 计算基数（新客立减后的金额）
+ * @returns 实际减免金额（元，未达门槛则0）
+ */
+export function calcFullReductionAmount(
+  baseAmount: number,
+  optimalActivity?: FullReductionActivity,
+  optimalThreshold?: FullReductionThreshold
+): number {
+  if (!optimalActivity || !optimalThreshold) return 0;
+
+  const baseAmountBn = new BigNumber(baseAmount);
+  const discountAmountBn = new BigNumber(optimalThreshold.discountAmount || 0);
+
+  // 1. 基数必须为正（避免减免后为负）
+  if (baseAmountBn.isLessThanOrEqualTo(0)) return 0;
+
+  // 2. 减免金额不能超过基数（避免减成负数）
+  const maxReducible = baseAmountBn;
+  const actualReduction = discountAmountBn.isLessThanOrEqualTo(maxReducible)
+    ? discountAmountBn
+    : maxReducible;
+
+  return truncateToTwoDecimals(actualReduction.toNumber());
+}
+
+// ------------------------------ 策略辅助函数 ------------------------------
+/**
+ * 根据优惠券useShops列表判断门店是否匹配（适配BaseCoupon的useShops字段）
+ */
+function isStoreMatchByList(
+  useShops: string[],
+  currentStoreId: string
+): boolean {
+  // 适用门店为空数组 → 无限制（所有门店适用）
+  if (useShops.length === 0) return true;
+  // 匹配当前门店ID（字符串比较，避免类型问题）
+  return useShops.includes(currentStoreId);
+}
+
+/**
+ * 计算优惠券抵扣金额（处理互斥逻辑，选择最优优惠券，按商品ID排除，新增细分统计）
+ * @param backendCoupons 后端优惠券列表
+ * @param goodsList 商品列表
+ * @param config 订单配置（含就餐类型）
+ * @returns 最优优惠券的抵扣结果（含商品券/满减券细分）
+ */
+export function calcCouponDeduction(
+  backendCoupons: BackendCoupon[],
+  goodsList: BaseCartItem[],
+  config: Pick<
+    OrderExtraConfig,
+    "currentStoreId" | "isMember" | "memberDiscountRate"
+  > & {
+    activities: ActivityConfig[];
+    cartOrder: Record<string, number>;
+    dinnerType: "dine-in" | "take-out";
+    currentTime?: Date;
+  }
+): {
+  deductionAmount: number;
+  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券/折扣券/买一送一等）
+  fullCouponDeduction: number; // 新增：满减优惠券抵扣
+  usedCoupon?: Coupon;
+  excludedProductIds: string[]; // 排除的商品ID列表（商品ID）
+} {
+  const goodsCoupon = backendCoupons.filter((v) => v.type == 2);
+  const discountCoupon = backendCoupons.filter((v) => v.type != 2);
+
+  // 3. 计算非兑换券最优抵扣（传递已抵扣商品ID，避免重复，统计细分字段）
+  let nonExchangeResult: CouponResult = {
+    deductionAmount: discountCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    usedCoupon: undefined,
+    productCouponDeduction: 0,
+    fullCouponDeduction: 0,
+  };
+
+  // 4. 计算兑换券抵扣（排除非兑换券已抵扣的商品ID，统计商品券细分）
+  let exchangeResult: ExchangeCalculationResult = {
+    deductionAmount: goodsCoupon.reduce((prve, cur): number => {
+      return prve + (cur.discountAmount || 0);
+    }, 0),
+    excludedProductIds: [],
+    productCouponDeduction: 0,
+  };
+
+  // 5. 汇总结果：兑换券与非兑换券不可同时使用，取抵扣金额大的
+  const exchangeBn = new BigNumber(exchangeResult.deductionAmount);
+  const nonExchangeBn = new BigNumber(nonExchangeResult.deductionAmount);
+  const isExchangeBetter = exchangeBn.isGreaterThan(nonExchangeBn);
+
+  return {
+    deductionAmount: exchangeBn.plus(nonExchangeBn).toNumber(),
+    productCouponDeduction: exchangeResult.deductionAmount,
+    fullCouponDeduction: nonExchangeResult.deductionAmount, // 兑换券与满减券互斥，满减券抵扣置0
+    usedCoupon: isExchangeBetter ? undefined : nonExchangeResult.usedCoupon,
+    excludedProductIds: isExchangeBetter
+      ? exchangeResult.excludedProductIds
+      : nonExchangeResult.excludedProductIds,
+  };
+}
+
+// ============================ 5. 其他费用计算（无ID依赖，逻辑不变） ============================
+/**
+ * 计算总打包费（赠菜也计算，称重商品打包数量≤1）
+ * @param goodsList 商品列表
+ * @param dinnerType 就餐类型（堂食dine-in/外卖take-out）
+ * @returns 总打包费（元）
+ */
+export function calcTotalPackFee(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out"
+): number {
+  // if (dinnerType !== "take-out") return 0;
+  let total = new BigNumber(0);
+
+  for (const goods of goodsList) {
+    const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
+    let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+
+    if (availableNum === 0) continue;
+
+    // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
+    let packNum = Math.min(availableNum, packNumber);
+    if (dinnerType === "take-out") {
+      packNum = availableNum;
+    }
+    if (goods.product_type === GoodsType.WEIGHT) {
+      packNum = Math.min(packNum, 1);
+    }
+
+    total = total.plus(new BigNumber(goods.packFee || 0).multipliedBy(packNum));
+  }
+
+  return truncateToTwoDecimals(total.toNumber());
+}
+
+/**
+ * 计算餐位费（按人数，不参与营销活动）
+ * @param config 餐位费配置
+ * @returns 餐位费（元，未启用则0）
+ */
+export function calcSeatFee(config: SeatFeeConfig): number {
+  if (!config.isEnabled || config.personCount == 0) return 0;
+  const personCount = Math.max(1, config.personCount); // 至少1人
+  return truncateToTwoDecimals(
+    new BigNumber(config.pricePerPerson).multipliedBy(personCount).toNumber()
+  );
+}
+
+/**
+ * 计算积分抵扣金额（按X积分=1元，不超过最大抵扣和用户积分）
+ * @param userPoints 用户当前积分
+ * @param rule 积分抵扣规则
+ * @param maxDeductionLimit 最大抵扣上限（通常为订单金额，避免超扣）
+ * @returns 积分抵扣金额 + 实际使用积分
+ */
+export function calcPointDeduction(
+  userPoints: number,
+  rule: PointDeductionRule,
+  maxDeductionLimit: number
+): {
+  deductionAmount: number;
+  usedPoints: number;
+} {
+  console.log("calcPointDeduction", userPoints, rule, maxDeductionLimit);
+  if (rule.pointsPerYuan <= 0 || userPoints <= 0) {
+    return { deductionAmount: 0, usedPoints: 0 };
+  }
+
+  const userPointsBn = new BigNumber(userPoints);
+  const pointsPerYuanBn = new BigNumber(rule.pointsPerYuan);
+  const maxLimitBn = new BigNumber(maxDeductionLimit);
+
+  // 最大可抵扣金额（积分可抵金额 vs 规则最大 vs 订单上限）
+  const maxDeductByPoints = userPointsBn.dividedBy(pointsPerYuanBn);
+  const maxDeductAmount = maxDeductByPoints.isLessThan(
+    rule.maxDeductionAmount ?? Infinity
+  )
+    ? maxDeductByPoints
+    : new BigNumber(rule.maxDeductionAmount || Infinity).isLessThan(maxLimitBn)
+    ? maxDeductByPoints
+    : maxLimitBn;
+
+  // 实际使用积分 = 抵扣金额 * 积分兑换比例
+  const usedPoints = maxDeductAmount.multipliedBy(pointsPerYuanBn);
+
+  return {
+    deductionAmount: truncateToTwoDecimals(maxDeductAmount.toNumber()),
+    usedPoints: truncateToTwoDecimals(
+      Math.min(usedPoints.toNumber(), userPoints)
+    ), // 避免积分超扣
+  };
+}
+
+// ============================ 6. 订单总费用汇总与实付金额计算（核心入口，补充细分字段） ============================
+/**
+ * 计算订单所有费用子项并汇总（核心入口函数）
+ * @param goodsList 购物车商品列表
+ * @param dinnerType 就餐类型
+ * @param backendCoupons 后端优惠券列表
+ * @param activities 全局营销活动列表
+ * @param config 订单额外配置（会员、积分、餐位费等）
+ * @param cartOrder 商品加入购物车顺序（key=购物车ID，value=时间戳）
+ * @param currentTime 当前时间（用于优惠券有效期判断）
+ * @returns 订单费用汇总（含所有子项和实付金额，新增商品券/满减券细分）
+ */
+export function calculateOrderCostSummary(
+  goodsList: BaseCartItem[],
+  dinnerType: "dine-in" | "take-out", // 前端就餐类型
+  backendCoupons: BackendCoupon[] = [],
+  activities: ActivityConfig[] = [],
+  config: OrderExtraConfig, // 含后端满减活动、currentDinnerType
+  cartOrder: Record<string, number> = {},
+  currentTime: Date = new Date()
+): OrderCostSummary {
+
+  //是否使用霸王餐，霸王餐配置
+  const {
+    isFreeDine,
+    freeDineConfig,
+    limitTimeDiscount,
+    fullReductionActivities,
+  } = config;
+
+  // ------------------------------ 1. 基础费用计算 ------------------------------
+  const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
+  const goodsRealAmount = calcGoodsRealAmount(
+    // 商品折扣后总和
+    goodsList,
+    {
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      limitTimeDiscount: config.limitTimeDiscount,
+    }
+  );
+  const goodsDiscountAmount = calcGoodsDiscountAmount(
+    goodsOriginalAmount,
+    goodsRealAmount
+  ); // 商品折扣金额
+  const newUserDiscount = config.newUserDiscount || 0; // 新客立减
+
+  // ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
+  let usedFullReductionActivity: FullReductionActivity | undefined;
+  let usedFullReductionThreshold: FullReductionThreshold | undefined;
+  let fullReductionAmount = 0;
+  // 2.1 筛选最优满减活动（后端活动列表、当前店铺、就餐类型、时间）
+  usedFullReductionActivity = filterOptimalFullReductionActivity(
+    config.fullReductionActivities,
+    Number(config.currentStoreId), // 转换为数字（后端shopId是number）
+    config.currentDinnerType, // 后端useType匹配的就餐类型（如"dine"）
+    currentTime
+  );
+
+  calcFullReductionActivityFullAmount(goodsList,usedFullReductionActivity,config.limitTimeDiscount,config.isMember);
+
+
+  console.log("usedFullReductionActivity", usedFullReductionActivity);
+
+  //  其他费用计算（原有逻辑不变） ------------------------------
+  const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
+  let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
+  seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
+  const additionalFee = Math.max(0, config.additionalFee); // 附加费
+
+  // 2.2 计算满减基数（先扣新客立减）
+  let baseAfterNewUserDiscount = new BigNumber(
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    usedFullReductionActivity &&
+    !usedFullReductionActivity.discountShare
+      ? goodsRealAmount
+      : goodsRealAmount
+  )
+    .minus(newUserDiscount)
+    .plus(packFee)
+    .plus(seatFee)
+    .plus(additionalFee)
+    .toNumber();
+  baseAfterNewUserDiscount =
+    baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
+
+  // 2.3 选择最优满减阈值（多门槛场景）
+  if (usedFullReductionActivity) {
+    usedFullReductionThreshold = selectOptimalThreshold(
+      usedFullReductionActivity.thresholds,
+      baseAfterNewUserDiscount,
+      goodsOriginalAmount,
+      goodsRealAmount,
+      usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
+    );
+
+    // 2.4 计算满减实际减免金额
+    fullReductionAmount = calcFullReductionAmount(
+      baseAfterNewUserDiscount,
+      usedFullReductionActivity,
+      usedFullReductionThreshold
+    );
+  }
+  // ------------------------------ 3. 优惠券抵扣（适配满减同享规则） ------------------------------
+  let couponDeductionAmount = 0;
+  let productCouponDeduction = 0;
+  let fullCouponDeduction = 0;
+  let usedCoupon: Coupon | undefined;
+  let excludedProductIds: string[] = [];
+
+  const couponResult = calcCouponDeduction(
+    // 原有优惠券计算函数
+    backendCoupons,
+    goodsList,
+    {
+      currentStoreId: config.currentStoreId,
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+      activities,
+      cartOrder,
+      dinnerType,
+      currentTime,
+    }
+  );
+  couponDeductionAmount = couponResult.deductionAmount;
+  productCouponDeduction = couponResult.productCouponDeduction;
+  fullCouponDeduction = couponResult.fullCouponDeduction;
+  usedCoupon = couponResult.usedCoupon;
+  excludedProductIds = couponResult.excludedProductIds;
+
+  // 若满减与优惠券同享（couponShare=1），才计算优惠券；否则优惠券抵扣为0
+  if (usedFullReductionActivity && !usedFullReductionActivity.couponShare) {
+    couponDeductionAmount = 0;
+    productCouponDeduction = 0;
+    fullCouponDeduction = 0;
+    usedCoupon = undefined;
+    excludedProductIds = [];
+  }
+
+  // ------------------------------ 4. 积分抵扣（适配满减同享规则） ------------------------------
+  let pointDeductionAmount = 0;
+  let usedPoints = 0;
+
+  // 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券 + 餐位费 + 打包费 + 附加费）
+  let maxPointDeductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee)
+    .toNumber();
+  maxPointDeductionLimit =
+    maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
+
+  const pointResult = calcPointDeduction(
+    config.userPoints,
+    config.pointDeductionRule,
+    maxPointDeductionLimit
+  );
+  console.log("积分抵扣结果:", pointResult);
+
+  pointDeductionAmount = pointResult.deductionAmount;
+  usedPoints = pointResult.usedPoints;
+  // 若满减与积分不同享（pointsShare=1）积分抵扣为0
+  if (usedFullReductionActivity && !usedFullReductionActivity.pointsShare) {
+    console.log("满减与积分不同享:积分抵扣为0");
+    pointDeductionAmount = 0;
+    usedPoints = 0;
+  }
+
+  //使用霸王餐
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    console.log("使用霸王餐");
+    fullReductionAmount = 0;
+    //不与优惠券同享
+    if (!freeDineConfig.withCoupon) {
+      couponDeductionAmount = 0;
+      productCouponDeduction = 0;
+      fullCouponDeduction = 0;
+      usedCoupon = undefined;
+      excludedProductIds = [];
+    }
+    //不与积分同享
+    if (!freeDineConfig.withPoints) {
+      pointDeductionAmount = 0;
+      usedPoints = 0;
+    }
+  }
+
+  // 商家减免计算（原有逻辑不变）
+  const merchantReductionConfig = config.merchantReduction;
+  let merchantReductionActualAmount = 0;
+  const maxMerchantReductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .isGreaterThan(0)
+    ? new BigNumber(goodsRealAmount)
+        .minus(newUserDiscount)
+        .minus(fullReductionAmount)
+        .minus(couponDeductionAmount)
+        .minus(pointDeductionAmount)
+        .plus(seatFee)
+        .plus(packFee)
+        .toNumber()
+    : 0;
+
+  switch (merchantReductionConfig.type) {
+    case MerchantReductionType.FIXED_AMOUNT:
+      merchantReductionActualAmount = Math.min(
+        merchantReductionConfig.fixedAmount || 0,
+        maxMerchantReductionLimit
+      );
+      break;
+    case MerchantReductionType.DISCOUNT_RATE:
+      const validRate =
+        Math.max(0, Math.min(100, merchantReductionConfig.discountRate || 0)) /
+        100;
+      merchantReductionActualAmount =
+        maxMerchantReductionLimit * (1 - validRate);
+      break;
+  }
+  merchantReductionActualAmount = Math.max(
+    0,
+    truncateToTwoDecimals(merchantReductionActualAmount)
+  );
+
+  // ------------------------------ 6. 最终实付金额计算 ------------------------------
+  const finalPayAmountBn = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .minus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .plus(seatFee)
+    .plus(packFee)
+    .plus(additionalFee);
+  let finalPayAmount = Math.max(
+    0,
+    truncateToTwoDecimals(finalPayAmountBn.toNumber())
+  );
+  // ------------------------------ 使用霸王餐计算 ------------------------------
+  let orderOriginFinalPayAmount = finalPayAmount;
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    finalPayAmount = BigNumber(finalPayAmount)
+      .times(freeDineConfig.rechargeTimes)
+      .toNumber();
+  }
+
+  // ------------------------------ 7. 总优惠金额计算 ------------------------------
+  const totalDiscountAmount = truncateToTwoDecimals(
+    new BigNumber(goodsDiscountAmount)
+      .plus(newUserDiscount)
+      .plus(fullReductionAmount)
+      .plus(couponDeductionAmount)
+      .plus(pointDeductionAmount)
+      .plus(merchantReductionActualAmount)
+      .toNumber()
+  );
+  //积分可抵扣最大金额 最终支付金额+积分抵扣-商家减免
+  const scoreMaxMoney = new BigNumber(finalPayAmount)
+    .plus(pointDeductionAmount)
+    .minus(merchantReductionActualAmount)
+    .toNumber();
+
+  console.log("限时折扣:", config.limitTimeDiscount);
+
+  // ------------------------------ 8. 返回完整结果 ------------------------------
+  return {
+    goodsTotal: goodsList.reduce(
+      (sum, g) => sum + Math.max(0, g.number - (g.returnNum || 0)),
+      0
+    ),
+    goodsRealAmount,
+    goodsOriginalAmount,
+    goodsDiscountAmount,
+    couponDeductionAmount,
+    productCouponDeduction,
+    fullCouponDeduction,
+    pointDeductionAmount,
+    seatFee,
+    packFee,
+    totalDiscountAmount,
+    //最终支付原金额
+    orderOriginFinalPayAmount,
+    //积分最大可抵扣金额
+    scoreMaxMoney,
+    // 满减活动明细（后端字段）
+    fullReduction: {
+      usedActivity: usedFullReductionActivity,
+      usedThreshold: usedFullReductionThreshold,
+      actualAmount: truncateToTwoDecimals(fullReductionAmount),
+    },
+    merchantReduction: {
+      type: merchantReductionConfig.type,
+      originalConfig: merchantReductionConfig,
+      actualAmount: merchantReductionActualAmount,
+    },
+    additionalFee,
+    finalPayAmount,
+    couponUsed: usedCoupon,
+    pointUsed: usedPoints,
+    newUserDiscount,
+    dinnerType,
+    config,
+  };
+}
+
+export function isWeightGoods(goods: BaseCartItem): boolean {
+  return goods.product_type === GoodsType.WEIGHT;
+}
+
+// ============================ 7. 对外暴露工具库 ============================
+export const OrderPriceCalculator = {
+  // 基础工具
+  truncateToTwoDecimals,
+  isTemporaryGoods,
+  isGiftGoods,
+  formatDiscountRate,
+  filterThresholdGoods,
+  isWeightGoods,
+  // 商品价格计算
+  calcSingleGoodsRealPrice,
+  calcGoodsOriginalAmount,
+  calcGoodsRealAmount,
+  calcGoodsDiscountAmount,
+  //满减活动工具
+  filterOptimalFullReductionActivity,
+  // 优惠券计算
+  calcCouponDeduction,
+  // 其他费用计算
+  calcTotalPackFee,
+  calcSeatFee,
+  calcPointDeduction,
+  // 核心入口
+  calculateOrderCostSummary,
+  // 枚举导出
+  Enums: {
+    GoodsType,
+    CouponType,
+    ActivityType,
+    WEEKDAY_MAP,
+  },
+};
+
+export default OrderPriceCalculator;
diff --git a/utils/goods-utils - 副本.js b/utils/goods-utils - 副本.js
index db21553..0012e45 100644
--- a/utils/goods-utils - 副本.js	
+++ b/utils/goods-utils - 副本.js	
@@ -1,27 +1,55 @@
-import {
-	BigNumber
-} from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import _ from "lodash";
 
-
-
 /**
  * 返回商品单价
  * @param goods 商品
  * @param user 用户信息
- * @param {Object} shopInfo
+ * @param {Object} shopInfo 店铺信息
+ * @param {boolean} limitTimeDiscount - 限时折扣
  */
-export function returnGoodsPrice(goods, user, shopInfo) {
-	if (goods.discount_sale_amount * 1 > 0) {
-		return goods.discount_sale_amount;
-	}
-	if(shopInfo&&!shopInfo.isMemberPrice){
-		return goods.salePrice;
-	}
-	if (user.isVip && goods.memberPrice * 1 <= goods.salePrice * 1 && goods.memberPrice * 1 > 0) {
-		return goods.memberPrice;
-	}
-	return goods.salePrice;
+export function returnGoodsPrice(goods, user, shopInfo, limitTimeDiscount) {
+  if (!goods) {
+    return 0;
+  }
+  // 商家改价
+  if (goods.discount_sale_amount * 1 > 0) {
+    return goods.discount_sale_amount;
+  }
+  // 限时折扣
+  if (limitTimeDiscount && limitTimeDiscount.id) {
+    if (
+      limitTimeDiscount.foodType == 1 &&
+      limitTimeDiscount.discountPriority == "limit-time"
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+    const canUseFoods = limitTimeDiscount.foods.split(",");
+    if (
+      limitTimeDiscount.foodType == 2 &&
+      limitTimeDiscount.discountPriority == "limit-time" &&
+      canUseFoods.includes(`${goods.productId}`)
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+  }
+  if (shopInfo && !shopInfo.isMemberPrice) {
+    return goods.salePrice;
+  }
+  if (
+    user.isVip &&
+    goods.memberPrice * 1 <= goods.salePrice * 1 &&
+    goods.memberPrice * 1 > 0
+  ) {
+    return goods.memberPrice;
+  }
+  return goods.salePrice;
 }
 
 /**
@@ -29,15 +57,15 @@ export function returnGoodsPrice(goods, user, shopInfo) {
  * @param arr 商品列表
  */
 export function returnGoodsGroupMap(arr) {
-	let map = {};
-	arr.forEach((v) => {
-		const key = v.productId + "_" + v.skuId;
-		if (!map[key]) {
-			map[key] = [];
-		}
-		map[key].push(v);
-	});
-	return map;
+  let map = {};
+  arr.forEach((v) => {
+    const key = v.productId + "_" + v.skuId;
+    if (!map[key]) {
+      map[key] = [];
+    }
+    map[key].push(v);
+  });
+  return map;
 }
 
 /**
@@ -45,17 +73,17 @@ export function returnGoodsGroupMap(arr) {
  * @param coupon
  */
 export function returnCoupType(coupon) {
-	const couponTypes = {
-		1: "满减券",
-		2: "商品券",
-		3: "折扣券",
-		4: "第二件半价券",
-		5: "消费送券",
-		6: "买一送一券",
-		7: "固定价格券",
-		8: "免配送费券",
-	};
-	return couponTypes[coupon.type] || "未知类型";
+  const couponTypes = {
+    1: "满减券",
+    2: "商品券",
+    3: "折扣券",
+    4: "第二件半价券",
+    5: "消费送券",
+    6: "买一送一券",
+    7: "固定价格券",
+    8: "免配送费券",
+  };
+  return couponTypes[coupon.type] || "未知类型";
 }
 
 /**
@@ -65,22 +93,37 @@ export function returnCoupType(coupon) {
  * @param user 用户信息
  */
 export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
-	const goodsCouponGoods = selCoupon
-		.filter((v) => v.type == 2)
-		.reduce((prve, cur) => {
-			prve.push(...cur.discount.hasDiscountGoodsArr);
-			return prve;
-		}, []);
-	const arr = _.cloneDeep(canDikouGoodsArr)
-		.map((v) => {
-			const findCart = goodsCouponGoods.find((carts) => carts.id == v.id);
-			if (findCart) {
-				v.num -= findCart.num;
-			}
-			return v;
-		})
-		.filter((v) => v.num > 0);
-	return arr;
+  const types = [2, 4, 6];
+  // 收集已抵扣商品并关联对应的优惠券类型
+  const goodsCouponGoods = selCoupon
+    .filter((v) => types.includes(v.type))
+    .reduce((prev, cur) => {
+      // 给每个抵扣商品添加所属优惠券类型
+      const goodsWithType = cur.discount.hasDiscountGoodsArr.map((goods) => ({
+        ...goods,
+        couponType: cur.type, // 记录该商品是被哪种类型的优惠券抵扣的
+      }));
+      prev.push(...goodsWithType);
+      return prev;
+    }, []);
+  const arr = _.cloneDeep(canDikouGoodsArr)
+    .map((v) => {
+      const findCart = goodsCouponGoods.find((carts) => carts.id == v.id);
+      if (findCart) {
+        // 根据优惠券类型判断扣减数量
+        if ([4, 6].includes(findCart.couponType)) {
+          // 类型4（第二件半价）或6（买一送一），数量减2
+          v.num -= 2;
+        } else {
+          // 其他类型（如类型2商品券），按原逻辑扣减对应数量
+          v.num -= findCart.num;
+        }
+      }
+      return v;
+    })
+    .filter((v) => v.num > 0); // 过滤掉数量<=0的商品
+
+  return arr;
 }
 
 /**
@@ -97,139 +140,208 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
  * @param {Object} args.user - 用户信息对象
  * @param {Object} args.selCoupon - 已经选择的优惠券信息对象
  * @param {Object} args.shopInfo
+ * @param {boolean} args.limitTimeDiscount - 限时折扣
  * @returns {Object} - { canUse: boolean, reason: string } 可用状态及不可用原因
  */
 export function returnCouponCanUse(args) {
-	let {
-		canDikouGoodsArr,
-		coupon,
-		goodsOrderPrice,
-		user,
-		selCoupon,
-		shopInfo
-	} = args;
+  let {
+    canDikouGoodsArr,
+    coupon,
+    goodsOrderPrice,
+    user,
+    selCoupon,
+    shopInfo,
+    isMemberPrice,
+    limitTimeDiscount,
+  } = args;
+  // 优惠券未启用
+  if (!coupon.use) {
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不在可用时间段内",
+    };
+  }
+  if(limitTimeDiscount&&limitTimeDiscount.id&&!coupon.discountShare){
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不可与限时折扣同享",
+    };
+  }
 
-	// 优惠券未启用
-	if (!coupon.use) {
-		return {
-			canUse: false,
-			reason: "优惠券未启用"
-		};
-	}
+  // 计算门槛金额
+  let fullAmount = goodsOrderPrice;
+  canDikouGoodsArr = returnCanDikouGoodsArr(
+    canDikouGoodsArr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
+  //优惠券指定门槛商品列表
+  let canCalcGoodsArr = [...canDikouGoodsArr];
+  //部分商品参与门槛计算
+  if (coupon.thresholdFoods.length) {
+    canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
+      return coupon.thresholdFoods.find((food) => food.id == v.productId);
+    });
+    fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
+      return (
+        pre + returnGoodsPrice(cur, user, shopInfo, limitTimeDiscount) * cur.num
+      );
+    }, 0);
+  }
 
-	canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user,shopInfo);
-	// 计算门槛金额
-	let fullAmount = goodsOrderPrice;
-	// 是否抵扣全部商品
-	const isDikouAll = coupon.useFoods.length === 0;
-	let canCalcGoodsArr = [];
-	// 订单里参与门槛计算的商品
-	if (!isDikouAll) {
-		canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
-			return coupon.useFoods.find((food) => food.id == v.productId);
-		});
-		fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
-			return pre + returnGoodsPrice(cur, user,shopInfo) * cur.num;
-		}, 0);
-	}
+  // 是否全部商品可用
+  const isDikouAll = coupon.useFoods.length === 0;
+  // 订单可用商品列表
+  let canUseGoodsArr = [];
+  if (!isDikouAll) {
+    canUseGoodsArr = canDikouGoodsArr.filter((v) => {
+      return coupon.useFoods.find((food) => food.id == v.productId);
+    });
+  }
+  if (user.isVip && !coupon.vipPriceShare) {
+    return {
+      canUse: false,
+      reason: "非会员可用",
+    };
+  }
+  if (selCoupon.length > 0 && !selCoupon[0].otherCouponShare) {
+    return {
+      canUse: false,
+      reason: "当前选中的券不可与其他券同享",
+    };
+  }
+  if (selCoupon.length > 0 && !coupon.otherCouponShare) {
+    return {
+      canUse: false,
+      reason: "当前选中的券不可与其他券同享",
+    };
+  }
+  // 满减券和折扣券计算门槛金额是否满足
+  if ([1, 3].includes(coupon.type)) {
+    if (canCalcGoodsArr.length <= 0) {
+      return {
+        canUse: false,
+        reason: "没有可参与计算门槛的商品",
+      };
+    }
+    // 不满足门槛金额
+    if (fullAmount < coupon.fullAmount) {
+      return {
+        canUse: false,
+        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+      };
+    }
+  }
+  // 商品兑换券，第二件半价和买一送一判断是否有可用商品
+  if ([2, 4, 5].includes(coupon.type)) {
+    if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
+      return {
+        canUse: false,
+        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+      };
+    }
 
-	// 没有符合条件的商品
-	if (!isDikouAll && canCalcGoodsArr.length === 0) {
-		return {
-			canUse: false,
-			reason: "没有符合条件的商品"
-		};
-	}
+    // 没有符合条件的商品
+    if (isDikouAll && canDikouGoodsArr.length === 0) {
+      return {
+        canUse: false,
+        reason: "没有符合条件的商品",
+      };
+    }
+    if (!isDikouAll && canUseGoodsArr.length === 0) {
+      return {
+        canUse: false,
+        reason: "没有符合条件的商品",
+      };
+    }
+  }
+  //商品兑换券是否达到门槛金额
+  if (coupon.type == 2 && goodsOrderPrice < coupon.fullAmount) {
+    return {
+      canUse: false,
+      reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+    };
+  }
 
-	// 不满足门槛金额
-	if (fullAmount < coupon.fullAmount) {
-		return {
-			canUse: false,
-			reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`
-		};
-	}
+  // 买一送一券特殊验证
+  if (coupon.type === 6) {
+    let canUse = false;
+    if (isDikouAll) {
+      canUse = canDikouGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
+    }
 
-	// 商品券特殊验证
-	if (coupon.type === 2) {
-		if (!(isDikouAll || canCalcGoodsArr.length > 0)) {
-			return {
-				canUse: false,
-				reason: "没有符合条件的商品可抵扣"
-			};
-		}
-	}
+    if (!canUse) {
+      return {
+        canUse: false,
+        reason: "需要购买至少2件相同的商品才能使用",
+      };
+    }
+  }
 
-	// 买一送一券特殊验证
-	if (coupon.type === 6) {
-		let canUse = false;
-		if (isDikouAll) {
-			canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-		} else if (canCalcGoodsArr.length > 0) {
-			canUse = canCalcGoodsArr.some((v) => v.num >= 2);
-		}
+  // 第二件半价券特殊验证
+  if (coupon.type === 4) {
+    let canUse = false;
+    if (isDikouAll) {
+      canUse = canDikouGoodsArr.some((v) => v.num >= 2);
+    } else if (canUseGoodsArr.length > 0) {
+      canUse = canUseGoodsArr.some((v) => v.num >= 2);
+    }
+    if (!canUse) {
+      return {
+        canUse: false,
+        reason: "需要购买至少2件相同的商品才能使用",
+      };
+    }
+  }
 
-		if (!canUse) {
-			return {
-				canUse: false,
-				reason: "需要购买至少2件相同的商品才能使用"
-			};
-		}
-	}
-
-	// 第二件半价券特殊验证
-	if (coupon.type === 4) {
-		let canUse = false;
-		if (isDikouAll) {
-			canUse = canDikouGoodsArr.some((v) => v.num >= 2);
-		} else if (canCalcGoodsArr.length > 0) {
-			canUse = canCalcGoodsArr.some((v) => v.num >= 2);
-		}
-
-		if (!canUse) {
-			return {
-				canUse: false,
-				reason: "需要购买至少2件相同的商品才能使用"
-			};
-		}
-	}
-
-	// 所有条件都满足
-	return {
-		canUse: true,
-		reason: ""
-	};
+  // 所有条件都满足
+  return {
+    canUse: true,
+    reason: "",
+  };
 }
 
-
 /**
  * 计算抵扣商品金额
  * @param discountGoodsArr 可抵扣商品列表
  * @param discountNum 抵扣数量
  * @param user 用户信息
- * @param {Object} shopInfo 店铺信息 
+ * @param {Object} shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,shopInfo) {
-	let hasCountNum = 0;
-	let discountPrice = 0;
-	let hasDiscountGoodsArr = [];
-	for (let i = 0; i < discountGoodsArr.length; i++) {
-		if (hasCountNum >= discountNum) {
-			break;
-		}
-		const goods = discountGoodsArr[i];
-		const shengyuNum = discountNum - hasCountNum;
-		const num = Math.min(goods.num, shengyuNum);
-		discountPrice += returnGoodsPrice(goods, user,shopInfo) * num;
-		hasCountNum += num;
-		hasDiscountGoodsArr.push({
-			...goods,
-			num
-		});
-	}
-	return {
-		discountPrice,
-		hasDiscountGoodsArr
-	};
+export function calcDiscountGoodsArrPrice(
+  discountGoodsArr,
+  discountNum,
+  user,
+  shopInfo,limitTimeDiscount
+) {
+  let hasCountNum = 0;
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  for (let i = 0; i < discountGoodsArr.length; i++) {
+    if (hasCountNum >= discountNum) {
+      break;
+    }
+    const goods = discountGoodsArr[i];
+    const shengyuNum = discountNum - hasCountNum;
+    const num = Math.min(goods.num, shengyuNum);
+    discountPrice += returnGoodsPrice(goods, user, shopInfo,limitTimeDiscount) * num;
+
+    hasCountNum += num;
+    hasDiscountGoodsArr.push({
+      ...goods,
+      num,
+    });
+  }
+
+  return {
+    discountPrice,
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -239,23 +351,51 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user,sh
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon) {
-	console.log('arr', arr);
-	const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
-	console.log('canDikouGoodsArr', canDikouGoodsArr);
-	if (coupon.type == 2) {
-		return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 6) {
-		return returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 4) {
-		return returnSecoendDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice);
-	}
-	if (coupon.type == 3) {
-		return returnCouponZhekouDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice, selCoupon);
-	}
+export function returnCouponDiscount(
+  arr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,
+  shopInfo,limitTimeDiscount
+) {
+  arr = returnCanDikouGoods(arr, user, shopInfo);
+  const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
+  if (coupon.type == 2) {
+    return returnCouponProductDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
+  }
+  if (coupon.type == 6) {
+    const result = returnCouponBuyOneGiveOneDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
+    return result;
+  }
+  if (coupon.type == 4) {
+    return returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo,limitTimeDiscount);
+  }
+  if (coupon.type == 3) {
+    return returnCouponZhekouDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      goodsOrderPrice,
+      selCoupon,
+      limitTimeDiscount
+    );
+  }
 }
 
 /**
@@ -265,41 +405,53 @@ export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoup
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param limitTimeDiscount 限时折扣
  *
  */
 export function returnCouponZhekouDiscount(
-	canDikouGoodsArr,
-	coupon,
-	user,
-	goodsOrderPrice,
-	selCoupon
+  canDikouGoodsArr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,limitTimeDiscount
 ) {
-	const {
-		discountRate,
-		maxDiscountAmount
-	} = coupon;
+  const { discountRate, maxDiscountAmount } = coupon;
 
-	const goodsCouponDiscount = selCoupon
-		.filter((v) => v.type == 2)
-		.reduce((prve, cur) => {
-			return prve + cur.discount.discountPrice;
-		}, 0);
-	goodsOrderPrice -= goodsCouponDiscount;
-	// 使用bignumber处理高精度计算
-	// 1. 计算折扣率（百分比转小数）：discountRate / 100
-	const discountRatio = new BigNumber(discountRate).dividedBy(100);
-	// 2. 计算优惠比例：1 - 折扣率（例如：8折的优惠比例是 1 - 0.8 = 0.2）
-	const discountAmountRatio = new BigNumber(1).minus(discountRatio);
-	// 3. 计算折扣金额：商品订单金额 × 优惠比例
-	let discountPrice = new BigNumber(goodsOrderPrice).times(discountAmountRatio).toNumber();
-	if (maxDiscountAmount != 0) {
-		discountPrice = discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
-	}
+  // 计算商品优惠券折扣总和，使用BigNumber避免精度问题
+  const goodsCouponDiscount = selCoupon
+    .filter((v) => v.type == 2)
+    .reduce((prve, cur) => {
+      return new BigNumber(prve).plus(
+        new BigNumber(cur.discount.discountPrice)
+      );
+    }, new BigNumber(0));
 
-	return {
-		discountPrice, // 折扣抵扣金额（即优惠的金额）
-		hasDiscountGoodsArr: [],
-	};
+  // 将商品订单价格转换为BigNumber并减去优惠券折扣
+  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(
+    goodsCouponDiscount
+  );
+
+  // 计算优惠比例：(100 - 折扣率) / 100
+  const discountAmountRatio = new BigNumber(100)
+    .minus(discountRate)
+    .dividedBy(100);
+
+  // 计算折扣金额：调整后的商品订单金额 × 优惠比例
+  let discountPrice = adjustedGoodsOrderPrice
+    .times(discountAmountRatio)
+    .decimalPlaces(2, BigNumber.ROUND_FLOOR)
+    .toNumber();
+
+  // 应用最大折扣金额限制
+  if (maxDiscountAmount !== 0) {
+    discountPrice =
+      discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
+  }
+
+  return {
+    discountPrice, // 折扣抵扣金额（即优惠的金额）
+    hasDiscountGoodsArr: [],
+  };
 }
 
 /**
@@ -307,39 +459,45 @@ export function returnCouponZhekouDiscount(
  * @param canDikouGoodsArr 可抵扣商品列表
  * @param coupon 优惠券
  * @param user 用户信息
+ * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user) {
-	const {
-		useFoods,
-		discountNum,
-		useRule
-	} = coupon;
-	//抵扣商品数组
-	let discountGoodsArr = [];
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoodsArr = canDikouGoodsArr
-				.slice(canDikouGoodsArr.length - discountNum, canDikouGoodsArr.length)
-				.reverse();
-		} else {
-			discountGoodsArr = canDikouGoodsArr.slice(0, discountNum);
-		}
-	} else {
-		//抵扣选中商品
-		const discountSelGoodsArr = canDikouGoodsArr.filter((v) =>
-			useFoods.find((food) => food.id == v.productId)
-		);
-		if (useRule == "price_asc") {
-			discountGoodsArr = discountSelGoodsArr
-				.slice(discountSelGoodsArr.length - discountNum, discountSelGoodsArr.length)
-				.reverse();
-		} else {
-			discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
-		}
-	}
-	const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user);
-	return result;
+export function returnCouponProductDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
+  const { useFoods, discountNum, useRule } = coupon;
+  //抵扣商品数组
+  let discountGoodsArr = [];
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoodsArr = canDikouGoodsArr.slice(discountNum * -1).reverse();
+    } else {
+      discountGoodsArr = canDikouGoodsArr.slice(0, discountNum);
+    }
+  } else {
+    //抵扣选中商品
+    const discountSelGoodsArr = canDikouGoodsArr.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoodsArr = discountSelGoodsArr.slice(discountNum * -1).reverse();
+    } else {
+      discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
+    }
+  }
+  const result = calcDiscountGoodsArrPrice(
+    discountGoodsArr,
+    discountNum,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
+  return result;
 }
 
 // 返回买一送一券抵扣详情
@@ -348,38 +506,47 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user) {
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
-	const {
-		useFoods,
-		useRule
-	} = coupon;
-	//抵扣商品
-	let discountGoods = undefined;
-	//符合买一送一条件的商品
-	const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
-		} else {
-			discountGoods = canUseGoods.slice(0, 1);
-		}
-	} else {
-		//符合抵扣条件的商品
-		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
-		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
-		}
-	}
-	const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
-	const hasDiscountGoodsArr = [discountGoods];
-	return {
-		discountPrice,
-		hasDiscountGoodsArr
-	};
+function returnCouponBuyOneGiveOneDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,limitTimeDiscount
+) {
+  const { useFoods, useRule } = coupon;
+  //抵扣商品
+  let discountGoods = undefined;
+  //符合买一送一条件的商品
+  const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods[canUseGoods.length - 1];
+    } else {
+      discountGoods = canUseGoods[0];
+    }
+  } else {
+    //符合抵扣条件的商品
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods1[canUseGoods1.length - 1];
+    } else {
+      discountGoods = canUseGoods1[0];
+    }
+  }
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  if (discountGoods) {
+    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo,limitTimeDiscount);
+    hasDiscountGoodsArr = [discountGoods];
+  }
+  return {
+    discountPrice: discountPrice <= 0 ? 0 : discountPrice,
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -388,39 +555,46 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user,shopIn
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
-	const {
-		useFoods,
-		useRule
-	} = coupon;
-	//抵扣商品
-	let discountGoods = undefined;
-	//符合买一送一条件的商品
-	const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
-	//抵扣全部商品
-	if (useFoods.length === 0) {
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods[canUseGoods.length - 1];
-		} else {
-			discountGoods = canUseGoods.slice(0, 1);
-		}
-	} else {
-		//符合抵扣条件的商品
-		const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
-		if (useRule == "price_asc") {
-			discountGoods = canUseGoods1[canUseGoods1.length - 1];
-		} else {
-			discountGoods = canUseGoods1.slice(0, 1);
-		}
-	}
-	const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
-	const hasDiscountGoodsArr = [discountGoods];
-	//返回半价价格
-	return {
-		discountPrice: new BigNumber(discountPrice).dividedBy(2).toNumber(),
-		hasDiscountGoodsArr,
-	};
+function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo,limitTimeDiscount) {
+  const { useFoods, useRule } = coupon;
+  //抵扣商品
+  let discountGoods = undefined;
+  //符合条件的商品
+  const canUseGoods = canDikouGoodsArr.filter((v) => v.num >= 2);
+  //抵扣全部商品
+  if (useFoods.length === 0) {
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods[canUseGoods.length - 1];
+    } else {
+      discountGoods = canUseGoods[0];
+    }
+  } else {
+    //符合抵扣条件的商品
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
+    if (useRule == "price_asc") {
+      discountGoods = canUseGoods1[canUseGoods1.length - 1];
+    } else {
+      discountGoods = canUseGoods1[0];
+    }
+  }
+  let discountPrice = 0;
+  let hasDiscountGoodsArr = [];
+  if (discountGoods) {
+    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo,limitTimeDiscount);
+    hasDiscountGoodsArr = [discountGoods];
+  }
+  //返回半价价格
+  return {
+    discountPrice:
+      discountPrice <= 0
+        ? 0
+        : new BigNumber(discountPrice).dividedBy(2).toNumber(),
+    hasDiscountGoodsArr,
+  };
 }
 
 /**
@@ -428,17 +602,21 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
  * @param arr 商品列表
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCanDikouGoods(arr, user, shopInfo) {
-	const result = arr
-		.filter((v) => {
-			return v.is_temporary != 1 && v.is_gift != 1;
-		})
-		.filter((v) => {
-			return v.num > 0;
-		})
-		.sort((a, b) => {
-			return returnGoodsPrice(b, use, shopInfo) - returnGoodsPrice(a, user, shopInfo);
-		});
-	return result;
-}
\ No newline at end of file
+export function returnCanDikouGoods(arr, user, shopInfo,limitTimeDiscount) {
+  const result = arr
+    .filter((v) => {
+      return v.is_temporary != 1 && v.is_gift != 1;
+    })
+    .filter((v) => {
+      return v.num > 0;
+    })
+    .sort((a, b) => {
+      return (
+        returnGoodsPrice(b, user, shopInfo,limitTimeDiscount) -
+        returnGoodsPrice(a, user, shopInfo,limitTimeDiscount)
+      );
+    });
+  return result;
+}
diff --git a/utils/goods-utils.js b/utils/goods-utils.js
index c431129..a9a9b89 100644
--- a/utils/goods-utils.js
+++ b/utils/goods-utils.js
@@ -5,19 +5,48 @@ import _ from "lodash";
  * 返回商品单价
  * @param goods 商品
  * @param user 用户信息
- * @param {Object} shopInfo
+ * @param {Object} shopInfo 店铺信息
+ * @param {boolean} limitTimeDiscount - 限时折扣
  */
-export function returnGoodsPrice(goods, user, shopInfo) {
+export function returnGoodsPrice(goods, user, shopInfo, limitTimeDiscount) {
   if (!goods) {
     return 0;
   }
+  // 商家改价
   if (goods.discount_sale_amount * 1 > 0) {
-    return goods.discount_sale_amount;
+    return goods.salePrice;
+  }
+  // 限时折扣
+  if (limitTimeDiscount && limitTimeDiscount.id) {
+    if (
+      limitTimeDiscount.foodType == 1 &&
+      limitTimeDiscount.discountPriority == "limit-time"
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
+    const canUseFoods = limitTimeDiscount.foods.split(",");
+    if (
+      limitTimeDiscount.foodType == 2 &&
+      limitTimeDiscount.discountPriority == "limit-time" &&
+      canUseFoods.includes(`${goods.productId}`)
+    ) {
+      return new BigNumber(goods.salePrice)
+        .times(limitTimeDiscount.discountRate / 100)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+    }
   }
   if (shopInfo && !shopInfo.isMemberPrice) {
     return goods.salePrice;
   }
-  if (user.isVip && goods.memberPrice * 1 <= goods.salePrice * 1 && goods.memberPrice * 1 > 0) {
+  if (
+    user.isVip &&
+    goods.memberPrice * 1 <= goods.salePrice * 1 &&
+    goods.memberPrice * 1 > 0
+  ) {
     return goods.memberPrice;
   }
   return goods.salePrice;
@@ -63,7 +92,9 @@ export function returnCoupType(coupon) {
  * @param selCoupon 已选择的优惠券列表
  * @param user 用户信息
  */
-export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
+export function returnCanDikouGoodsArr(args) {
+  const { canDikouGoodsArr, selCoupon, user, shopInfo, limitTimeDiscount } =
+    args;
   const types = [2, 4, 6];
   // 收集已抵扣商品并关联对应的优惠券类型
   const goodsCouponGoods = selCoupon
@@ -92,11 +123,53 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
       }
       return v;
     })
-    .filter((v) => v.num > 0); // 过滤掉数量<=0的商品
+    .filter((v) => {
+      const canUseNum=v.num-(v.returnNum||0)
+      if(canUseNum <= 0||v.is_temporary==1||v.is_gift==1){
+        return false
+      }
+
+      return true
+    }); // 过滤掉数量<=0的商品,赠菜，临时菜
 
   return arr;
 }
 
+/**
+ * 返回商品是否享用了会员价/会员折扣
+ * @param {*} goods
+ */
+function returnGoodsIsUseVipPrice(shopInfo,user,goods) {
+  if(goods.is_time_discount){
+    return false
+  }
+  if(shopInfo.isMemberPrice!=1||user.isVip!=1){
+    return false
+  }
+  if(shopInfo.isMemberPrice==1&&user.isVip==1){
+    if(goods.memberPrice<=0){
+      return false
+    }
+    return true
+  }
+  
+}
+
+/**
+ * 返回可以计算抵扣金额的商品列表
+ */
+function returnCanCalcGoodsList(canCalcGoodsArr, coupon, shopInfo, user) {
+  return canCalcGoodsArr.filter((goods) => {
+    if (!coupon.discountShare && goods.is_time_discount) {
+      return false;
+    }
+    if(!coupon.vipPriceShare&& returnGoodsIsUseVipPrice(shopInfo,user,goods)){
+      return false;
+    }
+    return true;
+  });
+}
+
 /**
  * 判断优惠券是否可使用，并返回不可用原因
  *
@@ -111,10 +184,20 @@ export function returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user) {
  * @param {Object} args.user - 用户信息对象
  * @param {Object} args.selCoupon - 已经选择的优惠券信息对象
  * @param {Object} args.shopInfo
+ * @param {boolean} args.limitTimeDiscount - 限时折扣
  * @returns {Object} - { canUse: boolean, reason: string } 可用状态及不可用原因
  */
 export function returnCouponCanUse(args) {
-  let { canDikouGoodsArr, coupon, goodsOrderPrice, user, selCoupon, shopInfo } = args;
+  let {
+    canDikouGoodsArr,
+    coupon,
+    goodsOrderPrice,
+    user,
+    selCoupon,
+    shopInfo,
+    isMemberPrice,
+    limitTimeDiscount,
+  } = args;
   // 优惠券未启用
   if (!coupon.use) {
     return {
@@ -122,10 +205,27 @@ export function returnCouponCanUse(args) {
       reason: coupon.noUseRestrictions || "不在可用时间段内",
     };
   }
+  if (
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    limitTimeDiscount.foodType == 1 &&
+    !coupon.discountShare
+  ) {
+    return {
+      canUse: false,
+      reason: coupon.noUseRestrictions || "不可与限时折扣同享",
+    };
+  }
 
   // 计算门槛金额
   let fullAmount = goodsOrderPrice;
-  canDikouGoodsArr = returnCanDikouGoodsArr(canDikouGoodsArr, selCoupon, user, shopInfo);
+  canDikouGoodsArr = returnCanDikouGoodsArr({
+    canDikouGoodsArr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount,
+  });
   //优惠券指定门槛商品列表
   let canCalcGoodsArr = [...canDikouGoodsArr];
   //部分商品参与门槛计算
@@ -133,10 +233,18 @@ export function returnCouponCanUse(args) {
     canCalcGoodsArr = canDikouGoodsArr.filter((v) => {
       return coupon.thresholdFoods.find((food) => food.id == v.productId);
     });
-    fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
-      return pre + returnGoodsPrice(cur, user, shopInfo) * cur.num;
-    }, 0);
   }
+  canCalcGoodsArr = returnCanCalcGoodsList(
+    canCalcGoodsArr,
+    coupon,
+    shopInfo,
+    user
+  );
+  fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
+    return (
+      pre + returnGoodsPrice(cur, user, shopInfo, limitTimeDiscount) * cur.num
+    );
+  }, 0);
 
   // 是否全部商品可用
   const isDikouAll = coupon.useFoods.length === 0;
@@ -147,12 +255,12 @@ export function returnCouponCanUse(args) {
       return coupon.useFoods.find((food) => food.id == v.productId);
     });
   }
-  if (user.isVip && !coupon.vipPriceShare) {
-    return {
-      canUse: false,
-      reason: "非会员可用",
-    };
-  }
+  // if (user.isVip && !coupon.vipPriceShare) {
+  //   return {
+  //     canUse: false,
+  //     reason: "非会员可用",
+  //   };
+  // }
   if (selCoupon.length > 0 && !selCoupon[0].otherCouponShare) {
     return {
       canUse: false,
@@ -183,15 +291,8 @@ export function returnCouponCanUse(args) {
   }
   // 商品兑换券，第二件半价和买一送一判断是否有可用商品
   if ([2, 4, 5].includes(coupon.type)) {
-    if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
-      return {
-        canUse: false,
-        reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
-      };
-    }
-
-    // 没有符合条件的商品
-    if (isDikouAll && canDikouGoodsArr.length === 0) {
+     // 没有符合条件的商品
+     if (isDikouAll && canDikouGoodsArr.length === 0) {
       return {
         canUse: false,
         reason: "没有符合条件的商品",
@@ -203,6 +304,23 @@ export function returnCouponCanUse(args) {
         reason: "没有符合条件的商品",
       };
     }
+    if (coupon.type == 2  ) {
+      if(canCalcGoodsArr.length<=0){
+        return {
+          canUse: false,
+          reason: "没有符合计算门槛条件的商品",
+        };
+      }
+      if(fullAmount < coupon.fullAmount){
+        return {
+          canUse: false,
+          reason: `满${coupon.fullAmount}元可用，当前可参与金额${fullAmount}元`,
+        };
+      }
+  
+    }
+
+   
   }
   //商品兑换券是否达到门槛金额
   if (coupon.type == 2 && goodsOrderPrice < coupon.fullAmount) {
@@ -258,8 +376,15 @@ export function returnCouponCanUse(args) {
  * @param discountNum 抵扣数量
  * @param user 用户信息
  * @param {Object} shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo) {
+export function calcDiscountGoodsArrPrice(
+  discountGoodsArr,
+  discountNum,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   let hasCountNum = 0;
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
@@ -270,7 +395,8 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, s
     const goods = discountGoodsArr[i];
     const shengyuNum = discountNum - hasCountNum;
     const num = Math.min(goods.num, shengyuNum);
-    discountPrice += returnGoodsPrice(goods, user, shopInfo) * num;
+    discountPrice +=
+      returnGoodsPrice(goods, user, shopInfo, limitTimeDiscount) * num;
 
     hasCountNum += num;
     hasDiscountGoodsArr.push({
@@ -293,22 +419,62 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, s
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon, shopInfo) {
+export function returnCouponDiscount(
+  arr,
+  coupon,
+  user,
+  goodsOrderPrice,
+  selCoupon,
+  shopInfo,
+  limitTimeDiscount
+) {
   arr = returnCanDikouGoods(arr, user, shopInfo);
-  const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
+  const canDikouGoodsArr = returnCanDikouGoodsArr({
+    canDikouGoodsArr: arr,
+    selCoupon,
+    user,
+    shopInfo,
+    limitTimeDiscount,
+  });
   if (coupon.type == 2) {
-    return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    return returnCouponProductDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
   }
   if (coupon.type == 6) {
-    const result = returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    const result = returnCouponBuyOneGiveOneDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     return result;
   }
   if (coupon.type == 4) {
-    return returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo);
+    return returnSecoendDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
   }
   if (coupon.type == 3) {
-    return returnCouponZhekouDiscount(canDikouGoodsArr, coupon, user, goodsOrderPrice, selCoupon);
+    return returnCouponZhekouDiscount(
+      canDikouGoodsArr,
+      coupon,
+      user,
+      goodsOrderPrice,
+      selCoupon,
+      limitTimeDiscount
+    );
   }
 }
 
@@ -319,6 +485,7 @@ export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoup
  * @param user 用户信息
  * @param goodsOrderPrice   商品订单金额
  * @param selCoupon 已选择的优惠券列表
+ * @param limitTimeDiscount 限时折扣
  *
  */
 export function returnCouponZhekouDiscount(
@@ -326,7 +493,8 @@ export function returnCouponZhekouDiscount(
   coupon,
   user,
   goodsOrderPrice,
-  selCoupon
+  selCoupon,
+  limitTimeDiscount
 ) {
   const { discountRate, maxDiscountAmount } = coupon;
 
@@ -334,14 +502,20 @@ export function returnCouponZhekouDiscount(
   const goodsCouponDiscount = selCoupon
     .filter((v) => v.type == 2)
     .reduce((prve, cur) => {
-      return new BigNumber(prve).plus(new BigNumber(cur.discount.discountPrice));
+      return new BigNumber(prve).plus(
+        new BigNumber(cur.discount.discountPrice)
+      );
     }, new BigNumber(0));
 
   // 将商品订单价格转换为BigNumber并减去优惠券折扣
-  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(goodsCouponDiscount);
+  const adjustedGoodsOrderPrice = new BigNumber(goodsOrderPrice).minus(
+    goodsCouponDiscount
+  );
 
   // 计算优惠比例：(100 - 折扣率) / 100
-  const discountAmountRatio = new BigNumber(100).minus(discountRate).dividedBy(100);
+  const discountAmountRatio = new BigNumber(100)
+    .minus(discountRate)
+    .dividedBy(100);
 
   // 计算折扣金额：调整后的商品订单金额 × 优惠比例
   let discountPrice = adjustedGoodsOrderPrice
@@ -351,7 +525,8 @@ export function returnCouponZhekouDiscount(
 
   // 应用最大折扣金额限制
   if (maxDiscountAmount !== 0) {
-    discountPrice = discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
+    discountPrice =
+      discountPrice >= maxDiscountAmount ? maxDiscountAmount : discountPrice;
   }
 
   return {
@@ -366,8 +541,15 @@ export function returnCouponZhekouDiscount(
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+export function returnCouponProductDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, discountNum, useRule } = coupon;
   //抵扣商品数组
   let discountGoodsArr = [];
@@ -389,7 +571,13 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shop
       discountGoodsArr = discountSelGoodsArr.slice(0, discountNum);
     }
   }
-  const result = calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, shopInfo);
+  const result = calcDiscountGoodsArrPrice(
+    discountGoodsArr,
+    discountNum,
+    user,
+    shopInfo,
+    limitTimeDiscount
+  );
   return result;
 }
 
@@ -399,8 +587,15 @@ export function returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shop
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+function returnCouponBuyOneGiveOneDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
   let discountGoods = undefined;
@@ -415,7 +610,9 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
     }
   } else {
     //符合抵扣条件的商品
-    const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
     if (useRule == "price_asc") {
       discountGoods = canUseGoods1[canUseGoods1.length - 1];
     } else {
@@ -425,7 +622,12 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
   if (discountGoods) {
-    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+    discountPrice = returnGoodsPrice(
+      discountGoods,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     hasDiscountGoodsArr = [discountGoods];
   }
   return {
@@ -440,8 +642,15 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
  * @param coupon 优惠券
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
+function returnSecoendDiscount(
+  canDikouGoodsArr,
+  coupon,
+  user,
+  shopInfo,
+  limitTimeDiscount
+) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
   let discountGoods = undefined;
@@ -456,7 +665,9 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
     }
   } else {
     //符合抵扣条件的商品
-    const canUseGoods1 = canUseGoods.filter((v) => useFoods.find((food) => food.id == v.productId));
+    const canUseGoods1 = canUseGoods.filter((v) =>
+      useFoods.find((food) => food.id == v.productId)
+    );
     if (useRule == "price_asc") {
       discountGoods = canUseGoods1[canUseGoods1.length - 1];
     } else {
@@ -466,12 +677,20 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
   if (discountGoods) {
-    discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
+    discountPrice = returnGoodsPrice(
+      discountGoods,
+      user,
+      shopInfo,
+      limitTimeDiscount
+    );
     hasDiscountGoodsArr = [discountGoods];
   }
   //返回半价价格
   return {
-    discountPrice: discountPrice <= 0 ? 0 : new BigNumber(discountPrice).dividedBy(2).toNumber(),
+    discountPrice:
+      discountPrice <= 0
+        ? 0
+        : new BigNumber(discountPrice).dividedBy(2).toNumber(),
     hasDiscountGoodsArr,
   };
 }
@@ -481,8 +700,9 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user, shopInfo) {
  * @param arr 商品列表
  * @param user 用户信息
  * @param shopInfo 店铺信息
+ * @param limitTimeDiscount 限时折扣
  */
-export function returnCanDikouGoods(arr, user, shopInfo) {
+export function returnCanDikouGoods(arr, user, shopInfo, limitTimeDiscount) {
   const result = arr
     .filter((v) => {
       return v.is_temporary != 1 && v.is_gift != 1;
@@ -491,7 +711,10 @@ export function returnCanDikouGoods(arr, user, shopInfo) {
       return v.num > 0;
     })
     .sort((a, b) => {
-      return returnGoodsPrice(b, user, shopInfo) - returnGoodsPrice(a, user, shopInfo);
+      return (
+        returnGoodsPrice(b, user, shopInfo, limitTimeDiscount) -
+        returnGoodsPrice(a, user, shopInfo, limitTimeDiscount)
+      );
     });
   return result;
 }
diff --git a/utils/goods.ts b/utils/goods.ts
index 9bd86d4..691d624 100644
--- a/utils/goods.ts
+++ b/utils/goods.ts
@@ -234,6 +234,40 @@ export interface FreeDineConfig {
   useShopType?: string; //all 全部 part部分
   shopIdList?: number[]; //可用门店id
 }
+
+//限时折扣配置
+export interface TimeLimitDiscountConfig {
+  /**
+   * 折扣优先级 limit-time/vip-price
+   */
+  discountPriority: string;
+  /**
+   * 折扣% 范围1-99
+   */
+  discountRate: number;
+  /**
+   * 参与商品
+   */
+  foods: string;
+  /**
+   * 参与商品 1全部 2部分
+   */
+  foodType: number;
+  /**
+   * 自增主键
+   */
+  id: number;
+  /**
+   * 店铺ID
+   */
+  shopId: number;
+  /**
+   * 可使用类型：堂食 dine-in  外带 take-out 外卖 take-away 配送 post
+   */
+  useType: string;
+  [property: string]: any;
+}
+
 /** 订单额外费用配置 */
 export interface OrderExtraConfig {
   // merchantReduction: number;        // 商家减免金额（元，默认0）
@@ -251,6 +285,7 @@ export interface OrderExtraConfig {
   currentDinnerType: "dine-in" | "take-out" | "take-away" | "post"; // 当前就餐类型（匹配useType）
   isFreeDine?: boolean; //是否霸王餐
   freeDineConfig?: FreeDineConfig;
+  limitTimeDiscount?: TimeLimitDiscountConfig; //限时折扣
 }
 
 /** 订单费用汇总（修改：补充商家减免类型和明细） */
@@ -283,10 +318,12 @@ export interface OrderCostSummary {
   config: OrderExtraConfig; // 订单额外费用配置
   //满减活动
   fullReduction: {
+    usedFullReductionActivityFullAmount: number; // 计算出的满减活动的门槛金额
     usedActivity?: FullReductionActivity; // 实际使用的满减活动
     usedThreshold?: FullReductionThreshold; // 实际使用的满减阈值（多门槛中选最优）
     actualAmount: number; // 满减实际减免金额（元）
   };
+  vipDiscountAmount: number; //会员折扣减免金额
   // 订单原支付金额
   orderOriginFinalPayAmount: number; //订单原金额（包含打包费+餐位费）
 }
@@ -399,6 +436,188 @@ function isDinnerTypeMatch(
   //满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
   return true;
 }
+
+//判断商品是否可以使用限时折扣
+export function returnCanUseLimitTimeDiscount(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (!limitTimeDiscount || !limitTimeDiscount.id) {
+    return false;
+  }
+  const canUseFoods = (limitTimeDiscount.foods || "").split(",");
+  if (limitTimeDiscount.discountPriority == "limit-time") {
+    if (
+      limitTimeDiscount.foodType == 1 ||
+      canUseFoods.includes("" + goods[idKey])
+    ) {
+      return true;
+    }
+  }
+  if (limitTimeDiscount.discountPriority == "vip-price") {
+    if (!useVipPrice) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function returnMemberPrice(useVipPrice: boolean, goods: BaseCartItem) {
+  if (useVipPrice) {
+    return goods.memberPrice || goods.salePrice;
+  } else {
+    return goods.salePrice;
+  }
+}
+
+/**
+ * 返回商品限时折扣价格
+ */
+function returnLimitPrice(
+  goods: BaseCartItem,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice
+) {
+  if (!limitTimeDiscount) {
+    return 0;
+  }
+  const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
+    100
+  );
+
+  const canuseLimit = returnCanUseLimitTimeDiscount(
+    goods,
+    limitTimeDiscount,
+    useVipPrice
+  );
+  if (canuseLimit) {
+    //可以使用限时折扣
+    if (limitTimeDiscount.discountPriority == "limit-time") {
+      //限时价优先
+      const result = BigNumber(goods.salePrice)
+        .times(discountRate)
+        .decimalPlaces(2, BigNumber.ROUND_UP)
+        .toNumber();
+      return result;
+    }
+    if (limitTimeDiscount.discountPriority == "vip-price") {
+      //会员价优先
+      if (useVipPrice) {
+        //使用会员价
+        return returnMemberPrice(useVipPrice, goods);
+      } else {
+        //不使用会员价
+        const result = BigNumber(goods.salePrice)
+          .times(discountRate)
+          .decimalPlaces(2, BigNumber.ROUND_UP)
+          .toNumber();
+        return result;
+      }
+    }
+  } else {
+    //不可以使用限时折扣
+    //会员价优先
+    if (useVipPrice) {
+      //使用会员价
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+}
+
+/**
+ * 计算商品计算门槛时的金额
+ */
+
+export function returnCalcPrice(
+  goods: BaseCartItem,
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean,
+  idKey = "product_id"
+) {
+  if (goods.discountSaleAmount && goods.discountSaleAmount * 1 > 0) {
+    return goods.salePrice;
+  }
+  //限时折扣和满减活动都有
+  if (fullReductionActivitie && limitTimeDiscount) {
+    if (
+      fullReductionActivitie.discountShare == 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣同享，与会员价不同享
+      return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+    }
+    if (
+      fullReductionActivitie.discountShare != 1 &&
+      fullReductionActivitie.vipPriceShare == 1
+    ) {
+      //与限时折扣不同享，与会员价同享
+      return returnMemberPrice(useVipPrice, goods);
+    }
+    if (fullReductionActivitie.vipPriceShare != 1) {
+      //与会员价不同享
+      return goods.salePrice;
+    }
+    return goods.salePrice;
+  }
+  //只有满减活动
+  if (fullReductionActivitie) {
+    if (fullReductionActivitie.vipPriceShare == 1) {
+      return returnMemberPrice(useVipPrice, goods);
+    } else {
+      return goods.salePrice;
+    }
+  }
+  //只有限时折扣
+  if (limitTimeDiscount) {
+    return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+  }
+
+  if (useVipPrice) {
+    return returnMemberPrice(useVipPrice, goods);
+  }
+  return goods.salePrice;
+}
+
+/**
+ * 计算满减活动门槛
+ */
+export function calcFullReductionActivityFullAmount(
+  goodsList: BaseCartItem[],
+  fullReductionActivitie: FullReductionActivity | undefined,
+  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+  useVipPrice: boolean
+): number {
+  if (!fullReductionActivitie) {
+    return 0;
+  }
+  let amount = 0;
+  for (let goods of goodsList) {
+    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+    if (goods.is_temporary || goods.is_gift || availableNum <= 0) {
+      //临时菜，赠菜，数量<=0的商品不计算
+      continue;
+    }
+    const calcPrice = returnCalcPrice(
+      goods,
+      fullReductionActivitie,
+      limitTimeDiscount,
+      useVipPrice,
+      "product_id"
+    );
+    if (calcPrice !== undefined) {
+      amount += calcPrice * availableNum;
+    }
+  }
+  return amount;
+  console.log("amount", amount);
+}
+
 /**
  * 筛选最优满减活动（对齐后端逻辑：状态→时间→周期→时段→就餐类型→排序→修改时间）
  * @param activities 后端返回的满减活动列表
@@ -424,11 +643,16 @@ export function filterOptimalFullReductionActivity(
       activity.thresholds?.length // 至少有一个满减阈值
     );
   });
+  console.log("baseEligible", baseEligible);
+
   if (!baseEligible.length) return undefined;
 
   // 第二步：时间筛选（有效期内+周期内+时段内）
   const timeEligible = baseEligible.filter((activity) => {
     // 1. 校验有效期（validStartTime ~ validEndTime）
+    if (activity.useTimeType == "all") {
+      return true;
+    }
     if (!activity.validStartTime || !activity.validEndTime) return false;
     const startDate = new Date(activity.validStartTime);
     const endDate = new Date(activity.validEndTime);
@@ -665,11 +889,12 @@ export function calcCouponThresholdAmount(
  */
 export function calcSingleGoodsRealPrice(
   goods: BaseCartItem,
-  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate"> & {
-    activity?: ActivityConfig; // 商品参与的营销活动（如限时折扣，按商品ID匹配）
-  }
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
 ): number {
-  const { isMember, memberDiscountRate, activity } = config;
+  const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
 
   //如果是增菜价格为0
   if (goods.is_gift) {
@@ -680,6 +905,7 @@ export function calcSingleGoodsRealPrice(
   if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
     return truncateToTwoDecimals(goods.discountSaleAmount);
   }
+  console.log("calcSingleGoodsRealPrice:goods", goods);
 
   // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
   const memberPrice = new BigNumber(
@@ -687,12 +913,35 @@ export function calcSingleGoodsRealPrice(
   );
 
   // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
-  const isActivityApplicable = activity
-    ? (activity.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
-    : false;
+  let isActivityApplicable = false;
+  if (activity) {
+    if (activity.foodType == 1) {
+      isActivityApplicable = true;
+    } else {
+      const canUseGoods = activity.foods?.split(",") || [];
+      if (canUseGoods.find((v) => v == String(goods.product_id))) {
+        isActivityApplicable = true;
+      }
+    }
+  }
   if (!activity || !isActivityApplicable) {
     return memberPrice.toNumber();
   }
+  //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
+  if (
+    activity.discountPriority == "limit-time" ||
+    (activity.discountPriority == "vip-price" && !isMember)
+  ) {
+    //限时折扣优先
+    return truncateToTwoDecimals(
+      new BigNumber(goods.salePrice)
+        .multipliedBy(activity.discountRate / 100)
+        .toNumber()
+    );
+  }
+  if (activity.discountPriority == "vip-price" && isMember) {
+    return memberPrice.toNumber();
+  }
 
   // 处理活动与会员的同享/不同享逻辑
   if (activity.vipPriceShare) {
@@ -751,26 +1000,17 @@ export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
  */
 export function calcGoodsRealAmount(
   goodsList: BaseCartItem[],
-  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
-  activities: ActivityConfig[] = []
+  config: Pick<
+    OrderExtraConfig,
+    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
+  >
 ): number {
   let total = new BigNumber(0);
 
   for (const goods of goodsList) {
     const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
     if (availableNum <= 0) continue;
-
-    // 匹配商品参与的营销活动（按商品ID匹配，优先商品自身配置）
-    const activity =
-      goods.activityInfo ??
-      activities.find(
-        (act) =>
-          (act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
-      );
-
-    const realPrice = new BigNumber(
-      calcSingleGoodsRealPrice(goods, { ...config, activity })
-    );
+    const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
     total = total.plus(realPrice.multipliedBy(availableNum));
   }
 
@@ -967,14 +1207,13 @@ export function calcTotalPackFee(
   for (const goods of goodsList) {
     const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
     let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
-   
 
     if (availableNum === 0) continue;
 
     // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
     let packNum = Math.min(availableNum, packNumber);
-    if(dinnerType === "take-out"){
-      packNum=availableNum
+    if (dinnerType === "take-out") {
+      packNum = availableNum;
     }
     if (goods.product_type === GoodsType.WEIGHT) {
       packNum = Math.min(packNum, 1);
@@ -1066,7 +1305,12 @@ export function calculateOrderCostSummary(
   currentTime: Date = new Date()
 ): OrderCostSummary {
   //是否使用霸王餐，霸王餐配置
-  const { isFreeDine, freeDineConfig } = config;
+  const {
+    isFreeDine,
+    freeDineConfig,
+    limitTimeDiscount,
+    fullReductionActivities,
+  } = config;
 
   // ------------------------------ 1. 基础费用计算 ------------------------------
   const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
@@ -1076,13 +1320,17 @@ export function calculateOrderCostSummary(
     {
       isMember: config.isMember,
       memberDiscountRate: config.memberDiscountRate,
-    },
-    activities
+      limitTimeDiscount: config.limitTimeDiscount,
+    }
   );
   const goodsDiscountAmount = calcGoodsDiscountAmount(
     goodsOriginalAmount,
     goodsRealAmount
   ); // 商品折扣金额
+
+  //会员折扣
+  let vipDiscountAmount = 0;
+
   const newUserDiscount = config.newUserDiscount || 0; // 新客立减
 
   // ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
@@ -1104,7 +1352,14 @@ export function calculateOrderCostSummary(
   const additionalFee = Math.max(0, config.additionalFee); // 附加费
 
   // 2.2 计算满减基数（先扣新客立减）
-  let baseAfterNewUserDiscount = new BigNumber(goodsRealAmount)
+  let baseAfterNewUserDiscount = new BigNumber(
+    limitTimeDiscount &&
+    limitTimeDiscount.id &&
+    usedFullReductionActivity &&
+    !usedFullReductionActivity.discountShare
+      ? goodsRealAmount
+      : goodsRealAmount
+  )
     .minus(newUserDiscount)
     .plus(packFee)
     .plus(seatFee)
@@ -1114,10 +1369,19 @@ export function calculateOrderCostSummary(
     baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
 
   // 2.3 选择最优满减阈值（多门槛场景）
+  let usedFullReductionActivityFullAmount = 0;
   if (usedFullReductionActivity) {
+    //计算当前满减活动的门槛金额
+    usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+      goodsList,
+      usedFullReductionActivity,
+      config.limitTimeDiscount,
+      config.isMember
+    );
+
     usedFullReductionThreshold = selectOptimalThreshold(
       usedFullReductionActivity.thresholds,
-      baseAfterNewUserDiscount,
+      usedFullReductionActivityFullAmount,
       goodsOriginalAmount,
       goodsRealAmount,
       usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
@@ -1182,27 +1446,23 @@ export function calculateOrderCostSummary(
   maxPointDeductionLimit =
     maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
 
-
   const pointResult = calcPointDeduction(
     config.userPoints,
     config.pointDeductionRule,
     maxPointDeductionLimit
   );
-  console.log("积分抵扣结果:", pointResult);
 
   pointDeductionAmount = pointResult.deductionAmount;
   usedPoints = pointResult.usedPoints;
   // 若满减与积分不同享（pointsShare=1）积分抵扣为0
   if (usedFullReductionActivity && !usedFullReductionActivity.pointsShare) {
-    console.log("满减与积分不同享:积分抵扣为0");
     pointDeductionAmount = 0;
     usedPoints = 0;
   }
 
   //使用霸王餐
   if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
-    console.log("使用霸王餐");
-    fullReductionAmount=0;
+    fullReductionAmount = 0;
     //不与优惠券同享
     if (!freeDineConfig.withCoupon) {
       couponDeductionAmount = 0;
@@ -1319,10 +1579,12 @@ export function calculateOrderCostSummary(
     scoreMaxMoney,
     // 满减活动明细（后端字段）
     fullReduction: {
+      usedFullReductionActivityFullAmount: usedFullReductionActivityFullAmount,
       usedActivity: usedFullReductionActivity,
       usedThreshold: usedFullReductionThreshold,
       actualAmount: truncateToTwoDecimals(fullReductionAmount),
     },
+    vipDiscountAmount: vipDiscountAmount, //会员折扣减免金额
     merchantReduction: {
       type: merchantReductionConfig.type,
       originalConfig: merchantReductionConfig,
diff --git a/utils/order-utils.js b/utils/order-utils.js
new file mode 100644
index 0000000..5149e0c
--- /dev/null
+++ b/utils/order-utils.js
@@ -0,0 +1,152 @@
+import BigNumber from "bignumber.js";
+
+//判断商品是否可以使用限时折扣
+export function canUseLimitTimeDiscount(
+  goods,
+  limitTimeDiscountRes,
+  shopInfo,
+  shopUserInfo,
+  idKey = "id"
+) {
+  shopInfo=shopInfo||{}
+  shopUserInfo=shopUserInfo||{}
+  if (!limitTimeDiscountRes || !limitTimeDiscountRes.id) {
+    return false;
+  }
+  const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  if (limitTimeDiscountRes.discountPriority == "limit-time") {
+    if (
+      limitTimeDiscountRes.foodType == 1 ||
+      canUseFoods.includes("" + goods[idKey])
+    ) {
+      return true;
+    }
+  }
+  if (
+    limitTimeDiscountRes.discountPriority == "vip-price" 
+    
+  ) {
+    
+    if(shopUserInfo.isVip != 1 || shopInfo.isMemberPrice != 1){
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * 返回商品显示价格
+ * @params {*} args 参数对象
+ * @params {*} args.goods 商品对象
+ * @params {*} args.shopInfo 店铺信息
+ * @params {*} args.limitTimeDiscountRes 限时折扣信息
+ * @params {*} args.shopUserInfo 店铺用户信息
+ * @returns
+ */
+export function returnPrice(args) {
+  let {
+    goods,
+    shopInfo,
+    limitTimeDiscountRes,
+    shopUserInfo,
+    idKey = "product_id",
+  } = args;
+  const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  shopInfo=shopInfo||{}
+  shopUserInfo=shopUserInfo||{}
+  if (shopInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+    const memberPrice = goods.memberPrice || goods.salePrice;
+
+    //是会员而且启用会员价
+    if (limitTimeDiscountRes) {
+      //使用限时折扣
+      //限时折扣优先
+      if (limitTimeDiscountRes.discountPriority == "limit-time") {
+        if (
+          limitTimeDiscountRes.foodType == 1 ||
+          canUseFoods.includes("" + goods[idKey])
+        ) {
+          return returnLimitPrice({
+            price: goods.salePrice,
+            limitTimeDiscountRes,
+          });
+        } else {
+          return memberPrice;
+        }
+      }
+      if (limitTimeDiscountRes.discountPriority == "vip-price") {
+        //会员优先
+        return memberPrice;
+      }
+    } else {
+      //是会员没有限时折扣
+      return memberPrice;
+    }
+  } else {
+    // console.log('不是会员或者没有启用会员价',goods,limitTimeDiscountRes);
+    //不是会员或者没有启用会员价
+    if (
+      limitTimeDiscountRes &&
+      limitTimeDiscountRes.id &&
+      (limitTimeDiscountRes.foodType == 1 ||
+        canUseFoods.includes("" + goods[idKey]))
+    ) {
+      const price = returnLimitPrice({
+        price: goods.salePrice,
+        limitTimeDiscountRes,
+        goods: goods,
+      });
+
+      return price;
+    } else {
+      return goods.salePrice;
+    }
+  }
+}
+
+/**
+ * 返回限时折扣价格
+ * @params {*} args 参数对象
+ * @params {*} args.limitTimeDiscountRes 限时折扣信息
+ * @params {*} args.price 商品价格
+ * @param  {*} args.goods 商品对象
+ * @returns
+ */
+export function returnLimitPrice(args) {
+  const { limitTimeDiscountRes, price, goods } = args;
+  const discountRate = new BigNumber(
+    limitTimeDiscountRes.discountRate
+  ).dividedBy(100);
+
+  const result = BigNumber(price)
+    .times(discountRate)
+    .decimalPlaces(2, BigNumber.ROUND_UP)
+    .toNumber();
+  return result;
+}
+
+/**
+ * 判断是否返回会员价
+ * @param {*} args 参数对象
+ * @param {*} args.shopInfo 店铺信息
+ * @param {*} args.shopUserInfo 店铺用户信息
+ * @returns
+ */
+export function canReturnMemberPrice(args) {
+  const { shopInfo, shopUserInfo } = args;
+  if (shopInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * 返回会员价格
+ * @param {*} goods
+ * @returns
+ */
+export function returnMemberPrice(goods) {
+  return goods.memberPrice || goods.salePrice;
+}