diff --git a/common/api/market/birthdayGift.js b/common/api/market/birthdayGift.js
new file mode 100644
index 0000000..96b3a8e
--- /dev/null
+++ b/common/api/market/birthdayGift.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/birthdayGift",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/common/api/market/discountActivity.js b/common/api/market/discountActivity.js
new file mode 100644
index 0000000..443b867
--- /dev/null
+++ b/common/api/market/discountActivity.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/discountActivity",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/common/api/market/drainageConfig.js b/common/api/market/drainageConfig.js
new file mode 100644
index 0000000..c25d08a
--- /dev/null
+++ b/common/api/market/drainageConfig.js
@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from "@/common/api/request.js";
+import { prveUrl } from "./config.js";
+
+export const config = (data) => {
+  return request({
+    url: prveUrl + "/user/drainageConfig",
+    method: "get",
+    data: data,
+  });
+};
diff --git a/components/birthday-modal.vue b/components/birthday-modal.vue
new file mode 100644
index 0000000..bd0ff83
--- /dev/null
+++ b/components/birthday-modal.vue
@@ -0,0 +1,545 @@
+<template>
+  <view>
+    <up-popup
+      :show="show"
+      bgColor="transparent"
+      :safeAreaInsetBottom="false"
+      @close="close"
+      mode="center"
+    >
+      <view class="container">
+        <view
+          class="content"
+          :style="contentStyle"
+          :class="`content${currentPage}`"
+        >
+          <!-- 顶部标题图 -->
+          <view class="top">
+            <image class="image" :src="imageList.gift" mode="widthFix"></image>
+          </view>
+
+          <!-- 优惠券列表 -->
+          <view class="list">
+            <view
+              class="item"
+              :style="kuangStyle"
+              v-for="(item, index) in couponList"
+              :key="index"
+            >
+              <!-- <view class="kuang">
+                <image
+                  class="kuang-img"
+                  :src="imageList.kuang"
+                  mode="aspectFit"
+                ></image>
+              </view> -->
+              <!-- 优惠券金额 -->
+              <view>
+                <template
+                  v-if="
+                    item.couponInfo.couponType == 3 ||
+                    item.couponInfo.couponType == 1
+                  "
+                >
+                  <text class="big-title">{{
+                    returnTitle(item.couponInfo)
+                  }}</text>
+                  <text class="u-m-l-12 small-title">
+                    {{ returnSmallTitle(item.couponInfo) }}
+                  </text>
+                </template>
+                <template v-else>
+                  <text class="big-title" style="font-size: 48rpx">{{
+                    returnTitle(item.couponInfo)
+                  }}</text>
+                </template>
+              </view>
+              <!-- 优惠券名称与领取按钮 -->
+              <view class="u-flex u-row-between u-m-t-16">
+                <view>
+                  <text class="title">{{ item.couponInfo.title }}</text>
+                  <text class="num">x{{ item.num }}</text>
+                </view>
+                <button class="lingqu" @click="handleReceive(item)">
+                  立即领取
+                </button>
+              </view>
+              <!-- 有效期（替换硬编码，用接口返回数据） -->
+              <view class="u-m-t-10 time">
+                有效期至：{{ formatDate(item.couponInfo.validStartTime) }}-{{
+                  formatDate(item.couponInfo.validEndTime)
+                }}
+              </view>
+            </view>
+          </view>
+
+          <!-- 分页控制（左右箭头+页码） -->
+          <view
+            class="u-flex u-row-center u-m-t-16"
+            v-if="allCoupons.length > 3"
+          >
+            <!-- 左箭头：当前页>1可点击 -->
+            <view
+              @click="handlePrevPage"
+              class="page-arrow"
+              :class="{ disabled: currentPage === 1 }"
+            >
+              <up-icon
+                name="arrow-left"
+                size="12"
+                :color="currentPage === 1 ? '#999' : '#000'"
+              ></up-icon>
+            </view>
+            <!-- 页码列表：点击切换+当前页高亮 -->
+            <view class="u-flex page-nums">
+              <view
+                v-for="(num, index) in pageNums"
+                :key="index"
+                class="item"
+                :class="{ active: currentPage === num }"
+                @click="handleClickPage(num)"
+              >
+                {{ num }}
+              </view>
+            </view>
+            <!-- 右箭头：当前页<总页数可点击 -->
+            <view
+              @click="handleNextPage"
+              class="page-arrow"
+              :class="{ disabled: currentPage === totalPages }"
+            >
+              <up-icon
+                name="arrow-right"
+                size="12"
+                :color="currentPage === totalPages ? '#999' : '#000'"
+              ></up-icon>
+            </view>
+          </view>
+
+          <!-- 底部一键领取按钮 -->
+          <view class="btn-wrap" :class="{ 'u-m-t-18': allCoupons.length > 3 }">
+            <image
+              @click="handleReceiveAll"
+              class="btn-img"
+              :src="imageList.btn"
+              mode="widthFix"
+            ></image>
+          </view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+  
+  <script setup>
+import _ from "lodash";
+import dayjs from "dayjs";
+import { onMounted, ref, reactive, computed } from "vue";
+import * as birthdayGiftApi from "@/common/api/market/birthdayGift.js";
+
+// 1. 分页核心配置
+const currentPage = ref(1); // 当前页码
+const pageSize = ref(3); // 每页显示条数
+const allCoupons = ref([]); // 存储全部优惠券（用于分页截取）
+const couponList = ref([]); // 当前页优惠券列表
+const pageNums = ref([]); // 页码数组（如[1,2,3]）
+const totalPages = computed(() => {
+  // 计算总页数：向上取整（如5条数据→2页）
+  return Math.ceil(allCoupons.value.length / pageSize.value);
+});
+
+// 2. 图片资源（修复bg2地址缺失的"g"）
+const imageList = reactive({
+  btn: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/493b459f8c944057be72750c12c4cd1a.png",
+  gift: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/112d2433378349b4a26ab311b8d3bac4.png",
+  kuang:
+    "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bb5e2d5ed73c455d9b6e9b4ac0e86192.png",
+  bg1: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/847f9aea44d64b15b35caf8967f3d63f.png",
+  bg2: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f704eef2e3d484d8862673131ae3989.png", // 修复：.pn→.png
+  bg3: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/7ab43d1ef2fc490d80165d18795a93f3.png",
+});
+
+// 3. 背景图（随当前页切换）
+const bgUrl = ref(imageList.bg1);
+const contentStyle = computed(() => ({
+  backgroundImage: `url(${bgUrl.value})`,
+  backgroundSize: "100% 100%", // 确保背景图铺满容器
+}));
+const kuangStyle = computed(() => ({
+  backgroundImage: `url(${imageList.kuang})`,
+}));
+
+// 4. 弹窗状态与props
+const show = ref(false);
+const props = defineProps({
+  getMode: {
+    type: String,
+    default: "eat",
+  },
+});
+
+// ---------------------- 分页核心逻辑 ----------------------
+/**
+ * 1. 生成页码数组（如总数据5条→[1,2]）
+ */
+const generatePageNums = () => {
+  pageNums.value = Array.from({ length: totalPages.value }, (_, i) => i + 1);
+};
+
+/**
+ * 2. 更新当前页优惠券列表（根据当前页截取数据）
+ */
+const updateCouponList = () => {
+  const startIdx = (currentPage.value - 1) * pageSize.value;
+  const endIdx = startIdx + pageSize.value;
+  couponList.value = allCoupons.value.slice(startIdx, endIdx);
+  // 同步切换背景图（当前页对应bg1/bg2/bg3）
+  bgUrl.value = imageList[`bg${currentPage.value}`] || imageList.bg1;
+};
+
+/**
+ * 3. 上一页切换
+ */
+const handlePrevPage = () => {
+  if (currentPage.value > 1) {
+    currentPage.value--;
+    updateCouponList();
+  }
+};
+
+/**
+ * 4. 下一页切换
+ */
+const handleNextPage = () => {
+  if (currentPage.value < totalPages.value) {
+    currentPage.value++;
+    updateCouponList();
+  }
+};
+
+/**
+ * 5. 点击页码切换
+ */
+const handleClickPage = (num) => {
+  currentPage.value = num;
+  updateCouponList();
+};
+
+// ---------------------- 数据与交互逻辑 ----------------------
+/**
+ * 1. 格式化日期（YYYY.MM.DD）
+ */
+const formatDate = (dateStr) => {
+  return dateStr ? dayjs(dateStr).format("YYYY.MM.DD") : ""; // 默认兜底日期
+};
+
+/**
+ * 2. 单个优惠券领取
+ */
+const handleReceive = async (item) => {
+  close();
+  uni.showToast({ title: "领取成功！去「我的优惠券」查看", icon: "none" });
+};
+
+/**
+ * 3. 底部一键领取（领取当前页所有优惠券）
+ */
+const handleReceiveAll = async () => {
+  if (couponList.value.length === 0) {
+    uni.showToast({ title: "当前页无优惠券可领", icon: "none" });
+    return;
+  }
+  close();
+  uni.showToast({ title: "领取成功！去「我的优惠券」查看", icon: "none" });
+};
+
+/**
+ * 4. 初始化获取优惠券数据
+ */
+const getCouponPopupAjax = async () => {
+  try {
+    const shopId = uni.cache.get("shopId");
+    const res = await birthdayGiftApi.config({ shopId });
+    if (res.length) {
+      // 处理有效期格式（固定有效期规则）
+      allCoupons.value = res.map((item) => {
+        if (item.validType === "fixed") {
+          item.validStartTime = dayjs()
+            .add(item.daysToTakeEffect, "day")
+            .format("YYYY-MM-DD HH:mm:ss");
+          item.validEndTime = dayjs()
+            .add(+item.daysToTakeEffect + +item.validDays, "day")
+            .format("YYYY-MM-DD HH:mm:ss");
+        }
+        return item;
+      });
+      // 初始化分页：生成页码→更新列表→显示弹窗
+      generatePageNums();
+      updateCouponList();
+      show.value = true;
+    }else{
+        close();
+    }
+  } catch (error) {
+    console.error("获取优惠券失败：", error);
+  }
+};
+
+// 页面挂载时初始化
+onMounted(() => {
+  getCouponPopupAjax();
+});
+
+function returnTitle(coupon) {
+  if (coupon.couponType == 1) {
+    return `￥${coupon.discountAmount}`;
+  }
+  if (coupon.couponType == 2) {
+    return `商品兑换券`;
+  }
+  if (coupon.couponType == 3) {
+    const discountRate = coupon.discountRate / 10;
+    return `${discountRate}折券`;
+  }
+  if (coupon.couponType == 4) {
+    return `第二件半价券`;
+  }
+  if (coupon.couponType == 6) {
+    return `买一送一券`;
+  }
+}
+
+function returnSmallTitle(coupon) {
+  if (coupon.couponType == 1) {
+    return `满${coupon.fullAmount || 0}可用`;
+  }
+  if (coupon.couponType == 3) {
+    return `满${coupon.fullAmount || 0}可用`;
+  }
+}
+
+const emit = defineEmits(["close"]);
+
+function close() {
+  show.value = false;
+  emit("close");
+}
+</script>
+  
+<style scoped lang="scss">
+// 基础容器样式
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 52rpx;
+
+  .content {
+    width: 100%;
+    position: relative;
+    margin: auto;
+    min-height: 836rpx;
+    padding: 0 28rpx 62rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+
+    // 分页箭头样式（添加禁用态）
+    .page-arrow {
+      cursor: pointer;
+      width: 64rpx;
+      height: 64rpx;
+      box-sizing: border-box;
+      color: #000;
+      background-color: #fff;
+      border: 1px solid #d9d9d9;
+      font-size: 14px;
+      line-height: 60rpx;
+      padding: 0 14rpx;
+      border-radius: 4rpx;
+      overflow: hidden;
+      cursor: pointer;
+      transition: all 0.2s;
+      margin: 0 16rpx;
+      display: flex;
+      justify-content: center;
+      align-content: center;
+      &.disabled {
+        cursor: not-allowed;
+      }
+    }
+
+    // 页码样式（当前页高亮）
+    .page-nums {
+      display: flex;
+      gap: 16rpx;
+      .item {
+        width: 64rpx;
+        height: 64rpx;
+        box-sizing: border-box;
+        color: #000;
+        background-color: #fff;
+        border: 1px solid #d9d9d9;
+        font-size: 14px;
+        line-height: 64rpx;
+        padding: 0 4rpx;
+        border-radius: 4rpx;
+        overflow: hidden;
+        cursor: pointer;
+        transition: all 0.2s;
+        text-align: center;
+        &.active {
+          border-color: #1890ff;
+          color: #1890ff;
+          font-weight: 500;
+        }
+        &:active:not(.active) {
+          background-color: #f5f5f5;
+        }
+      }
+    }
+
+    // 底部按钮容器
+    .btn-wrap {
+      margin: 28rpx 0 0;
+      margin-top: 30rpx;
+      .btn-img {
+        width: 100%;
+        height: 100%;
+        cursor: pointer;
+        &:active {
+          opacity: 0.9;
+        }
+      }
+    }
+  }
+}
+
+// 顶部标题图
+.top {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  z-index: 1;
+  .image {
+    width: 100%;
+  }
+}
+
+// 优惠券列表样式
+.list {
+  margin-top: 332rpx;
+  position: relative;
+  z-index: 2;
+  .item {
+    position: relative;
+    padding: 32rpx 12rpx 36rpx 36rpx;
+    background-size: 100% 100%;
+    background-position: center;
+    overflow: hidden;
+    margin-top: 36rpx;
+    box-sizing: border-box;
+
+    // 优惠券边框图
+    .kuang {
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      z-index: -1;
+      .kuang-img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    // 金额样式
+    .big-title {
+      color: #f05a82;
+      font-size: 36px;
+      font-weight: 600;
+    }
+    .small-title {
+      color: #f05a82;
+      font-size: 16px;
+      font-weight: 600;
+    }
+
+    // 名称与数量
+    .title {
+      color: #333;
+      font-size: 16px;
+      font-weight: 400;
+      padding-bottom: 10rpx;
+      border-bottom: 4rpx dashed #fd8293;
+    }
+    .num {
+      color: #f05a82;
+      font-size: 20px;
+      font-weight: 400;
+      line-height: 22px;
+      margin-left: 16rpx;
+    }
+
+    // 有效期
+    .time {
+      color: #666; // 调整颜色更柔和
+      font-size: 14px;
+      font-weight: 400;
+    }
+  }
+}
+
+// 领取按钮样式
+.lingqu {
+  padding: 12rpx 20rpx; // 加宽内边距，点击区域更大
+  border-radius: 14rpx;
+  background: #fd8293;
+  color: #fff;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 1;
+  border: none;
+  outline: none;
+  margin: 0;
+  cursor: pointer;
+  &:active {
+    background: #f07080; // 点击深色反馈
+  }
+}
+
+// 工具类样式（补充缺失的flex基础样式）
+.u-flex {
+  display: flex;
+}
+.u-row-center {
+  align-items: center;
+  justify-content: center;
+}
+.u-row-between {
+  justify-content: space-between;
+}
+.u-m-t-10 {
+  margin-top: 10rpx;
+}
+.u-m-t-16 {
+  margin-top: 16rpx;
+}
+.u-m-t-20 {
+  margin-top: 20rpx;
+}
+.u-m-t-30 {
+  margin-top: 30rpx;
+}
+.u-m-x-16 {
+  margin-left: 16rpx;
+  margin-right: 16rpx;
+}
+.u-m-l-12 {
+  margin-left: 12rpx;
+}
+</style>
\ No newline at end of file
diff --git a/components/coupon-modal.vue b/components/coupon-modal.vue
index 987b94e..b39b165 100644
--- a/components/coupon-modal.vue
+++ b/components/coupon-modal.vue
@@ -1,6 +1,6 @@
 <!-- 首页优惠券弹窗 -->
 <template>
-	<up-popup :show="show" bgColor="transparent">
+	<up-popup :show="show" bgColor="transparent" @close="close">
 		<view class="container">
 			<view class="content" :class="`content${currentNum}`">
 				<image class="bg" :src="bgUrl" mode="widthFix"></image>
@@ -141,6 +141,8 @@ async function getCouponPopupAjax() {
 				bgUrl.value = bgUrlList.value[1];
 				currentNum.value = 1;
 			}
+		}else{
+			close()
 		}
 	} catch (error) {
 		console.log(error);
@@ -167,6 +169,12 @@ async function getHandle() {
 	}
 	uni.hideLoading();
 }
+const emit=defineEmits(['close'])
+
+function close() {
+  show.value = false;
+  emit('close');
+}
 
 onMounted(() => {
 	getCouponPopupAjax();
diff --git a/components/drainage.vue b/components/drainage.vue
new file mode 100644
index 0000000..2dbc572
--- /dev/null
+++ b/components/drainage.vue
@@ -0,0 +1,101 @@
+<template>
+  <view>
+    <!-- 私域引流 -->
+    <up-popup
+      :show="showPreview"
+      mode="center"
+      round="16rpx"
+      closeOnClickOverlay
+      @close="close"
+      :safeAreaInsetBottom="false"
+    >
+      <view class="preview-box">
+        <view class="u-flex" style="align-items: stretch">
+          <view
+            class="u-flex-1 u-p-r-24 u-flex u-flex-col"
+            style="align-items: start; justify-content: space-between"
+          >
+            <view>
+              <view class="font-14 font-bold color-333">{{
+                drainageConfig.title
+              }}</view>
+              <view class="u-m-t-16 font-12 color-666">{{
+                drainageConfig.content
+              }}</view>
+            </view>
+
+            <view class="color-999 font-12 u-m-t-16">{{
+              drainageConfig.note
+            }}</view>
+          </view>
+
+          <image
+            :show-menu-by-longpress="true"
+            :src="drainageConfig.qrCode"
+            style="width: 240rpx; height: 240rpx"
+            mode="aspectFit"
+          ></image>
+        </view>
+
+        <view class="close" @click="close">
+          <up-icon name="close-circle" size="34" color="#fff"></up-icon>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+import * as drainageConfigApi from "@/common/api/market/drainageConfig.js";
+import { ref, reactive, computed, watch, onMounted } from "vue";
+
+const showPreview = defineModel({
+  type: Boolean,
+  default: false,
+});
+const emit = defineEmits(["close"]);
+
+function close() {
+  showPreview.value = false;
+  emit("close");
+}
+const drainageConfig = ref({});
+onMounted(async () => {
+  const shopId = uni.cache.get("shopId");
+  const drainageConfigRes = await drainageConfigApi.config({
+    shopId: shopId,
+  });
+  drainageConfig.value = drainageConfigRes;
+  if (drainageConfig.value.isEnable) {
+    showPreview.value = true;
+  } else {
+    close();
+  }
+});
+</script>
+
+<style scoped lang="scss">
+.u-flex-col {
+  flex-direction: column;
+}
+.preview {
+  padding: 8rpx 32rpx;
+  border-radius: 12rpx;
+  background: $my-main-color;
+  color: #ffffff;
+  font-size: 28rpx;
+  font-weight: 400;
+  line-height: 40rpx;
+}
+.preview-box {
+  width: 700rpx;
+  padding: 32rpx 28rpx;
+  position: relative;
+  .close {
+    position: absolute;
+    left: 50%;
+    bottom: -100rpx;
+    transform: translateX(-50%);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/components/modal-list.vue b/components/modal-list.vue
new file mode 100644
index 0000000..71898c5
--- /dev/null
+++ b/components/modal-list.vue
@@ -0,0 +1,41 @@
+<template>
+  <view>
+    <officialAccount
+      v-if="showOfficialAccount"
+      @close="modelClose($event, 'officialAccount')"
+    />
+    <couponModal
+      v-if="showCoupon"
+      getMode="eat"
+      @close="modelClose($event, 'coupon')"
+    />
+    <birthdayGift v-if="showBirthdayGift" @close="modelClose($event, 'birthdayGift')" />
+  </view>
+</template>
+<script setup>
+import { ref, watch, computed, reactive, toRaw } from "vue";
+import couponModal from "@/components/coupon-modal.vue";
+import birthdayGift from "@/components/birthday-modal.vue";
+import officialAccount from "@/components/official-account.vue";
+//弹窗列表
+const list = ref([]);
+
+const showBirthdayGift = ref(true);
+const showCoupon = ref(false);
+const showOfficialAccount = ref(false);
+
+function modelClose(e, type) {
+  console.log("modelClose", type);
+  if (type == "birthdayGift") {
+    showCoupon.value = true;
+    return;
+  }
+  if (type == "coupon") {
+    showOfficialAccount.value = true;
+    return;
+  }
+  if (type == "officialAccount") {
+    return;
+  }
+}
+</script>
\ No newline at end of file
diff --git a/components/official-account.vue b/components/official-account.vue
new file mode 100644
index 0000000..854d264
--- /dev/null
+++ b/components/official-account.vue
@@ -0,0 +1,116 @@
+<!-- 首页优惠券弹窗 -->
+<template>
+  <up-popup :show="show" bgColor="transparent" mode="center" @close="close">
+    <view class="container">
+      <view class="content">
+        <image class="bg" :src="bgUrl" mode="widthFix"></image>
+        <view class="info">
+          <view class="u-flex u-row-center">
+            <image
+              :show-menu-by-longpress="true"
+              :src="code"
+              style="height: 240rpx"
+              mode="heightFix"
+            ></image>
+          </view>
+          <view
+            class="color-999 font-12 text-center u-m-t-10"
+            style="line-height: 36rpx"
+            >长按识别关注，更多优惠不能错过</view
+          >
+        </view>
+        <view class="close" @click="close">
+          <up-icon name="close-circle" size="34" color="#fff"></up-icon>
+        </view>
+      </view>
+    </view>
+  </up-popup>
+</template>
+
+<script setup>
+import _ from "lodash";
+import dayjs from "dayjs";
+import { onMounted, ref } from "vue";
+
+const bgUrl = ref(
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/41239c8852874aa39d1f106e45456e10.png"
+);
+
+const show = ref(false);
+const code = ref(
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240408/4d6e818a01f145a898d8c2368f4b5ad1.jpg"
+);
+
+
+const emit=defineEmits(['close'])
+
+function close() {
+  show.value = false;
+  emit('close');
+}
+onMounted(() => {
+  show.value = true;
+});
+</script>
+
+<style scoped lang="scss">
+.u-row-center {
+  justify-content: center;
+}
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 54rpx;
+  .content {
+    width: 100%;
+    position: relative;
+    .close {
+      position: absolute;
+      left: 50%;
+      bottom: -100rpx;
+      transform: translateX(-50%);
+    }
+    .bg {
+      width: 100%;
+      height: 100%;
+    }
+    .info {
+      position: absolute;
+      bottom: 86rpx;
+      left: 60rpx;
+      right: 60rpx;
+    }
+    .btn-wrap {
+      width: 60%;
+      position: absolute;
+      left: 20%;
+      &.btn-wrap1 {
+        bottom: 74upx;
+      }
+      &.btn-wrap2 {
+        bottom: 74upx;
+      }
+      &.btn-wrap3 {
+        bottom: 38upx;
+      }
+      .btn-img {
+        width: 100%;
+      }
+      .t {
+        font-size: 42upx;
+        font-weight: bold;
+        color: #b43a14;
+        position: absolute;
+        top: 44%;
+        left: 54%;
+        white-space: nowrap;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/components/order-finish-modal.vue b/components/order-finish-modal.vue
new file mode 100644
index 0000000..e6ecce7
--- /dev/null
+++ b/components/order-finish-modal.vue
@@ -0,0 +1,26 @@
+<template>
+  <view>
+    <officialAccount
+      v-if="showOfficialAccount"
+      @close="modelClose($event, 'officialAccount')"
+    />
+    <Drainage v-model="showDrainage" @close="modelClose($event, 'drainage')" />
+  </view>
+</template>
+  <script setup>
+import { ref, watch, computed, reactive, toRaw } from "vue";
+import officialAccount from "@/components/official-account.vue";
+import Drainage from "@/components/drainage.vue";
+
+const showDrainage = ref(true);
+const showOfficialAccount = ref(false);
+
+function modelClose(e, type) {
+  console.log("modelClose", type);
+  if(type=='drainage'){
+    showOfficialAccount.value = true;
+    return 
+  }
+
+}
+</script>
\ No newline at end of file
diff --git a/components/paymentMethod copy.vue b/components/paymentMethod copy.vue
new file mode 100644
index 0000000..84e0447
--- /dev/null
+++ b/components/paymentMethod copy.vue	
@@ -0,0 +1,260 @@
+<template>
+	<!-- 支付方式 -->
+	<view class="paymentMethod">
+		<view class="paymentMethod_content">
+			<view class="paymentMethod_title">支付方式</view>
+			<up-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChanges" :size="28"
+				placement="column">
+				<block v-for="(item,index) in paymentMethodList" :key="index">
+					<view class="method_list" @click="groupChanges(item.type)" :class="{disabled:returnDisabled(item)}"
+						v-if="(index+1) == radiovalue?!changeFreeenable:true">
+						<view class="method_list_top">
+							<view class="method_list_top_left">
+								<image class="icon" :src="item.url" mode="aspectFill" />
+								<view class="method_list_top_cen">
+									<view class="name"> {{ item.name }} </view>
+									<view class="method_list_bom" v-if="item.type == 1">
+										<text class="balance">
+											当前余额￥{{orderVIP?(orderVIP.amount||0):0}}</text>
+										<text class="topUpNow" @click="goRecharge">去充值</text>
+									</view>
+								</view>
+							</view>
+							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18" :name="item.type">
+							</up-radio>
+						</view>
+					</view>
+				</block>
+			</up-radio-group>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect,
+		defineExpose
+	} from 'vue'
+
+	const props = defineProps({
+		rechargeFreeChecked: {
+			type: Boolean,
+			default: false
+		},
+		payAmount: {
+			type: Number,
+			default: 0
+		},
+		freeCheck: {
+			type: Boolean,
+			default: false
+		},
+		changeFreeenable: {
+			type: Boolean,
+			default: false
+		},
+		disablePayType: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		}
+
+	});
+
+	function returnDisabled(item) {
+		if (props.disablePayType.includes(item.name)) {
+			return true
+		}else{
+			return false
+		}
+	}
+
+	const orderVIP = ref(null)
+	const emits = defineEmits(['customevent', 'groupChange']);
+	watchEffect(() => {
+		orderVIP.value = uni.cache.get('orderVIP')
+	})
+
+	const orderVIPfun = (data) => {
+		orderVIP.value = data
+	}
+
+	const paymentMethodList = ref([
+		// #ifdef MP-WEIXIN
+		{
+			name: "微信支付",
+			type: 2,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+			payType: 'wechatPay'
+		},
+		// #endif
+		// #ifdef MP-ALIPAY
+		{
+			name: "支付宝支付",
+			type: 3,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+			payType: 'aliPay'
+		},
+		// #endif
+		{
+			name: "余额支付",
+			type: 1,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+			payType: 'accountPay'
+		}
+	])
+
+
+	const paymentMethodName = ref([{
+			name: "余额支付",
+			type: 1,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+			payType: 'accountPay'
+		},
+		{
+			name: "微信支付",
+			type: 2,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+			payType: 'wechatPay'
+		},
+		{
+			name: "支付宝支付",
+			type: 3,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+			payType: 'aliPay'
+		},
+	])
+
+	const radiovalue = ref(2) // 支付方式
+
+	const ispws = ref(false) // 输入支付密码
+
+	const storeInfo = ref({})
+
+	// * 监听支付方式切换
+	const groupChanges = (type) => {
+		if (props.freeCheck && type == 1) {
+			return;
+		}
+		const item=paymentMethodList.value.find(v=>v.type==type)
+		if(item&&returnDisabled(item)){
+			 uni.showToast({
+				title:"当前支付方式不可用",
+				icon:'none'
+			})
+			return
+		}
+		// if (props.payAmount <= 0 && type != 1) {
+		// 	return;
+		// }
+		radiovalue.value = type;
+		let name = paymentMethodName.value[type - 1].name;
+
+		emits("groupChange", paymentMethodName.value[type - 1])
+	}
+
+	// 去充值
+	const goRecharge = () => {
+		if (orderVIP.value.isVip) {
+			uni.navigateTo({
+				url: '/pages/user/member/czzx?shopId=' + orderVIP.value.shopId
+			})
+			return
+		}
+		uni.navigateTo({
+			url: '/user/vip/buy-vip?shopId=' + orderVIP.value.shopId
+		})
+
+		// uni.pro.navigateTo('user/member/index', {
+		// 	shopId: orderVIP.value.shopId
+		// })
+	}
+	// 将方法暴露给父组件
+	defineExpose({
+		groupChanges,
+		orderVIPfun
+	});
+</script>
+
+<style lang="scss">
+	.paymentMethod {
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		border-radius: 18rpx;
+
+		.paymentMethod_content {
+			background-color: #fff;
+			border-radius: 22rpx;
+			padding: 30rpx 30rpx 0 30rpx;
+			box-sizing: border-box;
+
+			.paymentMethod_title {
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				box-sizing: border-box;
+			}
+
+			.method_list {
+				padding: 40rpx 0;
+				box-sizing: border-box;
+				&.disabled{
+					opacity: .6;
+				}
+				.method_list_top {
+					display: flex;
+					justify-content: space-between;
+
+					.method_list_top_left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							width: 54.67rpx !important;
+							height: 48rpx !important;
+							margin-right: 22rpx;
+						}
+
+						.name {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #333;
+						}
+
+						.method_list_top_cen {
+							display: flex;
+							flex-direction: column;
+						}
+					}
+
+				}
+
+				.method_list_bom {
+					display: flex;
+					align-items: center;
+
+					.balance {
+						margin-right: 20rpx;
+						font-size: 24rpx;
+					}
+
+					.topUpNow {
+						color: #FF803D;
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.method_list:nth-child(odd) {
+				border-bottom: 2rpx solid #e5e5e5;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue
index 84e0447..00af685 100644
--- a/components/paymentMethod.vue
+++ b/components/paymentMethod.vue
@@ -1,260 +1,276 @@
 <template>
-	<!-- 支付方式 -->
-	<view class="paymentMethod">
-		<view class="paymentMethod_content">
-			<view class="paymentMethod_title">支付方式</view>
-			<up-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChanges" :size="28"
-				placement="column">
-				<block v-for="(item,index) in paymentMethodList" :key="index">
-					<view class="method_list" @click="groupChanges(item.type)" :class="{disabled:returnDisabled(item)}"
-						v-if="(index+1) == radiovalue?!changeFreeenable:true">
-						<view class="method_list_top">
-							<view class="method_list_top_left">
-								<image class="icon" :src="item.url" mode="aspectFill" />
-								<view class="method_list_top_cen">
-									<view class="name"> {{ item.name }} </view>
-									<view class="method_list_bom" v-if="item.type == 1">
-										<text class="balance">
-											当前余额￥{{orderVIP?(orderVIP.amount||0):0}}</text>
-										<text class="topUpNow" @click="goRecharge">去充值</text>
-									</view>
-								</view>
-							</view>
-							<up-radio :disabled="returnDisabled(item)" activeColor="#E8AD7B" icon-size="18" size="18" :name="item.type">
-							</up-radio>
-						</view>
-					</view>
-				</block>
-			</up-radio-group>
-		</view>
-	</view>
+  <!-- 支付方式 -->
+  <view class="paymentMethod">
+    <view class="paymentMethod_content">
+      <view class="paymentMethod_title">支付方式</view>
+      <up-radio-group
+        v-model="radiovalue"
+        iconPlacement="right"
+        @change="groupChanges"
+        :size="28"
+        placement="column"
+      >
+        <block v-for="(item, index) in paymentMethodList" :key="index">
+          <view
+            class="method_list"
+            @click="groupChanges(item.type)"
+            :class="{ disabled: returnDisabled(item) }"
+          >
+            <view class="method_list_top">
+              <view class="method_list_top_left">
+                <image class="icon" :src="item.url" mode="aspectFill" />
+                <view class="method_list_top_cen">
+                  <view class="name"> {{ item.name }} </view>
+                  <view class="method_list_bom" v-if="item.type == 1">
+                    <text class="balance">
+                      当前余额￥{{ orderVIP ? orderVIP.amount || 0 : 0 }}</text
+                    >
+                    <text class="topUpNow" @click="goRecharge">去充值</text>
+                  </view>
+                </view>
+              </view>
+              <up-radio
+                :disabled="returnDisabled(item)"
+                activeColor="#E8AD7B"
+                icon-size="18"
+                size="18"
+                :name="item.type"
+              >
+              </up-radio>
+            </view>
+          </view>
+        </block>
+      </up-radio-group>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose
-	} from 'vue'
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+} from "vue";
 
-	const props = defineProps({
-		rechargeFreeChecked: {
-			type: Boolean,
-			default: false
-		},
-		payAmount: {
-			type: Number,
-			default: 0
-		},
-		freeCheck: {
-			type: Boolean,
-			default: false
-		},
-		changeFreeenable: {
-			type: Boolean,
-			default: false
-		},
-		disablePayType: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		}
+const props = defineProps({
+  rechargeFreeChecked: {
+    type: Boolean,
+    default: false,
+  },
+  payAmount: {
+    type: Number,
+    default: 0,
+  },
+  freeCheck: {
+    type: Boolean,
+    default: false,
+  },
+  changeFreeenable: {
+    type: Boolean,
+    default: false,
+  },
+  disablePayType: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
 
-	});
+function returnDisabled(item) {
+  if (props.disablePayType.includes(item.name)) {
+    return true;
+  } else {
+    return false;
+  }
+}
 
-	function returnDisabled(item) {
-		if (props.disablePayType.includes(item.name)) {
-			return true
-		}else{
-			return false
-		}
-	}
+const orderVIP = ref(null);
+const emits = defineEmits(["customevent", "groupChange"]);
+watchEffect(() => {
+  orderVIP.value = uni.cache.get("orderVIP");
+});
 
-	const orderVIP = ref(null)
-	const emits = defineEmits(['customevent', 'groupChange']);
-	watchEffect(() => {
-		orderVIP.value = uni.cache.get('orderVIP')
-	})
+const orderVIPfun = (data) => {
+  orderVIP.value = data;
+};
 
-	const orderVIPfun = (data) => {
-		orderVIP.value = data
-	}
+const paymentMethodList = ref([
+  // #ifdef MP-WEIXIN
+  {
+    name: "微信支付",
+    type: 2,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+    payType: "wechatPay",
+  },
+  // #endif
+  // #ifdef MP-ALIPAY
+  {
+    name: "支付宝支付",
+    type: 3,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+    payType: "aliPay",
+  },
+  // #endif
+  {
+    name: "余额支付",
+    type: 1,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+    payType: "accountPay",
+  },
+]);
 
-	const paymentMethodList = ref([
-		// #ifdef MP-WEIXIN
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		// #endif
-		// #ifdef MP-ALIPAY
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-		// #endif
-		{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		}
-	])
+const paymentMethodName = ref([
+  {
+    name: "余额支付",
+    type: 1,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
+    payType: "accountPay",
+  },
+  {
+    name: "微信支付",
+    type: 2,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+    payType: "wechatPay",
+  },
+  {
+    name: "支付宝支付",
+    type: 3,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+    payType: "aliPay",
+  },
+]);
 
+const radiovalue = ref(2); // 支付方式
 
-	const paymentMethodName = ref([{
-			name: "余额支付",
-			type: 1,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png",
-			payType: 'accountPay'
-		},
-		{
-			name: "微信支付",
-			type: 2,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
-			payType: 'wechatPay'
-		},
-		{
-			name: "支付宝支付",
-			type: 3,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
-			payType: 'aliPay'
-		},
-	])
+const ispws = ref(false); // 输入支付密码
 
-	const radiovalue = ref(2) // 支付方式
+const storeInfo = ref({});
 
-	const ispws = ref(false) // 输入支付密码
+// * 监听支付方式切换
+const groupChanges = (type) => {
+  if (props.freeCheck && type == 1) {
+    return;
+  }
+  const item = paymentMethodList.value.find((v) => v.type == type);
+  if (item && returnDisabled(item)) {
+    uni.showToast({
+      title: "当前支付方式不可用",
+      icon: "none",
+    });
+    return;
+  }
+  // if (props.payAmount <= 0 && type != 1) {
+  // 	return;
+  // }
+  radiovalue.value = type;
+  let name = paymentMethodName.value[type - 1].name;
 
-	const storeInfo = ref({})
+  emits("groupChange", paymentMethodName.value[type - 1]);
+};
 
-	// * 监听支付方式切换
-	const groupChanges = (type) => {
-		if (props.freeCheck && type == 1) {
-			return;
-		}
-		const item=paymentMethodList.value.find(v=>v.type==type)
-		if(item&&returnDisabled(item)){
-			 uni.showToast({
-				title:"当前支付方式不可用",
-				icon:'none'
-			})
-			return
-		}
-		// if (props.payAmount <= 0 && type != 1) {
-		// 	return;
-		// }
-		radiovalue.value = type;
-		let name = paymentMethodName.value[type - 1].name;
+// 去充值
+const goRecharge = () => {
+  if (props.disablePayType.includes("余额支付")) {
+    return;
+  }
+  if (orderVIP.value.isVip) {
+    uni.navigateTo({
+      url: "/pages/user/member/czzx?shopId=" + orderVIP.value.shopId,
+    });
+    return;
+  }
+  uni.navigateTo({
+    url: "/user/vip/buy-vip?shopId=" + orderVIP.value.shopId,
+  });
 
-		emits("groupChange", paymentMethodName.value[type - 1])
-	}
-
-	// 去充值
-	const goRecharge = () => {
-		if (orderVIP.value.isVip) {
-			uni.navigateTo({
-				url: '/pages/user/member/czzx?shopId=' + orderVIP.value.shopId
-			})
-			return
-		}
-		uni.navigateTo({
-			url: '/user/vip/buy-vip?shopId=' + orderVIP.value.shopId
-		})
-
-		// uni.pro.navigateTo('user/member/index', {
-		// 	shopId: orderVIP.value.shopId
-		// })
-	}
-	// 将方法暴露给父组件
-	defineExpose({
-		groupChanges,
-		orderVIPfun
-	});
+  // uni.pro.navigateTo('user/member/index', {
+  // 	shopId: orderVIP.value.shopId
+  // })
+};
+// 将方法暴露给父组件
+defineExpose({
+  groupChanges,
+  orderVIPfun,
+});
 </script>
 
 <style lang="scss">
-	.paymentMethod {
-		box-sizing: border-box;
-		margin-top: 30rpx;
-		border-radius: 18rpx;
+.paymentMethod {
+  box-sizing: border-box;
+  margin-top: 30rpx;
+  border-radius: 18rpx;
 
-		.paymentMethod_content {
-			background-color: #fff;
-			border-radius: 22rpx;
-			padding: 30rpx 30rpx 0 30rpx;
-			box-sizing: border-box;
+  .paymentMethod_content {
+    background-color: #fff;
+    border-radius: 22rpx;
+    padding: 30rpx 30rpx 0 30rpx;
+    box-sizing: border-box;
 
-			.paymentMethod_title {
-				font-weight: 500;
-				font-size: 32rpx;
-				color: #333333;
-				box-sizing: border-box;
-			}
+    .paymentMethod_title {
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #333333;
+      box-sizing: border-box;
+    }
 
-			.method_list {
-				padding: 40rpx 0;
-				box-sizing: border-box;
-				&.disabled{
-					opacity: .6;
-				}
-				.method_list_top {
-					display: flex;
-					justify-content: space-between;
+    .method_list {
+      padding: 40rpx 0;
+      box-sizing: border-box;
+      &.disabled {
+        opacity: 0.6;
+      }
+      .method_list_top {
+        display: flex;
+        justify-content: space-between;
 
-					.method_list_top_left {
-						display: flex;
-						align-items: center;
+        .method_list_top_left {
+          display: flex;
+          align-items: center;
 
-						.icon {
-							width: 54.67rpx !important;
-							height: 48rpx !important;
-							margin-right: 22rpx;
-						}
+          .icon {
+            width: 54.67rpx !important;
+            height: 48rpx !important;
+            margin-right: 22rpx;
+          }
 
-						.name {
-							font-size: 32rpx;
-							font-weight: 500;
-							color: #333;
-						}
+          .name {
+            font-size: 32rpx;
+            font-weight: 500;
+            color: #333;
+          }
 
-						.method_list_top_cen {
-							display: flex;
-							flex-direction: column;
-						}
-					}
+          .method_list_top_cen {
+            display: flex;
+            flex-direction: column;
+          }
+        }
+      }
 
-				}
+      .method_list_bom {
+        display: flex;
+        align-items: center;
 
-				.method_list_bom {
-					display: flex;
-					align-items: center;
+        .balance {
+          margin-right: 20rpx;
+          font-size: 24rpx;
+        }
 
-					.balance {
-						margin-right: 20rpx;
-						font-size: 24rpx;
-					}
+        .topUpNow {
+          color: #ff803d;
+          font-size: 28rpx;
+        }
+      }
+    }
 
-					.topUpNow {
-						color: #FF803D;
-						font-size: 28rpx;
-					}
-				}
-			}
-
-			.method_list:nth-child(odd) {
-				border-bottom: 2rpx solid #e5e5e5;
-			}
-		}
-	}
+    .method_list:nth-child(odd) {
+      border-bottom: 2rpx solid #e5e5e5;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 6367448..0031c6f 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -1,5 +1,5 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
-const debug = false
+const debug = true
 // #ifdef H5
 const proxyApi = "/api"
 // #endif
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index 59684f6..ab064d4 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -1,103 +1,142 @@
 <template>
-	<view>
-		<view class="card_box">
-			<!-- <view class="card_head_box">
+  <view>
+    <view class="card_box">
+      <!-- <view class="card_head_box">
 				<view class="card_head_item" v-for="(item,index) in 8" :key="index"></view>
 			</view> -->
 
-			<!-- 先付款 -->
-			<view class="tabBox" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-				<view class="tab">
-					<view v-for="(item,index) in tebtypeList" :key="index"
-						:class="is_type==index?'tab_item'+(is_type+1)+' tab_item  active ':'tab_item'"
-						@click="tabClick(item,index)">
-						<view></view>
-						<image class="icon" :src="is_type==index?item.url_active:item.url" mode="aspectFill" />
-						<text class="title" :class="{active:is_type==index}">{{item.title}}</text>
-					</view>
-				</view>
-				<view class="table" v-if=" is_type == 0 ">
-					<view class="table_left">
-						<image class="icon"
-							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
-							mode="aspectFill" />
-						<text class="title">桌台</text>
-					</view>
-					<view class="value" v-if="listinfo.tableName"> {{ listinfo.tableName || '' }} </view>
-				</view>
+      <!-- 先付款 -->
+      <view class="tabBox" v-if="listinfo.status == 'unpaid' || !listinfo.id">
+        <view class="tab">
+          <view
+            v-for="(item, index) in tebtypeList"
+            :key="index"
+            :class="
+              is_type == index
+                ? 'tab_item' + (is_type + 1) + ' tab_item  active '
+                : 'tab_item'
+            "
+            @click="tabClick(item, index)"
+          >
+            <view></view>
+            <image
+              class="icon"
+              :src="is_type == index ? item.url_active : item.url"
+              mode="aspectFill"
+            />
+            <text class="title" :class="{ active: is_type == index }">{{
+              item.title
+            }}</text>
+          </view>
+        </view>
+        <view class="table" v-if="is_type == 0">
+          <view class="table_left">
+            <image
+              class="icon"
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
+              mode="aspectFill"
+            />
+            <text class="title">桌台</text>
+          </view>
+          <view class="value" v-if="listinfo.tableName">
+            {{ listinfo.tableName || "" }}
+          </view>
+        </view>
+      </view>
 
-			</view>
-
-			<view class="card">
-				<orderItemVue :useVipPrice="useVipPrice" v-if="nowCarts.length" :nowCarts="nowCarts"></orderItemVue>
-				<!-- 订单头部 -->
-				<view class="card_item" v-for="(value, key) in listinfo.detailMap" :key="key">
-					<!-- <view class="head">
+      <view class="card">
+        <orderItemVue
+          :useVipPrice="useVipPrice"
+          v-if="nowCarts.length"
+          :nowCarts="nowCarts"
+        ></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>
-								</view>
-								<view class="num">x{{item.num}}</view>
-							</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>
+                </view>
+                <view class="num">x{{ item.num }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
 
-					</view>
+        <view
+          class="total-wrap u-m-t-30"
+          v-if="listinfo.status == 'unpaid' || !listinfo.id"
+        >
+          <view>总计￥</view>
+          <view class="price">
+            {{ cartStore.orderCostSummary.goodsRealAmount }}
+          </view>
+        </view>
 
-
-				</view>
-
-				<view class="total-wrap u-m-t-30" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-					<view>总计￥</view>
-					<view class="price"> {{cartStore.orderCostSummary.goodsRealAmount}} </view>
-				</view>
-
-				<!-- <view class="total-wrap" v-else>
+        <!-- <view class="total-wrap" v-else>
 					<view>实付￥</view>
 					<view class="price"> {{listinfo.payAmount||''}} </view>
 				</view> -->
 
-				<view class="cell-item" v-if="is_type != 0">
-					<view class="label">打包费</view>
-					<view class="val">
-						<view></view>
-						<view style="font-size: 28rpx;">￥</view>
-						<view>{{cartStore.orderCostSummary.packFee }}</view>
-					</view>
-				</view>
+        <view class="cell-item" v-if="is_type != 0">
+          <view class="label">打包费</view>
+          <view class="val">
+            <view></view>
+            <view style="font-size: 28rpx">￥</view>
+            <view>{{ cartStore.orderCostSummary.packFee }}</view>
+          </view>
+        </view>
 
+        <!-- isTableFee == 0是不免除 -->
+        <view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
+          <view class="label">餐位费</view>
+          <view class="val">
+            <view>X{{ cartStore.seatFeeConfig.personCount }}</view>
+            <view style="font-size: 28rpx">￥</view>
+            <view>{{ cartStore.orderCostSummary.seatFee }}</view>
+          </view>
+        </view>
 
-				<!-- isTableFee == 0是不免除 -->
-				<view class="cell-item" v-if="cartStore.orderCostSummary.seatFee">
-					<view class="label">餐位费</view>
-					<view class="val">
-						<view>X{{cartStore.seatFeeConfig.personCount}}</view>
-						<view style="font-size: 28rpx;">￥</view>
-						<view>{{cartStore.orderCostSummary.seatFee}}</view>
-					</view>
-				</view>
-
-				<!-- <view class="cell-item" v-else>
+        <!-- <view class="cell-item" v-else>
 					<view class="label">免餐位费</view>
 					<view class="val">
 						<view></view>
@@ -106,1178 +145,1369 @@
 					</view>
 				</view> -->
 
-				<!-- 支付之前 -->
-				<block v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id">
-					<view class="u-m-t-40 u-p-l-20 u-p-r-20">
-						<view class="favorable" v-for="(item,indexe) in favorablelist" :key="indexe"
-							:class="{column:item.type=='product'}" @click="goUrl(item)">
-							<view class="favorable_left">
-								<view class="u-flex" style="width: 44rpx;">
-									<u-image bgColor="#fff" :width="item.width||'44rpx'" :height="item.height||'44rpx'"
-										v-if="item.icon" :src="item.icon" mode=""></u-image>
-								</view>
-								<text class="name u-m-l-16 no-wrap"> {{ item.name }} </text>
-								<text class=" u-p-l-6" style="color: #666;max-width: 400rpx;font-size: 10px;"
-									v-if="item.type=='points'">
-									「可用积分{{pointsRes.accountPoints}}，最大可抵扣{{maxPointDiscount}}元」
+        <!-- 支付之前 -->
+        <block
+          v-if="
+            listinfo.status == 'unpaid' ||
+            listinfo.status == 'paying' ||
+            !listinfo.id
+          "
+        >
+          <view class="u-m-t-40 u-p-l-20 u-p-r-20">
+            <view class="youhui-item" v-if="discountActivity">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/coup.png"
+                  bgColor="#fff"
+                  style="width: 40rpx; height: 34rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">满减活动</text>
+              </view>
 
-								</text>
-							</view>
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ discountActivity.discountAmount }}</view
+              >
+            </view>
+            <view class="youhui-item" v-if="newUserDiscount">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/coup.png"
+                  bgColor="#fff"
+                  style="width: 40rpx; height: 34rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">新客立减</text>
+              </view>
 
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ newUserDiscount }}</view
+              >
+            </view>
+            <view
+              class="favorable"
+              v-for="(item, indexe) in favorablelist"
+              :key="indexe"
+              :class="{ column: item.type == 'product' }"
+              @click="goUrl(item)"
+            >
+              <view class="favorable_left">
+                <view class="u-flex" style="width: 44rpx">
+                  <u-image
+                    bgColor="#fff"
+                    :width="item.width || '44rpx'"
+                    :height="item.height || '44rpx'"
+                    v-if="item.icon"
+                    :src="item.icon"
+                    mode=""
+                  ></u-image>
+                </view>
+                <text class="name u-m-l-16 no-wrap"> {{ item.name }} </text>
+                <template v-if="item.type == 'points' && !disabledPointsUse">
+                  <text
+                    class="u-p-l-6"
+                    style="color: #666; max-width: 400rpx; font-size: 10px"
+                  >
+                    「可用积分{{ pointsRes.accountPoints }}，最大可抵扣{{
+                      maxPointDiscount
+                    }}元」
+                  </text>
+                </template>
+              </view>
 
-							<!-- 优惠卷 -->
-							<view class="favorable_right" v-if="item.type=='coupon'">
-								<template v-if="cartStore.orderCostSummary.couponDeductionAmount>0">
-									<text
-										class="favorable_right_text red">-￥{{cartStore.orderCostSummary.couponDeductionAmount}}</text>
-								</template>
-								<template v-else>
-									<text class="favorable_right_text red" v-if="hasCouponCanUse">有可用优惠券</text>
-									<text class=" favorable_right_text " v-else>暂无可用优惠券</text>
-								</template>
+              <!-- 优惠卷 -->
+              <view class="favorable_right" v-if="item.type == 'coupon'">
+                <template
+                  v-if="cartStore.orderCostSummary.couponDeductionAmount > 0"
+                >
+                  <text class="favorable_right_text red"
+                    >-￥{{
+                      cartStore.orderCostSummary.couponDeductionAmount
+                    }}</text
+                  >
+                </template>
+                <template v-else>
+                  <text
+                    class="favorable_right_text red"
+                    v-if="disabledCouponUse"
+                    >{{ disabledCouponReason }}</text
+                  >
+                  <text
+                    class="favorable_right_text red"
+                    v-else-if="hasCouponCanUse"
+                    >有可用优惠券</text
+                  >
+                  <text class="favorable_right_text" v-else
+                    >暂无可用优惠券</text
+                  >
+                </template>
+                <template v-if="!disabledCouponUse">
+                  <up-icon
+                    name="arrow-right"
+                    color="#575B66"
+                    size="16"
+                    v-if="
+                      listinfo.status == 'unpaid' ||
+                      listinfo.status == 'paying' ||
+                      !listinfo.id
+                    "
+                  ></up-icon>
+                </template>
+              </view>
 
+              <!-- 新客立减 -->
+              <view class="favorable_right" v-if="item.type == 'newUser'">
+                <text
+                  class="favorable_right_text red"
+                  v-if="newUserDiscount > 0"
+                  >-￥{{ newUserDiscount }}</text
+                >
+              </view>
 
+              <!-- 积分 -->
+              <view
+                class="favorable_right u-flex u-col-center"
+                v-if="item.type == 'points'"
+              >
+                <text
+                  v-if="disabledPointsUse"
+                  class="u-p-l-6 red"
+                  style="max-width: 400rpx; font-size: 24rpx"
+                  >{{ disabledPointsUseReason }}</text
+                >
+                <template
+                  v-else-if="
+                    usePoints && cartStore.orderCostSummary.pointDeductionAmount
+                  "
+                >
+                  <up-icon
+                    name="checkmark-circle-fill"
+                    size="24rpx"
+                    color="#FE7E00"
+                  ></up-icon>
+                  <text class="red">
+                    -¥{{ cartStore.orderCostSummary.pointDeductionAmount }}
+                  </text>
+                </template>
 
-								<up-icon name="arrow-right" color="#575B66" size="16"
-									v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id"></up-icon>
-
-							</view>
-
-							<!-- 新客立减 -->
-							<view class="favorable_right" v-if="item.type=='newUser'">
-								<text class="favorable_right_text red"
-									v-if="newUserDiscount>0">-￥{{newUserDiscount}}</text>
-
-							</view>
-
-							<!-- 积分 -->
-							<view class="favorable_right u-flex u-col-center" v-if="item.type=='points'">
-								<template v-if="usePoints&&cartStore.orderCostSummary.pointDeductionAmount">
-									<up-icon name="checkmark-circle-fill" size="24rpx" color="#FE7E00"></up-icon>
-									<text class="red">
-										-¥{{cartStore.orderCostSummary.pointDeductionAmount}}
-									</text>
-								</template>
-
-								<template v-else>
-									<view v-if="maxPointDiscount>0" class="u-flex u-col-center">
-										<view class="round"></view>
-										<text class="color-333 font-12 no-wrap u-m-l-4">使用抵扣</text>
-									</view>
-
-								</template>
-
-							</view>
-							<!-- <view class="favorable_right" v-if="item.type=='points'">
-								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
-									v-if="calcUsablePointsData.integral">
-									使用 {{ calcUsablePointsData.integral}}
-									积分抵扣￥{{props.listinfo.pointsDiscountAmount}}
-								</text>
-								<up-icon v-else name="arrow-right" color="#575B66" size="16"></up-icon>
-							</view> -->
-
-						</view>
-					</view>
-				</block>
-				<block v-else>
-					<view class="cell-item column" v-if="listinfo.discountInfo">
-						<view class="label">优惠折扣</view>
-						<view class="val column">
-							<view class="productCoupon" v-for="(item,index) in listinfo.discountInfo" :key="index">
-								<view class="name">{{item.name}}</view>
-								<!-- <view class="num">{{item.amount}}</view> -->
-								<view class="amount" style="margin-left: 10rpx;">{{item.amount}}元</view>
-							</view>
-						</view>
-					</view>
-				</block>
-
-
-			</view>
-		</view>
-		<view class="orderInfo">
-			<view class="row" @click="copyHandle(listinfo.orderNo)">
-				<text class="t">订单编号：</text>
-				<text class="info"
-					style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">{{listinfo.orderNo}}(点击复制)</text>
-			</view>
-			<view class="row">
-				<text class="t">下单时间：</text>
-				<text class="info">{{$u.timeFormat(listinfo.updateTime, 'yyyy-mm-dd hh:MM:ss')}}</text>
-			</view>
-			<view class="row" v-if="listinfo.tableName">
-				<text class="t">下单台桌：</text>
-				<text class="info">{{listinfo.tableName}}</text>
-			</view>
-			<view class="row" v-if="orderVIP.shopName">
-				<text class="t">下单门店：</text>
-				<text class="info">{{orderVIP.shopName}}</text>
-			</view>
-			<view class="row" v-if="listinfo.dineMod">
-				<text class="t">用餐模式：</text>
-				<text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
-				<text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
-				<text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
-			</view>
-			<view class="row" v-if="listinfo.id&& listinfo.satus!='unpaid'">
-				<text class="t">备注：</text>
-				<text class="info u-line-5">{{ listinfo.remark || ""}}</text>
-			</view>
-			<view class="row" v-if="listinfo.seatNum">
-				<text class="t">就餐人数：</text>
-				<text class="info">{{ listinfo.seatNum || ""}}</text>
-			</view>
-			<view class="row" v-if="listinfo.refundType">
-				<text class="t">退款方式：</text>
-				<text class="info">{{ listinfo.refundType == 'cash'?'手动退款':'原路退回'}}</text>
-			</view>
-		</view>
-
-
-	</view>
-
+                <template v-else>
+                  <view
+                    v-if="maxPointDiscount > 0 && !disabledPointsUse"
+                    class="u-flex u-col-center"
+                  >
+                    <view class="round"></view>
+                    <text class="color-333 font-12 no-wrap u-m-l-4"
+                      >使用抵扣</text
+                    >
+                  </view>
+                </template>
+              </view>
+            </view>
+          </view>
+        </block>
+        <block v-else>
+          <view class="cell-item column" v-if="listinfo.discountInfo">
+            <view class="label">优惠折扣</view>
+            <view class="val column">
+              <view
+                class="productCoupon"
+                v-for="(item, index) in listinfo.discountInfo"
+                :key="index"
+              >
+                <view class="name">{{ item.name }}</view>
+                <!-- <view class="num">{{item.amount}}</view> -->
+                <view class="amount" style="margin-left: 10rpx"
+                  >{{ item.amount }}元</view
+                >
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+    <view class="orderInfo">
+      <view class="row" @click="copyHandle(listinfo.orderNo)">
+        <text class="t">订单编号：</text>
+        <text
+          class="info"
+          style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+          >{{ listinfo.orderNo }}(点击复制)</text
+        >
+      </view>
+      <view class="row">
+        <text class="t">下单时间：</text>
+        <text class="info">{{
+          $u.timeFormat(listinfo.updateTime, "yyyy-mm-dd hh:MM:ss")
+        }}</text>
+      </view>
+      <view class="row" v-if="listinfo.tableName">
+        <text class="t">下单台桌：</text>
+        <text class="info">{{ listinfo.tableName }}</text>
+      </view>
+      <view class="row" v-if="orderVIP.shopName">
+        <text class="t">下单门店：</text>
+        <text class="info">{{ orderVIP.shopName }}</text>
+      </view>
+      <view class="row" v-if="listinfo.dineMod">
+        <text class="t">用餐模式：</text>
+        <text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
+        <text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
+        <text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
+      </view>
+      <view class="row" v-if="listinfo.id && listinfo.satus != 'unpaid'">
+        <text class="t">备注：</text>
+        <text class="info u-line-5">{{ listinfo.remark || "" }}</text>
+      </view>
+      <view class="row" v-if="listinfo.seatNum">
+        <text class="t">就餐人数：</text>
+        <text class="info">{{ listinfo.seatNum || "" }}</text>
+      </view>
+      <view class="row" v-if="listinfo.refundType">
+        <text class="t">退款方式：</text>
+        <text class="info">{{
+          listinfo.refundType == "cash" ? "手动退款" : "原路退回"
+        }}</text>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	const cartStore = useCartsStore()
-	import {
-		consumeDiscount
-	} from '@/common/api/market/index.js'
-	import orderItemVue from './order-item.vue';
-	import {
-		ref,
-		reactive,
-		defineProps,
-		computed,
-		defineEmits,
-		watch,
-		watchEffect,
-		defineExpose,
-		toRaw,
-		onMounted,
-		nextTick
+import { useCartsStore } from "@/stores/carts.js";
+import * as discountActivityApi from "@/common/api/market/discountActivity";
+const cartStore = useCartsStore();
+import { consumeDiscount } from "@/common/api/market/index.js";
+import orderItemVue from "./order-item.vue";
+import {
+  ref,
+  reactive,
+  defineProps,
+  computed,
+  defineEmits,
+  watch,
+  watchEffect,
+  defineExpose,
+  toRaw,
+  onMounted,
+  nextTick,
+} from "vue";
+import { returnHasCouponCanUse } from "@/utils/coupon.js";
+let hasCouponCanUse = ref(false);
 
-	} from 'vue'
-	import {
-		returnHasCouponCanUse
-	} from '@/utils/coupon.js'
-	let hasCouponCanUse = ref(false)
+const usePoints = ref(false);
 
+function chnageIsUsePoints() {
+  usePoints.value = !usePoints.value;
+}
 
-	const usePoints = ref(false)
+import IntegralInput from "./IntegralInput.vue";
+import {
+  APImemberPointsmyPoints,
+  APImemberPointscalcUsablePoints,
+  APImemberPointscalcDeductionAmount,
+} from "@/common/api/shop/index.js";
+import goodsIcon from "@/static/icon/goods.png";
+import coupIcon from "@/static/icon/coup.png";
+import pointsIcon from "@/static/icon/points.png";
+// 定义自定义事件
+const emits = defineEmits(["customevent", "istype", "learcoupons"]);
 
-	function chnageIsUsePoints() {
-		usePoints.value = !usePoints.value
-	}
+// teb  切换送餐和打包
+const tebtypeList = reactive([
+  {
+    title: "送餐到桌",
+    show: false,
+    type: "table",
+    val: "dine-in",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
+    url_active:
+      "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png",
+  },
+  {
+    title: "打包外带",
+    show: false,
+    type: "takeself",
+    val: "take-out",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
+    url_active:
+      "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png",
+  },
+]);
 
-	import IntegralInput from './IntegralInput.vue';
-	import {
-		APImemberPointsmyPoints,
-		APImemberPointscalcUsablePoints,
-		APImemberPointscalcDeductionAmount
-	} from '@/common/api/shop/index.js'
-	import goodsIcon from '@/static/icon/goods.png'
-	import coupIcon from '@/static/icon/coup.png'
-	import pointsIcon from '@/static/icon/points.png'
-	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'istype', 'learcoupons']);
+const favorablelist = ref([
+  //   {
+  //     name: "新客立减",
+  //     type: "newUser",
+  //     width: "40rpx",
+  //     height: "34rpx",
+  //     value: "",
+  //     icon: coupIcon,
+  //     url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png",
+  //   },
+  {
+    name: "优惠券",
+    type: "coupon",
+    width: "40rpx",
+    height: "34rpx",
+    value: "",
+    icon: coupIcon,
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png",
+  },
+  {
+    icon: pointsIcon,
+    name: "积分抵扣",
+    type: "points",
+    value: "",
+    url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png",
+  },
+]);
 
-	// teb  切换送餐和打包
-	const tebtypeList = reactive([{
-			title: "送餐到桌",
-			show: false,
-			type: "table",
-			val: "dine-in",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
-			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"
-		},
-		{
-			title: "打包外带",
-			show: false,
-			type: "takeself",
-			val: "take-out",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
-			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"
-		},
-	])
+const props = defineProps({
+  useVipPrice: {
+    type: Boolean,
+    default: false,
+  },
+  freeCheck: {
+    type: Boolean,
+  },
+  shifu: {
+    type: [String, Number],
+    defalut: 0,
+  },
+  listinfo: {
+    type: Object,
+    default: {
+      combinedArray: {},
+      Productroll: 0,
+      coupondiscountAmount: 0,
+      couponInfoList: "",
+      pointsDiscountAmount: 0,
+      packFeess: 0,
+      totalPrices: 0,
+      Seatcharge: 0,
+      payAmount: 0,
+      remark: "",
+    },
+  },
+  orderVIP: {
+    type: Object,
+  },
+  ordershopUserInfo: {
+    type: Object,
+    default: {
+      isTableFee: 0,
+    },
+  },
+  isBwc: {
+    type: Boolean,
+    default: false,
+  },
+  nowCarts: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
 
-	const favorablelist = ref([{
-			name: "新客立减",
-			type: "newUser",
-			width: '40rpx',
-			height: '34rpx',
-			value: "",
-			icon: coupIcon,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
-		},
-		{
-			name: "优惠券",
-			type: "coupon",
-			width: '40rpx',
-			height: '34rpx',
-			value: "",
-			icon: coupIcon,
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
-		},
-		{
-			icon: pointsIcon,
-			name: "积分抵扣",
-			type: "points",
-			value: "",
-			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png"
-		}
-	])
+const is_type = ref(0);
 
+//满减活动
+const discountActivityRes = ref(null);
 
-	const props = defineProps({
-		useVipPrice: {
-			type: Boolean,
-			default: false
-		},
-		freeCheck: {
-			type: Boolean
-		},
-		shifu: {
-			type: [String, Number],
-			defalut: 0
-		},
-		listinfo: {
-			type: Object,
-			default: {
-				combinedArray: {},
-				Productroll: 0,
-				coupondiscountAmount: 0,
-				couponInfoList: '',
-				pointsDiscountAmount: 0,
-				packFeess: 0,
-				totalPrices: 0,
-				Seatcharge: 0,
-				payAmount: 0,
-				remark: ''
-			}
+//当前使用的满减活动的门槛满减
+const discountActivity = ref(null);
+//备份当前使用的满减活动的门槛满减
+let back_discountActivity = null;
+//禁止使用优惠券
+const disabledCouponUse = ref(false);
+const disabledCouponReason = ref("");
+//禁止使用积分
+const disabledPointsUse = ref(false);
+//禁止使用积分原因
+const disabledPointsUseReason = ref("");
 
-		},
-		orderVIP: {
-			type: Object
-		},
-		ordershopUserInfo: {
-			type: Object,
-			default: {
-				isTableFee: 0
-			}
-		},
-		isBwc: {
-			type: Boolean,
-			default: false
-		},
-		nowCarts: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		},
+// 监听送餐/打包切换
+const tabClick = (item, index) => {
+  is_type.value = index;
+  emits("istype", is_type.value);
+  cartStore.setDinnerType(item.val);
+  // this.getchoseEatModel('tabClick', index, item);
+};
+cartStore.setDinnerType(tebtypeList[is_type.value].val);
 
-	})
+// 操作优惠卷
+const dataprocessing = (data) => {
+  favorablelist.value[1].value = data;
+};
 
-	const is_type = ref(0)
-	// 监听送餐/打包切换
-	const tabClick = (item, index) => {
-		is_type.value = index
-		emits("istype", is_type.value)
-		cartStore.setDinnerType(item.val)
-		// this.getchoseEatModel('tabClick', index, item);
-	}
-	cartStore.setDinnerType(tebtypeList[is_type.value].val)
+// 清空
+const bwcclear = () => {
+  IntegralInputclose();
+};
 
-	// 操作优惠卷
-	const dataprocessing = (data) => {
-		favorablelist.value[1].value = data
+// 跳转
+const goUrl = (item) => {
+  const canDikouGoodsArr = props.nowCarts;
+  // const goodsOrderPrice = props.listinfo.totalPrices
+  // const user=uni.cache.get('shopUserInfo')
+  uni.setStorageSync(
+    "goodsOrderPrice",
+    cartStore.orderCostSummary.goodsRealAmount
+  );
 
-	}
+  switch (item.type) {
+    case "coupon":
+      if (disabledCouponUse.value) {
+        return uni.showToast({
+          title: disabledCouponReason.value,
+          icon: "none",
+        });
+      }
+      emits("learcoupons", "coupon");
+      uni.pro.navigateTo("/pages/order/coupon", {});
+      break;
 
-	const returnCouponDiscount = computed(() => {
-		if (!favorablelist.value[1].value) {
-			return 0
-		}
-		return favorablelist.value[1].value.reduce((prve, cur) => {
-			return prve + (cur.discountAmount || 0)
-		}, 0)
-	})
+    case "points":
+      if (disabledPointsUse.value) {
+        return uni.showToast({
+          title: disabledPointsUseReason.value,
+          icon: "none",
+        });
+      }
+      if (maxPointDiscount.value <= 0) {
+        return;
+      }
+      chnageIsUsePoints();
+	  break;
+  }
+};
 
-	// 清空
-	const bwcclear = () => {
-		IntegralInputclose()
-		// 清空优惠卷
-		favorablelist.value[1].value = ''
-		favorablelist.value[1].value = ''
-	}
-	const dinnerType = computed(() => {
-		return is_type.value ? 'take-out' : 'dine-ine'
-	})
-	// 跳转
-	const goUrl = (item) => {
-		const canDikouGoodsArr = props.nowCarts
-		// const goodsOrderPrice = props.listinfo.totalPrices
-		// const user=uni.cache.get('shopUserInfo')
-		uni.setStorageSync('goodsOrderPrice', cartStore.orderCostSummary.goodsRealAmount)
+// 积分
+const calcUsablePointsData = reactive({
+  minIntegral: 1, //最小
+  maxIntegral: "", //最多积分
+  instructionText: "",
+  unusableReason: "",
+  showModal: false,
+  integral: "",
+});
 
-		if (props.isBwc) {
-			uni.showToast({
-				title: '不可与其他优惠共享!',
-				icon: 'none'
-			})
-			return false;
-		}
-		switch (item.type) {
-			case 'coupon':
-				emits('learcoupons', 'coupon')
-				uni.pro.navigateTo('/pages/order/coupon', {})
-				break;
+const pointsRes = reactive({
+  accountPoints: 0,
+});
+const maxPointDiscount = ref(0);
+//积分可抵扣最大金额
+const maxMoney = computed(() => {
+  return (
+    cartStore.orderCostSummary.finalPayAmount +
+    cartStore.orderCostSummary.pointDeductionAmount
+  );
+});
 
-			case 'points':
-				if (maxPointDiscount.value <= 0) {
-					return
-				}
-				chnageIsUsePoints()
-				return
-		}
-	}
+async function getMaxPointsDiscount() {
+  let res = await APImemberPointscalcUsablePoints({
+    shopUserId: props.orderVIP.id,
+    orderAmount: maxMoney.value,
+  });
+  Object.assign(pointsRes, res);
+  maxPointDiscount.value = res.maxDeductionAmount;
+  if (usePoints.value) {
+    cartStore.setUserPoints(res.maxUsablePoints || 0);
+  }
+}
+watch(
+  () => maxMoney.value,
+  (newval) => {
+    console.log("maxMoney.value", newval);
+    getMaxPointsDiscount();
+  }
+);
+watch(
+  () => usePoints.value,
+  (newval) => {
+    if (newval) {
+      getMaxPointsDiscount();
+    } else {
+      cartStore.setUserPoints(0);
+    }
+  }
+);
 
-	// 积分
-	const calcUsablePointsData = reactive({
-		minIntegral: 1, //最小
-		maxIntegral: '', //最多积分
-		instructionText: '',
-		unusableReason: '',
-		showModal: false,
-		integral: ''
-	})
+// * 获取积分相关信息
+const getCalcUsablePoints = async (data) => {
+  Object.assign(calcUsablePointsData, data);
+  try {
+    cartStore.setPointDeductionRule(
+      data.equivalentPoints,
+      data.maxDeductionAmount
+    );
+    calcUsablePointsData.minIntegral = data.minDeductionPoints;
+    calcUsablePointsData.maxIntegral = data.maxUsablePoints;
+    calcUsablePointsData.instructionText = `请输入 ${data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`;
+  } catch (error) {
+    //TODO handle the exception
+  }
+};
 
+// 积分取消清空
+const IntegralInputclose = async () => {
+  calcUsablePointsData.integral = null;
+  props.listinfo.pointsDiscountAmount = 0;
+  calcUsablePointsData.showModal = false;
+  // cartStore.setUserPoints(0);
+};
 
-	const pointsRes = reactive({
-		accountPoints: 0
-	})
-	const maxPointDiscount = ref(0)
-	//积分可抵扣最大金额
-	const maxMoney = computed(() => {
-		return cartStore.orderCostSummary.finalPayAmount + cartStore.orderCostSummary
-			.pointDeductionAmount
-	})
+// * 复制订单号
+const copyHandle = (e) => {
+  uni.setClipboardData({
+    data: e,
+    success() {
+      uni.showToast({
+        title: "复制成功",
+        icon: "none",
+      });
+    },
+  });
+};
 
-	async function getMaxPointsDiscount() {
-		let res = await APImemberPointscalcUsablePoints({
-			shopUserId: props.orderVIP.id,
-			orderAmount: maxMoney.value
-		})
-		Object.assign(pointsRes, res)
-		maxPointDiscount.value = res.maxDeductionAmount
-		if (usePoints.value) {
-			cartStore.setUserPoints(res.maxUsablePoints || 0)
-		}
-		console.log('getMaxPointsDiscount:cartStore.orderCostSummary.pointUsed', cartStore.orderCostSummary.pointUsed);
-	}
-	watch(() => maxMoney.value, (newval) => {
-		console.log('maxMoney.value', newval);
-		getMaxPointsDiscount()
-	})
-	watch(() => usePoints.value, (newval) => {
-		if (newval) {
-			getMaxPointsDiscount()
-		} else {
-			cartStore.setUserPoints(0)
-		}
+// 将方法暴露给父组件
+defineExpose({
+  dataprocessing,
+  getCalcUsablePoints,
+  bwcclear,
+  IntegralInputclose,
+});
 
-	})
+watch(
+  () => props.listinfo.seatNum,
+  (newval) => {
+    cartStore.setSeatFeeConfig("personCount", newval || 0);
+  }
+);
 
+const newUserDiscount = ref(0);
+const back_favorablelist = toRaw(favorablelist.value);
+async function getConsumeDiscount() {
+  const consumeDiscountRes = await consumeDiscount({
+    shopId: uni.cache.get("shopId"),
+  });
+  if (!consumeDiscountRes) {
+    favorablelist.value = back_favorablelist.filter(
+      (v) => v.name != "新客立减"
+    );
+    return;
+  }
 
-	// * 获取积分相关信息
-	const getCalcUsablePoints = async (data) => {
-		Object.assign(calcUsablePointsData, data);
-		try {
-			cartStore.setPointDeductionRule(data.equivalentPoints, data.maxDeductionAmount)
-			calcUsablePointsData.minIntegral = data.minDeductionPoints
-			calcUsablePointsData.maxIntegral = data.maxUsablePoints
-			calcUsablePointsData.instructionText =
-				`请输入 ${ data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`
-		} catch (error) {
-			//TODO handle the exception
-		}
+  if (consumeDiscountRes) {
+    newUserDiscount.value = consumeDiscountRes.amount;
+    cartStore.newUserDiscount = consumeDiscountRes.amount || 0;
+    cartStore.consumeDiscount = consumeDiscountRes;
+  }
+}
 
-	}
+// 初始化订单计算可能为计算完毕，所以判断监听价格变化后再获取优惠券
+let loadFinish = false;
+watch(
+  () => cartStore.orderCostSummary.goodsRealAmount,
+  async (newval) => {
+    if (newval && !loadFinish) {
+      const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount;
+      const dinnerType = cartStore.dinnerType;
+      const shopInfo = cartStore.shopInfo;
+      const shopId = cartStore.shopInfo.shopId;
+      const user = uni.cache.get("shopUserInfo");
+      const shopUserId = user.id;
+      const allGoods = cartStore.allGoods;
 
-	// 积分取消清空
-	const IntegralInputclose = async () => {
-		calcUsablePointsData.integral = null
-		props.listinfo.pointsDiscountAmount = 0
-		calcUsablePointsData.showModal = false
-		// cartStore.setUserPoints(0);
-	}
+      hasCouponCanUse.value = await returnHasCouponCanUse({
+        goodsOrderPrice,
+        dinnerType,
+        shopId,
+        shopInfo,
+        shopUserId,
+        allGoods,
+        user,
+      });
+    }
+  }
+);
 
-	// * 复制订单号
-	const copyHandle = (e) => {
-		uni.setClipboardData({
-			data: e,
-			success() {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			}
-		});
-	}
+const originalPrice = computed(() => {
+  const originalPrice =
+    cartStore.orderCostSummary.goodsRealAmount +
+    cartStore.orderCostSummary.packFee +
+    cartStore.orderCostSummary.seatFee;
+  console.log("originalPrice", originalPrice);
+  return originalPrice;
+});
 
+watch(
+  () => originalPrice.value,
+  () => {
+    if (discountActivityRes.value) {
+      calcDiscountActivity();
+    }
+  }
+);
 
-	// 将方法暴露给父组件
-	defineExpose({
-		dataprocessing,
-		getCalcUsablePoints,
-		bwcclear,
-		IntegralInputclose
-	});
+watch(
+  () => props.isBwc,
+  (newval) => {
+    const freeDineConfig = props.orderVIP.freeDineConfig;
+    if (newval) {
+      discountActivity.value = null;
+      cartStore.fullReductionActivities = [];
+      if (!freeDineConfig.withCoupon) {
+        disabledCouponUse.value = true;
+        disabledCouponReason.value = "霸王餐与优惠券不可同时使用";
+        cartStore.setCoupons([]);
+      }
+      if (!freeDineConfig.withPoints) {
+        disabledPointsUse.value = true;
+        disabledPointsUseReason.value = "霸王餐与积分不可同时使用";
+		usePoints.value = false;
+        cartStore.setUserPoints(0);
+      }
+    } else {
+      if (back_discountActivity) {
+        calcDiscountActivity();
+      }
+    }
+  }
+);
 
-	watch(() => props.listinfo.seatNum, (newval) => {
-		cartStore.setSeatFeeConfig('personCount', newval || 0)
-	})
+function calcDiscountActivity() {
+  const res = discountActivityRes.value;
+  const user = uni.cache.get("shopUserInfo");
 
-	const newUserDiscount = ref(0)
-	const back_favorablelist = toRaw(favorablelist.value)
-	async function getConsumeDiscount() {
-		const consumeDiscountRes = await consumeDiscount({
-			shopId: uni.cache.get('shopId'),
-		})
-		if (!consumeDiscountRes) {
-			favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减')
-			return
-		}
-	
-		if (consumeDiscountRes) {
-			newUserDiscount.value = consumeDiscountRes.amount
-			cartStore.newUserDiscount = consumeDiscountRes.amount || 0
-			cartStore.consumeDiscount = consumeDiscountRes
-		}
-	}
-	
-	// 初始化订单计算可能为计算完毕，所以判断监听价格变化后再获取优惠券
-	let loadFinish = false
-	watch(() => cartStore.orderCostSummary.goodsRealAmount,async (newval) => {
-		if (newval && !loadFinish) {
-			const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount
-			const dinnerType = cartStore.dinnerType
-			const shopInfo = cartStore.shopInfo
-			const shopId = cartStore.shopInfo.shopId
-			const user = uni.cache.get('shopUserInfo')
-			const shopUserId = user.id
-			const allGoods = cartStore.allGoods
-
-			hasCouponCanUse.value = await returnHasCouponCanUse({
-				goodsOrderPrice,
-				dinnerType,
-				shopId,
-				shopInfo,
-				shopUserId,
-				allGoods,
-				user
-			})
-			console.log('hasCouponCanUse', hasCouponCanUse.value);
-		}
-	})
-	onMounted(() => {
-		getConsumeDiscount()
-
-	})
+  //不与会员同享
+  if (!res.vipPriceShare && user.isVip) {
+    return;
+  }
+  if (res && res.thresholds && res.thresholds.length > 0) {
+    console.log("calcDiscountActivity", res);
+    const canUseThresholds = res.thresholds.filter((v) => {
+      return originalPrice.value >= v.fullAmount;
+    });
+    if (canUseThresholds.length) {
+      discountActivity.value = canUseThresholds[0];
+      back_discountActivity = canUseThresholds[0];
+    }
+  }
+  if (!discountActivity.value) {
+    return;
+  }
+  console.log("当前满减门槛", discountActivity.value);
+  if (!res.couponShare) {
+    disabledCouponUse.value = true;
+    cartStore.backendCoupons = [];
+    disabledCouponReason.value = "当前满减活动不可与其他优惠共享";
+  }
+  //不与积分同享
+  if (!res.pointsShare && discountActivity.value) {
+    disabledPointsUse.value = true;
+    disabledPointsUseReason.value = "当前满减活动不与积分同享";
+    cartStore.setUserPoints(0);
+  }
+  if (discountActivity.value) {
+    cartStore.fullReductionActivities = [discountActivityRes.value];
+  }
+}
+async function getDiscountActivity() {
+  const res = await discountActivityApi.config({
+    shopId: uni.cache.get("shopId"),
+  });
+  if (!res) {
+    return;
+  }
+  discountActivityRes.value = res;
+  calcDiscountActivity();
+}
+onMounted(() => {
+  getConsumeDiscount();
+  getDiscountActivity();
+});
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .orderInfo .u-textarea {
-		background: #FAFAFA;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-	}
-
-	.round {
-		width: 24rpx;
-		height: 24rpx;
-		border-radius: 50%;
-		background-color: #fff;
-		border: 1px solid #D9D9D9;
-	}
-
-	::v-deep .u-textarea__field {
-		background: #FAFAFA;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-	}
-
-	.t {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-		flex-shrink: 0;
-	}
-
-	.card_box {
-		background-color: #fff;
-		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		position: relative;
-		width: 100%;
-		height: 100%;
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		border-radius: 18rpx;
-		padding-bottom: 32rpx;
-
-		.tabBox {
-			width: 100%;
-			margin-top: 52rpx;
-			position: relative;
-			z-index: 1;
-
-			.tab {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				border-radius: 22rpx 22rpx 0 0;
-				// background-color: $uni-bg-color;
-
-				.tab_item {
-					width: 50%;
-					height: 90rpx;
-					line-height: 90rpx;
-					display: flex;
-					align-items: center;
-					padding-left: 30rpx;
-					box-sizing: border-box;
-					background-color: #FEFBF8;
-					border-radius: 0 22rpx 0 0;
-					position: relative;
-
-					.title {
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #999999;
-						position: relative;
-						z-index: 1;
-					}
-
-					.title.active {
-						color: #E8AD7B;
-					}
-
-					.icon {
-						width: 48rpx;
-						height: 48rpx;
-						margin-right: 16rpx;
-						position: relative;
-						z-index: 1;
-					}
-				}
-
-				.tab_item.active {
-					background-color: #fff;
-				}
-
-				// .tab_item.active:after {
-				//  content: "";
-				//          position: absolute;
-				//          top: 0;
-				//          left: -4px;
-				//          width: 40px;
-				//          height: 26px;
-				//          background: orange;
-				// }
-				.tab_item.active:before {
-					content: "";
-					position: absolute;
-					top: -20rpx;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					border-radius: 2px;
-					background: #fff;
-					transform: skewX(0deg);
-				}
-
-				.tab_item1.active:before {
-					border-radius: 22rpx 40rpx 0 0;
-				}
-
-				.tab_item2.active:before {
-					border-radius: 40rpx 22rpx 0 0;
-				}
-			}
-
-			.table {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin: 0 30rpx;
-				box-sizing: border-box;
-				height: 90rpx;
-				background-color: $uni-bg-color;
-				border-bottom: 1rpx solid #E5E5E5;
-
-				.table_left {
-					display: flex;
-					align-items: center;
-
-					.icon {
-						width: 32.86rpx;
-						height: 39.07rpx;
-						margin-right: 24rpx;
-					}
-
-					.title {
-						display: flex;
-						align-items: center;
-						color: #E8AD7B;
-					}
-				}
-
-				.value {
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #333333;
-				}
-			}
-
-			.pack {
-				display: flex;
-				flex-direction: column;
-				padding: 30rpx;
-				box-sizing: border-box;
-				background-color: $uni-bg-color;
-				border-radius: 0 0 22rpx 22rpx;
-
-				.top {
-					display: flex;
-					flex-direction: column;
-					margin-top: 8rpx;
-
-					.title {
-						font-size: 28rpx;
-						color: #333;
-						font-weight: bold;
-						margin-bottom: 16rpx;
-					}
-
-					.address {
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #999;
-					}
-				}
-
-				.list {
-					display: flex;
-					flex-direction: column;
-
-					.item {
-						height: 70rpx;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						font-size: 28rpx;
-
-						.lable {
-							color: #666;
-							font-weight: 500;
-						}
-
-						.getPhone {
-							display: flex;
-							align-items: center;
-
-							.u-input {
-								width: 340rpx;
-								border: none;
-
-								input {
-									font-size: 24rpx;
-									color: #333;
-
-								}
-
-								.input-placeholder {
-									font-size: 24rpx;
-								}
-							}
-						}
-
-						.text,
-						.getBtn {
-							color: #E8AD7B;
-						}
-
-						.getBtn {
-							border-radius: 12rpx;
-							border: 2rpx solid #E8AD7B;
-							padding: 8rpx 20rpx;
-							box-sizing: border-box;
-						}
-					}
-				}
-
-			}
-		}
-
-
-		.card_head_box {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: absolute;
-			top: -22.5rpx;
-			padding: 0 44rpx;
-
-			.card_head_item {
-				width: 45rpx;
-				height: 45rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				// box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
-			}
-
-		}
-
-		.card {
-			// background-color: #fff;
-			border-radius: 20upx;
-			margin-bottom: 28upx;
-			position: relative;
-
-			.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;
-
-						.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;
-				height: 60rpx;
-				box-sizing: border-box;
-				// 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;
-
-						&.red {
-							color: #FF3232;
-						}
-					}
-
-				}
-
-				.favorable_right {
-					.column {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-
-						.favorable_right_text {
-							margin-bottom: 10rpx;
-
-							&.red {
-								color: #FF3232;
-							}
-
-							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 {
-				display: flex;
-				margin: 0 30rpx;
-				justify-content: flex-end;
-				align-items: flex-end;
-				padding: 0 0 30rpx 34rpx;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				border-bottom: 2rpx dashed #e5e5e5;
-
-				.price {
-					font-weight: bold;
-					font-size: 36rpx;
-				}
-			}
-
-
-
-			.order_footer {
-				display: flex;
-				flex-direction: column;
-				padding: 34rpx;
-				position: relative;
-
-
-
-			}
-
-
-		}
-	}
-
-	.orderInfo {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		margin-top: 32rpx;
-		padding: 32rpx 34rpx;
-
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		.row {
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 32rpx;
-
-			.t {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-				flex-shrink: 0;
-			}
-
-			.info {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #666666;
-			}
-		}
-
-		.row:last-child {
-			margin-bottom: none;
-		}
-
-	}
-
-
-	.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;
-			}
-		}
-	}
-
-	.red {
-		color: #FF3232;
-	}
+::v-deep .orderInfo .u-textarea {
+  background: #fafafa;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.round {
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 50%;
+  background-color: #fff;
+  border: 1px solid #d9d9d9;
+}
+
+::v-deep .u-textarea__field {
+  background: #fafafa;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.t {
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #333333;
+  flex-shrink: 0;
+}
+
+.card_box {
+  background-color: #fff;
+  // box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  position: relative;
+  width: 100%;
+  height: 100%;
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  border-radius: 18rpx;
+  padding-bottom: 32rpx;
+
+  .tabBox {
+    width: 100%;
+    margin-top: 52rpx;
+    position: relative;
+    z-index: 1;
+
+    .tab {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-radius: 22rpx 22rpx 0 0;
+      // background-color: $uni-bg-color;
+
+      .tab_item {
+        width: 50%;
+        height: 90rpx;
+        line-height: 90rpx;
+        display: flex;
+        align-items: center;
+        padding-left: 30rpx;
+        box-sizing: border-box;
+        background-color: #fefbf8;
+        border-radius: 0 22rpx 0 0;
+        position: relative;
+
+        .title {
+          font-weight: 500;
+          font-size: 28rpx;
+          color: #999999;
+          position: relative;
+          z-index: 1;
+        }
+
+        .title.active {
+          color: #e8ad7b;
+        }
+
+        .icon {
+          width: 48rpx;
+          height: 48rpx;
+          margin-right: 16rpx;
+          position: relative;
+          z-index: 1;
+        }
+      }
+
+      .tab_item.active {
+        background-color: #fff;
+      }
+
+      // .tab_item.active:after {
+      //  content: "";
+      //          position: absolute;
+      //          top: 0;
+      //          left: -4px;
+      //          width: 40px;
+      //          height: 26px;
+      //          background: orange;
+      // }
+      .tab_item.active:before {
+        content: "";
+        position: absolute;
+        top: -20rpx;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        border-radius: 2px;
+        background: #fff;
+        transform: skewX(0deg);
+      }
+
+      .tab_item1.active:before {
+        border-radius: 22rpx 40rpx 0 0;
+      }
+
+      .tab_item2.active:before {
+        border-radius: 40rpx 22rpx 0 0;
+      }
+    }
+
+    .table {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0 30rpx;
+      box-sizing: border-box;
+      height: 90rpx;
+      background-color: $uni-bg-color;
+      border-bottom: 1rpx solid #e5e5e5;
+
+      .table_left {
+        display: flex;
+        align-items: center;
+
+        .icon {
+          width: 32.86rpx;
+          height: 39.07rpx;
+          margin-right: 24rpx;
+        }
+
+        .title {
+          display: flex;
+          align-items: center;
+          color: #e8ad7b;
+        }
+      }
+
+      .value {
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+      }
+    }
+
+    .pack {
+      display: flex;
+      flex-direction: column;
+      padding: 30rpx;
+      box-sizing: border-box;
+      background-color: $uni-bg-color;
+      border-radius: 0 0 22rpx 22rpx;
+
+      .top {
+        display: flex;
+        flex-direction: column;
+        margin-top: 8rpx;
+
+        .title {
+          font-size: 28rpx;
+          color: #333;
+          font-weight: bold;
+          margin-bottom: 16rpx;
+        }
+
+        .address {
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .list {
+        display: flex;
+        flex-direction: column;
+
+        .item {
+          height: 70rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          font-size: 28rpx;
+
+          .lable {
+            color: #666;
+            font-weight: 500;
+          }
+
+          .getPhone {
+            display: flex;
+            align-items: center;
+
+            .u-input {
+              width: 340rpx;
+              border: none;
+
+              input {
+                font-size: 24rpx;
+                color: #333;
+              }
+
+              .input-placeholder {
+                font-size: 24rpx;
+              }
+            }
+          }
+
+          .text,
+          .getBtn {
+            color: #e8ad7b;
+          }
+
+          .getBtn {
+            border-radius: 12rpx;
+            border: 2rpx solid #e8ad7b;
+            padding: 8rpx 20rpx;
+            box-sizing: border-box;
+          }
+        }
+      }
+    }
+  }
+
+  .card_head_box {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: absolute;
+    top: -22.5rpx;
+    padding: 0 44rpx;
+
+    .card_head_item {
+      width: 45rpx;
+      height: 45rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      // box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+
+  .card {
+    // background-color: #fff;
+    border-radius: 20upx;
+    margin-bottom: 28upx;
+    position: relative;
+
+    .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;
+
+          .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;
+      height: 60rpx;
+      box-sizing: border-box;
+      // 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;
+
+          &.red {
+            color: #ff3232;
+          }
+        }
+      }
+
+      .favorable_right {
+        .column {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+
+          .favorable_right_text {
+            margin-bottom: 10rpx;
+
+            &.red {
+              color: #ff3232;
+            }
+
+            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 {
+      display: flex;
+      margin: 0 30rpx;
+      justify-content: flex-end;
+      align-items: flex-end;
+      padding: 0 0 30rpx 34rpx;
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      border-bottom: 2rpx dashed #e5e5e5;
+
+      .price {
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+    }
+
+    .order_footer {
+      display: flex;
+      flex-direction: column;
+      padding: 34rpx;
+      position: relative;
+    }
+  }
+}
+
+.orderInfo {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  margin-top: 32rpx;
+  padding: 32rpx 34rpx;
+
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  .row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 32rpx;
+
+    .t {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+      flex-shrink: 0;
+    }
+
+    .info {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #666666;
+    }
+  }
+
+  .row:last-child {
+    margin-bottom: none;
+  }
+}
+
+.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;
+    }
+  }
+}
+
+.red {
+  color: #ff3232;
+}
+.youhui-item {
+  height: 60rpx;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
+.align-center {
+  align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/components/rechargeFree.vue b/pages/order/components/rechargeFree.vue
index 9c18794..aea2dbe 100644
--- a/pages/order/components/rechargeFree.vue
+++ b/pages/order/components/rechargeFree.vue
@@ -1,92 +1,107 @@
 <template>
-	<!-- 充值免单 -->
-	<view class="rechargeFree">
-		<view class="rechargeFree_bg" @click="changeFree">
-			<view class="left">
-				<view class="icon">优惠</view>
-				<view class="text">
-					充值消费{{freeDineConfig.rechargeTimes}}倍（订单满￥{{freeDineConfig.rechargeThreshold}}元可用），本单立享免单！</view>
-			</view>
-			<up-checkbox :disabled="!freeDineConfig.enable"  @change="change" shape="circle" usedAlone v-model:checked="changeFreeenable" icon-size="20" size="20">
-			</up-checkbox>
-			<!-- <up-checkbox-group iconPlacement="right">
+  <!-- 充值免单 -->
+  <view class="rechargeFree">
+    <view class="rechargeFree_bg" @click="itemClick">
+      <view class="left">
+        <view class="icon">优惠</view>
+        <view class="text">
+          充值消费{{ freeDineConfig.rechargeTimes }}倍（订单满￥{{
+            freeDineConfig.rechargeThreshold
+          }}元可用），本单立享免单！</view
+        >
+      </view>
+	  <view @click.stop="()=>{}">
+		<up-checkbox
+        :disabled="!freeDineConfig.enable"
+        @change="changeFree"
+        shape="circle"
+		activeColor="#E8AD7B" 
+        usedAlone
+        v-model:checked="changeFreeenable"
+        icon-size="20"
+        size="20"
+      >
+      </up-checkbox>
+	  </view>
+
+      <!-- <up-checkbox-group iconPlacement="right">
 				<up-checkbox : v-model="changeFreeenable"
 					:checked="freeDineConfig.enable" @change="change" activeColor="#E8AD7B" shape="circle"
 					icon-size="16" size="16">
 				</up-checkbox>
 			</up-checkbox-group> -->
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		defineProps,
-		defineEmits
-	} from 'vue';
+import { ref, defineProps, defineEmits } from "vue";
 
-	// 定义接收的属性
-	const props = defineProps({
-		freeDineConfig: {
-			type: Object,
-			default: {}
-		},
-		payAmount: {
-			type: Number,
-			default: 0
-		},
-	});
+// 定义接收的属性
+const props = defineProps({
+  freeDineConfig: {
+    type: Object,
+    default: {},
+  },
+  payAmount: {
+    type: Number,
+    default: 0,
+  },
+});
+function itemClick(){
+	changeFreeenable.value = !changeFreeenable.value;
+	emits("changeFree", changeFreeenable.value);
 
-	const emits = defineEmits(['changeFree']);
+}
+const emits = defineEmits(["changeFree"]);
 
-	const changeFreeenable = ref(false)
+const changeFreeenable = ref(false);
 
-	/**
-	 * 监听是否免单
-	 */
-	const change = (e) => {
-		emits('changeFree', e);
-	}
+/**
+ * 监听是否免单
+ */
+const changeFree = (e) => {
+  emits("changeFree", e);
+};
 </script>
 
 <style lang="scss" scoped>
-	.rechargeFree {
-		// padding: 0 20rpx;
-		margin-top: 32rpx;
+.rechargeFree {
+  // padding: 0 20rpx;
+  margin-top: 32rpx;
 
-		.rechargeFree_bg {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 32rpx 24rpx;
-			border-radius: 24rpx;
-			background-color: #fff;
+  .rechargeFree_bg {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 32rpx 24rpx;
+    border-radius: 24rpx;
+    background-color: #fff;
 
-			.left {
-				display: flex;
-				align-items: center;
+    .left {
+      display: flex;
+      align-items: center;
 
-				.icon {
-					width: 68rpx;
-					height: 36rpx;
-					text-align: center;
-					line-height: 36rpx;
-					background: linear-gradient(180deg, #FEDE81 0%, #FEB263 100%);
-					border-radius: 12rpx 0rpx 12rpx 0rpx;
-					font-weight: 500;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-right: 12rpx;
-				}
+      .icon {
+        width: 68rpx;
+        height: 36rpx;
+        text-align: center;
+        line-height: 36rpx;
+        background: linear-gradient(180deg, #fede81 0%, #feb263 100%);
+        border-radius: 12rpx 0rpx 12rpx 0rpx;
+        font-weight: 500;
+        font-size: 20rpx;
+        color: #ffffff;
+        margin-right: 12rpx;
+      }
 
-				.text {
-					width: 80%;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-	}
+      .text {
+        width: 80%;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index e893384..a2b2bad 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1,1614 +1,1679 @@
 <template>
-	<view class="container">
-		<up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
-		<view class="headStatus">
-			<view class="status">
+  <view class="container">
+    <up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
+    <view class="headStatus">
+      <view class="status">
+        <up-icon
+          v-if="
+            listinfo.status == 'done' ||
+            listinfo.status == 'unpaid' ||
+            !listinfo.id
+          "
+          name="checkmark-circle-fill"
+          color="#03C061"
+          size="23"
+        ></up-icon>
+        <view
+          class="statusName"
+          v-if="listinfo.status == 'unpaid' || !listinfo.id"
+          >待支付</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'done'">已完成</view>
+        <view class="statusName" v-if="listinfo.status == 'refund'">退单</view>
+        <view class="statusName" v-if="listinfo.status == 'part-refund'"
+          >部分退单</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'cancelled'"
+          >取消订单</view
+        >
+      </view>
+      <view class="time" v-if="listinfo.createTime"
+        >下单时间：{{ listinfo.createTime }}</view
+      >
+      <view
+        class="time"
+        v-if="
+          listinfo.paidTime &&
+          (listinfo.status != 'cancelled' || listinfo.status != 'unpaid')
+        "
+      >
+        付款时间：{{ listinfo.paidTime }}
+      </view>
+    </view>
 
-				<up-icon v-if="listinfo.status =='done'||listinfo.status =='unpaid'||!listinfo.id"
-					name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
-				<view class="statusName" v-if="listinfo.status == 'unpaid'||!listinfo.id">待支付</view>
-				<view class="statusName" v-if="listinfo.status=='done'">已完成</view>
-				<view class="statusName" v-if="listinfo.status=='refund'">退单</view>
-				<view class="statusName" v-if="listinfo.status=='part-refund'">部分退单</view>
-				<view class="statusName" v-if="listinfo.status=='cancelled'">取消订单</view>
-			</view>
-			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
-			<view class="time" v-if="listinfo.paidTime && (listinfo.status!='cancelled' ||listinfo.status!='unpaid')">
-				付款时间：{{listinfo.paidTime}}
-			</view>
-		</view>
+    <view class="wxQrcode" v-if="shopQrcode">
+      <view class="left">
+        <text class="title">扫码加好友，优惠多多</text>
+        <text>优惠活动多</text>
+        <text>充值有好礼</text>
+        <text>会员享低价</text>
+        <text>长按保存，微信内扫一扫加好友</text>
+      </view>
+      <!-- #ifdef MP-WEIXIN -->
+      <u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
+      <!-- #endif -->
+      <!-- #ifdef MP-ALIPAY -->
+      <image
+        style="height: 150rpx; width: 150rpx"
+        :src="shopQrcode"
+        @longpress="saveImage(shopQrcode)"
+        mode="aspectFill"
+      ></image>
+      <!-- #endif -->
+    </view>
 
-		<view class="wxQrcode" v-if="shopQrcode">
-			<view class="left">
-				<text class="title">扫码加好友，优惠多多</text>
-				<text>优惠活动多</text>
-				<text>充值有好礼</text>
-				<text>会员享低价</text>
-				<text>长按保存，微信内扫一扫加好友</text>
-			</view>
-			<!-- #ifdef MP-WEIXIN -->
-			<u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
-			<!-- #endif -->
-			<!-- #ifdef MP-ALIPAY -->
-			<image style="height: 150rpx;width: 150rpx;" :src="shopQrcode" @longpress="saveImage(shopQrcode)"
-				mode="aspectFill"></image>
-			<!-- #endif -->
-		</view>
+    <!--  {{cartStore.orderCostSummary}} -->
 
-
-		<!--  {{cartStore.orderCostSummary}} -->
-
-		<!-- 详情 -->
-		<orderInfo :useVipPrice="cartStore.useVipPrice" :packfee="packfee" :shifu="shifu" :nowCarts="cartStore.carts"
-			ref="orderInfoAfterRef" :freeCheck="freeCheck" :listinfo="listinfo" :orderVIP="orderVIP"
-			:ordershopUserInfo='ordershopUserInfo' @istype="istype" @clickPointsamount='clickPointsamount'
-			@learcoupons="learcoupons" :isBwc='isBwc'>
-		</orderInfo>
-		<!-- 订单备注 -->
-		<view class="orderInfo">
-			<view class="">
-				<view class="t">
-					订单备注：
-				</view>
-				<view class="u-m-t-18 ">
-					<up-textarea border="none" placeholder="请填写口味、偏好等要求" type="textarea" v-model="orderRemarker"
-						:clearable="true" />
-				</view>
-			</view>
-		</view>
-		<!-- 霸王餐 -->
-		<rechargeFree :freeDineConfig="orderVIP.freeDineConfig" :payAmount="listinfo.totalPrices"
-			v-if="(listinfo.status == 'unpaid'||!listinfo.id) && orderVIP.freeDineConfig.enable"
-			@changeFree="changeFree">
-		</rechargeFree>
-		<!-- 充值享优惠 -->
-		<view v-else>
-			<ChargeVue @updateChargeSel="updateChargeSel" @updateRechargeId="updateRechargeId"
-				v-if="(listinfo.status == 'unpaid'||!listinfo.id)"></ChargeVue>
-		</view>
-		<!-- 支付方式 -->
-		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
-			:disablePayType="disablePayType" :changeFreeenable="isBwc" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-		</paymentMethodes>
-		<view class="fixedview">
-			<view class="flex-between" v-if="listinfo.status == 'unpaid'||!listinfo.id">
-				<view class="fixedview_one flex-start">
-					<view class="fixedview_oneone"> 实付金额： </view>
-					<view class="fixedview_onetow" v-if="rechargeItem.id">
-						<text>¥</text>{{rechargeItem.amount}}
-					</view>
-					<view class="fixedview_onetow" v-else>
-						<text>¥</text>{{cartStore.orderCostSummary.finalPayAmount}}
-					</view>
-				</view>
-				<view class="flex-colum-end u-flex u-flex-y-center">
-
-					<view class="u-m-r-30 u-flex u-flex-y-center">
-						<template v-if="ordershopUserInfo.registerType=='before'">
-							<up-button shape="circle" v-if="!listinfo.id" @click="toJiacai" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-							<up-button shape="circle" v-if="listinfo.id&&listinfo.status=='unpaid'" plain
-								@tap="cancelOrder" :custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<text class="u-font-32 color-main u-m-l-16">取消订单</text>
-								</view>
-							</up-button>
-						</template>
-						<template v-else>
-							<up-button v-if="!cartStore.isEmpty" shape="circle" @click="onlyCreateOrder" plain
-								:custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
-									<text class="u-font-32 color-main ">仅下单</text>
-								</view>
-							</up-button>
-							<up-button v-else shape="circle" @click="toJiacai" plain :custom-style="customStyle">
-								<view class="u-flex u-flex-y-center">
-									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
-										mode=""></image>
-									<text class="u-font-32 color-main u-m-l-16">加菜</text>
-								</view>
-							</up-button>
-						</template>
-					</view>
-					<view class="fixedview_tow" @tap="$u.debounce(istoricalorders,1000)">
-						{{paymentmethod.paymentBtnText}}
-					</view>
-					<!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
+    <!-- 详情 -->
+    <orderInfo
+      :useVipPrice="cartStore.useVipPrice"
+      :packfee="packfee"
+      :shifu="shifu"
+      :nowCarts="cartStore.carts"
+      ref="orderInfoAfterRef"
+      :freeCheck="freeCheck"
+      :listinfo="listinfo"
+      :orderVIP="orderVIP"
+      :ordershopUserInfo="ordershopUserInfo"
+      @istype="istype"
+      @clickPointsamount="clickPointsamount"
+      @learcoupons="learcoupons"
+      :isBwc="isBwc"
+    >
+    </orderInfo>
+    <!-- 订单备注 -->
+    <view class="orderInfo">
+      <view class="">
+        <view class="t"> 订单备注： </view>
+        <view class="u-m-t-18">
+          <up-textarea
+            border="none"
+            placeholder="请填写口味、偏好等要求"
+            type="textarea"
+            v-model="orderRemarker"
+            :clearable="true"
+          />
+        </view>
+      </view>
+    </view>
+    <!-- 霸王餐 -->
+    <rechargeFree
+      :freeDineConfig="orderVIP.freeDineConfig"
+      :payAmount="listinfo.totalPrices"
+      v-if="showFreeDine"
+      @changeFree="changeFree"
+    >
+    </rechargeFree>
+    <!-- 充值享优惠 -->
+    <view v-else>
+      <ChargeVue
+        @updateChargeSel="updateChargeSel"
+        @updateRechargeId="updateRechargeId"
+        v-if="listinfo.status == 'unpaid' || !listinfo.id"
+      ></ChargeVue>
+    </view>
+    <!-- 支付方式 -->
+    <paymentMethodes
+      ref="paymentMethodref"
+      :orderVIP="orderVIP"
+      @groupChange="groupChange"
+      :disablePayType="disablePayType"
+      :changeFreeenable="isBwc"
+      v-if="listinfo.status == 'unpaid' || !listinfo.id"
+    >
+    </paymentMethodes>
+    <view class="fixedview">
+      <view
+        class="flex-between"
+        v-if="listinfo.status == 'unpaid' || !listinfo.id"
+      >
+        <view class="fixedview_one flex-start">
+          <view class="fixedview_oneone"> 实付金额： </view>
+          <view class="fixedview_onetow" v-if="rechargeItem.id">
+            <text>¥</text>{{ rechargeItem.amount }}
+          </view>
+          <view class="fixedview_onetow" v-else>
+            <text>¥</text>{{ cartStore.orderCostSummary.finalPayAmount }}
+          </view>
+        </view>
+        <view class="flex-colum-end u-flex u-flex-y-center">
+          <view class="u-m-r-30 u-flex u-flex-y-center">
+            <template v-if="ordershopUserInfo.registerType == 'before'">
+              <up-button
+                shape="circle"
+                v-if="!listinfo.id"
+                @click="toJiacai"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <image
+                    style="width: 40rpx; height: 40rpx"
+                    src="@/static/icon/add-goods.png"
+                    mode=""
+                  ></image>
+                  <text class="u-font-32 color-main u-m-l-16">加菜</text>
+                </view>
+              </up-button>
+              <up-button
+                shape="circle"
+                v-if="listinfo.id && listinfo.status == 'unpaid'"
+                plain
+                @tap="cancelOrder"
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <text class="u-font-32 color-main u-m-l-16">取消订单</text>
+                </view>
+              </up-button>
+            </template>
+            <template v-else>
+              <up-button
+                v-if="!cartStore.isEmpty"
+                shape="circle"
+                @click="onlyCreateOrder"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
+                  <text class="u-font-32 color-main">仅下单</text>
+                </view>
+              </up-button>
+              <up-button
+                v-else
+                shape="circle"
+                @click="toJiacai"
+                plain
+                :custom-style="customStyle"
+              >
+                <view class="u-flex u-flex-y-center">
+                  <image
+                    style="width: 40rpx; height: 40rpx"
+                    src="@/static/icon/add-goods.png"
+                    mode=""
+                  ></image>
+                  <text class="u-font-32 color-main u-m-l-16">加菜</text>
+                </view>
+              </up-button>
+            </template>
+          </view>
+          <view class="fixedview_tow" @tap="$u.debounce(istoricalorders, 1000)">
+            {{ paymentmethod.paymentBtnText }}
+          </view>
+          <!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
 						取消订单
 					</view> -->
-				</view>
-			</view>
-		</view>
-		<view style="width: 100%;height: 200rpx;color: #fff; color: #fff;">
-		</view>
-		<payPassword ref="payPasswordref" :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
-	</view>
+        </view>
+      </view>
+    </view>
+    <view style="width: 100%; height: 200rpx; color: #fff; color: #fff"> </view>
+    <payPassword
+      ref="payPasswordref"
+      :isShow="ispws"
+      @inputComplete="accountPayevent"
+      @close="ispws = false"
+    />
+    <!-- 私域引流配置 -->
+    <OrderFinshModal v-if="showDrainage"></OrderFinshModal>
+  </view>
 </template>
 <script setup>
-	import {
-		back
-	} from '@/utils/uniapp.js'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import {
-		BigNumber
-	} from 'bignumber.js';
-	import ChargeVue from './components/charge.vue';
-	import {
-		pay
-	} from '@/utils/pay.js'
-	import * as UTILS from '@/utils/goods-utils.js'
-	import {
-		findCoupon
-	} from '@/common/api/market/coupon.js';
-
-	function onback() {
-		closeSocket()
-		back()
-	}
-	const customStyle = {
-		'width': '180rpx',
-		'height': '70rpx',
-		'background': 'FFFFFF',
-		'border-radius': '106rpx',
-		'border': '2rpx solid #E8AD7B'
-	}
-	import _ from "lodash";
-	import {
-		ref,
-		reactive,
-		computed,
-		onMounted,
-		onUnmounted,
-		watchEffect,
-		nextTick,
-		watch,
-		onBeforeMount,
-		onBeforeUnmount
-	} from 'vue';
-	import {
-		getTableInfo
-	} from '@/common/api/shop/index.js'
-	import {
-		APIgetOrderById,
-		APIputuserorder,
-		APIhistoryOrder,
-		rechargePayOrder,
-		APIcancelOrder
-	} from '@/common/api/order/index.js'
-	import {
-		APIusershopInfodetail,
-		APIshopUserInfo
-	} from '@/common/api/member.js'
-	import {
-		APImemberPointsmyPoints,
-		APImemberPointscalcUsablePoints
-	} from '@/common/api/shop/index.js'
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	import {
-		useWebSocket
-	} from '@/stores/carts-websocket.js';
-
-	const cartStore = useCartsStore()
-
-
-
-	const disablePayType = ref([])
-	//充值相关
-	const rechargeItem = ref({
-		id: ''
-	})
-	const rechargeId = ref(null)
-
-	function updateRechargeId(e) {
-		rechargeId.value = e
-	}
-
-	function updateChargeSel(newval) {
-		rechargeItem.value = newval
-		console.log('updateChargeSel',newval);
-		//充值并付款时只能微信支付
-		if (newval && newval.id) {
-			disablePayType.value = ['余额支付']
-			paymentMethodref.value.groupChanges(2)
-			return
-		} 
-		console.log('orderVIP.value.amount',orderVIP.value.amount);
-		if (!orderVIP.value.amount) {
-			disablePayType.value = ['余额支付']
-			if (paymentMethodref.value) {
-				paymentMethodref.value.groupChanges(2)
-			}
-			return
-		}
-		if (orderVIP.value.amount < newval) {
-			disablePayType.value = ['余额支付']
-			if (paymentMethodref.value) {
-				paymentMethodref.value.groupChanges(2)
-			}
-			return
-		}
-		disablePayType.value = []
-	}
-
-	async function onMessage(Message) {
-		cartStore.onMessage(Message, cartsSocket)
-		listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1
-		if (Message.operate_type == "init") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "cleanup") {
-			listinfo.totalCost = 0;
-			youhuiReset()
-			if (listinfo.id) {
-				let res = await APIgetOrderById({
-					orderId: listinfo.id
-				})
-				console.log('onMessage:APIgetOrderById', res);
-				if (res) {
-					orderRemarker.value=res.remark;
-					// cartStore.carts=[];
-					// cartStore.setOldOrder(res)
-				}
-				if (noPayStatus[res.status]) {
-					uni.showToast({
-						title: noPayStatus[res.status],
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1000);
-					return;
-				}
-			}
-		}
-		if (Message.operate_type == "del") {
-			youhuiReset()
-		}
-		if (Message.operate_type == "edit") {
-			youhuiReset()
-		}
-		if (Message.operate_type == 'clearOrder') {
-			youhuiReset()
-		}
-		if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-			.operate_type == 'product_update') {
-			youhuiReset()
-		}
-		return Message
-	}
-	let cartsSocket = null
-	cartStore.goodsInit()
-	const socketInitPar = {
-		type: 'shopping',
-		operate_type: 'init',
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId'),
-	}
-
-	function socketInit() {
-		cartsSocket = useWebSocket();
-		cartsSocket.connect(socketInitPar, onMessage);
-	}
-	const noPayStatus = {
-		cancelled: "订单已取消",
-		done: "订单已关闭",
-	};
-
-
-
-	function youhuiReset() {
-		listinfo.pointsDiscountAmount = 0;
-		listinfo.pointsNum = 0;
-		listinfo.pointsDiscountAmount = 0
-		listinfo.Productroll = 0
-		uniqueIds.value = []
-		try {
-			orderInfoAfterRef.value?.IntegralInputclose();
-		} catch {
-
-		}
-	}
-
-
-	// 结账管理
-	import {
-		Memberpay
-	} from '@/stores/pay.js';
-
-	const storeMemberpay = Memberpay();
-
-	import {
-		productStore
-	} from '@/stores/user.js';
-	const storeuser = productStore();
-
-	import payPassword from '@/components/payPassword.vue'
-	import orderInfo from './components/orderInfo.vue'
-	// import orderInfoBefore from '../components/orderInfoBefore.vue'
-	import rechargeFree from './components/rechargeFree.vue'
-	import paymentMethodes from '@/components/paymentMethod.vue'; //支付方式
-	import {
-		onShow,
-		onBackPress
-	} from '@dcloudio/uni-app';
-	import {
-		onHide
-	} from '@dcloudio/uni-app';
-	// 输入支付密码
-	const ispws = ref(false)
-	const userInfo= uni.cache.get('userInfo')
-
-	// 会员信息
-	const orderVIP = ref(uni.cache.get('orderVIP'))
-	// 商品订单关联的店铺信息
-	const ordershopUserInfo = ref(uni.cache.get('shopInfo'))
-
-
-	cartStore.updateData('orderVIP', orderVIP.value)
-	cartStore.updateData('shopInfo', ordershopUserInfo.value)
-	// 是否显示商家二维码信息
-	const shopQrcode = ref(ordershopUserInfo.shopInfo || false)
-
-	// 霸王餐
-	const isBwc = ref(false)
-	//订单备注
-	const orderRemarker = ref('')
-	// 订单详情
-	const listinfo = reactive({
-		combinedArray: [],
-		Productroll: 0,
-		coupondiscountAmount: 0,
-		pointsDiscountAmount: 0,
-		packFeess: 0,
-		totalPrices: 0,
-		Seatcharge: 0,
-		pointsNum: 0,
-		id: null
-	})
-
-
-
-	//判断是否是打包商品
-	const is_type = ref(0)
-	//打包商品切换
-	const istype = (newValue) => {
-		is_type.value = newValue;
-	};
-	//积分
-
-	const freeCheck = ref(false)
-	let backtimer = null
-	let historyTotalPrices = 0;
-	// * 获取订单详情接口
-	const orderorderInfo = async () => {
-		console.log('listinfo.id', listinfo.id);
-		let res = listinfo.id ? await APIgetOrderById({
-			orderId: listinfo.id
-		}) : await APIhistoryOrder({
-			tableCode: options.tableCode
-		})
-		orderRemarker.value=res.remark;
-		if (res && res.tableCode) {
-			socketInitPar.table_code = res.tableCode
-			let tableRes = await getTableInfo({
-				tableCode: options.tableCode
-			})
-			console.log(tableRes);
-			listinfo.tableName = tableRes.name;
-		} else {
-			if (options.tableCode) {
-				socketInitPar.table_code = options.tableCode
-				let tableRes = await getTableInfo({
-					tableCode: options.tableCode
-				})
-				console.log(tableRes);
-				listinfo.tableName = tableRes.name;
-			}
-		}
-		cartStore.setOldOrder(res);
-		socketInit()
-		console.log(res);
-
-		getOrderInfoAfterCalcInit(res)
-	}
-
-	//拿到订单数据后续初始化处理
-	function getOrderInfoAfterCalcInit(res) {
-		console.log('getOrderInfoAfterCalcInit',res);
-		if (res && res.id) {
-			Object.assign(listinfo, res);
-			// 历史订单
-			if (listinfo.detailMap) {
-				let combinedArray = [];
-				for (const key in listinfo.detailMap) {
-					if (listinfo.detailMap.hasOwnProperty(key)) {
-						let subArray = listinfo.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				listinfo.combinedArray = combinedArray
-				listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray)
-				// 计算购物车商品费用
-				historyTotalPrices = cartStore.getTotalTotalPrices(listinfo
-					.combinedArray, isBwc.value) * 1
-
-				listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1
-				// 餐位费listinfo.seatNum
-				listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum)
-			}
-			if (listinfo.discountInfo) {
-				const discountObj = JSON.parse(listinfo.discountInfo);
-				const tempArray = [];
-				for (const [key, value] of Object.entries(discountObj)) {
-					tempArray.push({
-						name: key,
-						amount: value
-					});
-				}
-				listinfo.discountInfo = tempArray;
-			}
-			// 回填先质控
-			listinfo.pointsDiscountAmount = 0
-			// console.log(listinfo)
-
-		} else {
-			listinfo.totalPrices = cartStore.totalPrice * 1
-		}
-
-		// uni.showToast({
-		// 	title:'订单已取消或已付款',
-		// 	icon:'none'
-		// })
-		// backtimer=setTimeout(()=>{
-		// 	const arr=getCurrentPages()
-		// 	if(arr.length<=1){
-		// 		toJiacai()
-		// 	}else{
-		// 		uni.navigateBack({delta:1})
-		// 	}
-		// },1000)
-	}
-
-
-	// 监听价格算法
-	watchEffect(async () => {
-		if (listinfo.combinedArray.length > 0 || cartStore.carts.length > 0) {
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge
-			// try {
-			let historyOrderPackFee = is_type.value != 0 ? listinfo.packFeess : 0;
-			let nowCartPackFee = is_type.value != 0 ? cartStore.totalPackFee * 1 : 0;
-			let seatFee = is_type.value == 0 ? listinfo.Seatcharge : 0;
-			let sum = cartStore.totalPackFee * 1 + historyOrderPackFee + listinfo.totalPrices + seatFee;
-			listinfo.originAmount = Math.round(sum * 100) / 100;
-
-			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
-			let sums = nowCartPackFee + historyOrderPackFee + listinfo.totalPrices + seatFee - (listinfo
-				.Productroll || 0) - (listinfo.coupondiscountAmount || 0) - (listinfo
-				.pointsDiscountAmount || 0);
-			listinfo.totalCost = Math.round(sums * 100) / 100;
-
-			// 总价格
-			// console.log(listinfo.combinedArray, listinfo.packFeess, listinfo.totalPrices, listinfo
-			// 	.Seatcharge, listinfo.Productroll, listinfo.coupondiscountAmount, sums) // 霸王餐
-			// console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value)
-			if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-				listinfo.totalCost = (parseFloat(listinfo.totalCost) * parseFloat(orderVIP.value
-					.freeDineConfig.rechargeTimes)).toFixed(2)
-			}
-			// 积分
-			if (listinfo.totalCost && (listinfo.status == 'unpaid' || !listinfo.id) && orderVIP.value.id) {
-				uni.$u.debounce(memberPointscalcUsablePoints, 500)
-			}
-			// } catch (error) {
-			// 	//TODO handle the exception
-			// }
-		}
-	});
-
-
-
-	const changeFree = (e) => {
-		isBwc.value = e
-
-		orderInfoAfterRef.value.bwcclear()
-		uniqueIds.value = [] // 筛选出商品卷的id
-		listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		listinfo.pointsNum = 0 // 商品卷总价价格
-		// 商品价格
-		listinfo.totalPrices = cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value)
-		// 支付方式切换
-		// #ifdef MP-WEIXIN
-		paymentMethodref.value.groupChanges(2)
-		// #endif
-		// #ifdef MP-ALIPAY
-		paymentMethodref.value.groupChanges(3)
-		// #endif
-
-
-	}
-
-	const saveImage = (url) => {
-		uni.saveImage({
-			url: url,
-			success: () => {
-				uni.showToast({
-					title: "保存成功",
-					icon: 'none'
-				})
-			},
-		});
-	}
-
-	//
-	const paymentMethodref = ref(null)
-
-	// 支付方式切换
-	const paymentmethod = reactive({
-		radiovalue: 2,
-		paymentBtnText: "微信支付",
-		payType: 'wechatPay'
-	})
-
-	const groupChange = async (e) => {
-		paymentmethod.radiovalue = e.type;
-		paymentmethod.paymentBtnText = e.name;
-		paymentmethod.payType = e.payType;
-	}
-
-	// * 去充值
-	const goRecharge = () => {
-		uni.pro.navigateTo('/pages/member/index', {
-			shopId: listinfo.shopId
-		})
-	}
-
-	// 操作下单时候
-	const orderInfoAfterRef = ref(null)
-
-	// 商品卷的id储存
-	const uniqueIds = ref([])
-
-	// 这是优惠卷传的值
-	const handleReturnData = async (data) => {
-		// 这是优惠卷
-		if (data.typeOrder == 1) {
-			if (data.item) {
-				// 优惠卷减去的金额
-				listinfo.coupondiscountAmount = data.item.discountAmount
-				uniqueIds.value.push(data.item.id)
-				orderInfoAfterRef.value.dataprocessing(data)
-			}
-		} else {
-			// 筛选出商品卷的id
-			// 商品卷总价价格
-			// uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
-			uniqueIds.value = [...uniqueIds.value, ...data.map(item => item.id)]
-			console.log(uniqueIds.value);
-			listinfo.Productroll = cartStore.getTotalProductroll(data).value
-			// TODO handle the exception
-			let res = {
-				Productroll: listinfo.Productroll,
-				uniqueIds: uniqueIds.value.length
-			}
-			orderInfoAfterRef.value.dataprocessing(res)
-
-		}
-
-	};
-
-	const learcoupons = (data) => {
-		if (data == 'product') {
-			uniqueIds.value = [] // 筛选出商品卷的id
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-			listinfo.Productroll = 0 // 商品卷总价价格
-			listinfo.pointsNum = 0 // 积分总价格
-		} else {
-			// 每次点击优惠卷删除优惠卷里的id 
-			if (listinfo.coupondiscountAmount != 0) {
-				uniqueIds.value.pop()
-			}
-			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
-		}
-	}
-
-	//取消订单
-	const cancelOrder = async () => {
-		uni.showModal({
-			title: '取消订单',
-			content: '是否取消订单？',
-			showCancel: true,
-			success: async (res) => {
-				if (res.confirm) {
-					await APIcancelOrder({
-						shopId: listinfo.shopId,
-						orderId: listinfo.id
-					})
-					uni.showToast({
-						title: '取消订单成功',
-						icon: 'none'
-					})
-					setTimeout(() => {
-						uni.pro.switchTab('order/index')
-					}, 1000)
-				}
-			}
-		})
-
-	}
-
-	// 删除订单
-	const APIputuserorderclick = async () => {
-		await APIputuserorder(listinfo.id)
-		uni.showToast({
-			title: '删除成功',
-			icon: 'none'
-		})
-		uni.pro.switchTab('order/index')
-	}
-	async function onlyCreateOrder() {
-		await createOrder()
-		orderorderInfo()
-	}
-	// 生成订单
-	const createOrder = async () => {
-		// cartStore.carts = [];
-		const res = await storeMemberpay.actionscreateOrder({
-			dineMode: is_type.value == 0 ? 'dine-in' : 'take-out', //堂食 dine-in 外带 take-out 外卖 take-away
-			seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
-			// packFee: packFee.value, //打包费
-			packFee: packfee.value, //打包费
-			originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
-			remark: orderRemarker.value, //备注
-			placeNum: listinfo.id ? (listinfo.placeNum * 1 + 1) : 1, //当前订单下单次数
-			waitCall: '', //是否等叫 0 否 1 等叫
-			orderId: listinfo.id || '',
-			tableCode: options.tableCode,
-			userId: uni.cache.get('userInfo').id || '' //
-		})
-		// 清空购物车
-		if (res) {
-			Object.assign(listinfo, res)
-			// cartStore.setOldOrder(res)
-			getOrderInfoAfterCalcInit(res)
-
-			cartsSocket.sendMessage({
-				type: 'shopping',
-				table_code: uni.cache.get('tableCode'),
-				shop_id: uni.cache.get('shopId'),
-				operate_type: 'cleanup',
-			})
-			return res
-		} else {
-			uni.showToast({
-				title: '生成订单失败'
-			})
-		}
-
-	}
-
-	function isPayBefor() {
-		return ordershopUserInfo.value.registerType == 'before' ? true : false
-	}
-
-
-	function pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_lock'
-		})
-	}
-
-	function pay_unlock() {
-		clearInterval(payStatusTimer)
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'pay_unlock'
-		})
-	}
-	async function search_pay_lock() {
-		cartsSocket.sendMessage({
-			...socketInitPar,
-			operate_type: 'search_pay_lock'
-		})
-		return new Promise((relove, reject) => {
-			cartsSocket.socketTask.onMessage(res => {
-				relove(JSON.parse(res.data))
-			})
-		})
-	}
-	let payStatusTimer = null
-	let orderIsLock = true;
-	let usePoints=ref(0)
-	
-	
-	let checkOrderPay = {}
-	
-	const istoricalorders = async () => {
-		
-		checkOrderPay = {
-			orderId:'',
-			vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
-			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-			seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
-			originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
-			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
-			discountAmount: 0, //手动优惠金额  写死0
-			productCouponDiscountAmount: cartStore.orderCostSummary.productCouponDeduction, //商品优惠券抵扣金额
-			otherCouponDiscountAmount: cartStore.orderCostSummary.fullCouponDeduction, //其他优惠券抵扣金额
-			couponList: cartStore.backendCoupons.map(v => v.id), //用户使用的卡券
-			orderAmount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
-			roundAmount: 0, //抹零金额 减免多少钱
-			pointsDiscountAmount: cartStore.orderCostSummary
-				.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
-			pointsNum: cartStore.orderCostSummary.pointUsed, //(扣除各类折扣 enable_deduction后使用)
-			newCustomerDiscountAmount: cartStore.orderCostSummary.newUserDiscount, //新客立减
-			newCustomerDiscountId: cartStore.orderCostSummary.newUserDiscount > 0 ? cartStore
-				.consumeDiscount.id : '',
-			remark: orderRemarker.value, //用户备注
-		}
-		
-		//先付
-		if (isPayBefor()) {
-			console.log('isPayBefor');
-			console.log('cartStore.isEmpty', cartStore.isEmpty);
-			console.log('cartStore.carts', cartStore.carts);
-			// 购物车有数据
-			if (!cartStore.isEmpty) {
-				usePoints=cartStore.orderCostSummary.pointUsed
-				const res = await createOrder()
-				//历史订单数据
-				const res1 = await APIgetOrderById({
-					orderId: res.id
-				})
-				console.log('历史订单数据',res1);
-				orderRemarker.value=res1.remark;
-				cartStore.setOldOrder(res1)
-			}
-			console.log('istoricalorders：cartStore.orderCostSummary.pointUsed',cartStore.orderCostSummary.pointUsed);
-			console.log('istoricalorders：cartStore.userPoints',cartStore.userPoints);
-			goToPay()
-			// goToPay()
-
-		} else {
-			//后付
-			
-			// 购物车有数据
-			if (!cartStore.isEmpty) {
-				usePoints=cartStore.orderCostSummary.pointUsed
-				const res = await createOrder()
-				//历史订单数据
-				const res1 = await APIgetOrderById({
-					orderId: res.id
-				})
-				console.log('历史订单数据',res1);
-				orderRemarker.value=res1.remark;
-				cartStore.setOldOrder(res1)
-				goToPay()
-				return 
-			}
-			// 先调用历史订单
-			let APIhistoryOrderres = await APIhistoryOrder({
-				tableCode: listinfo.tableCode
-			})
-			// 判断是否有历史订单
-			if (APIhistoryOrderres.detailMap) {
-				let combinedArray = [];
-				for (const key in APIhistoryOrderres.detailMap) {
-					if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
-						let subArray = APIhistoryOrderres.detailMap[key];
-						combinedArray = [...combinedArray, ...subArray]
-					}
-				}
-				// 判断支付之前是是否还有新加订单
-				if (listinfo.combinedArray.length === combinedArray.length) {
-					goToPay()
-				} else {
-					uni.showToast({
-						title: '你的订单已更新！',
-						icon: 'none'
-					})
-					orderorderInfo()
-				}
-			} else {
-				uni.showToast({
-					title: '你的小伙伴已提交订单~',
-					icon: 'none'
-				})
-				setTimeout(() => {
-					orderorderInfo()
-				}, 1000)
-			}
-		}
-
-
-
-	}
-
-	// * 去支付
-	const goToPay = async (isCreateOrder = false) => {
-		// 余额支付
-		if (paymentmethod.payType == 'accountPay') {
-			if (orderVIP.value.payPwd == '') {
-				uni.showModal({
-					title: '提示',
-					content: '您还未设置支付密码，是否去设置？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.pro.navigateTo('user/member/setPassword', {
-								shopId: orderVIP.value.shopId,
-								type: 'detail'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-				return
-			} 
-			if(userInfo.usePayPwd){
-				ispws.value = true
-				return 
-			}
-			accountPayevent()
-			return 
-		}
-
-		const canPayRes = await search_pay_lock()
-		const canPay = canPayRes.status == 1 ? true : false;
-		if (!canPay) {
-			uni.showToast({
-				title: '有人正在付款中！',
-				icon: 'none'
-			})
-			return
-		}
-		pay_lock()
-		payStatusTimer = setInterval(() => {
-			pay_lock()
-		}, 1000)
-
-		if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
-			await storeMemberpay.actionspayltPayVip({
-				shopId: orderVIP.value.shopId,
-				shopUserId: orderVIP.value.id,
-				orderId: listinfo.id,
-				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
-				amount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
-				returnUrl: '', //跳转地址
-				buyerRemark: '',
-				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
-			})
-
-			orderorderInfo()
-			return false;
-		} else {
-			checkOrderPay.orderId=listinfo.id;
-			console.log('cartStore.orderCostSummary',cartStore.orderCostSummary);
-			console.log('topay checkOrderPay', checkOrderPay);
-			try {
-				if (rechargeItem.value.id && rechargeId.value) {
-					//充值并且支付
-					const payRes = await rechargePayOrder({
-						checkOrderPay: {
-							...checkOrderPay,
-							userId: uni.cache.get('shopUserInfo').userId || ''
-						},
-
-						payType: paymentmethod.payType,
-						buyerRemark: '',
-						returnUrl: '',
-						rechargeId: rechargeId.value,
-						rechargeDetailId: rechargeItem.value.id,
-						shopUserId: orderVIP.value.id,
-						shopId: orderVIP.value.shopId,
-					})
-					await pay(payRes)
-					pay_unlock()
-				} else {
-					console.log('微信支付');
-					await storeMemberpay.actionsltPayOrder({
-						checkOrderPay,
-						payType: paymentmethod.payType,
-						buyerRemark: '',
-						returnUrl: ''
-					})
-				}
-
-			} catch (error) {
-				console.log('error', error);
-				pay_unlock()
-				//TODO handle the exception
-			}
-		}
-		pay_unlock()
-		console.log('orderorderInfo');
-		orderorderInfo()
-	}
-
-	//002-获取订单可用积分及抵扣金额（支付页面使用）
-	const memberPointscalcUsablePoints = async () => {
-		let res = await APImemberPointscalcUsablePoints({
-			shopUserId: orderVIP.value.id,
-			orderAmount: listinfo.totalCost,
-		})
-		orderInfoAfterRef.value?.getCalcUsablePoints(res)
-	}
-	// 
-	const clickPointsamount = (Pointsamount) => {
-		listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount
-		listinfo.pointsNum = Pointsamount.pointsNum
-	}
-
-	const payPasswordref = ref(null)
-	// 余额支付
-	const accountPayevent = async (pwd) => {
-		ispws.value = false;
-		checkOrderPay.userId=uni.cache.get('userInfo').id
-		checkOrderPay.orderId=listinfo.id
-		console.log('余额支付本地计算',cartStore.orderCostSummary);
-		console.log('余额支付提交参数',{
-				checkOrderPay,
-				payType: paymentmethod.payType,
-				pwd: pwd,
-				shopUserId: orderVIP.value.id,
-				buyerRemark: '',
-				returnUrl: ''
-			});
-			console.log('积分',checkOrderPay.pointsNum);
-		try {
-			await storeMemberpay.balancePayOrder({
-				checkOrderPay,
-				payType: paymentmethod.payType,
-				pwd: pwd,
-				shopUserId: orderVIP.value.id,
-				buyerRemark: '',
-				returnUrl: ''
-			})
-			uni.showToast({
-				title: '支付成功',
-				icon: 'none'
-			})
-		} catch (error) {
-			//TODO handle the exception
-		}
-		orderorderInfo()
-	}
-
-	onBeforeUnmount(() => {
-		uni.$off('returnData', handleReturnData);
-		clearTimeout(backtimer)
-		clearInterval(payStatusTimer)
-		closeSocket()
-	});
-	onHide(() => {
-		closeSocket()
-		clearInterval(payStatusTimer)
-	})
-
-	function closeSocket() {
-
-		// cartsSocket.closeExistingConnection()
-	}
-
-	onShow(() => {
-		if (cartsSocket) {
-			cartsSocket.connect()
-		}
-		try {
-			// 更新数据
-			if (orderVIP.value) {
-				orderVIP.value = uni.cache.get('orderVIP')
-				paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
-				if (listinfo.id && ordershopUserInfo.value.registerType != 'before') {
-					orderorderInfo()
-				}
-			}
-		} catch (error) {
-			//TODO handle the exception
-		}
-
-
-		orderorderInfo()
-		uni.$off('selCoupon')
-		uni.$on('selCoupon', function(data) {
-			console.log('selCoupon', data)
-			orderInfoAfterRef.value.dataprocessing(_.cloneDeep(data))
-			cartStore.setCoupons(_.cloneDeep(data))
-		})
-
-	});
-	let options = {}
-
-	// 跳转到加菜页面
-	function toJiacai() {
-		back()
-		return
-		uni.navigateTo({
-			url: '/pages/product/index'
-		})
-	}
-	const packfee = computed(() => {
-		return cartStore.orderCostSummary.packFee
-	})
-	//不计算各种折扣前的实付金额
-	const shifu = computed(() => {
-		const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
-		return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
-	})
-	//减去各种折扣后的金额
-	const lastPayMoney = computed(() => {
-		return shifu.value * 1
-	})
-
-
-	const payStatus = {
-		'unpaid': '待支付',
-		'done': '已完成',
-		'refund': '已退款',
-		'part-refund': '部分退款',
-		'cancelled': '已取消'
-	}
-	const navTitle = computed(() => {
-		if (!listinfo.id && !cartStore.isEmpty) {
-			return '待确认'
-		}
-		if (cartStore.isEmpty && listinfo.id) {
-			return payStatus[listinfo.status] || '待确认'
-		} else {
-			return '待确认'
-		}
-	})
-
-	async function init(opt) {
-		console.log('init');
-		cartStore.clearOrderConfig()
-		Object.assign(options, opt)
-		listinfo.id = options.orderId;
-		console.log('options', options);
-		if (options.shopId) {
-			// 每次进来全局更新shopId
-			uni.cache.set('shopId', options.shopId, 30)
-			uni.$on('returnData', handleReturnData);
-		}
-		//如果已经生成订单，根据历史订信息设置相关配置
-		if (options.orderId) {
-			let res = await APIgetOrderById({
-				orderId: listinfo.id
-			})
-			if (res) {
-				uni.cache.set('tableCode', res.tableCode)
-				uni.cache.set('tableCode', res.seatNum)
-				options.tableCode = res.tableCode
-				cartStore.setSeatFeeConfig('personCount', res.seatNum)
-				cartStore.setDinnerType(res.dineMode || 'dine-in')
-				orderRemarker.value=res.remark;
-			}
-		}
-		//获取店铺信息
-		const shopInfoRes = await APIusershopInfodetail({
-			shopId: options.shopId
-		})
-		if (shopInfoRes) {
-			cartStore.shopInfo = shopInfoRes.shopInfo;
-		}
-		await cartStore.goodsInit()
-		// * 获取会员信息
-		await storeuser.actionsproductqueryProduct()
-		await nextTick()
-
-		orderVIP.value = uni.cache.get('orderVIP')
-		if (options.tableCode) {
-			socketInitPar.table_code = options.tableCode
-			socketInit()
-		} else {
-			orderorderInfo()
-		}
-
-	}
-	onLoad((opt) => {
-		init(opt)
-	})
+import { back } from "@/utils/uniapp.js";
+import { onLoad } from "@dcloudio/uni-app";
+import { BigNumber } from "bignumber.js";
+import ChargeVue from "./components/charge.vue";
+import { pay } from "@/utils/pay.js";
+import Drainage from "@/components/drainage.vue";
+import * as drainageConfigApi from "@/common/api/market/drainageConfig.js";
+import OrderFinshModal from "@/components/order-finish-modal.vue";
+
+function onback() {
+  closeSocket();
+  back();
+}
+const customStyle = {
+  width: "180rpx",
+  height: "70rpx",
+  background: "FFFFFF",
+  "border-radius": "106rpx",
+  border: "2rpx solid #E8AD7B",
+};
+import _ from "lodash";
+import {
+  ref,
+  reactive,
+  computed,
+  onMounted,
+  onUnmounted,
+  watchEffect,
+  nextTick,
+  watch,
+  onBeforeMount,
+  onBeforeUnmount,
+} from "vue";
+import { getTableInfo } from "@/common/api/shop/index.js";
+import {
+  APIgetOrderById,
+  APIputuserorder,
+  APIhistoryOrder,
+  rechargePayOrder,
+  APIcancelOrder,
+} from "@/common/api/order/index.js";
+import { APIusershopInfodetail, APIshopUserInfo } from "@/common/api/member.js";
+import {
+  APImemberPointsmyPoints,
+  APImemberPointscalcUsablePoints,
+} from "@/common/api/shop/index.js";
+import { useCartsStore } from "@/stores/carts.js";
+import { useWebSocket } from "@/stores/carts-websocket.js";
+
+const cartStore = useCartsStore();
+
+const disablePayType = ref([]);
+//充值相关
+const rechargeItem = ref({
+  id: "",
+});
+const rechargeId = ref(null);
+
+function updateRechargeId(e) {
+  rechargeId.value = e;
+}
+
+function updateChargeSel(newval) {
+  rechargeItem.value = newval;
+  console.log("updateChargeSel", newval);
+  //充值并付款时只能微信支付
+  if (newval && newval.id) {
+    disablePayType.value = ["余额支付"];
+    paymentMethodref.value.groupChanges(2);
+    return;
+  }
+  console.log("orderVIP.value.amount", orderVIP.value.amount);
+  if (!orderVIP.value.amount) {
+    disablePayType.value = ["余额支付"];
+    if (paymentMethodref.value) {
+      paymentMethodref.value.groupChanges(2);
+    }
+    return;
+  }
+  if (orderVIP.value.amount < newval) {
+    disablePayType.value = ["余额支付"];
+    if (paymentMethodref.value) {
+      paymentMethodref.value.groupChanges(2);
+    }
+    return;
+  }
+  disablePayType.value = [];
+}
+
+async function onMessage(Message) {
+  cartStore.onMessage(Message, cartsSocket);
+  listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1;
+  if (Message.operate_type == "init") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "cleanup") {
+    listinfo.totalCost = 0;
+    youhuiReset();
+    if (listinfo.id) {
+      let res = await APIgetOrderById({
+        orderId: listinfo.id,
+      });
+      console.log("onMessage:APIgetOrderById", res);
+      if (res) {
+        orderRemarker.value = res.remark;
+        // cartStore.carts=[];
+        // cartStore.setOldOrder(res)
+      }
+      if (noPayStatus[res.status]) {
+        uni.showToast({
+          title: noPayStatus[res.status],
+          icon: "none",
+        });
+        setTimeout(() => {
+          uni.navigateBack();
+        }, 1000);
+        return;
+      }
+    }
+  }
+  if (Message.operate_type == "del") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "edit") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "clearOrder") {
+    youhuiReset();
+  }
+  if (
+    Message.type == "product" &&
+    Message.data_type == "product_update" &&
+    Message.operate_type == "product_update"
+  ) {
+    youhuiReset();
+  }
+  return Message;
+}
+let cartsSocket = null;
+cartStore.goodsInit();
+const socketInitPar = {
+  type: "shopping",
+  operate_type: "init",
+  table_code: uni.cache.get("tableCode"),
+  shop_id: uni.cache.get("shopId"),
+};
+
+function socketInit() {
+  cartsSocket = useWebSocket();
+  cartsSocket.connect(socketInitPar, onMessage);
+}
+const noPayStatus = {
+  cancelled: "订单已取消",
+  done: "订单已关闭",
+};
+
+function youhuiReset() {
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.pointsNum = 0;
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.Productroll = 0;
+  uniqueIds.value = [];
+  try {
+    orderInfoAfterRef.value?.IntegralInputclose();
+  } catch {}
+}
+
+// 结账管理
+import { Memberpay } from "@/stores/pay.js";
+
+const storeMemberpay = Memberpay();
+
+import { productStore } from "@/stores/user.js";
+const storeuser = productStore();
+
+import payPassword from "@/components/payPassword.vue";
+import orderInfo from "./components/orderInfo.vue";
+// import orderInfoBefore from '../components/orderInfoBefore.vue'
+import rechargeFree from "./components/rechargeFree.vue";
+import paymentMethodes from "@/components/paymentMethod.vue"; //支付方式
+import { onShow, onBackPress } from "@dcloudio/uni-app";
+import { onHide } from "@dcloudio/uni-app";
+// 输入支付密码
+const ispws = ref(false);
+const userInfo = uni.cache.get("userInfo");
+
+// 会员信息
+const orderVIP = ref(uni.cache.get("orderVIP"));
+// 商品订单关联的店铺信息
+const ordershopUserInfo = ref(uni.cache.get("shopInfo"));
+
+cartStore.updateData("orderVIP", orderVIP.value);
+cartStore.updateData("shopInfo", ordershopUserInfo.value);
+// 是否显示商家二维码信息
+const shopQrcode = ref(ordershopUserInfo.shopInfo || false);
+
+// 霸王餐
+const isBwc = ref(false);
+//是否显示霸王餐
+const showFreeDine = computed(() => {
+  //原始金额
+  const originMoney = BigNumber(cartStore.orderCostSummary.goodsOriginalAmount)
+    .plus(cartStore.orderCostSummary.packFee)
+    .plus(cartStore.orderCostSummary.seatFee)
+    .plus(cartStore.orderCostSummary.additionalFee);
+  //实付金额=原始金额*倍数
+  // const fullAmount=originMoney.times(oorderVIP.value.freeDineConfig.multiple)
+
+  if (
+    (listinfo.status == "unpaid" || !listinfo.id) &&
+    orderVIP.value.freeDineConfig.enable &&
+    originMoney >= orderVIP.value.freeDineConfig.rechargeThreshold
+  ) {
+    return true;
+  }
+});
+
+//订单备注
+const orderRemarker = ref("");
+// 订单详情
+const listinfo = reactive({
+  combinedArray: [],
+  Productroll: 0,
+  coupondiscountAmount: 0,
+  pointsDiscountAmount: 0,
+  packFeess: 0,
+  totalPrices: 0,
+  Seatcharge: 0,
+  pointsNum: 0,
+  id: null,
+});
+
+//判断是否是打包商品
+const is_type = ref(0);
+//打包商品切换
+const istype = (newValue) => {
+  is_type.value = newValue;
+};
+//积分
+
+const freeCheck = ref(false);
+let backtimer = null;
+let historyTotalPrices = 0;
+// * 获取订单详情接口
+const orderorderInfo = async () => {
+  console.log("listinfo.id", listinfo.id);
+  let res = listinfo.id
+    ? await APIgetOrderById({
+        orderId: listinfo.id,
+      })
+    : await APIhistoryOrder({
+        tableCode: options.tableCode,
+      });
+  orderRemarker.value = res.remark;
+  if (res && res.tableCode) {
+    socketInitPar.table_code = res.tableCode;
+    let tableRes = await getTableInfo({
+      tableCode: options.tableCode,
+    });
+    console.log(tableRes);
+    listinfo.tableName = tableRes.name;
+  } else {
+    if (options.tableCode) {
+      socketInitPar.table_code = options.tableCode;
+      let tableRes = await getTableInfo({
+        tableCode: options.tableCode,
+      });
+      console.log(tableRes);
+      listinfo.tableName = tableRes.name;
+    }
+  }
+  cartStore.setOldOrder(res);
+  socketInit();
+  console.log(res);
+
+  getOrderInfoAfterCalcInit(res);
+};
+
+//拿到订单数据后续初始化处理
+function getOrderInfoAfterCalcInit(res) {
+  console.log("getOrderInfoAfterCalcInit", res);
+  if (res && res.id) {
+    Object.assign(listinfo, res);
+    // 历史订单
+    if (listinfo.detailMap) {
+      let combinedArray = [];
+      for (const key in listinfo.detailMap) {
+        if (listinfo.detailMap.hasOwnProperty(key)) {
+          let subArray = listinfo.detailMap[key];
+          combinedArray = [...combinedArray, ...subArray];
+        }
+      }
+      listinfo.combinedArray = combinedArray;
+      listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray);
+      // 计算购物车商品费用
+      historyTotalPrices =
+        cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value) * 1;
+
+      listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1;
+      // 餐位费listinfo.seatNum
+      listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum);
+    }
+    if (listinfo.discountInfo) {
+      const discountObj = JSON.parse(listinfo.discountInfo);
+      const tempArray = [];
+      for (const [key, value] of Object.entries(discountObj)) {
+        tempArray.push({
+          name: key,
+          amount: value,
+        });
+      }
+      listinfo.discountInfo = tempArray;
+    }
+    // 回填先质控
+    listinfo.pointsDiscountAmount = 0;
+    // console.log(listinfo)
+  } else {
+    listinfo.totalPrices = cartStore.totalPrice * 1;
+  }
+
+  // uni.showToast({
+  // 	title:'订单已取消或已付款',
+  // 	icon:'none'
+  // })
+  // backtimer=setTimeout(()=>{
+  // 	const arr=getCurrentPages()
+  // 	if(arr.length<=1){
+  // 		toJiacai()
+  // 	}else{
+  // 		uni.navigateBack({delta:1})
+  // 	}
+  // },1000)
+}
+
+// 监听价格算法
+watchEffect(async () => {
+  if (listinfo.combinedArray.length > 0 || cartStore.carts.length > 0) {
+    // 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge
+    // try {
+    let historyOrderPackFee = is_type.value != 0 ? listinfo.packFeess : 0;
+    let nowCartPackFee = is_type.value != 0 ? cartStore.totalPackFee * 1 : 0;
+    let seatFee = is_type.value == 0 ? listinfo.Seatcharge : 0;
+    let sum =
+      cartStore.totalPackFee * 1 +
+      historyOrderPackFee +
+      listinfo.totalPrices +
+      seatFee;
+    listinfo.originAmount = Math.round(sum * 100) / 100;
+
+    // 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
+    let sums =
+      nowCartPackFee +
+      historyOrderPackFee +
+      listinfo.totalPrices +
+      seatFee -
+      (listinfo.Productroll || 0) -
+      (listinfo.coupondiscountAmount || 0) -
+      (listinfo.pointsDiscountAmount || 0);
+    listinfo.totalCost = Math.round(sums * 100) / 100;
+
+    // 总价格
+    // console.log(listinfo.combinedArray, listinfo.packFeess, listinfo.totalPrices, listinfo
+    // 	.Seatcharge, listinfo.Productroll, listinfo.coupondiscountAmount, sums) // 霸王餐
+    // console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value)
+    if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
+      listinfo.totalCost = (
+        parseFloat(listinfo.totalCost) *
+        parseFloat(orderVIP.value.freeDineConfig.rechargeTimes)
+      ).toFixed(2);
+    }
+    // 积分
+    if (
+      listinfo.totalCost &&
+      (listinfo.status == "unpaid" || !listinfo.id) &&
+      orderVIP.value.id
+    ) {
+      uni.$u.debounce(memberPointscalcUsablePoints, 500);
+    }
+    // } catch (error) {
+    // 	//TODO handle the exception
+    // }
+  }
+});
+
+const changeFree = (e) => {
+  if (JSON.stringify(e) == "{}") {
+    return;
+  }
+  isBwc.value = e;
+  cartStore.isFreeDine = e;
+  if (e) {
+    disablePayType.value = ["余额支付"];
+  } else {
+    disablePayType.value = [];
+  }
+  orderInfoAfterRef.value.bwcclear();
+  uniqueIds.value = []; // 筛选出商品卷的id
+  listinfo.coupondiscountAmount = 0; // 优惠卷减去的金额
+  listinfo.pointsNum = 0; // 商品卷总价价格
+  // 商品价格
+  //   listinfo.totalPrices = cartStore.getTotalTotalPrices(
+  //     listinfo.combinedArray,
+  //     isBwc.value
+  //   );
+  // 支付方式切换
+  // #ifdef MP-WEIXIN
+  paymentMethodref.value.groupChanges(2);
+  // #endif
+  // #ifdef MP-ALIPAY
+  paymentMethodref.value.groupChanges(3);
+  // #endif
+};
+
+const saveImage = (url) => {
+  uni.saveImage({
+    url: url,
+    success: () => {
+      uni.showToast({
+        title: "保存成功",
+        icon: "none",
+      });
+    },
+  });
+};
+
+//
+const paymentMethodref = ref(null);
+
+// 支付方式切换
+const paymentmethod = reactive({
+  radiovalue: 2,
+  paymentBtnText: "微信支付",
+  payType: "wechatPay",
+});
+
+const groupChange = async (e) => {
+  paymentmethod.radiovalue = e.type;
+  paymentmethod.paymentBtnText = e.name;
+  paymentmethod.payType = e.payType;
+};
+
+// * 去充值
+const goRecharge = () => {
+  uni.pro.navigateTo("/pages/member/index", {
+    shopId: listinfo.shopId,
+  });
+};
+
+// 操作下单时候
+const orderInfoAfterRef = ref(null);
+
+// 商品卷的id储存
+const uniqueIds = ref([]);
+
+// 这是优惠卷传的值
+const handleReturnData = async (data) => {
+  // 这是优惠卷
+  if (data.typeOrder == 1) {
+    if (data.item) {
+      // 优惠卷减去的金额
+      listinfo.coupondiscountAmount = data.item.discountAmount;
+      uniqueIds.value.push(data.item.id);
+      orderInfoAfterRef.value.dataprocessing(data);
+    }
+  } else {
+    // 筛选出商品卷的id
+    // 商品卷总价价格
+    // uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
+    uniqueIds.value = [...uniqueIds.value, ...data.map((item) => item.id)];
+    console.log(uniqueIds.value);
+    listinfo.Productroll = cartStore.getTotalProductroll(data).value;
+    // TODO handle the exception
+    let res = {
+      Productroll: listinfo.Productroll,
+      uniqueIds: uniqueIds.value.length,
+    };
+    orderInfoAfterRef.value.dataprocessing(res);
+  }
+};
+
+const learcoupons = (data) => {
+  if (data == "product") {
+    uniqueIds.value = []; // 筛选出商品卷的id
+    listinfo.coupondiscountAmount = 0; // 优惠卷减去的金额
+    listinfo.Productroll = 0; // 商品卷总价价格
+    listinfo.pointsNum = 0; // 积分总价格
+  } else {
+    // 每次点击优惠卷删除优惠卷里的id
+    if (listinfo.coupondiscountAmount != 0) {
+      uniqueIds.value.pop();
+    }
+    listinfo.coupondiscountAmount = 0; // 优惠卷减去的金额
+  }
+};
+
+//取消订单
+const cancelOrder = async () => {
+  uni.showModal({
+    title: "取消订单",
+    content: "是否取消订单？",
+    showCancel: true,
+    success: async (res) => {
+      if (res.confirm) {
+        await APIcancelOrder({
+          shopId: listinfo.shopId,
+          orderId: listinfo.id,
+        });
+        uni.showToast({
+          title: "取消订单成功",
+          icon: "none",
+        });
+        setTimeout(() => {
+          uni.pro.switchTab("order/index");
+        }, 1000);
+      }
+    },
+  });
+};
+
+// 删除订单
+const APIputuserorderclick = async () => {
+  await APIputuserorder(listinfo.id);
+  uni.showToast({
+    title: "删除成功",
+    icon: "none",
+  });
+  uni.pro.switchTab("order/index");
+};
+async function onlyCreateOrder() {
+  await createOrder();
+  orderorderInfo();
+}
+// 生成订单
+const createOrder = async () => {
+  // cartStore.carts = [];
+  const res = await storeMemberpay.actionscreateOrder({
+    dineMode: is_type.value == 0 ? "dine-in" : "take-out", //堂食 dine-in 外带 take-out 外卖 take-away
+    seatNum: uni.cache.get("dinersNum") ? uni.cache.get("dinersNum") : "", //用餐人数
+    // packFee: packFee.value, //打包费
+    packFee: packfee.value, //打包费
+    originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+    remark: orderRemarker.value, //备注
+    placeNum: listinfo.id ? listinfo.placeNum * 1 + 1 : 1, //当前订单下单次数
+    waitCall: "", //是否等叫 0 否 1 等叫
+    orderId: listinfo.id || "",
+    tableCode: options.tableCode,
+    userId: uni.cache.get("userInfo").id || "", //
+  });
+  // 清空购物车
+  if (res) {
+    Object.assign(listinfo, res);
+    // cartStore.setOldOrder(res)
+    getOrderInfoAfterCalcInit(res);
+
+    cartsSocket.sendMessage({
+      type: "shopping",
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: "cleanup",
+    });
+    return res;
+  } else {
+    uni.showToast({
+      title: "生成订单失败",
+    });
+  }
+};
+
+function isPayBefor() {
+  return ordershopUserInfo.value.registerType == "before" ? true : false;
+}
+
+function pay_lock() {
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "pay_lock",
+  });
+}
+
+function pay_unlock() {
+  clearInterval(payStatusTimer);
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "pay_unlock",
+  });
+}
+async function search_pay_lock() {
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "search_pay_lock",
+  });
+  return new Promise((relove, reject) => {
+    cartsSocket.socketTask.onMessage((res) => {
+      relove(JSON.parse(res.data));
+    });
+  });
+}
+let payStatusTimer = null;
+let orderIsLock = true;
+let usePoints = ref(0);
+
+function returnPayParams() {
+  const checkOrderPay = {
+    orderId: "",
+    vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
+    userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+    seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
+    originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
+    discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
+    discountAmount: 0, //手动优惠金额  写死0
+    productCouponDiscountAmount:
+      cartStore.orderCostSummary.productCouponDeduction, //商品优惠券抵扣金额
+    otherCouponDiscountAmount: cartStore.orderCostSummary.fullCouponDeduction, //其他优惠券抵扣金额
+    couponList: cartStore.backendCoupons.map((v) => v.id), //用户使用的卡券
+    orderAmount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
+    roundAmount: 0, //抹零金额 减免多少钱
+    pointsDiscountAmount: cartStore.orderCostSummary.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
+    pointsNum: cartStore.orderCostSummary.pointUsed, //(扣除各类折扣 enable_deduction后使用)
+    newCustomerDiscountAmount: cartStore.orderCostSummary.newUserDiscount, //新客立减
+    newCustomerDiscountId:
+      cartStore.orderCostSummary.newUserDiscount > 0
+        ? cartStore.consumeDiscount.id
+        : "",
+    remark: orderRemarker.value, //用户备注
+    discountActAmount: cartStore.orderCostSummary.fullReduction.actualAmount, //满减抵扣金额
+  };
+  return {
+    checkOrderPay,
+    payType: paymentmethod.payType,
+    buyerRemark: "",
+    returnUrl: "",
+    rechargeId: rechargeId.value,
+    rechargeDetailId: rechargeItem.value.id,
+    shopUserId: orderVIP.value.id,
+    shopId: orderVIP.value.shopId,
+    pwd: "",
+    discountActld: cartStore.orderCostSummary.fullReduction.usedActivity
+      ? cartStore.orderCostSummary.fullReduction.usedActivity.id
+      : "", //满减活动id
+  };
+}
+
+const istoricalorders = async () => {
+  //先付
+  if (isPayBefor()) {
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      usePoints = cartStore.orderCostSummary.pointUsed;
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+    }
+    goToPay();
+    // goToPay()
+  } else {
+    //后付
+
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      usePoints = cartStore.orderCostSummary.pointUsed;
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+      goToPay();
+      return;
+    }
+    // 先调用历史订单
+    let APIhistoryOrderres = await APIhistoryOrder({
+      tableCode: listinfo.tableCode,
+    });
+    // 判断是否有历史订单
+    if (APIhistoryOrderres.detailMap) {
+      let combinedArray = [];
+      for (const key in APIhistoryOrderres.detailMap) {
+        if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
+          let subArray = APIhistoryOrderres.detailMap[key];
+          combinedArray = [...combinedArray, ...subArray];
+        }
+      }
+      // 判断支付之前是是否还有新加订单
+      if (listinfo.combinedArray.length === combinedArray.length) {
+        goToPay();
+      } else {
+        uni.showToast({
+          title: "你的订单已更新！",
+          icon: "none",
+        });
+        orderorderInfo();
+      }
+    } else {
+      uni.showToast({
+        title: "你的小伙伴已提交订单~",
+        icon: "none",
+      });
+      setTimeout(() => {
+        orderorderInfo();
+      }, 1000);
+    }
+  }
+};
+
+// * 去支付
+const goToPay = async (isCreateOrder = false) => {
+  const payParams = returnPayParams();
+  const { checkOrderPay } = payParams;
+  // 余额支付
+  if (paymentmethod.payType == "accountPay") {
+    if (orderVIP.value.payPwd == "") {
+      uni.showModal({
+        title: "提示",
+        content: "您还未设置支付密码，是否去设置？",
+        success: (res) => {
+          if (res.confirm) {
+            uni.pro.navigateTo("user/member/setPassword", {
+              shopId: orderVIP.value.shopId,
+              type: "detail",
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+      return;
+    }
+    if (userInfo.usePayPwd) {
+      ispws.value = true;
+      return;
+    }
+    accountPayevent();
+    return;
+  }
+
+  const canPayRes = await search_pay_lock();
+  const canPay = canPayRes.status == 1 ? true : false;
+  if (!canPay) {
+    uni.showToast({
+      title: "有人正在付款中！",
+      icon: "none",
+    });
+    return;
+  }
+  pay_lock();
+  payStatusTimer = setInterval(() => {
+    pay_lock();
+  }, 1000);
+
+  if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
+    const isPaySuccess = await storeMemberpay.actionspayltPayVip({
+      shopId: orderVIP.value.shopId,
+      shopUserId: orderVIP.value.id,
+      orderId: listinfo.id,
+      userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+      amount: cartStore.orderCostSummary.finalPayAmount, // 最终订单金额
+      orderAmount: cartStore.orderCostSummary.orderOriginFinalPayAmount, // 最终订单原金额
+      originAmount: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
+      returnUrl: "", //跳转地址
+      buyerRemark: "",
+      seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
+    });
+    if (isPaySuccess) {
+      paySucessCallback();
+    }
+    orderorderInfo();
+    return false;
+  } else {
+    payParams.checkOrderPay.orderId = listinfo.id;
+    try {
+      if (rechargeItem.value.id && rechargeId.value) {
+        //充值并且支付
+        const payRes = await rechargePayOrder(payParams);
+        const isPaySuccess = await pay(payRes);
+        if (isPaySuccess) {
+          paySucessCallback();
+        }
+        pay_unlock();
+      } else {
+        console.log("微信支付");
+        const isPaySuccess = await storeMemberpay.actionsltPayOrder(payParams);
+        if (isPaySuccess) {
+          paySucessCallback();
+        }
+      }
+    } catch (error) {
+      console.log("error", error);
+      pay_unlock();
+      //TODO handle the exception
+    }
+  }
+  pay_unlock();
+  console.log("orderorderInfo");
+  orderorderInfo();
+};
+
+//002-获取订单可用积分及抵扣金额（支付页面使用）
+const memberPointscalcUsablePoints = async () => {
+  let res = await APImemberPointscalcUsablePoints({
+    shopUserId: orderVIP.value.id,
+    orderAmount: listinfo.totalCost,
+  });
+  orderInfoAfterRef.value?.getCalcUsablePoints(res);
+};
+//
+const clickPointsamount = (Pointsamount) => {
+  listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount;
+  listinfo.pointsNum = Pointsamount.pointsNum;
+};
+
+const payPasswordref = ref(null);
+// 余额支付
+const accountPayevent = async (pwd) => {
+  const payParams = returnPayParams();
+  ispws.value = false;
+  payParams.checkOrderPay.userId = uni.cache.get("userInfo").id;
+  payParams.checkOrderPay.orderId = listinfo.id;
+
+  try {
+    const isPaySuccess = await storeMemberpay.balancePayOrder(payParams);
+    if (isPaySuccess) {
+      uni.showToast({
+        title: "支付成功",
+        icon: "none",
+      });
+      paySucessCallback();
+    }
+  } catch (error) {
+    //TODO handle the exception
+  }
+  orderorderInfo();
+};
+
+onBeforeUnmount(() => {
+  uni.$off("returnData", handleReturnData);
+  clearTimeout(backtimer);
+  clearInterval(payStatusTimer);
+  closeSocket();
+});
+onHide(() => {
+  closeSocket();
+  clearInterval(payStatusTimer);
+});
+
+function closeSocket() {
+  // cartsSocket.closeExistingConnection()
+}
+
+onShow(() => {
+  if (cartsSocket) {
+    cartsSocket.connect();
+  }
+  try {
+    // 更新数据
+    if (orderVIP.value) {
+      orderVIP.value = uni.cache.get("orderVIP");
+      paymentMethodref.value.orderVIPfun(uni.cache.get("orderVIP"));
+      if (listinfo.id && ordershopUserInfo.value.registerType != "before") {
+        orderorderInfo();
+      }
+    }
+  } catch (error) {
+    //TODO handle the exception
+  }
+
+  orderorderInfo();
+  uni.$off("selCoupon");
+  uni.$on("selCoupon", function (data) {
+    console.log("selCoupon", data);
+    orderInfoAfterRef.value.dataprocessing(_.cloneDeep(data));
+    cartStore.setCoupons(_.cloneDeep(data));
+  });
+});
+let options = {};
+
+// 跳转到加菜页面
+function toJiacai() {
+  back();
+  return;
+  uni.navigateTo({
+    url: "/pages/product/index",
+  });
+}
+const packfee = computed(() => {
+  return cartStore.orderCostSummary.packFee;
+});
+//不计算各种折扣前的实付金额
+const shifu = computed(() => {
+  const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0;
+  return payAmount + cartStore.totalPrice * 1 + packfee.value * 1;
+});
+//减去各种折扣后的金额
+const lastPayMoney = computed(() => {
+  return shifu.value * 1;
+});
+
+const payStatus = {
+  unpaid: "待支付",
+  done: "已完成",
+  refund: "已退款",
+  "part-refund": "部分退款",
+  cancelled: "已取消",
+};
+const navTitle = computed(() => {
+  if (!listinfo.id && !cartStore.isEmpty) {
+    return "待确认";
+  }
+  if (cartStore.isEmpty && listinfo.id) {
+    return payStatus[listinfo.status] || "待确认";
+  } else {
+    return "待确认";
+  }
+});
+
+//支付成功后的处理
+function paySucessCallback() {
+  showDrainage.value = true;
+}
+
+//私域引流配置
+const drainageConfig = ref({});
+//私域引流弹窗
+const showDrainage = ref(false);
+async function init(opt) {
+  console.log("init");
+  cartStore.clearOrderConfig();
+  Object.assign(options, opt);
+  listinfo.id = options.orderId;
+  console.log("options", options);
+  if (options.shopId) {
+    // 每次进来全局更新shopId
+    uni.cache.set("shopId", options.shopId, 30);
+    uni.$on("returnData", handleReturnData);
+  }
+  //如果已经生成订单，根据历史订信息设置相关配置
+  if (options.orderId) {
+    let res = await APIgetOrderById({
+      orderId: listinfo.id,
+    });
+    if (res) {
+      uni.cache.set("tableCode", res.tableCode);
+      uni.cache.set("tableCode", res.seatNum);
+      options.tableCode = res.tableCode;
+      cartStore.setSeatFeeConfig("personCount", res.seatNum);
+      cartStore.setDinnerType(res.dineMode || "dine-in");
+      orderRemarker.value = res.remark;
+    }
+  }
+  //获取店铺信息
+  const shopInfoRes = await APIusershopInfodetail({
+    shopId: options.shopId,
+  });
+  if (shopInfoRes) {
+    cartStore.shopInfo = shopInfoRes.shopInfo;
+  }
+  await cartStore.goodsInit();
+  // * 获取会员信息
+  await storeuser.actionsproductqueryProduct();
+  await nextTick();
+
+  orderVIP.value = uni.cache.get("orderVIP");
+  cartStore.freeDineConfig = orderVIP.value.freeDineConfig;
+  if (options.tableCode) {
+    socketInitPar.table_code = options.tableCode;
+    socketInit();
+  } else {
+    orderorderInfo();
+  }
+}
+onLoad((opt) => {
+  init(opt);
+});
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F7F7F7;
-	}
-
-	.container {
-		padding: 32rpx 28rpx 32rpx 28rpx;
-	}
-
-	.headStatus {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 32rpx;
-		align-items: center;
-
-		.status {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-weight: bold;
-			font-size: 36rpx;
-			color: #333333;
-
-			.statusName {
-				margin-left: 16rpx;
-			}
-		}
-
-		.time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 18rpx;
-		}
-	}
-
-	.wxQrcode {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		padding: 32rpx 24rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 32rpx;
-
-		.left {
-			display: flex;
-			flex-direction: column;
-		}
-
-		.title {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			margin-bottom: 16rpx;
-		}
-	}
-
-	.card_box {
-		background-color: #fff;
-		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
-		position: relative;
-		width: 100%;
-		height: 100%;
-		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
-		border-radius: 18rpx;
-
-		.card_head_box {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			position: absolute;
-			top: -22.5rpx;
-			padding: 0 44rpx;
-
-			.card_head_item {
-				width: 45rpx;
-				height: 45rpx;
-				background-color: #f9f9f9;
-				border-radius: 50%;
-				box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
-			}
-
-		}
-	}
-
-	.card {
-		// background-color: #fff;
-		border-radius: 20upx;
-		margin-bottom: 28upx;
-		position: relative;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			padding: 50rpx 0 32rpx 0;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.head_left {
-				.shopName {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.tableName {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-
-			.status {
-				text {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-
-		.number-wrap {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-top: 32rpx;
-
-			.t {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.number {
-				font-weight: bold;
-				font-size: 56rpx;
-				color: #333333;
-			}
-		}
-
-
-		.price {
-			.i {
-				font-size: 20upx;
-			}
-
-			.num {
-				font-size: 38upx;
-			}
-		}
-
-		.shop-box {
-			padding: 36rpx 34rpx 30rpx 34rpx;
-			border-bottom: 2rpx dashed #E3E3E3;
-
-			.shop-head {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.shop-head-left {
-					display: flex;
-					align-items: center;
-
-					.tag-wrap {
-						width: 80rpx;
-						height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 10rpx 10rpx 10rpx 10rpx;
-						border: 2rpx solid #E3AD7F;
-						margin-right: 18rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						.tag {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #E3AD7F;
-						}
-					}
-
-					.title {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-				}
-			}
-
-			.shop-info {
-				margin-top: 32rpx;
-
-				.item:nth-child(1) {
-					margin-top: 0;
-				}
-
-				.item {
-					padding: 32rpx 0 !important;
-					display: flex;
-
-					.cover {}
-
-					.info {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						padding-left: 16upx;
-
-						.productName {
-							font-weight: bold;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 20rpx;
-						}
-
-						.productSkuName {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 3;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-
-						.n {
-							font-size: 24upx;
-							color: #999;
-						}
-					}
-
-					.price {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-end;
-						padding-left: 68rpx;
-
-						.priceAmount {
-							font-weight: 500;
-							font-size: 28rpx;
-							color: #333333;
-							margin-top: 26rpx;
-						}
-
-						.num {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #999999;
-							margin-top: 22rpx;
-						}
-					}
-				}
-			}
-
-			.total-wrap {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				font-weight: 500;
-				font-size: 28rpx;
-
-				.price {
-					font-weight: bold;
-					font-size: 32rpx;
-				}
-			}
-		}
-
-
-
-		.order_footer {
-			display: flex;
-			flex-direction: column;
-			padding: 34rpx;
-			position: relative;
-
-			.order_footer_icon {
-				width: 100%;
-				position: absolute;
-				top: -22.5rpx;
-				left: 0;
-				display: flex;
-				justify-content: space-between;
-
-				.order_footer_left_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-left: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
-
-				}
-
-				.order_footer_right_icon {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: -22.5rpx;
-					background-color: #f9f9f9;
-					border-radius: 50%;
-					box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
-
-				}
-			}
-
-			.title {
-				font-weight: bold;
-				font-size: 28rpx;
-				color: #333333;
-			}
-
-			.order-info {
-				.row {
-					display: flex;
-					justify-content: space-between;
-					padding-top: 32upx;
-
-					.t {
-						font-weight: normal;
-						font-size: 28rpx;
-						color: #333333;
-					}
-
-					.info {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
-				}
-			}
-		}
-
-
-	}
-
-	.pay-info-wrap {
-		padding: 0;
-		box-sizing: border-box;
-
-		.info-wrap {
-			padding: 64rpx 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-
-			.title {
-				align-self: center;
-				font-size: 32rpx;
-				color: #333;
-				font-weight: bold;
-			}
-		}
-
-		.info-content {
-			.pay-title {
-				display: flex;
-				align-items: flex-end;
-				justify-content: center;
-				font-weight: bold;
-				width: 100%;
-				font-size: 48rpx;
-				color: #333;
-				margin-top: 48rpx;
-
-				text {
-					font-size: 60rpx;
-					color: #333;
-				}
-			}
-
-			.pay-password {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: 64rpx;
-
-				.list {
-					width: 88rpx;
-					height: 88rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border: 2rpx solid #999;
-					border-radius: 8rpx;
-
-					text {
-						font-size: 32rpx;
-					}
-				}
-
-			}
-
-			.hint {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 100rpx;
-
-				text {
-					font-size: 28rpx;
-					color: #ccc;
-				}
-			}
-		}
-
-	}
-
-	.fixedview {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		z-index: 999;
-
-		// height: 80rpx;
-		.flex-between {
-			width: 100%;
-			padding: 36rpx 36rpx 70rpx 36rpx;
-			background: #FFFFFF;
-
-			.fixedview_one {
-				display: flex;
-				align-items: flex-end;
-
-				.fixedview_oneone {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.fixedview_onetow {
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #333333;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-			}
-
-			.flex-colum-end {
-				.fixedview_tow {
-					background: #E3AD7F;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-
-				.fixedview_tows {
-					margin-top: 10rpx;
-					background: #c3c3c3;
-					border-radius: 36rpx;
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-					padding: 14rpx 44rpx;
-				}
-			}
-
-		}
-	}
-
-	.orderInfo {
-		background: #FFFFFF;
-		border-radius: 18rpx 18rpx 18rpx 18rpx;
-		margin-top: 32rpx;
-		padding: 32rpx 34rpx;
-
-		.t {
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #333333;
-			flex-shrink: 0;
-		}
-
-		.info {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #666666;
-		}
-
-	}
+page {
+  background-color: #f7f7f7;
+}
+
+.container {
+  padding: 32rpx 28rpx 32rpx 28rpx;
+}
+
+.headStatus {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 32rpx;
+  align-items: center;
+
+  .status {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #333333;
+
+    .statusName {
+      margin-left: 16rpx;
+    }
+  }
+
+  .time {
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    margin-top: 18rpx;
+  }
+}
+
+.wxQrcode {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  padding: 32rpx 24rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #999999;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+
+  .left {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .title {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #333333;
+    margin-bottom: 16rpx;
+  }
+}
+
+.card_box {
+  background-color: #fff;
+  // box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+  position: relative;
+  width: 100%;
+  height: 100%;
+  // box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
+  border-radius: 18rpx;
+
+  .card_head_box {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: absolute;
+    top: -22.5rpx;
+    padding: 0 44rpx;
+
+    .card_head_item {
+      width: 45rpx;
+      height: 45rpx;
+      background-color: #f9f9f9;
+      border-radius: 50%;
+      box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+    }
+  }
+}
+
+.card {
+  // background-color: #fff;
+  border-radius: 20upx;
+  margin-bottom: 28upx;
+  position: relative;
+
+  .head {
+    display: flex;
+    justify-content: space-between;
+    padding: 50rpx 0 32rpx 0;
+    border-bottom: 2rpx dashed #e3e3e3;
+
+    .head_left {
+      .shopName {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+      }
+
+      .tableName {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+
+    .status {
+      text {
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
+  }
+
+  .number-wrap {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 32rpx;
+
+    .t {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .number {
+      font-weight: bold;
+      font-size: 56rpx;
+      color: #333333;
+    }
+  }
+
+  .price {
+    .i {
+      font-size: 20upx;
+    }
+
+    .num {
+      font-size: 38upx;
+    }
+  }
+
+  .shop-box {
+    padding: 36rpx 34rpx 30rpx 34rpx;
+    border-bottom: 2rpx dashed #e3e3e3;
+
+    .shop-head {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .shop-head-left {
+        display: flex;
+        align-items: center;
+
+        .tag-wrap {
+          width: 80rpx;
+          height: 48rpx;
+          background: #ffffff;
+          border-radius: 10rpx 10rpx 10rpx 10rpx;
+          border: 2rpx solid #e3ad7f;
+          margin-right: 18rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .tag {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #e3ad7f;
+          }
+        }
+
+        .title {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+      }
+    }
+
+    .shop-info {
+      margin-top: 32rpx;
+
+      .item:nth-child(1) {
+        margin-top: 0;
+      }
+
+      .item {
+        padding: 32rpx 0 !important;
+        display: flex;
+
+        .cover {
+        }
+
+        .info {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          padding-left: 16upx;
+
+          .productName {
+            font-weight: bold;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 20rpx;
+          }
+
+          .productSkuName {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          .n {
+            font-size: 24upx;
+            color: #999;
+          }
+        }
+
+        .price {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+          padding-left: 68rpx;
+
+          .priceAmount {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 26rpx;
+          }
+
+          .num {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            margin-top: 22rpx;
+          }
+        }
+      }
+    }
+
+    .total-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      font-weight: 500;
+      font-size: 28rpx;
+
+      .price {
+        font-weight: bold;
+        font-size: 32rpx;
+      }
+    }
+  }
+
+  .order_footer {
+    display: flex;
+    flex-direction: column;
+    padding: 34rpx;
+    position: relative;
+
+    .order_footer_icon {
+      width: 100%;
+      position: absolute;
+      top: -22.5rpx;
+      left: 0;
+      display: flex;
+      justify-content: space-between;
+
+      .order_footer_left_icon {
+        width: 45rpx;
+        height: 45rpx;
+        margin-left: -22.5rpx;
+        background-color: #f9f9f9;
+        border-radius: 50%;
+        box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+      }
+
+      .order_footer_right_icon {
+        width: 45rpx;
+        height: 45rpx;
+        margin-right: -22.5rpx;
+        background-color: #f9f9f9;
+        border-radius: 50%;
+        box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+      }
+    }
+
+    .title {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .order-info {
+      .row {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 32upx;
+
+        .t {
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #333333;
+        }
+
+        .info {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #666666;
+        }
+      }
+    }
+  }
+}
+
+.pay-info-wrap {
+  padding: 0;
+  box-sizing: border-box;
+
+  .info-wrap {
+    padding: 64rpx 30rpx 30rpx 30rpx;
+    box-sizing: border-box;
+
+    .title {
+      align-self: center;
+      font-size: 32rpx;
+      color: #333;
+      font-weight: bold;
+    }
+  }
+
+  .info-content {
+    .pay-title {
+      display: flex;
+      align-items: flex-end;
+      justify-content: center;
+      font-weight: bold;
+      width: 100%;
+      font-size: 48rpx;
+      color: #333;
+      margin-top: 48rpx;
+
+      text {
+        font-size: 60rpx;
+        color: #333;
+      }
+    }
+
+    .pay-password {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 64rpx;
+
+      .list {
+        width: 88rpx;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 2rpx solid #999;
+        border-radius: 8rpx;
+
+        text {
+          font-size: 32rpx;
+        }
+      }
+    }
+
+    .hint {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100rpx;
+
+      text {
+        font-size: 28rpx;
+        color: #ccc;
+      }
+    }
+  }
+}
+
+.fixedview {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 999;
+
+  // height: 80rpx;
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 36rpx 70rpx 36rpx;
+    background: #ffffff;
+
+    .fixedview_one {
+      display: flex;
+      align-items: flex-end;
+
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .flex-colum-end {
+      .fixedview_tow {
+        background: #e3ad7f;
+        border-radius: 36rpx;
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        padding: 14rpx 44rpx;
+      }
+
+      .fixedview_tows {
+        margin-top: 10rpx;
+        background: #c3c3c3;
+        border-radius: 36rpx;
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        padding: 14rpx 44rpx;
+      }
+    }
+  }
+}
+
+.orderInfo {
+  background: #ffffff;
+  border-radius: 18rpx 18rpx 18rpx 18rpx;
+  margin-top: 32rpx;
+  padding: 32rpx 34rpx;
+
+  .t {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #333333;
+    flex-shrink: 0;
+  }
+
+  .info {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #666666;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 5a78e68..412b7c2 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1,519 +1,861 @@
 <template>
-	<view>
-		<Nav />
-		<!-- 顶部面板 -->
-		<view class="top--panel" :class="{ grayscale: !isBusinessTime }">
-			<image
-				class="panelimgbackground"
-				:src="shopExtend ? shopExtend.value : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
-				mode="aspectFill"
-			></image>
-			<view class="panelone flex-start">
-				<view class="u-flex u-flex-y-center">
-					<text>
-						{{ shopInfo.shopName }}
-					</text>
-					<view class="u-flex u-flex-y-center u-m-t-4">
-						<up-icon name="arrow-right" color="#999999" size="14"></up-icon>
-					</view>
-				</view>
-				<!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
-			</view>
-			<view class="paneltow" v-if="distance">距离您{{ distance }}</view>
-			<view class="panelthere flex-between">
-				<view class="paneltheretext">
-					营业时间：{{ (shopInfo.businessStartDay || '--') + ' 至 ' + (shopInfo.businessEndDay || '--') }} {{ endTimeref.startTime }} -
-					{{ endTimeref.endTime < '05' ? ` 凌晨${endTimeref.endTime}` : endTimeref.endTime }}
-				</view>
-				<view class="flex-start" @click="callChildMethod">
-					<view style="margin-right: 14rpx">查看</view>
-					<up-icon name="arrow-down" color="#999999" size="14"></up-icon>
-				</view>
-			</view>
-			<!-- 本店招牌菜 -->
-			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">本店招牌菜</view>
-			<view class="panelfive">
-				<scroll-view :scroll-x="true" :scroll-with-animation="false">
-					<view class="panelfive_list">
-						<view class="panelfiveitem" @click="clickspecifications(item, index, index, '热销')" v-for="(item, index) in shopProductList.hots" :key="index">
-							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
-							<view
-								class="vifgoodsImg flex-center"
-								v-if="item.isSale == 0 || (item.isSaleTime == 0 && !item.isSaleTimeshow) || item.isSoldStock == 1 || (item.isStock == 1 && item.stockNumber <= 0)"
-							>
-								<image v-if="item.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg" style="width: 200rpx; height: 100%" mode=""></image>
-								<image
-									v-else-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
-									src="@/static/ztt/icon_goods_wks.svg"
-									style="width: 200rpx; height: 100%"
-									mode=""
-								></image>
-								<image v-else-if="item.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg" style="width: 200rpx; height: 100%" mode=""></image>
-								<image
-									v-else-if="item.isStock == 1 && item.stockNumber <= 0"
-									src="@/static/ztt/icon_goods_kcbz.svg"
-									style="width: 200rpx; height: 100%"
-									mode=""
-								></image>
-							</view>
-							<view class="panelfiveitemone">
-								{{ item.name }}
-							</view>
-							<view class="panelfiveitemtow">本店回头客第{{ index + 1 }}名</view>
-							<view class="panelfiveitemthere flex-between">
-								<text>招牌</text>
-								<view class="describe" v-if="item.suitNum > 1 && item.type != 'sku'" style="font-size: 20rpx; margin-top: 10rpx">
-									「{{ item.suitNum }}{{ item.unitName }}起点」
-								</view>
-							</view>
+  <view>
+    <Nav />
+    <!-- 顶部面板 -->
+    <view class="top--panel" :class="{ grayscale: !isBusinessTime }">
+      <image
+        class="panelimgbackground"
+        :src="
+          shopExtend
+            ? shopExtend.value
+            : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'
+        "
+        mode="aspectFill"
+      ></image>
+      <view class="panelone flex-start">
+        <view class="u-flex u-flex-y-center">
+          <text>
+            {{ shopInfo.shopName }}
+          </text>
+          <view class="u-flex u-flex-y-center u-m-t-4">
+            <up-icon name="arrow-right" color="#999999" size="14"></up-icon>
+          </view>
+        </view>
+        <!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
+      </view>
+      <view class="paneltow" v-if="distance">距离您{{ distance }}</view>
+      <view class="panelthere flex-between">
+        <view class="paneltheretext">
+          营业时间：{{
+            (shopInfo.businessStartDay || "--") +
+            " 至 " +
+            (shopInfo.businessEndDay || "--")
+          }}
+          {{ endTimeref.startTime }} -
+          {{
+            endTimeref.endTime < "05"
+              ? ` 凌晨${endTimeref.endTime}`
+              : endTimeref.endTime
+          }}
+        </view>
+        <view class="flex-start" @click="callChildMethod">
+          <view style="margin-right: 14rpx">查看</view>
+          <up-icon name="arrow-down" color="#999999" size="14"></up-icon>
+        </view>
+      </view>
+      <!-- 本店招牌菜 -->
+      <view
+        class="panelfour"
+        v-if="shopProductList.hots && shopProductList.hots.length > 0"
+        >本店招牌菜</view
+      >
+      <view class="panelfive">
+        <scroll-view :scroll-x="true" :scroll-with-animation="false">
+          <view class="panelfive_list">
+            <view
+              class="panelfiveitem"
+              @click="clickspecifications(item, index, index, '热销')"
+              v-for="(item, index) in shopProductList.hots"
+              :key="index"
+            >
+              <image
+                class="panelfiveitemimage"
+                :src="item.coverImg"
+                mode="aspectFill"
+              ></image>
+              <view
+                class="vifgoodsImg flex-center"
+                v-if="
+                  item.isSale == 0 ||
+                  (item.isSaleTime == 0 && !item.isSaleTimeshow) ||
+                  item.isSoldStock == 1 ||
+                  (item.isStock == 1 && item.stockNumber <= 0)
+                "
+              >
+                <image
+                  v-if="item.isSale == 0"
+                  src="@/static/ztt/icon_goods_yxj.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
+                  src="@/static/ztt/icon_goods_wks.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isSoldStock == 1"
+                  src="@/static/ztt/icon_goods_sq.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+                <image
+                  v-else-if="item.isStock == 1 && item.stockNumber <= 0"
+                  src="@/static/ztt/icon_goods_kcbz.svg"
+                  style="width: 200rpx; height: 100%"
+                  mode=""
+                ></image>
+              </view>
+              <view class="panelfiveitemone">
+                {{ item.name }}
+              </view>
+              <view class="panelfiveitemtow"
+                >本店回头客第{{ index + 1 }}名</view
+              >
+              <view class="panelfiveitemthere flex-between">
+                <text>招牌</text>
+                <view
+                  class="describe"
+                  v-if="item.suitNum > 1 && item.type != 'sku'"
+                  style="font-size: 20rpx; margin-top: 10rpx"
+                >
+                  「{{ item.suitNum }}{{ item.unitName }}起点」
+                </view>
+              </view>
 
-							<!-- <view class="panelfiveitemfour">
+              <!-- <view class="panelfiveitemfour">
 								{{item.shortTitle?item.shortTitle:''}}
 							</view>
 							<view class="panelfiveitemfive">
 								月售{{item.stockNumber}}
 							</view> -->
-							<view
-								v-if="item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)"
-								class="flex-between"
-								style="margin-top: 32rpx; margin-bottom: 48rpx"
-							>
-								<view class="panelfiveitemsex flex-between">
-									<view class="panelfiveitemsex_oen">
-										<text class="tips" :class="shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0 ? 'lineThrough' : ''">¥</text>
-										<!-- 会员价与价格 -->
-										<text class="price">
-											{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
-										</text>
-										<!-- 单位 -->
-										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
-									</view>
-								</view>
-								<view class="panelfiveitemNum">
-									<view class="sku-wrap flex-center" style="background-color: #cecece">
-										<text class="t" v-if="item.isSaleTime == 0 && !item.isSaleTimeshow">未开售</text>
-										<text class="t" v-if="item.isSoldStock == 1">已售罄</text>
-									</view>
-								</view>
-							</view>
+              <view
+                v-if="
+                  item.isSoldStock == 1 ||
+                  (item.isSaleTime == 0 && !item.isSaleTimeshow)
+                "
+                class="flex-between"
+                style="margin-top: 32rpx; margin-bottom: 48rpx"
+              >
+                <view class="panelfiveitemsex flex-between">
+                  <view class="panelfiveitemsex_oen">
+                    <text
+                      class="tips"
+                      :class="
+                        shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0
+                          ? 'lineThrough'
+                          : ''
+                      "
+                      >¥</text
+                    >
+                    <!-- 会员价与价格 -->
+                    <text class="price">
+                      {{
+                        shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                          ? item.memberPrice || item.salePrice
+                          : item.salePrice
+                      }}
+                    </text>
+                    <!-- 单位 -->
+                    <text class="unit" v-if="item.unitName"
+                      >/{{ item.unitName }}</text
+                    >
+                  </view>
+                </view>
+                <view class="panelfiveitemNum">
+                  <view
+                    class="sku-wrap flex-center"
+                    style="background-color: #cecece"
+                  >
+                    <text
+                      class="t"
+                      v-if="item.isSaleTime == 0 && !item.isSaleTimeshow"
+                      >未开售</text
+                    >
+                    <text class="t" v-if="item.isSoldStock == 1">已售罄</text>
+                  </view>
+                </view>
+              </view>
 
-							<view v-else class="flex-between" style="margin-top: 32rpx; margin-bottom: 48rpx; flex-wrap: inherit">
-								<view class="panelfiveitemsex flex-between">
-									<view class="panelfiveitemsex_oen">
-										<text class="tips" :class="shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0 ? 'lineThrough' : ''">¥</text>
-										<!-- 会员价与价格 -->
-										<text class="price">
-											{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
-										</text>
-										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
-										<!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
+              <view
+                v-else
+                class="flex-between"
+                style="
+                  margin-top: 32rpx;
+                  margin-bottom: 48rpx;
+                  flex-wrap: inherit;
+                "
+              >
+                <view class="panelfiveitemsex flex-between">
+                  <view class="panelfiveitemsex_oen">
+                    <text
+                      class="tips"
+                      :class="
+                        shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0
+                          ? 'lineThrough'
+                          : ''
+                      "
+                      >¥</text
+                    >
+                    <!-- 会员价与价格 -->
+                    <text class="price">
+                      {{
+                        shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                          ? item.memberPrice || item.salePrice
+                          : item.salePrice
+                      }}
+                    </text>
+                    <text class="unit" v-if="item.unitName"
+                      >/{{ item.unitName }}</text
+                    >
+                    <!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
 											style="font-size: 16rpx;">「{{item.suitNum}}{{item.unitName}}起点」</text> -->
-									</view>
-								</view>
-								<!-- single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 -->
-								<view class="panelfiveitemNum">
-									<!-- v-if="item.type == 'single'|| item.type == 'weight' || item.type == 'coupon' || (item.type == 'package' && item.groupType=='0')" -->
-									<view
-										class="sku-wrap flex-center"
-										v-if="item.type == 'sku' || (item.type == 'package' && item.groupType == '1')"
-										@click.stop="clickspecifications(item, index, index1)"
-									>
-										<text class="t no-wrap" v-if="item.groupType == '1'">选择套餐</text>
-										<text class="t" v-else>选规格</text>
-										<text class="dot num" v-if="item.cartNumber > 0">{{ ifcartNumber(item) < 99 ? ifcartNumber(item) : '99+' }}</text>
-									</view>
-									<view class="Controls" v-else>
-										<view class="btn" v-if="item.cartNumber != '0'">
-											<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view>
-										</view>
-										<text class="num">{{ ifcartNumber(item) }}</text>
-										<view class="btn">
-											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item, '+'), 500)"></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
+                  </view>
+                </view>
+                <!-- single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 -->
+                <view class="panelfiveitemNum">
+                  <!-- v-if="item.type == 'single'|| item.type == 'weight' || item.type == 'coupon' || (item.type == 'package' && item.groupType=='0')" -->
+                  <view
+                    class="sku-wrap flex-center"
+                    v-if="
+                      item.type == 'sku' ||
+                      (item.type == 'package' && item.groupType == '1')
+                    "
+                    @click.stop="clickspecifications(item, index, index1)"
+                  >
+                    <text class="t no-wrap" v-if="item.groupType == '1'"
+                      >选择套餐</text
+                    >
+                    <text class="t" v-else>选规格</text>
+                    <text class="dot num" v-if="item.cartNumber > 0">{{
+                      ifcartNumber(item) < 99 ? ifcartNumber(item) : "99+"
+                    }}</text>
+                  </view>
+                  <view class="Controls" v-else>
+                    <view class="btn" v-if="item.cartNumber != '0'">
+                      <up-icon
+                        name="minus-circle-fill"
+                        color="#E9AB7A"
+                        size="25"
+                      ></up-icon>
+                      <view
+                        class="btnClick"
+                        @tap.stop="
+                          $u.throttle(() => singleclick(item, '-'), 500)
+                        "
+                      ></view>
+                    </view>
+                    <text class="num">{{ ifcartNumber(item) }}</text>
+                    <view class="btn">
+                      <up-icon
+                        name="plus-circle-fill"
+                        color="#E9AB7A"
+                        size="25"
+                      ></up-icon>
+                      <view
+                        class="btnClick"
+                        @tap.stop="
+                          $u.throttle(() => singleclick(item, '+'), 500)
+                        "
+                      ></view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
 
-		<!-- 滚动区域 -->
-		<view class="scroll-panel" id="scroll-panel" :class="{ grayscale: !isBusinessTime }">
-			<view class="list-box">
-				<view class="left" :style="{ top: `${store.height}px` }">
-					<scroll-view
-						:scroll-into-view="leftIntoView"
-						:scroll-with-animation="false"
-						:scroll-y="true"
-						:style="{ height: `${store.screenHeight - store.height}px` }"
-						style="padding-bottom: 200rpx"
-					>
-						<view
-							class="item"
-							v-for="(item, index) in shopProductList.productInfo"
-							:key="index"
-							:class="{ active: index == leftIndex }"
-							:id="'left-' + index"
-							:data-index="index"
-							@click="leftTap(index)"
-						>
-							<text>{{ item.name }}</text>
-						</view>
-					</scroll-view>
-				</view>
-				<view class="main">
-					<view>
-						<view class="item main-item" v-for="(item, index) in shopProductList.productInfo" :key="index" :id="'item-' + index">
-							<view class="title">
-								<view>{{ item.name }}</view>
-							</view>
-							<view class="goods" @click="clickspecifications(item1, index, index1)" v-for="(item1, index1) in item.productList" :key="index1">
-								<image
-									class="goodsImg"
-									v-if="item1.coverImg != null"
-									:lazy-load="true"
-									@load="imageLoaded(item1, index, index1)"
-									:src="`${item1.coverImg}${!item1.imgLoad ? '?x-oss-process=image/resize,m_lfit,w_150,h_150' : ''}`"
-									mode="aspectFill"
-								></image>
-								<image class="goodsImg" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif" mode="" v-else :lazy-load="true"></image>
-								<view
-									class="vifgoodsImg"
-									v-if="
-										item1.isSale == 0 ||
-										(item1.isSaleTime == 0 && !item1.isSaleTimeshow) ||
-										item1.isSoldStock == 1 ||
-										(item1.isStock == 1 && item1.stockNumber <= 0)
-									"
-								>
-									<image v-if="item1.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg" style="width: 200rpx; height: 100%" mode=""></image>
-									<image
-										v-else-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
-										src="@/static/ztt/icon_goods_wks.svg"
-										style="width: 200rpx; height: 100%"
-										mode=""
-									></image>
-									<image v-else-if="item1.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg" style="width: 200rpx; height: 100%" mode=""></image>
-									<image
-										v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
-										src="@/static/ztt/icon_goods_kcbz.svg"
-										style="width: 200rpx; height: 100%"
-										mode=""
-									></image>
-								</view>
-								<view v-if="index == '0'" class="topSort" :class="'c' + (index1 + 1)">TOP{{ index1 + 1 }}</view>
-								<view class="goods_right" style="overflow: hidden">
-									<view class="name">{{ item1.name }}</view>
-									<!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
-									<view class="lookBack" v-if="specifications.item.isHot == 1">热销</view>
-									<view class="describe">{{ item1.shortTitle ? item1.shortTitle : '' }}</view>
+    <!-- 滚动区域 -->
+    <view
+      class="scroll-panel"
+      id="scroll-panel"
+      :class="{ grayscale: !isBusinessTime }"
+    >
+      <view class="list-box">
+        <view class="left" :style="{ top: `${store.height}px` }">
+          <scroll-view
+            :scroll-into-view="leftIntoView"
+            :scroll-with-animation="false"
+            :scroll-y="true"
+            :style="{ height: `${store.screenHeight - store.height}px` }"
+            style="padding-bottom: 200rpx"
+          >
+            <view
+              class="item"
+              v-for="(item, index) in shopProductList.productInfo"
+              :key="index"
+              :class="{ active: index == leftIndex }"
+              :id="'left-' + index"
+              :data-index="index"
+              @click="leftTap(index)"
+            >
+              <text>{{ item.name }}</text>
+            </view>
+          </scroll-view>
+        </view>
+        <view class="main">
+          <view>
+            <view
+              class="item main-item"
+              v-for="(item, index) in shopProductList.productInfo"
+              :key="index"
+              :id="'item-' + index"
+            >
+              <view class="title">
+                <view>{{ item.name }}</view>
+              </view>
+              <view
+                class="goods"
+                @click="clickspecifications(item1, index, index1)"
+                v-for="(item1, index1) in item.productList"
+                :key="index1"
+              >
+                <image
+                  class="goodsImg"
+                  v-if="item1.coverImg != null"
+                  :lazy-load="true"
+                  @load="imageLoaded(item1, index, index1)"
+                  :src="`${item1.coverImg}${
+                    !item1.imgLoad
+                      ? '?x-oss-process=image/resize,m_lfit,w_150,h_150'
+                      : ''
+                  }`"
+                  mode="aspectFill"
+                ></image>
+                <image
+                  class="goodsImg"
+                  src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif"
+                  mode=""
+                  v-else
+                  :lazy-load="true"
+                ></image>
+                <view
+                  class="vifgoodsImg"
+                  v-if="
+                    item1.isSale == 0 ||
+                    (item1.isSaleTime == 0 && !item1.isSaleTimeshow) ||
+                    item1.isSoldStock == 1 ||
+                    (item1.isStock == 1 && item1.stockNumber <= 0)
+                  "
+                >
+                  <image
+                    v-if="item1.isSale == 0"
+                    src="@/static/ztt/icon_goods_yxj.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
+                    src="@/static/ztt/icon_goods_wks.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isSoldStock == 1"
+                    src="@/static/ztt/icon_goods_sq.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                  <image
+                    v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
+                    src="@/static/ztt/icon_goods_kcbz.svg"
+                    style="width: 200rpx; height: 100%"
+                    mode=""
+                  ></image>
+                </view>
+                <view
+                  v-if="index == '0'"
+                  class="topSort"
+                  :class="'c' + (index1 + 1)"
+                  >TOP{{ index1 + 1 }}</view
+                >
+                <view class="goods_right" style="overflow: hidden">
+                  <view class="name">{{ item1.name }}</view>
+                  <!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
+                  <view class="lookBack" v-if="specifications.item.isHot == 1"
+                    >热销</view
+                  >
+                  <view class="describe">{{
+                    item1.shortTitle ? item1.shortTitle : ""
+                  }}</view>
 
-									<view class="describe" v-if="item1.suitNum > 1 && item1.type != 'sku'" style="font-size: 20rpx">
-										「{{ item1.suitNum }}{{ item1.unitName }}起点」
-									</view>
-									<view v-if="item1.isSoldStock == 1 || (item1.isSaleTime == 0 && !item1.isSaleTimeshow)" class="flex-between">
-										<view class="money">
-											<view>￥</view>
-											<text class="money_num" style="margin-right: 10rpx">
-												{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item1.memberPrice || item1.salePrice : item1.salePrice }}
-											</text>
-											<text v-if="item1.unitName">/{{ item1.unitName }}</text>
-										</view>
-										<view class="flex-end">
-											<view class="sku-wrap flex-center" style="background-color: #cecece">
-												<text class="t" v-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow">未开售</text>
-												<text class="t" v-else-if="item1.isSoldStock == 1">已售罄</text>
-											</view>
-										</view>
-									</view>
-									<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>
-											<text class="money_num" v-if="item1.unitName">/{{ item1.unitName }}</text>
-											<!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
+                  <view
+                    class="describe"
+                    v-if="item1.suitNum > 1 && item1.type != 'sku'"
+                    style="font-size: 20rpx"
+                  >
+                    「{{ item1.suitNum }}{{ item1.unitName }}起点」
+                  </view>
+                  <view
+                    v-if="
+                      item1.isSoldStock == 1 ||
+                      (item1.isSaleTime == 0 && !item1.isSaleTimeshow)
+                    "
+                    class="flex-between"
+                  >
+                    <view class="money">
+                      <view>￥</view>
+                      <text class="money_num" style="margin-right: 10rpx">
+                        {{
+                          shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                            ? item1.memberPrice || item1.salePrice
+                            : item1.salePrice
+                        }}
+                      </text>
+                      <text v-if="item1.unitName">/{{ item1.unitName }}</text>
+                    </view>
+                    <view class="flex-end">
+                      <view
+                        class="sku-wrap flex-center"
+                        style="background-color: #cecece"
+                      >
+                        <text
+                          class="t"
+                          v-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow"
+                          >未开售</text
+                        >
+                        <text class="t" v-else-if="item1.isSoldStock == 1"
+                          >已售罄</text
+                        >
+                      </view>
+                    </view>
+                  </view>
+                  <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>
+                      <text class="money_num" v-if="item1.unitName"
+                        >/{{ item1.unitName }}</text
+                      >
+                      <!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
 												style="font-size: 14rpx;">
 												「{{item1.suitNum}}{{item1.unitName}}起点」
 											</text> -->
-										</view>
-										<view class="flex-end" v-if="item1.type == 'sku' || (item1.type == 'package' && item1.groupType == '1')">
-											<view class="sku-wrap flex-center" @click.stop="clickspecifications(item1, index, index1)">
-												<text class="t no-wrap" v-if="item1.groupType == '1'">选择套餐</text>
-												<text class="t" v-else>选规格</text>
-												<text class="dot num" v-if="item1.cartNumber > 0">{{ ifcartNumber(item1) < 99 ? ifcartNumber(item1) : '99+' }}</text>
-											</view>
-										</view>
-										<view class="Controls" v-else>
-											<view class="btn" v-if="item1.cartNumber * 1 != '0'">
-												<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-												<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item1, '-'), 500)"></view>
-											</view>
+                    </view>
+                    <view
+                      class="flex-end"
+                      v-if="
+                        item1.type == 'sku' ||
+                        (item1.type == 'package' && item1.groupType == '1')
+                      "
+                    >
+                      <view
+                        class="sku-wrap flex-center"
+                        @click.stop="clickspecifications(item1, index, index1)"
+                      >
+                        <text class="t no-wrap" v-if="item1.groupType == '1'"
+                          >选择套餐</text
+                        >
+                        <text class="t" v-else>选规格</text>
+                        <text class="dot num" v-if="item1.cartNumber > 0">{{
+                          ifcartNumber(item1) < 99 ? ifcartNumber(item1) : "99+"
+                        }}</text>
+                      </view>
+                    </view>
+                    <view class="Controls" v-else>
+                      <view class="btn" v-if="item1.cartNumber * 1 != '0'">
+                        <up-icon
+                          name="minus-circle-fill"
+                          color="#E9AB7A"
+                          size="25"
+                        ></up-icon>
+                        <view
+                          class="btnClick"
+                          @tap.stop="
+                            $u.throttle(() => singleclick(item1, '-'), 500)
+                          "
+                        ></view>
+                      </view>
 
-											<text class="num">{{ ifcartNumber(item1) }}</text>
-											<view class="btn">
-												<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-												<view class="btnClick" @tap.stop="$u.throttle(() => singleclick(item1, '+'), 500)"></view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="fill-last" :style="{ height: fillHeight + 'px' }"></view>
-					</view>
-				</view>
-			</view>
-		</view>
+                      <text class="num">{{ ifcartNumber(item1) }}</text>
+                      <view class="btn">
+                        <up-icon
+                          name="plus-circle-fill"
+                          color="#E9AB7A"
+                          size="25"
+                        ></up-icon>
+                        <view
+                          class="btnClick"
+                          @tap.stop="
+                            $u.throttle(() => singleclick(item1, '+'), 500)
+                          "
+                        ></view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view
+              class="fill-last"
+              :style="{ height: fillHeight + 'px' }"
+            ></view>
+          </view>
+        </view>
+      </view>
+    </view>
 
-		<confirmorder
-			ref="confirmorderref"
-			:cartLists_count="cartLists_count"
-			:cartList="matchedProducts"
-			:totalPrices="totalPrices"
-			:confirmordershow="confirmordershow"
-			@close="confirmordershow = !confirmordershow"
-			@customevent="websocketsendMessage"
-			:orderinfo="orderinfo"
-		></confirmorder>
+    <confirmorder
+      ref="confirmorderref"
+      :cartLists_count="cartLists_count"
+      :cartList="matchedProducts"
+      :totalPrices="totalPrices"
+      :confirmordershow="confirmordershow"
+      @close="confirmordershow = !confirmordershow"
+      @customevent="websocketsendMessage"
+      :orderinfo="orderinfo"
+    ></confirmorder>
 
-		<!-- 店铺详情 -->
-		<shopindex ref="showShopInfoRef"></shopindex>
-		<!-- 购物车 -->
-		<shoppingCartes
-			:cartLists_count="cartLists_count"
-			:cartList="matchedProducts"
-			:showCart="showCart"
-			@customevent="websocketsendMessage"
-			@close="showCart = !showCart"
-			:orderinfo="orderinfo"
-			@clickcancelOrder="clickcancelOrder"
-			v-if="cartLists_count > 0"
-		></shoppingCartes>
+    <!-- 店铺详情 -->
+    <shopindex ref="showShopInfoRef"></shopindex>
+    <!-- 购物车 -->
+    <shoppingCartes
+      :cartLists_count="cartLists_count"
+      :cartList="matchedProducts"
+      :showCart="showCart"
+      @customevent="websocketsendMessage"
+      @close="showCart = !showCart"
+      :orderinfo="orderinfo"
+      @clickcancelOrder="clickcancelOrder"
+      v-if="cartLists_count > 0"
+    ></shoppingCartes>
 
-		<!-- 显示购物车栏 -->
-		<view class="cart-wrap" v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime">
-			<view class="cart-content">
-				<view class="left">
-					<view class="iconBox">
-						<image
-							class="icon"
-							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
-							mode="aspectFill"
-							@click="Historicalorders(true)"
-						></image>
-						<text class="u-badge">{{ cartLists_count < 99 ? cartLists_count : '99+' }}</text>
-					</view>
+    <!-- 显示购物车栏 -->
+    <view
+      class="cart-wrap"
+      v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime"
+    >
+      <view class="cart-content">
+        <view class="left">
+          <view class="iconBox">
+            <image
+              class="icon"
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+              mode="aspectFill"
+              @click="Historicalorders(true)"
+            ></image>
+            <text class="u-badge">{{
+              cartLists_count < 99 ? cartLists_count : "99+"
+            }}</text>
+          </view>
 
-					<text class="i">￥</text>
-					<text class="num">{{ totalPrices }}</text>
-				</view>
-				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
-					<text class="t">结算</text>
-				</view>
-			</view>
-		</view>
+          <text class="i">￥</text>
+          <text class="num">{{ totalPrices }}</text>
+        </view>
+        <view class="btn" @tap="$u.debounce(orderdetail, 500)">
+          <text class="t">结算</text>
+        </view>
+      </view>
+    </view>
 
-		<!-- 规格 -->
-		<up-popup :show="showShopsku" :round="20" mode="bottom" @close="(showShopsku = false), (pagemetashow = false)">
-			<view class="shop_sku">
-				<scroll-view scroll-y style="max-height: 60vh; width: 100%">
-					<view class="positionabsolute">
-						<up-icon
-							name="close-circle"
-							@click="
-								showShopsku = false;
-								pagemetashow = false;
-							"
-							color="#000"
-							size="25"
-						></up-icon>
-					</view>
-					<up-swiper :list="specifications.item.images" height="250"></up-swiper>
-					<view class="shop_sku_name">{{ specifications.item.name }}</view>
-					<view class="shop_sku_description">
-						{{ specifications.item.shortTitle ? specifications.item.shortTitle : '' }}
-					</view>
-					<view v-if="specifications.item.type != 'package'">
-						<view class="shop_sku_box" v-for="(specOptions, specType) in specifications.item.selectSpecInfo" :key="specType">
-							<view class="shop_sku_box_name">
-								{{ specType }}
-							</view>
-							<view class="flex-start">
-								<view
-									class="shop_sku_box_item"
-									v-for="option in specOptions"
-									:key="option"
-									@click="selectSpec(specType, option)"
-									:class="{ shop_sku_box_item_selected: selectedSpecs[specType] === option }"
-								>
-									{{ option }}
-									<view
-										class="shop_sku_box_item_tip"
-										v-if="specifications.item.result && specifications.item.result.isSoldStock == 1 && selectedSpecs[specType] === option"
-									>
-										<view>售罄</view>
-									</view>
-									<view class="shop_sku_box_item_tip" v-if="specifications.item.result == 'kong' && canSubmit == false && selectedSpecs[specType] === option">
-										<view>已下架</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<!-- 套餐 -->
-					<view v-else>
-						<view class="shop_sku_box">
-							<view v-for="(setmenu, setmenuindex) in specifications.item.groupSnap" :key="setmenuindex">
-								<view class="shop_sku_box_name">{{ setmenu.title }} {{ setmenu.count }} 选{{ setmenu.number }}</view>
-								<view class="flex-start">
-									<view
-										class="shop_sku_box_item"
-										v-for="(option, goodsid) in setmenu.goods"
-										:key="goodsid"
-										@click="goodsidClick(setmenuindex, option, goodsid)"
-										:class="{ shop_sku_box_item_selected: isOptionSelected(setmenuindex, option) }"
-										:disabled="isMaxSelected(setmenuindex) && !isOptionSelected(setmenuindex, option)"
-									>
-										{{ option.proName }}
-										<text v-if="option.unitName">/{{ option.unitName }}</text>
-										<view class="shop_sku_box_item_tip" v-if="specifications.item.isSoldStock == 1">
-											<view>售罄</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="shop_bottom">
-					<view class="flex-between">
-						<view class="price" v-if="specifications.item.type != 'package' && specifications.item.result">
-							<text class="i">￥</text>
-							<text class="num">
-								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-										? specifications.item.result.memberPrice || specifications.item.result.salePrice
-										: specifications.item.result.salePrice
-								}}
-							</text>
-							<text class="i" v-if="specifications.item.unitName">/{{ specifications.item.unitName }}</text>
-							<text v-if="specifications.item.result.suitNum > 1">「{{ specifications.item.result.suitNum }}{{ specifications.item.result.unitName }}起点」</text>
-						</view>
-						<view class="price" v-else>
-							<text class="i">￥</text>
-							<text class="num">
-								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
-										? specifications.item.memberPrice || specifications.item.salePrice
-										: specifications.item.salePrice
-								}}
-							</text>
-							<text class="i" v-if="specifications.item.unitName">/{{ specifications.item.unitName }}</text>
-							<text v-if="specifications.item.suitNum > 1">「{{ specifications.item.suitNum }}{{ specifications.item.unitName }}起点」</text>
-						</view>
+    <!-- 规格 -->
+    <up-popup
+      :show="showShopsku"
+      :round="20"
+      mode="bottom"
+      @close="(showShopsku = false), (pagemetashow = false)"
+    >
+      <view class="shop_sku">
+        <scroll-view scroll-y style="max-height: 60vh; width: 100%">
+          <view class="positionabsolute">
+            <up-icon
+              name="close-circle"
+              @click="
+                showShopsku = false;
+                pagemetashow = false;
+              "
+              color="#000"
+              size="25"
+            ></up-icon>
+          </view>
+          <up-swiper
+            :list="specifications.item.images"
+            height="250"
+          ></up-swiper>
+          <view class="shop_sku_name">{{ specifications.item.name }}</view>
+          <view class="shop_sku_description">
+            {{
+              specifications.item.shortTitle
+                ? specifications.item.shortTitle
+                : ""
+            }}
+          </view>
+          <view v-if="specifications.item.type != 'package'">
+            <view
+              class="shop_sku_box"
+              v-for="(specOptions, specType) in specifications.item
+                .selectSpecInfo"
+              :key="specType"
+            >
+              <view class="shop_sku_box_name">
+                {{ specType }}
+              </view>
+              <view class="flex-start">
+                <view
+                  class="shop_sku_box_item"
+                  v-for="option in specOptions"
+                  :key="option"
+                  @click="selectSpec(specType, option)"
+                  :class="{
+                    shop_sku_box_item_selected:
+                      selectedSpecs[specType] === option,
+                  }"
+                >
+                  {{ option }}
+                  <view
+                    class="shop_sku_box_item_tip"
+                    v-if="
+                      specifications.item.result &&
+                      specifications.item.result.isSoldStock == 1 &&
+                      selectedSpecs[specType] === option
+                    "
+                  >
+                    <view>售罄</view>
+                  </view>
+                  <view
+                    class="shop_sku_box_item_tip"
+                    v-if="
+                      specifications.item.result == 'kong' &&
+                      canSubmit == false &&
+                      selectedSpecs[specType] === option
+                    "
+                  >
+                    <view>已下架</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 套餐 -->
+          <view v-else>
+            <view class="shop_sku_box">
+              <view
+                v-for="(setmenu, setmenuindex) in specifications.item.groupSnap"
+                :key="setmenuindex"
+              >
+                <view class="shop_sku_box_name"
+                  >{{ setmenu.title }} {{ setmenu.count }} 选{{
+                    setmenu.number
+                  }}</view
+                >
+                <view class="flex-start">
+                  <view
+                    class="shop_sku_box_item"
+                    v-for="(option, goodsid) in setmenu.goods"
+                    :key="goodsid"
+                    @click="goodsidClick(setmenuindex, option, goodsid)"
+                    :class="{
+                      shop_sku_box_item_selected: isOptionSelected(
+                        setmenuindex,
+                        option
+                      ),
+                    }"
+                    :disabled="
+                      isMaxSelected(setmenuindex) &&
+                      !isOptionSelected(setmenuindex, option)
+                    "
+                  >
+                    {{ option.proName }}
+                    <text v-if="option.unitName">/{{ option.unitName }}</text>
+                    <view
+                      class="shop_sku_box_item_tip"
+                      v-if="specifications.item.isSoldStock == 1"
+                    >
+                      <view>售罄</view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+        <view class="shop_bottom">
+          <view class="flex-between">
+            <view
+              class="price"
+              v-if="
+                specifications.item.type != 'package' &&
+                specifications.item.result
+              "
+            >
+              <text class="i">￥</text>
+              <text class="num">
+                {{
+                  shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                    ? specifications.item.result.memberPrice ||
+                      specifications.item.result.salePrice
+                    : specifications.item.result.salePrice
+                }}
+              </text>
+              <text class="i" v-if="specifications.item.unitName"
+                >/{{ specifications.item.unitName }}</text
+              >
+              <text v-if="specifications.item.result.suitNum > 1"
+                >「{{ specifications.item.result.suitNum
+                }}{{ specifications.item.result.unitName }}起点」</text
+              >
+            </view>
+            <view class="price" v-else>
+              <text class="i">￥</text>
+              <text class="num">
+                {{
+                  shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+                    ? specifications.item.memberPrice ||
+                      specifications.item.salePrice
+                    : specifications.item.salePrice
+                }}
+              </text>
+              <text class="i" v-if="specifications.item.unitName"
+                >/{{ specifications.item.unitName }}</text
+              >
+              <text v-if="specifications.item.suitNum > 1"
+                >「{{ specifications.item.suitNum
+                }}{{ specifications.item.unitName }}起点」</text
+              >
+            </view>
 
-						<view class="operation-wrap" v-if="specifications.item.type != 'package'">
-							<view class="btn">
-								<up-icon name="minus-circle-fill" color="#E9AB7A" size="25" v-if="shopCartNumber > 0"></up-icon>
-								<view class="btnClick" @click="shopCart('-')"></view>
-							</view>
-							<text class="num">{{ shopCartNumber }}</text>
-							<view class="btn">
-								<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-								<view class="btnClick" @click="shopCart('+')"></view>
-							</view>
-						</view>
-					</view>
-					<view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
-						<view class="shop_skuselectname">{{ selectedSpecsStr }}</view>
-					</view>
-					<view
-						v-if="specifications.item.type == 'package'"
-						class="addShopping"
-						:class="shopCartNumber > 0 && allConditionsSatisfied ? 'active' : ''"
-						@click="submitSelection()"
-					>
-						{{ skuBtnText }}
-					</view>
-					<view v-else class="addShopping" :class="shopCartNumber > 0 && canSubmit ? 'active' : ''" @click="submitSelection()">
-						{{ skuBtnText }}
-					</view>
-				</view>
-			</view>
-		</up-popup>
-		<view class="history_order" @click="toHistory" v-if="shopInfo && shopInfo.registerType == 'after' && orderinfo.id">
-			<image class="img" src="@/static/history.png" mode=""></image>
-			<text>已下单菜品</text>
-		</view>
-		<Loading :isLoading="!useSocket.isConnected" />
-		<couponModal getMode="eat" />
-	</view>
+            <view
+              class="operation-wrap"
+              v-if="specifications.item.type != 'package'"
+            >
+              <view class="btn">
+                <up-icon
+                  name="minus-circle-fill"
+                  color="#E9AB7A"
+                  size="25"
+                  v-if="shopCartNumber > 0"
+                ></up-icon>
+                <view class="btnClick" @click="shopCart('-')"></view>
+              </view>
+              <text class="num">{{ shopCartNumber }}</text>
+              <view class="btn">
+                <up-icon
+                  name="plus-circle-fill"
+                  color="#E9AB7A"
+                  size="25"
+                ></up-icon>
+                <view class="btnClick" @click="shopCart('+')"></view>
+              </view>
+            </view>
+          </view>
+          <view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
+            <view class="shop_skuselectname">{{ selectedSpecsStr }}</view>
+          </view>
+          <view
+            v-if="specifications.item.type == 'package'"
+            class="addShopping"
+            :class="
+              shopCartNumber > 0 && allConditionsSatisfied ? 'active' : ''
+            "
+            @click="submitSelection()"
+          >
+            {{ skuBtnText }}
+          </view>
+          <view
+            v-else
+            class="addShopping"
+            :class="shopCartNumber > 0 && canSubmit ? 'active' : ''"
+            @click="submitSelection()"
+          >
+            {{ skuBtnText }}
+          </view>
+        </view>
+      </view>
+    </up-popup>
+    <view
+      class="history_order"
+      @click="toHistory"
+      v-if="shopInfo && shopInfo.registerType == 'after' && orderinfo.id"
+    >
+      <image class="img" src="@/static/history.png" mode=""></image>
+      <text>已下单菜品</text>
+    </view>
+    <Loading :isLoading="!useSocket.isConnected" />
+    <ModalList></ModalList>
+  </view>
 </template>
 
 <script setup>
-import couponModal from '@/components/coupon-modal.vue';
-import { ref, reactive, onMounted, watchEffect, getCurrentInstance, computed, watch } from 'vue';
+import ModalList from "@/components/modal-list.vue";
+import {
+  ref,
+  reactive,
+  onMounted,
+  watchEffect,
+  getCurrentInstance,
+  computed,
+  watch,
+} from "vue";
 
-import { onLoad, onReady, onShow, onHide, onPageScroll } from '@dcloudio/uni-app';
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onHide,
+  onPageScroll,
+} from "@dcloudio/uni-app";
 
 //导航栏
-import Nav from '@/components/CustomNavbar.vue';
-import shopindex from './components/shopindex.vue';
-import shoppingCartes from './components/shoppingCartes.vue';
-import confirmorder from './components/confirmorder.vue';
-import Loading from '@/components/Loading.vue';
-import dayjs from 'dayjs';
-import isBetween from 'dayjs/plugin/isBetween';
+import Nav from "@/components/CustomNavbar.vue";
+import shopindex from "./components/shopindex.vue";
+import shoppingCartes from "./components/shoppingCartes.vue";
+import confirmorder from "./components/confirmorder.vue";
+import Loading from "@/components/Loading.vue";
+import dayjs from "dayjs";
+import isBetween from "dayjs/plugin/isBetween";
 dayjs.extend(isBetween);
 
 // 获取全局属性
 const { proxy } = getCurrentInstance();
 
 //接口引入
-import { productminiApphotsquery, APIgroupquery, APIminiAppinfo, APIminiAppskuinfo } from '@/common/api/product/product.js';
+import {
+  productminiApphotsquery,
+  APIgroupquery,
+  APIminiAppinfo,
+  APIminiAppskuinfo,
+} from "@/common/api/product/product.js";
 
-import { APIhistoryOrder, APIcancelOrder, APIrmPlaceOrder } from '@/common/api/order/index.js';
+import {
+  APIhistoryOrder,
+  APIcancelOrder,
+  APIrmPlaceOrder,
+} from "@/common/api/order/index.js";
 
 // websocket
 // import useWebSocket from '@/common/js/websocket.js';
-import { useWebSocket } from '@/stores/carts-websocket.js';
+import { useWebSocket } from "@/stores/carts-websocket.js";
 
 // pinia管理
-import { useNavbarStore } from '@/stores/navbarStore';
+import { useNavbarStore } from "@/stores/navbarStore";
 
 // 结账管理
-import { Memberpay } from '@/stores/pay.js';
+import { Memberpay } from "@/stores/pay.js";
 
 const storeMemberpay = Memberpay();
 const store = useNavbarStore();
 
-import { productStore } from '@/stores/user.js';
+import { productStore } from "@/stores/user.js";
 
 const userStore = productStore();
 
 // 金额管理
-import { useCartStore } from '@/stores/order.js';
+import { useCartStore } from "@/stores/order.js";
 const cartStore = useCartStore();
 
 // 动态更新导航栏配置
 store.updateNavbarConfig({
-	showBack: true, //左边返回键
-	rightText: '', //右边文字
-	showSearch: false, //true是标题其他事文字
-	title: '',
-	isTransparent: false,
-	hasPlaceholder: false //是否要占位符
+  showBack: true, //左边返回键
+  rightText: "", //右边文字
+  showSearch: false, //true是标题其他事文字
+  title: "",
+  isTransparent: false,
+  hasPlaceholder: false, //是否要占位符
 });
 
-const shopInfo = uni.cache.get('shopInfo');
-const shopTable = uni.cache.get('shopTable');
-const distance = uni.cache.get('distance'); //距离
+const shopInfo = uni.cache.get("shopInfo");
+const shopTable = uni.cache.get("shopTable");
+const distance = uni.cache.get("distance"); //距离
 
 //店铺详情
 const showShopInfoRef = ref(null);
@@ -523,13 +865,13 @@ const isLoading = ref(true);
 
 //调用shop组件
 const callChildMethod = () => {
-	if (showShopInfoRef.value) {
-		showShopInfoRef.value.childMethod();
-	}
+  if (showShopInfoRef.value) {
+    showShopInfoRef.value.childMethod();
+  }
 };
 
 try {
-	const shopExtend = uni.cache.get('shopTable').shopExtendMap.shopinfo_bg;
+  const shopExtend = uni.cache.get("shopTable").shopExtendMap.shopinfo_bg;
 } catch (error) {}
 
 // 计算高度
@@ -537,13 +879,13 @@ const navScroll = ref(null);
 
 // 获取商品数据
 const shopProductList = reactive({
-	hots: [],
-	productInfo: []
+  hots: [],
+  productInfo: [],
 });
 
 // * 图片加载
 const imageLoaded = (item, index, index1) => {
-	// shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
+  // shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
 };
 
 // 计算左侧位置
@@ -553,7 +895,7 @@ const leftIndex = ref(0);
 const scrollTopSiz = ref(0);
 
 //元素最低端的距离
-const lastbottom = ref('');
+const lastbottom = ref("");
 
 //储存元素的下标
 const topArr = ref([]);
@@ -566,51 +908,56 @@ const scrollTopSize = ref(0);
 
 //左侧导航点击
 const leftTap = (index) => {
-	uni.pageScrollTo({
-		scrollTop: topArr.value[index] - store.height,
-		duration: 0
-	});
-	leftIndex.value = index;
+  uni.pageScrollTo({
+    scrollTop: topArr.value[index] - store.height,
+    duration: 0,
+  });
+  leftIndex.value = index;
 };
 
 /* 计算左侧滚动位置定位 */
 const leftIntoView = computed(() => {
-	return `left-${leftIndex.value ? leftIndex.value : 0}`;
+  return `left-${leftIndex.value ? leftIndex.value : 0}`;
 });
 
 /* 获取元素顶部信息 */
 const getElementTop = () => {
-	new Promise((resolve, reject) => {
-		let view = uni.createSelectorQuery().selectAll('.main-item');
-		view.boundingClientRect(async (data) => {
-			resolve(data);
-		}).exec();
-		proxy.$uGetRect('.scroll-panel').then((res) => {
-			scrollTopSize.value = res.top; //元素距离顶部的距离
-		});
-	}).then((res) => {
-		try {
-			topArr.value = res.map((item) => {
-				return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
-			});
+  new Promise((resolve, reject) => {
+    let view = uni.createSelectorQuery().selectAll(".main-item");
+    view
+      .boundingClientRect(async (data) => {
+        resolve(data);
+      })
+      .exec();
+    proxy.$uGetRect(".scroll-panel").then((res) => {
+      scrollTopSize.value = res.top; //元素距离顶部的距离
+    });
+  }).then((res) => {
+    try {
+      topArr.value = res.map((item) => {
+        return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+      });
 
-			// 获取最后一个元素最低端的盒子到顶点的距离
-			for (let i = 0; i <= topArr.value.length - 1; i++) {
-				if (store.screenHeight - 200 >= topArr.value[topArr.value.length - 1] - topArr.value[i]) {
-					// 获取距离最后一个index
-					lastbottom.value = i;
-					break;
-				}
-			}
-			/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
-			let last = res[res.length - 1].height;
-			if (last - 20 < store.screenHeight) {
-				fillHeight.value = 200;
-			}
-		} catch (error) {
-			//TODO handle the exception
-		}
-	});
+      // 获取最后一个元素最低端的盒子到顶点的距离
+      for (let i = 0; i <= topArr.value.length - 1; i++) {
+        if (
+          store.screenHeight - 200 >=
+          topArr.value[topArr.value.length - 1] - topArr.value[i]
+        ) {
+          // 获取距离最后一个index
+          lastbottom.value = i;
+          break;
+        }
+      }
+      /* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+      let last = res[res.length - 1].height;
+      if (last - 20 < store.screenHeight) {
+        fillHeight.value = 200;
+      }
+    } catch (error) {
+      //TODO handle the exception
+    }
+  });
 };
 
 // 定时器
@@ -618,39 +965,39 @@ const mainThrottle = ref(null);
 
 /* 主区域滚动监听 */
 const mainScroll = (e) => {
-	// 节流方法
-	clearTimeout(mainThrottle.value);
-	mainThrottle.value = setTimeout(() => {
-		scrollFn();
-	}, 10);
-	let scrollFn = () => {
-		let top = e.scrollTop;
-		let index = 0;
-		// 判断左边是否可以滑动
+  // 节流方法
+  clearTimeout(mainThrottle.value);
+  mainThrottle.value = setTimeout(() => {
+    scrollFn();
+  }, 10);
+  let scrollFn = () => {
+    let top = e.scrollTop;
+    let index = 0;
+    // 判断左边是否可以滑动
 
-		for (let i = topArr.value.length - 1; i >= 0; i--) {
-			/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
-			if (top + 2 >= topArr.value[i] - store.height) {
-				index = i;
-				break;
-			}
-		}
-		/* 查找当前滚动距离 */
-		if (index >= lastbottom.value) {
-			//
-			leftIndex.value = index > leftIndex.value ? index : leftIndex.value;
-			// this.leftIndex = this.leftIndex
-		} else {
-			leftIndex.value = index < 0 ? 0 : index;
-		}
-	};
+    for (let i = topArr.value.length - 1; i >= 0; i--) {
+      /* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+      if (top + 2 >= topArr.value[i] - store.height) {
+        index = i;
+        break;
+      }
+    }
+    /* 查找当前滚动距离 */
+    if (index >= lastbottom.value) {
+      //
+      leftIndex.value = index > leftIndex.value ? index : leftIndex.value;
+      // this.leftIndex = this.leftIndex
+    } else {
+      leftIndex.value = index < 0 ? 0 : index;
+    }
+  };
 };
 
 //动态导航栏滑动距离
 onPageScroll((res) => {
-	uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
-	uni.$u.debounce((navScroll.value = res.scrollTop), 500);
-	uni.$u.debounce(mainScroll(res), 500);
+  uni.$u.debounce((store.scrollTop = res.scrollTop), 500);
+  uni.$u.debounce((navScroll.value = res.scrollTop), 500);
+  uni.$u.debounce(mainScroll(res), 500);
 });
 
 // 点击详情
@@ -658,19 +1005,19 @@ const showShopsku = ref(false);
 
 // 规格信息
 const specifications = reactive({
-	item: {},
-	index: '',
-	inedxs: '',
-	type: '',
-	product_id: '',
-	sku_id: '',
-	groupSnap: {},
-	item: {
-		groupSnap: [],
-		result: {
-			isSoldStock: 0
-		}
-	}
+  item: {},
+  index: "",
+  inedxs: "",
+  type: "",
+  product_id: "",
+  sku_id: "",
+  groupSnap: {},
+  item: {
+    groupSnap: [],
+    result: {
+      isSoldStock: 0,
+    },
+  },
 });
 // 用于判断接口数据是否加载完成
 const isDataLoaded = ref(false);
@@ -682,67 +1029,67 @@ const selectedSpecs = ref({});
 const canSubmit = ref(false);
 
 //字形判断
-const skuBtnText = ref('添加到购物车');
+const skuBtnText = ref("添加到购物车");
 
 // 计算属性，判断是否所有规格类型都有选中项
 const allSpecsSelected = computed(() => {
-	// 获取所有规格类型的键
-	const specKeys = Object.keys(specifications.item.selectSpecInfo);
-	// skuBtnText.value = selectedSpecsStr.value ? `您还没选择${specKeys[1]}哦` : ``
-	// 检查每个规格类型是否都在 selectedSpecs 中有对应的选中值
-	return specKeys.every((key) => selectedSpecs.value[key]);
+  // 获取所有规格类型的键
+  const specKeys = Object.keys(specifications.item.selectSpecInfo);
+  // skuBtnText.value = selectedSpecsStr.value ? `您还没选择${specKeys[1]}哦` : ``
+  // 检查每个规格类型是否都在 selectedSpecs 中有对应的选中值
+  return specKeys.every((key) => selectedSpecs.value[key]);
 });
 
 // 处理规格选择的方法
 const selectSpec = async (specType, option) => {
-	// 规格清零
-	shopCartNumber.value = 0;
+  // 规格清零
+  shopCartNumber.value = 0;
 
-	// 更新 selectedSpecs 对象，将当前规格类型的选中值设置为用户点击的选项
-	const newSelectedSpecs = {};
-	const specKeys = Object.keys(specifications.item.selectSpecInfo);
-	for (const key of specKeys) {
-		if (key === specType) {
-			newSelectedSpecs[key] = option;
-		} else {
-			newSelectedSpecs[key] = selectedSpecs.value[key];
-		}
-	}
-	selectedSpecs.value = newSelectedSpecs;
-	if (allSpecsSelected.value) {
-		// try {
-		let result = await APIminiAppskuinfo({
-			specInfo: selectedSpecsStr.value,
-			id: specifications.item.id
-		});
-		// skuList
-		if (result != true) {
-			specifications.sku_id = result.id;
-			specifications.product_id = result.productId;
-			// 添加多规格分组
-			specifications.item.result = result;
-			if (result.isSoldStock == 0) {
-				canSubmit.value = true;
-			} else {
-				canSubmit.value = false;
-			}
-		} else {
-			specifications.item.result = 'kong';
-			canSubmit.value = false;
-		}
-	} else {
-		canSubmit.value = false;
-	}
+  // 更新 selectedSpecs 对象，将当前规格类型的选中值设置为用户点击的选项
+  const newSelectedSpecs = {};
+  const specKeys = Object.keys(specifications.item.selectSpecInfo);
+  for (const key of specKeys) {
+    if (key === specType) {
+      newSelectedSpecs[key] = option;
+    } else {
+      newSelectedSpecs[key] = selectedSpecs.value[key];
+    }
+  }
+  selectedSpecs.value = newSelectedSpecs;
+  if (allSpecsSelected.value) {
+    // try {
+    let result = await APIminiAppskuinfo({
+      specInfo: selectedSpecsStr.value,
+      id: specifications.item.id,
+    });
+    // skuList
+    if (result != true) {
+      specifications.sku_id = result.id;
+      specifications.product_id = result.productId;
+      // 添加多规格分组
+      specifications.item.result = result;
+      if (result.isSoldStock == 0) {
+        canSubmit.value = true;
+      } else {
+        canSubmit.value = false;
+      }
+    } else {
+      specifications.item.result = "kong";
+      canSubmit.value = false;
+    }
+  } else {
+    canSubmit.value = false;
+  }
 };
 
 // 监听 specifications 的变化
 watch(
-	() => specifications.item.groupSnap,
-	(newGroupSnap) => {
-		if (Array.isArray(newGroupSnap)) {
-			selectedOptions.value = newGroupSnap.map(() => []);
-		}
-	}
+  () => specifications.item.groupSnap,
+  (newGroupSnap) => {
+    if (Array.isArray(newGroupSnap)) {
+      selectedOptions.value = newGroupSnap.map(() => []);
+    }
+  }
 );
 
 // 存储选中的选项，二维数组
@@ -750,50 +1097,57 @@ const selectedOptions = ref(specifications.item.groupSnap.map(() => []));
 
 // / 选择规格的方法
 const goodsidClick = (setmenuindex, option, goodsid) => {
-	if (!selectedOptions.value[setmenuindex]) {
-		// 如果 selectedOptions.value[setmenuindex] 不存在，初始化一个空数组
-		selectedOptions.value[setmenuindex] = [];
-	}
-	if (isOptionSelected(setmenuindex, option)) {
-		// 如果已经选中，取消选中
-		selectedOptions.value[setmenuindex] = selectedOptions.value[setmenuindex].filter((item) => item.proId !== option.proId);
-	} else if (!isMaxSelected(setmenuindex)) {
-		// 如果未达到最大选择数量，添加到选中列表
-		selectedOptions.value[setmenuindex].push(option);
-	}
+  if (!selectedOptions.value[setmenuindex]) {
+    // 如果 selectedOptions.value[setmenuindex] 不存在，初始化一个空数组
+    selectedOptions.value[setmenuindex] = [];
+  }
+  if (isOptionSelected(setmenuindex, option)) {
+    // 如果已经选中，取消选中
+    selectedOptions.value[setmenuindex] = selectedOptions.value[
+      setmenuindex
+    ].filter((item) => item.proId !== option.proId);
+  } else if (!isMaxSelected(setmenuindex)) {
+    // 如果未达到最大选择数量，添加到选中列表
+    selectedOptions.value[setmenuindex].push(option);
+  }
 };
 
 // 判断选项是否已选中
 const isOptionSelected = (setmenuindex, option) => {
-	// 确保 selectedOptions.value[setmenuindex] 存在
-	if (selectedOptions.value[setmenuindex]) {
-		return selectedOptions.value[setmenuindex].some((item) => item.proId === option.proId);
-	}
-	return false;
+  // 确保 selectedOptions.value[setmenuindex] 存在
+  if (selectedOptions.value[setmenuindex]) {
+    return selectedOptions.value[setmenuindex].some(
+      (item) => item.proId === option.proId
+    );
+  }
+  return false;
 };
 
 // 判断是否达到最大选择数量
 const isMaxSelected = (setmenuindex) => {
-	// 确保 selectedOptions.value[setmenuindex] 存在
-	if (selectedOptions.value[setmenuindex]) {
-		return selectedOptions.value[setmenuindex].length >= specifications.item.groupSnap[setmenuindex].number;
-	}
-	return false;
+  // 确保 selectedOptions.value[setmenuindex] 存在
+  if (selectedOptions.value[setmenuindex]) {
+    return (
+      selectedOptions.value[setmenuindex].length >=
+      specifications.item.groupSnap[setmenuindex].number
+    );
+  }
+  return false;
 };
 
 // 计算所有选中条件是否都符合
 const allConditionsSatisfied = computed(() => {
-	// 检查 specifications.item.groupSnap 是否存在
-	if (!specifications.item?.groupSnap) {
-		return false;
-	}
-	return specifications.item.groupSnap.every((optionGroup, index) => {
-		// 获取当前索引对应的已选选项，如果不存在则默认为空数组
-		const selected = selectedOptions.value[index] || [];
-		// 检查是否达到最大选择数量
-		const hasEnoughSelection = selected.length === optionGroup.number;
-		return hasEnoughSelection;
-	});
+  // 检查 specifications.item.groupSnap 是否存在
+  if (!specifications.item?.groupSnap) {
+    return false;
+  }
+  return specifications.item.groupSnap.every((optionGroup, index) => {
+    // 获取当前索引对应的已选选项，如果不存在则默认为空数组
+    const selected = selectedOptions.value[index] || [];
+    // 检查是否达到最大选择数量
+    const hasEnoughSelection = selected.length === optionGroup.number;
+    return hasEnoughSelection;
+  });
 });
 
 // 提交选择，套餐选中最后处理的数据
@@ -801,8 +1155,8 @@ const selectedGroupSnap = ref([]);
 
 // 计算属性，将 selectedSpecs 转换为字符串形式
 const selectedSpecsStr = computed(() => {
-	const values = Object.values(selectedSpecs.value);
-	return values.join('，');
+  const values = Object.values(selectedSpecs.value);
+  return values.join("，");
 });
 
 //添加购物车数量
@@ -810,318 +1164,356 @@ const shopCartNumber = ref(0);
 
 // 多规格 套餐添加数量
 const shopCart = async (i) => {
-	if (i == '-' && shopCartNumber.value >= 0) {
-		shopCartNumber.value = 0;
-		return false;
-	}
-	let res = await shoppingcart();
-	if (i == '-') {
-		if (!res && shopCartNumber.value == specifications.item.suitNum) {
-			uni.showToast({
-				title: `起点${specifications.item.suitNum}个`,
-				icon: 'none'
-			});
-			return false;
-		} else {
-			shopCartNumber.value--;
-		}
-	} else {
-		if (!res && shopCartNumber.value < 1) {
-			console.log(res, specifications);
-			if (specifications.type == 'sku') {
-				shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
-			} else {
-				shopCartNumber.value = parseFloat(specifications.item.suitNum);
-			}
-		} else {
-			shopCartNumber.value++;
-		}
-	}
+  if (i == "-" && shopCartNumber.value >= 0) {
+    shopCartNumber.value = 0;
+    return false;
+  }
+  let res = await shoppingcart();
+  if (i == "-") {
+    if (!res && shopCartNumber.value == specifications.item.suitNum) {
+      uni.showToast({
+        title: `起点${specifications.item.suitNum}个`,
+        icon: "none",
+      });
+      return false;
+    } else {
+      shopCartNumber.value--;
+    }
+  } else {
+    if (!res && shopCartNumber.value < 1) {
+      console.log(res, specifications);
+      if (specifications.type == "sku") {
+        shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
+      } else {
+        shopCartNumber.value = parseFloat(specifications.item.suitNum);
+      }
+    } else {
+      shopCartNumber.value++;
+    }
+  }
 };
 
 // 套餐比较两个对象是否相等
 function isObjectEqual(obj1, obj2) {
-	if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
-		return obj1 === obj2;
-	}
-	const keys1 = Object.keys(obj1);
-	const keys2 = Object.keys(obj2);
-	if (keys1.length !== keys2.length) {
-		return false;
-	}
-	for (const key of keys1) {
-		if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
-			if (!isArrayEqual(obj1[key], obj2[key])) {
-				return false;
-			}
-		} else if (!isObjectEqual(obj1[key], obj2[key])) {
-			return false;
-		}
-	}
-	return true;
+  if (
+    typeof obj1 !== "object" ||
+    obj1 === null ||
+    typeof obj2 !== "object" ||
+    obj2 === null
+  ) {
+    return obj1 === obj2;
+  }
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+  if (keys1.length !== keys2.length) {
+    return false;
+  }
+  for (const key of keys1) {
+    if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
+      if (!isArrayEqual(obj1[key], obj2[key])) {
+        return false;
+      }
+    } else if (!isObjectEqual(obj1[key], obj2[key])) {
+      return false;
+    }
+  }
+  return true;
 }
 
 // 比较两个数组是否相等（忽略顺序）
 function isArrayEqual(arr1, arr2) {
-	if (arr1.length !== arr2.length) {
-		return false;
-	}
-	const usedIndices = new Array(arr2.length).fill(false);
-	for (const item1 of arr1) {
-		let found = false;
-		for (let i = 0; i < arr2.length; i++) {
-			if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
-				usedIndices[i] = true;
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			return false;
-		}
-	}
-	return true;
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+  const usedIndices = new Array(arr2.length).fill(false);
+  for (const item1 of arr1) {
+    let found = false;
+    for (let i = 0; i < arr2.length; i++) {
+      if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
+        usedIndices[i] = true;
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      return false;
+    }
+  }
+  return true;
 }
 
 // 根据购物车的数据匹配选中的商品查找是否有匹配的数组
 const matchingProduct = async (data) => {
-	return matchedProducts.value.find((product, index) => {
-		if (specifications.type == 'package') {
-			// 套餐
-			let result = false;
-			try {
-				if (product.type == 'package') {
-					let res = JSON.parse(product.cartListinfo.pro_group_info);
-					result = isArrayEqual(res, selectedGroupSnap.value);
-				}
-			} catch (error) {
-				//TODO handle the exception
-			}
-			// 直接返回布尔值
-			return result;
-		} else if (specifications.item.type == 'sku') {
-			// 多规格
-			return product.cartListinfo.sku_id == data.id && product.cartListinfo.product_id == data.productId;
-		} else {
-			// 其他
-			return product.skuId == data.skuId && product.id == data.id;
-		}
-	});
+  return matchedProducts.value.find((product, index) => {
+    if (specifications.type == "package") {
+      // 套餐
+      let result = false;
+      try {
+        if (product.type == "package") {
+          let res = JSON.parse(product.cartListinfo.pro_group_info);
+          result = isArrayEqual(res, selectedGroupSnap.value);
+        }
+      } catch (error) {
+        //TODO handle the exception
+      }
+      // 直接返回布尔值
+      return result;
+    } else if (specifications.item.type == "sku") {
+      // 多规格
+      return (
+        product.cartListinfo.sku_id == data.id &&
+        product.cartListinfo.product_id == data.productId
+      );
+    } else {
+      // 其他
+      return product.skuId == data.skuId && product.id == data.id;
+    }
+  });
 };
 
 // 判断多规格和套餐  商品是否在购物车有数据
 const shoppingcart = async () => {
-	let res = null;
-	if (specifications.item.type == 'package') {
-		if (!allConditionsSatisfied.value) {
-			return false;
-		}
-		// 是否是套餐package
-		selectedGroupSnap.value = specifications.item.groupSnap.map((setmenu, index) => {
-			return {
-				...setmenu,
-				goods: selectedOptions.value[index]
-			};
-		});
-		res = await matchingProduct(selectedGroupSnap.value);
-	} else {
-		if (!canSubmit.value) {
-			return false;
-		}
-		res = await matchingProduct(specifications.item.result);
-	}
-	return res;
+  let res = null;
+  if (specifications.item.type == "package") {
+    if (!allConditionsSatisfied.value) {
+      return false;
+    }
+    // 是否是套餐package
+    selectedGroupSnap.value = specifications.item.groupSnap.map(
+      (setmenu, index) => {
+        return {
+          ...setmenu,
+          goods: selectedOptions.value[index],
+        };
+      }
+    );
+    res = await matchingProduct(selectedGroupSnap.value);
+  } else {
+    if (!canSubmit.value) {
+      return false;
+    }
+    res = await matchingProduct(specifications.item.result);
+  }
+  return res;
 };
 
 // 提交选择并执行下一步操作的方法
 const submitSelection = async () => {
-	if (!isProductAvailable(specifications.productListitem.days, specifications.productListitem.startTime, specifications.productListitem.endTime)) {
-		uni.showToast({
-			title: '不在可售时间内'
-		});
-		return false;
-	}
-	// 判断购物车是否有该选中商品
-	// 数量不能少于0
-	if (shopCartNumber.value <= 0) {
-		return;
-	}
-	if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type == 'sku' && canSubmit.value)) {
-		let res = await shoppingcart();
+  if (
+    !isProductAvailable(
+      specifications.productListitem.days,
+      specifications.productListitem.startTime,
+      specifications.productListitem.endTime
+    )
+  ) {
+    uni.showToast({
+      title: "不在可售时间内",
+    });
+    return false;
+  }
+  // 判断购物车是否有该选中商品
+  // 数量不能少于0
+  if (shopCartNumber.value <= 0) {
+    return;
+  }
+  if (
+    (specifications.item.type == "package" && allConditionsSatisfied.value) ||
+    (specifications.item.type == "sku" && canSubmit.value)
+  ) {
+    let res = await shoppingcart();
 
-		// 是否是套餐 有就传
-		if (specifications.item.type == 'package') {
-			// 需求更改:所所有商品套餐都是add,没有修改
-			res = null;
-		} else {
-			selectedGroupSnap.value = [];
-		}
+    // 是否是套餐 有就传
+    if (specifications.item.type == "package") {
+      // 需求更改:所所有商品套餐都是add,没有修改
+      res = null;
+    } else {
+      selectedGroupSnap.value = [];
+    }
 
-		websocketsendMessage({
-			id: res ? res.cartListId : '',
-			type: 'shopping',
-			suitNum: specifications.productListitem.suitNum,
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: res ? 'edit' : 'add',
-			product_id: specifications.product_id,
-			sku_id: specifications.sku_id,
-			number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) : shopCartNumber.value,
-			pro_group_info: selectedGroupSnap.value,
-			goods_type: specifications.item.type == 'package' ? 'package' : '',
-			is_print: 1,
-			product_type: specifications.item.type
-		});
-		// 清空套餐选中
-		selectedGroupSnap.value = [];
-		showShopsku.value = false;
-	} else {
-		return;
-	}
+    websocketsendMessage({
+      id: res ? res.cartListId : "",
+      type: "shopping",
+      suitNum: specifications.productListitem.suitNum,
+      table_code: uni.cache.get("tableCode"),
+      shop_id: uni.cache.get("shopId"),
+      operate_type: res ? "edit" : "add",
+      product_id: specifications.product_id,
+      sku_id: specifications.sku_id,
+      number: res
+        ? await calculateValue(res.cartNumber, "+", shopCartNumber.value)
+        : shopCartNumber.value,
+      pro_group_info: selectedGroupSnap.value,
+      goods_type: specifications.item.type == "package" ? "package" : "",
+      is_print: 1,
+      product_type: specifications.item.type,
+    });
+    // 清空套餐选中
+    selectedGroupSnap.value = [];
+    showShopsku.value = false;
+  } else {
+    return;
+  }
 };
 
 //获取多规格数据
 const clickspecifications = async (item, index, indexs, type) => {
-	console.log(item);
-	// 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	if (
-		item.isSoldStock == 1 ||
-		(item.isSaleTime == 0 && !item.isSaleTimeshow) ||
-		item.type == 'single' ||
-		item.type == 'weight' ||
-		(item.type == 'package' && item.groupType == '0')
-	) {
-		return false;
-	}
-	// 数量清零
-	shopCartNumber.value = 0;
-	// 初始化
-	let data = {
-		item: item,
-		productListitem: item,
-		type: '',
-		product_id: '',
-		sku_id: ''
-	};
-	Object.assign(specifications, data);
-	// 初始化 多规格选中
-	selectedSpecs.value = {};
-	canSubmit.value = false;
-	// skuBtnText.value = '请选择规格'
-	// single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	let res = await APIminiAppinfo(item.id);
-	specifications.item = res;
-	if (specifications.item.type == 'package') {
-		selectedOptions.value = [];
-		specifications.product_id = res.id;
-		specifications.sku_id = item.skuId;
-		shopCartNumber.value = 1;
-	}
-	// 购物车是否有商品
-	specifications.type = res.type;
-	specifications.item.selectSpecInfo = Object.fromEntries(Object.entries(specifications.item.selectSpecInfo).filter(([_, value]) => value.length > 0));
-	// 给默认数量
-	specifications.item.amountcartNumber = 0;
-	showShopsku.value = true;
+  console.log(item);
+  // 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+  if (
+    item.isSoldStock == 1 ||
+    (item.isSaleTime == 0 && !item.isSaleTimeshow) ||
+    item.type == "single" ||
+    item.type == "weight" ||
+    (item.type == "package" && item.groupType == "0")
+  ) {
+    return false;
+  }
+  // 数量清零
+  shopCartNumber.value = 0;
+  // 初始化
+  let data = {
+    item: item,
+    productListitem: item,
+    type: "",
+    product_id: "",
+    sku_id: "",
+  };
+  Object.assign(specifications, data);
+  // 初始化 多规格选中
+  selectedSpecs.value = {};
+  canSubmit.value = false;
+  // skuBtnText.value = '请选择规格'
+  // single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+  let res = await APIminiAppinfo(item.id);
+  specifications.item = res;
+  if (specifications.item.type == "package") {
+    selectedOptions.value = [];
+    specifications.product_id = res.id;
+    specifications.sku_id = item.skuId;
+    shopCartNumber.value = 1;
+  }
+  // 购物车是否有商品
+  specifications.type = res.type;
+  specifications.item.selectSpecInfo = Object.fromEntries(
+    Object.entries(specifications.item.selectSpecInfo).filter(
+      ([_, value]) => value.length > 0
+    )
+  );
+  // 给默认数量
+  specifications.item.amountcartNumber = 0;
+  showShopsku.value = true;
 };
 // 判断商品是否在可售时间内
 const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
-	// 将后端返回的字符串转换为数组
-	const sellDays = sellDaysStr.split(',');
-	const now = dayjs();
-	const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-	const currentDay = days[now.day()];
+  // 将后端返回的字符串转换为数组
+  const sellDays = sellDaysStr.split(",");
+  const now = dayjs();
+  const days = [
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday",
+  ];
+  const currentDay = days[now.day()];
 
-	// console.log('当前日期:', currentDay);
-	// console.log('可售日期列表:', sellDays);
+  // console.log('当前日期:', currentDay);
+  // console.log('可售日期列表:', sellDays);
 
-	// 检查当前周几是否在可售周几列表中
-	if (!sellDays.includes(currentDay)) {
-		// console.log('当前日期不在可售日期列表中');
-		return false;
-	}
+  // 检查当前周几是否在可售周几列表中
+  if (!sellDays.includes(currentDay)) {
+    // console.log('当前日期不在可售日期列表中');
+    return false;
+  }
 
-	const startTime = dayjs(`${now.format('YYYY-MM-DD')} ${startTimeStr}`);
-	let endTime = dayjs(`${now.format('YYYY-MM-DD')} ${endTimeStr}`);
+  const startTime = dayjs(`${now.format("YYYY-MM-DD")} ${startTimeStr}`);
+  let endTime = dayjs(`${now.format("YYYY-MM-DD")} ${endTimeStr}`);
 
-	// 处理跨天情况
-	if (endTime.isBefore(startTime)) {
-		endTime = endTime.add(1, 'day');
-	}
+  // 处理跨天情况
+  if (endTime.isBefore(startTime)) {
+    endTime = endTime.add(1, "day");
+  }
 
-	// console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
-	// console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
-	// console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
+  // console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
 
-	const isInRange = now.isBetween(startTime, endTime, null, '[)');
-	// console.log('当前时间是否在可售时间范围内:', isInRange);
+  const isInRange = now.isBetween(startTime, endTime, null, "[)");
+  // console.log('当前时间是否在可售时间范围内:', isInRange);
 
-	return isInRange;
+  return isInRange;
 };
 
 // 单规格
 const singleclick = async (item, i) => {
-	if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
-		uni.showToast({
-			title: '不在可售时间内'
-		});
-		return false;
-	}
-	// 判断购物车是否有该选中商品
-	let res = null;
-	try {
-		res = matchedProducts.value.find((product, index) => {
-			return product.skuId == item.skuId && product.id == item.id;
-		});
-	} catch (error) {
-		//TODO handle the exception
-	}
+  if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
+    uni.showToast({
+      title: "不在可售时间内",
+    });
+    return false;
+  }
+  // 判断购物车是否有该选中商品
+  let res = null;
+  try {
+    res = matchedProducts.value.find((product, index) => {
+      return product.skuId == item.skuId && product.id == item.id;
+    });
+  } catch (error) {
+    //TODO handle the exception
+  }
 
-	// 保存这次点击的
-	specifications.productListitem = item;
+  // 保存这次点击的
+  specifications.productListitem = item;
 
-	// 是否起售 如果小于或者大于都是1
-	let suitNum = 1;
-	const cartNumberFloat = parseFloat(item.cartNumber);
-	if (!res && item.suitNum > cartNumberFloat) {
-		suitNum = item.suitNum;
-	} else if (item.suitNum >= cartNumberFloat && i === '-') {
-		suitNum = item.cartNumber;
-	}
-	websocketsendMessage({
-		id: res ? item.cartListId : '',
-		type: 'shopping',
-		suitNum: item.suitNum,
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId'),
-		operate_type: (await calculateValue(item.cartNumber, i, suitNum)) == 'del' ? 'del' : res ? 'edit' : 'add',
-		product_id: item.id,
-		sku_id: item.skuId,
-		number: await calculateValue(item.cartNumber, i, suitNum),
-		is_print: 1,
-		product_type: item.type
-	});
+  // 是否起售 如果小于或者大于都是1
+  let suitNum = 1;
+  const cartNumberFloat = parseFloat(item.cartNumber);
+  if (!res && item.suitNum > cartNumberFloat) {
+    suitNum = item.suitNum;
+  } else if (item.suitNum >= cartNumberFloat && i === "-") {
+    suitNum = item.cartNumber;
+  }
+  websocketsendMessage({
+    id: res ? item.cartListId : "",
+    type: "shopping",
+    suitNum: item.suitNum,
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type:
+      (await calculateValue(item.cartNumber, i, suitNum)) == "del"
+        ? "del"
+        : res
+        ? "edit"
+        : "add",
+    product_id: item.id,
+    sku_id: item.skuId,
+    number: await calculateValue(item.cartNumber, i, suitNum),
+    is_print: 1,
+    product_type: item.type,
+  });
 };
 
 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);
-	}
+  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);
+  }
 };
 
 // WebSocket处理  	// 初始化配置
 const options = {
-	initMessage: {
-		type: 'shopping',
-		operate_type: 'init',
-		table_code: uni.cache.get('tableCode'),
-		shop_id: uni.cache.get('shopId')
-	}
+  initMessage: {
+    type: "shopping",
+    operate_type: "init",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+  },
 };
 const useSocket = useWebSocket();
 useSocket.connect(options.initMessage, onMessage);
@@ -1133,47 +1525,50 @@ const confirmordershow = ref(false);
 
 // 更新商品数量的方法
 const updateProductQuantities = () => {
-	console.log('updateProductQuantities');
-	// 先将所有商品的 cartNumber 初始化为 0
-	shopProductList.hots.forEach((i) => {
-		i.cartNumber = 0;
-	});
-	// 遍历商品列表二维数组
-	shopProductList.productInfo.forEach((group) => {
-		group.productList.forEach((product) => {
-			product.cartNumber = 0;
-		});
-	});
+  console.log("updateProductQuantities");
+  // 先将所有商品的 cartNumber 初始化为 0
+  shopProductList.hots.forEach((i) => {
+    i.cartNumber = 0;
+  });
+  // 遍历商品列表二维数组
+  shopProductList.productInfo.forEach((group) => {
+    group.productList.forEach((product) => {
+      product.cartNumber = 0;
+    });
+  });
 
-	// 再去更新数组的值
-	cartListFilter.value.forEach((cartItem) => {
-		shopProductList.productInfo.forEach((group) => {
-			group.productList.forEach((product) => {
-				if (product.id == cartItem.product_id && product.skuId == cartItem.sku_id) {
-					product.cartNumber = cartItem.number || 0;
-					product.cartListId = cartItem.id;
-				}
-			});
-		});
-	});
-	// 遍历购物车数组
-	cartListFilter.value.forEach((cartItem) => {
-		// 遍历商品列表二维数组
-		shopProductList.hots.forEach((group) => {
-			// 商品 id 匹配
-			if (group.id == cartItem.product_id) {
-				// 更新商品的数量
-				group.cartListId = cartItem.id;
-				group.cartNumber = cartItem.number || 0;
-			}
-		});
-	});
+  // 再去更新数组的值
+  cartListFilter.value.forEach((cartItem) => {
+    shopProductList.productInfo.forEach((group) => {
+      group.productList.forEach((product) => {
+        if (
+          product.id == cartItem.product_id &&
+          product.skuId == cartItem.sku_id
+        ) {
+          product.cartNumber = cartItem.number || 0;
+          product.cartListId = cartItem.id;
+        }
+      });
+    });
+  });
+  // 遍历购物车数组
+  cartListFilter.value.forEach((cartItem) => {
+    // 遍历商品列表二维数组
+    shopProductList.hots.forEach((group) => {
+      // 商品 id 匹配
+      if (group.id == cartItem.product_id) {
+        // 更新商品的数量
+        group.cartListId = cartItem.id;
+        group.cartNumber = cartItem.number || 0;
+      }
+    });
+  });
 };
 
 //websocket产值
 const websocketsendMessage = (data) => {
-	console.log(data);
-	uni.$u.debounce(useSocket.sendMessage(data), 500);
+  console.log(data);
+  uni.$u.debounce(useSocket.sendMessage(data), 500);
 };
 
 // 用于记录已经处理过的消息的 msg_id
@@ -1181,201 +1576,211 @@ const processedMessageIds = new Set();
 
 //设置商品初始选中
 function setGoodsInitSel(cartsArr) {
-	console.log('setGoodsInitSel');
-	const arr = cartsArr && cartsArr.length ? cartsArr : cartStore.carts;
-	if (arr.length <= 0) {
-		return;
-	}
-	shopProductList.hots.map((v) => {
-		const item = arr.find((cart) => cart.product_id == v.id);
-		if (item) {
-			v.cartNumber = `${item.number}`;
-		}
-	});
-	shopProductList.productInfo.map((info) => {
-		info.productList.map((v) => {
-			const item = arr.find((cart) => cart.product_id == v.id);
-			if (item) {
-				v.cartNumber = `${item.number}`;
-				console.log(v.cartNumber);
-			}
-		});
-	});
+  console.log("setGoodsInitSel");
+  const arr = cartsArr && cartsArr.length ? cartsArr : cartStore.carts;
+  if (arr.length <= 0) {
+    return;
+  }
+  shopProductList.hots.map((v) => {
+    const item = arr.find((cart) => cart.product_id == v.id);
+    if (item) {
+      v.cartNumber = `${item.number}`;
+    }
+  });
+  shopProductList.productInfo.map((info) => {
+    info.productList.map((v) => {
+      const item = arr.find((cart) => cart.product_id == v.id);
+      if (item) {
+        v.cartNumber = `${item.number}`;
+        console.log(v.cartNumber);
+      }
+    });
+  });
+}
+
+async function delGoods() {
+  await websocketsendMessage({
+    id: Message.id,
+    type: "shopping",
+    table_code: uni.cache.get("tableCode"),
+    shop_id: uni.cache.get("shopId"),
+    operate_type: "del",
+    is_print: 1,
+  });
 }
 
 // 收到的消息变化
 async function onMessage(Message) {
-	if (Message) {
-		console.log('product index 收到消息', Message);
-		// 心跳返回  过滤
-		if (Message.type == 'ping_interval' || Message.msg_id == 'ping_interval') {
-			isLoading.value = false;
-			return false;
-		}
-		// 检查消息是否已经处理过
-		if (processedMessageIds.has(Message.msg_id)) {
-			return;
-		}
-		processedMessageIds.add(Message.msg_id);
+  if (Message) {
+    console.log("product index 收到消息", Message);
+    // 心跳返回  过滤
+    if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
+      isLoading.value = false;
+      return false;
+    }
+    // 检查消息是否已经处理过
+    if (processedMessageIds.has(Message.msg_id)) {
+      return;
+    }
+    processedMessageIds.add(Message.msg_id);
 
-		// 初始化
-		if (Message.operate_type == 'init') {
-			cartStore.carts = Message.data;
-			uni.hideLoading();
-			isLoading.value = false;
-			// 初始化商品数量
-			// setGoodsInitSel(Message.data)
-		}
+    // 初始化
+    if (Message.operate_type == "init") {
+      cartStore.carts = Message.data;
+      uni.hideLoading();
+      isLoading.value = false;
+      // 初始化商品数量
+      // setGoodsInitSel(Message.data)
+    }
 
-		// 清空购物车
-		if (Message.operate_type == 'cleanup') {
-			cartStore.carts = [];
-			setTimeout(() => {
-				Historicalorders();
-			}, 400);
-			showCart.value = false;
-		}
+    // 清空购物车
+    if (Message.operate_type == "cleanup") {
+      cartStore.carts = [];
+      setTimeout(() => {
+        Historicalorders();
+      }, 400);
+      showCart.value = false;
+    }
 
-		// 删除除购物车
-		if (Message.operate_type == 'del' && Message.status == 1) {
-			// 优化：使用可选链操作符避免报错
-			cartStore.carts = cartStore.carts.filter((item) => item.id !== Message.data?.id);
-			// cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
-		}
+    // 删除除购物车
+    if (Message.operate_type == "del" && Message.status == 1) {
+      // 优化：使用可选链操作符避免报错
+      cartStore.carts = cartStore.carts.filter(
+        (item) => item.id !== Message.data?.id
+      );
+      // cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
+    }
 
-		// 添加或者减少购物后返回
-		if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-			[Message.data].forEach((objA) => {
-				const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
-				if (index !== -1) {
-					cartStore.carts[index] = objA;
-				} else {
-					cartStore.carts.push(objA);
-				}
-			});
-		}
+    // 添加或者减少购物后返回
+    if (Message.operate_type == "add" || Message.operate_type == "edit") {
+      [Message.data].forEach((objA) => {
+        const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
+        if (index !== -1) {
+          cartStore.carts[index] = objA;
+        } else {
+          cartStore.carts.push(objA);
+        }
+      });
+    }
 
-		// 历史订单
-		if (Message.operate_type == 'clearOrder') {
-			Historicalorders();
-		}
+    // 历史订单
+    if (Message.operate_type == "clearOrder") {
+      Historicalorders();
+    }
 
-		// 购物车数据更新从新请求
-		if (Message.type == 'product' && Message.data_type == 'product_update' && Message.operate_type == 'product_update') {
-			isDataLoaded.value = false;
-			productqueryProduct();
-		}
+    // 购物车数据更新从新请求
+    if (
+      Message.type == "product" &&
+      Message.data_type == "product_update" &&
+      Message.operate_type == "product_update"
+    ) {
+      isDataLoaded.value = false;
+      productqueryProduct();
+    }
 
-		// 提示
-		if (Message.status == 0 && Message.type != 'no_suit_num') {
-			uni.showToast({
-				title: Message.msg,
-				icon: 'none'
-			});
-		}
+    // 提示
+    if (Message.status == 0 && Message.type != "no_suit_num") {
+      uni.showToast({
+        title: Message.msg,
+        icon: "none",
+      });
+    }
 
-		if (Message.type == 'no_suit_num') {
-			// console.log(specifications)
-			uni.showModal({
-				title: '提示',
-				showCancel: false,
-				content: '此商品库存不足起售数量！',
-				success: async (data) => {
-					await websocketsendMessage({
-						id: Message.id,
-						type: 'shopping',
-						table_code: uni.cache.get('tableCode'),
-						shop_id: uni.cache.get('shopId'),
-						operate_type: 'del',
-						is_print: 1
-					});
-				}
-			});
-		}
+    if (Message.type == "no_suit_num") {
+      // console.log(specifications)
+      uni.showModal({
+        title: "提示",
+        showCancel: false,
+        content: "此商品库存不足起售数量！",
+        success: (data) => {
+          delGoods();
+        },
+      });
+    }
 
-		//除去p 每次返回都回执消息
-		await websocketsendMessage({
-			type: 'receipt',
-			msg_id: Message.msg_id
-		});
+    //除去p 每次返回都回执消息
+    await websocketsendMessage({
+      type: "receipt",
+      msg_id: Message.msg_id,
+    });
 
-		// 初始化商品数量
-		await updateProductQuantities();
-	}
+    // 初始化商品数量
+    await updateProductQuantities();
+  }
 }
 
 // 更新购物车数据shopProductList.hots
 const matchedProducts = computed(() => {
-	if (cartStore.carts.length > 0) {
-		let Specialstop = null;
+  if (cartStore.carts.length > 0) {
+    let Specialstop = null;
 
-		try {
-			Specialstop = [
-				...[
-					{
-						id: '',
-						name: '',
-						productList: shopProductList.hots
-					}
-				],
-				...shopProductList.productInfo
-			];
-		} catch (error) {
-			Specialstop = shopProductList.productInfo;
-			//TODO handle the exception
-		}
-		return cartStore.carts
-			.flatMap((cartItem) => {
-				for (const group of Specialstop) {
-					for (const product of group.productList) {
-						if (product.id == cartItem.product_id) {
-							console.log(cartItem);
-							return {
-								...product,
-								cartListinfo: cartItem,
-								cartListId: cartItem.id, //购物车id
-								cartNumber: cartItem.number //增加一个数量算法
-								// cartNumberToAdd: cartItem.number //增加一个数量算法
-							};
-						}
-					}
-				}
-				if (cartItem.is_temporary === 1) {
-					return [
-						{
-							...cartItem,
-							memberPrice: cartItem.discount_sale_amount,
-							salePrice: cartItem.discount_sale_amount,
-							cartListinfo: cartItem,
-							cartListId: cartItem.id, // 购物车id
-							cartNumber: cartItem.number // 增加一个数量算法
-						}
-					];
-				}
-				// 如果没找到匹配的商品，返回 null 或者其他默认值，这里返回 null
-				return null;
-			})
-			.filter((item) => item !== null);
-	} else {
-		return [];
-	}
+    try {
+      Specialstop = [
+        ...[
+          {
+            id: "",
+            name: "",
+            productList: shopProductList.hots,
+          },
+        ],
+        ...shopProductList.productInfo,
+      ];
+    } catch (error) {
+      Specialstop = shopProductList.productInfo;
+      //TODO handle the exception
+    }
+    return cartStore.carts
+      .flatMap((cartItem) => {
+        for (const group of Specialstop) {
+          for (const product of group.productList) {
+            if (product.id == cartItem.product_id) {
+              console.log(cartItem);
+              return {
+                ...product,
+                cartListinfo: cartItem,
+                cartListId: cartItem.id, //购物车id
+                cartNumber: cartItem.number, //增加一个数量算法
+                // cartNumberToAdd: cartItem.number //增加一个数量算法
+              };
+            }
+          }
+        }
+        if (cartItem.is_temporary === 1) {
+          return [
+            {
+              ...cartItem,
+              memberPrice: cartItem.discount_sale_amount,
+              salePrice: cartItem.discount_sale_amount,
+              cartListinfo: cartItem,
+              cartListId: cartItem.id, // 购物车id
+              cartNumber: cartItem.number, // 增加一个数量算法
+            },
+          ];
+        }
+        // 如果没找到匹配的商品，返回 null 或者其他默认值，这里返回 null
+        return null;
+      })
+      .filter((item) => item !== null);
+  } else {
+    return [];
+  }
 });
 
 //删除某一个待支付订单
 const clickcancelOrder = async (data) => {
-	if (data.i == 'all') {
-		await APIcancelOrder({
-			shopId: uni.cache.get('shopId'),
-			orderId: orderinfo.value.id
-		});
-	} else {
-		await APIrmPlaceOrder({
-			shopId: uni.cache.get('shopId'),
-			orderId: orderinfo.value.id,
-			placeNum: data.key
-		});
-	}
-	Historicalorders();
+  if (data.i == "all") {
+    await APIcancelOrder({
+      shopId: uni.cache.get("shopId"),
+      orderId: orderinfo.value.id,
+    });
+  } else {
+    await APIrmPlaceOrder({
+      shopId: uni.cache.get("shopId"),
+      orderId: orderinfo.value.id,
+      placeNum: data.key,
+    });
+  }
+  Historicalorders();
 };
 
 // 储存是否存在多次下单
@@ -1384,135 +1789,155 @@ const confirmorderref = ref(null);
 
 // 结账
 const orderdetail = async () => {
-	uni.navigateTo({
-		url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni.cache.get('shopId')
-	});
-	return;
-	try {
-		await Historicalorders();
-	} catch (error) {}
-	confirmordershow.value = true;
-	showCart.value = false;
+  uni.navigateTo({
+    url:
+      "/pages/order/confirm-order?tableCode=" +
+      uni.cache.get("tableCode") +
+      "&shopId=" +
+      uni.cache.get("shopId"),
+  });
+  return;
+  try {
+    await Historicalorders();
+  } catch (error) {}
+  confirmordershow.value = true;
+  showCart.value = false;
 };
 
 // 历史订单
 const Historicalorders = async (W) => {
-	if (W) {
-		showCart.value = !showCart.value;
-	} else {
-		let res = await APIhistoryOrder({
-			tableCode: uni.cache.get('tableCode')
-		});
-		orderinfo.value = {
-			id: res.id,
-			detailMap: res.detailMap,
-			placeNum: res.placeNum
-		};
-	}
+  if (W) {
+    showCart.value = !showCart.value;
+  } else {
+    let res = await APIhistoryOrder({
+      tableCode: uni.cache.get("tableCode"),
+    });
+    orderinfo.value = {
+      id: res.id,
+      detailMap: res.detailMap,
+      placeNum: res.placeNum,
+    };
+  }
 };
 
 // 提取合并 orderinfo.detailMap 数组的逻辑
 function combineOrderInfoDetailMap(orderinfo) {
-	if (!orderinfo) return [];
-	let combinedArray = [];
-	for (const key in orderinfo.detailMap) {
-		if (orderinfo.detailMap.hasOwnProperty(key)) {
-			let subArray = orderinfo.detailMap[key];
-			combinedArray = [...combinedArray, ...subArray];
-		}
-	}
-	return combinedArray;
+  if (!orderinfo) return [];
+  let combinedArray = [];
+  for (const key in orderinfo.detailMap) {
+    if (orderinfo.detailMap.hasOwnProperty(key)) {
+      let subArray = orderinfo.detailMap[key];
+      combinedArray = [...combinedArray, ...subArray];
+    }
+  }
+  return combinedArray;
 }
 
 // 计算购物车商品费用
 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) {
-		// 购物车总数价格
-		cart = matchedProducts.value.reduce((total, item) => {
-			if (item.type == 'sku') {
-				item.skuList.forEach((i, t) => {
-					if (item.cartListinfo.sku_id == i.id) {
-						item.memberPrice = i.memberPrice;
-						item.salePrice = i.salePrice;
-					}
-				});
-			}
-			// 是否启用会员价 0否1是
-			if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-				// memberPrice会员价
-				return total + parseFloat(item.memberPrice || item.salePrice) * parseFloat(item.cartNumber);
-			} else {
-				// salePrice销售价
-				return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
-			}
-		}, 0);
-	}
-	cart = parseFloat(cart);
-	// 向上取整并保留两位小数
-	return parseFloat(cart.toFixed(2));
+  // 待支付订单
+  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) {
+    // 购物车总数价格
+    cart = matchedProducts.value.reduce((total, item) => {
+      if (item.type == "sku") {
+        item.skuList.forEach((i, t) => {
+          if (item.cartListinfo.sku_id == i.id) {
+            item.memberPrice = i.memberPrice;
+            item.salePrice = i.salePrice;
+          }
+        });
+      }
+      // 是否启用会员价 0否1是
+      if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+        // memberPrice会员价
+        return (
+          total +
+          parseFloat(item.memberPrice || item.salePrice) *
+            parseFloat(item.cartNumber)
+        );
+      } else {
+        // salePrice销售价
+        return (
+          total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber)
+        );
+      }
+    }, 0);
+  }
+  cart = parseFloat(cart);
+  // 向上取整并保留两位小数
+  return parseFloat(cart.toFixed(2));
 });
 
 // 计算购物车商品总数量
 const cartLists_count = computed(() => {
-	const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
-	const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
-		return sum + parseFloat(item.num);
-	}, 0);
+  const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
+  const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
+    return sum + parseFloat(item.num);
+  }, 0);
 
-	const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
-		const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item.cartNumber;
-		return sum + num;
-	}, 0);
+  const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
+    const num =
+      typeof item.cartNumber === "string"
+        ? parseFloat(item.cartNumber)
+        : item.cartNumber;
+    return sum + num;
+  }, 0);
 
-	const totalCount = matchedProductsCount;
-	return parseFloat(totalCount.toFixed(2));
+  const totalCount = matchedProductsCount;
+  return parseFloat(totalCount.toFixed(2));
 });
 
 // 定义 ifcartNumber 计算属性方法 展示数量
 function ifcartNumber(item) {
-	// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-	if (!item || item.cartNumber * 1 == 0) {
-		return '';
-	}
-	let numValue = parseFloat(item.cartNumber);
-	if (isNaN(numValue)) {
-		// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-		return '';
-	}
-	// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-	if (item.type === 'weight') {
-		// 如果类型是称重重量，将值保留两位小数
-		return parseFloat(numValue.toFixed(2));
-	} else {
-		// 如果类型是整数，将值转换为整数
-		return Math.round(numValue);
-	}
-	// 如果类型不匹配，返回原始值
-	return item.cartNumber;
+  // 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+  if (!item || item.cartNumber * 1 == 0) {
+    return "";
+  }
+  let numValue = parseFloat(item.cartNumber);
+  if (isNaN(numValue)) {
+    // 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+    return "";
+  }
+  // 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 ifcartNumber = computed(() => {
 // 	return (item) => {
@@ -1540,1096 +1965,1112 @@ function ifcartNumber(item) {
 
 // 计算处理后的购物车列表 	// 用于筛选后的购物车数组
 const cartListFilter = computed(() => {
-	// 使用 reduce 方法对 cartList 进行处理
-	const grouped = cartStore.carts.reduce((acc, item) => {
-		const productId = item.product_id;
-		const num = parseFloat(item.number);
+  // 使用 reduce 方法对 cartList 进行处理
+  const grouped = cartStore.carts.reduce((acc, item) => {
+    const productId = item.product_id;
+    const num = parseFloat(item.number);
 
-		if (!acc[productId]) {
-			// 如果 acc 中还没有该 product_id 的记录，创建一个新对象
-			acc[productId] = {
-				...item,
-				number: num
-			};
-		} else {
-			// 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
-			acc[productId].number += num;
-		}
-		return acc;
-	}, {});
-	// 将累加结果保留两位小数，并将对象转换为数组
-	return Object.values(grouped).map((item) => ({
-		...item,
-		number: item.number.toFixed(2)
-	}));
+    if (!acc[productId]) {
+      // 如果 acc 中还没有该 product_id 的记录，创建一个新对象
+      acc[productId] = {
+        ...item,
+        number: num,
+      };
+    } else {
+      // 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
+      acc[productId].number += num;
+    }
+    return acc;
+  }, {});
+  // 将累加结果保留两位小数，并将对象转换为数组
+  return Object.values(grouped).map((item) => ({
+    ...item,
+    number: item.number.toFixed(2),
+  }));
 });
 
 const endTimeref = reactive({
-	startTime: '',
-	endTime: ''
+  startTime: "",
+  endTime: "",
 });
 
 // 获取当前时间
 const getCurrentTime = () => {
-	const now = new Date();
-	const hours = now.getHours().toString().padStart(2, '0');
-	const minutes = now.getMinutes().toString().padStart(2, '0');
-	return `${hours}:${minutes}`;
+  const now = new Date();
+  const hours = now.getHours().toString().padStart(2, "0");
+  const minutes = now.getMinutes().toString().padStart(2, "0");
+  return `${hours}:${minutes}`;
 };
 
 // 计算是否在营业时间内
 const isBusinessTime = computed(() => {
-	if (!shopInfo.businessTime) {
-		return true;
-	}
-	const currentTime = getCurrentTime();
-	const [startTime, endTime] = shopInfo.businessTime.split('-');
-	endTimeref.startTime = startTime;
-	endTimeref.endTime = endTime;
-	// 如果开始时间大于结束时间，说明是跨天的营业时间
-	if (startTime > endTime) {
-		return currentTime >= startTime || currentTime <= endTime;
-	}
-	return currentTime >= startTime && currentTime <= endTime;
+  if (!shopInfo.businessTime) {
+    return true;
+  }
+  const currentTime = getCurrentTime();
+  const [startTime, endTime] = shopInfo.businessTime.split("-");
+  endTimeref.startTime = startTime;
+  endTimeref.endTime = endTime;
+  // 如果开始时间大于结束时间，说明是跨天的营业时间
+  if (startTime > endTime) {
+    return currentTime >= startTime || currentTime <= endTime;
+  }
+  return currentTime >= startTime && currentTime <= endTime;
 });
 
 // 列表请求
 const productqueryProduct = async () => {
-	cartStore.goodsIsloading = false;
-	try {
-		shopProductList.hots = await productminiApphotsquery();
-		shopProductList.productInfo = await APIgroupquery();
-	} catch (error) {
-		uni.showToast({
-			title: '网络不稳定，请重新扫码进入',
-			icon: 'none'
-		});
-		setTimeout(() => {
-			uni.pro.switchTab('index/index');
-		}, 1000);
-	}
-	if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
-		//TODO handle the exception
-		//第一步：将所有商品的 cartNumber 初始化为 0
-		shopProductList.productInfo.forEach((group) => {
-			group.productList.forEach(async (product) => {
-				product.cartNumber = 0;
-				product.isSaleTimeshow = await isProductAvailable(product.days, product.startTime, product.endTime);
-				cartStore.setGoodsMap(product.id, product);
-			});
-		});
-		shopProductList.hots.forEach(async (i) => {
-			i.cartNumber = 0;
-			i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
-			cartStore.setGoodsMap(i.id, i);
-		});
-		cartStore.goodsIsloading = true;
-		scrollTopSize.value = 0;
-		topArr.value = [];
-		// userStore.actionsAPIuser()
-		// 数据可以更新
-		isDataLoaded.value = true;
-		// 历史订单
-		Historicalorders();
-		updateProductQuantities();
-	} else {
-		uni.showToast({
-			title: '暂无列表数据,请重新扫码',
-			icon: 'none'
-		});
-		isDataLoaded.value = false;
-		setTimeout(() => {
-			uni.pro.switchTab('index/index');
-		}, 1000);
-		return false;
-	}
+  cartStore.goodsIsloading = false;
+  try {
+    shopProductList.hots = await productminiApphotsquery();
+    shopProductList.productInfo = await APIgroupquery();
+  } catch (error) {
+    uni.showToast({
+      title: "网络不稳定，请重新扫码进入",
+      icon: "none",
+    });
+    setTimeout(() => {
+      uni.pro.switchTab("index/index");
+    }, 1000);
+  }
+  if (
+    shopProductList.productInfo.length > 0 ||
+    shopProductList.hots.length > 0
+  ) {
+    //TODO handle the exception
+    //第一步：将所有商品的 cartNumber 初始化为 0
+    shopProductList.productInfo.forEach((group) => {
+      group.productList.forEach(async (product) => {
+        product.cartNumber = 0;
+        product.isSaleTimeshow = await isProductAvailable(
+          product.days,
+          product.startTime,
+          product.endTime
+        );
+        cartStore.setGoodsMap(product.id, product);
+      });
+    });
+    shopProductList.hots.forEach(async (i) => {
+      i.cartNumber = 0;
+      i.isSaleTimeshow = await isProductAvailable(
+        i.days,
+        i.startTime,
+        i.endTime
+      );
+      cartStore.setGoodsMap(i.id, i);
+    });
+    cartStore.goodsIsloading = true;
+    scrollTopSize.value = 0;
+    topArr.value = [];
+    // userStore.actionsAPIuser()
+    // 数据可以更新
+    isDataLoaded.value = true;
+    // 历史订单
+    Historicalorders();
+    updateProductQuantities();
+  } else {
+    uni.showToast({
+      title: "暂无列表数据,请重新扫码",
+      icon: "none",
+    });
+    isDataLoaded.value = false;
+    setTimeout(() => {
+      uni.pro.switchTab("index/index");
+    }, 1000);
+    return false;
+  }
 };
 
 onLoad(async (e) => {
-	await proxy.$onLaunched;
+  await proxy.$onLaunched;
 });
 
 onShow(async () => {
-	// 监听页面显示和隐藏
-	useSocket.setOnMessage(onMessage);
-	useSocket.onShowconnect();
-	let res = await APIhistoryOrder({
-		tableCode: uni.cache.get('tableCode')
-	});
-	if (res) {
-		orderinfo.value = {
-			id: res.id,
-			detailMap: res.detailMap,
-			placeNum: res.placeNum
-		};
-	} else {
-		orderinfo.value = {
-			id: ''
-		};
-	}
+  // 监听页面显示和隐藏
+  useSocket.setOnMessage(onMessage);
+  useSocket.onShowconnect();
+  let res = await APIhistoryOrder({
+    tableCode: uni.cache.get("tableCode"),
+  });
+  if (res) {
+    orderinfo.value = {
+      id: res.id,
+      detailMap: res.detailMap,
+      placeNum: res.placeNum,
+    };
+  } else {
+    orderinfo.value = {
+      id: "",
+    };
+  }
 });
 
 onHide(() => {});
 
 onMounted(async () => {
-	await proxy.$onLaunched;
-	// 获取当前页面栈
-	const pages = getCurrentPages();
-	// 获取当前页面实例
-	const currentPage = pages[pages.length - 1];
-	// 获取页面参数
-	const options = currentPage.options;
-	let res = await APIhistoryOrder({
-		tableCode: uni.cache.get('tableCode')
-	});
+  await proxy.$onLaunched;
+  // 获取当前页面栈
+  const pages = getCurrentPages();
+  // 获取当前页面实例
+  const currentPage = pages[pages.length - 1];
+  // 获取页面参数
+  const options = currentPage.options;
+  let res = await APIhistoryOrder({
+    tableCode: uni.cache.get("tableCode"),
+  });
 
-	await productqueryProduct();
-	if (res && res.id && shopInfo.registerType == 'after') {
-		toHistory();
-		return;
-	}
-	setTimeout(() => {
-		// 启动网络监听
-		useSocket.initNetworkListener();
-		getElementTop();
-	}, 500);
+  await productqueryProduct();
+  if (res && res.id && shopInfo.registerType == "after") {
+    toHistory();
+    return;
+  }
+  setTimeout(() => {
+    // 启动网络监听
+    useSocket.initNetworkListener();
+    getElementTop();
+  }, 500);
 });
 
 //跳转历史订单
 function toHistory() {
-	uni.navigateTo({
-		url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni.cache.get('shopId')
-	});
-	// uni.navigateTo({
-	// 	url: '/pages/order/confirm-order?orderId=' + orderinfo.id + '&shopId=' + uni.cache.get('shopId')+'&tableCode='+uni.cache.get('tableCode')
-	// })
+  const tableCode = uni.cache.get("tableCode");
+  const shopId = uni.cache.get("shopId");
+  uni.navigateTo({
+    url: `/pages/order/confirm-order?tableCode=${tableCode}&shopId=${shopId}`,
+  });
 }
 </script>
 
 <style lang="scss" scoped>
 .grayscale {
-	filter: grayscale(100%);
-	pointer-events: none;
+  filter: grayscale(100%);
+  pointer-events: none;
 }
 
 .top--panel {
-	// padding: 0 20rpx;
-	background-color: #fff;
+  // padding: 0 20rpx;
+  background-color: #fff;
 
-	.panelimgbackground {
-		width: 100%;
-		height: 272rpx;
-	}
+  .panelimgbackground {
+    width: 100%;
+    height: 272rpx;
+  }
 
-	.panelone {
-		padding: 20rpx 20rpx 0 20rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #333333;
-	}
+  .panelone {
+    padding: 20rpx 20rpx 0 20rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #333333;
+  }
 
-	.paneltow {
-		padding: 0 20rpx;
-		margin-top: 16rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-	}
+  .paneltow {
+    padding: 0 20rpx;
+    margin-top: 16rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+  }
 
-	.panelthere {
-		margin-top: 32rpx;
-		margin-bottom: 50rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		padding: 0 20rpx;
+  .panelthere {
+    margin-top: 32rpx;
+    margin-bottom: 50rpx;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    padding: 0 20rpx;
 
-		.paneltheretext {
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-		}
+    .paneltheretext {
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+    }
 
-		.flex-start {
-			view {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
-		}
-	}
+    .flex-start {
+      view {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
+    }
+  }
 
-	.panelfour {
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #333333;
-		padding: 0 20rpx;
-	}
+  .panelfour {
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+    padding: 0 20rpx;
+  }
 
-	.panelfive {
-		width: 100%;
-		padding: 0 20rpx;
+  .panelfive {
+    width: 100%;
+    padding: 0 20rpx;
 
-		.panelfive_list {
-			display: flex;
-		}
+    .panelfive_list {
+      display: flex;
+    }
 
-		.panelfiveitem {
-			margin-top: 16rpx;
-			width: 340rpx;
-			margin-right: 30rpx;
-			position: relative;
-			flex-shrink: 0;
+    .panelfiveitem {
+      margin-top: 16rpx;
+      width: 340rpx;
+      margin-right: 30rpx;
+      position: relative;
+      flex-shrink: 0;
 
-			.panelfiveitemimage {
-				border-radius: 20rpx 20rpx 0rpx 0rpx;
-				width: 100%;
-				height: 204rpx;
-			}
+      .panelfiveitemimage {
+        border-radius: 20rpx 20rpx 0rpx 0rpx;
+        width: 100%;
+        height: 204rpx;
+      }
 
-			.vifgoodsImg {
-				width: 100%;
-				height: 204rpx;
-				position: absolute;
-				top: 0;
-				left: 0;
-				z-index: 9;
-				background-color: rgb(0, 0, 0, 0.5);
+      .vifgoodsImg {
+        width: 100%;
+        height: 204rpx;
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: 9;
+        background-color: rgb(0, 0, 0, 0.5);
 
-				image {
-					padding: 30rpx;
-					width: 100%;
-					height: 100%;
-				}
-			}
+        image {
+          padding: 30rpx;
+          width: 100%;
+          height: 100%;
+        }
+      }
 
-			.panelfiveitemone {
-				margin-top: 32rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #333333;
-				overflow: hidden; //超出的文本隐藏
-				text-overflow: ellipsis; //溢出用省略号显示
-				white-space: nowrap; //溢出不换行
-			}
+      .panelfiveitemone {
+        margin-top: 32rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #333333;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+      }
 
-			.panelfiveitemtow {
-				margin-top: 16rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #ff534b;
-			}
+      .panelfiveitemtow {
+        margin-top: 16rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #ff534b;
+      }
 
-			.panelfiveitemthere {
-				margin-top: 12rpx;
-				// text:nth-child(1) {
-				// 	margin-left: 0;
-				// }
+      .panelfiveitemthere {
+        margin-top: 12rpx;
+        // text:nth-child(1) {
+        // 	margin-left: 0;
+        // }
 
-				text {
-					padding: 4rpx 24rpx;
-					background: #f6f6f6;
-					border-radius: 8rpx 8rpx 8rpx 8rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #999999;
-				}
-			}
+        text {
+          padding: 4rpx 24rpx;
+          background: #f6f6f6;
+          border-radius: 8rpx 8rpx 8rpx 8rpx;
+          font-family: Source Han Sans CN, Source Han Sans CN;
+          font-weight: 400;
+          font-size: 20rpx;
+          color: #999999;
+        }
+      }
 
-			.panelfiveitemfour {
-				margin-top: 12rpx;
-				width: 100%;
-				height: 36rpx;
-				line-height: 36rpx;
-				overflow: hidden; //超出的文本隐藏
-				text-overflow: ellipsis; //溢出用省略号显示
-				white-space: nowrap; //溢出不换行
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
+      .panelfiveitemfour {
+        margin-top: 12rpx;
+        width: 100%;
+        height: 36rpx;
+        line-height: 36rpx;
+        overflow: hidden; //超出的文本隐藏
+        text-overflow: ellipsis; //溢出用省略号显示
+        white-space: nowrap; //溢出不换行
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
 
-			.panelfiveitemfive {
-				margin-top: 8rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #999999;
-			}
+      .panelfiveitemfive {
+        margin-top: 8rpx;
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #999999;
+      }
 
-			.panelfiveitemsex {
-				.panelfiveitemsex_oen {
-					.tips {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #333333;
-					}
+      .panelfiveitemsex {
+        .panelfiveitemsex_oen {
+          .tips {
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+          }
 
-					.price {
-						font-family: Source Han Sans CN, Source Han Sans CN;
-						font-weight: bold;
-						font-size: 36rpx;
-						color: #333333;
-					}
+          .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;
-					}
+          .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;
-					}
-				}
-			}
+          .unit {
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 400;
+            font-size: 36rpx;
+            color: #333333;
+          }
+        }
+      }
 
-			.panelfiveitemNum {
-				// position: absolute;
-				// bottom: 82rpx;
-				// right: 0;
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
+      .panelfiveitemNum {
+        // position: absolute;
+        // bottom: 82rpx;
+        // right: 0;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
 
-				.sku-wrap {
-					padding: 10rpx 20rpx;
-					background: #e3ad7f;
-					border-radius: 32rpx;
-					position: relative;
-					align-items: center;
-					white-space: nowrap;
-					.t {
-						font-size: 28rpx;
-						color: #fff;
-					}
+        .sku-wrap {
+          padding: 10rpx 20rpx;
+          background: #e3ad7f;
+          border-radius: 32rpx;
+          position: relative;
+          align-items: center;
+          white-space: nowrap;
+          .t {
+            font-size: 28rpx;
+            color: #fff;
+          }
 
-					.dot {
-						position: absolute;
-						top: -15rpx;
-						right: -10rpx;
-						background-color: #ff4b33;
-						color: #fff;
-						border-radius: 58rpx;
-						padding: 5rpx 14rpx;
-						box-sizing: border-box;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						font-size: 20rpx;
-					}
-				}
+          .dot {
+            position: absolute;
+            top: -15rpx;
+            right: -10rpx;
+            background-color: #ff4b33;
+            color: #fff;
+            border-radius: 58rpx;
+            padding: 5rpx 14rpx;
+            box-sizing: border-box;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 20rpx;
+          }
+        }
 
-				.Controls {
-					display: flex;
-					align-items: center;
+        .Controls {
+          display: flex;
+          align-items: center;
 
-					.num {
-						margin: 8rpx 8rpx 0 8rpx;
-					}
+          .num {
+            margin: 8rpx 8rpx 0 8rpx;
+          }
 
-					.btn {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						position: relative;
+          .btn {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
 
-						.btnClick {
-							width: 100rpx;
-							height: 100rpx;
-							position: absolute;
-							// bottom: 0;
-						}
-					}
-				}
-			}
-		}
-	}
+            .btnClick {
+              width: 100rpx;
+              height: 100rpx;
+              position: absolute;
+              // bottom: 0;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 .scroll-panel {
-	position: relative;
+  position: relative;
 
-	.list-box {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		justify-content: flex-start;
-		align-items: flex-start;
-		align-content: flex-start;
-		font-size: 28rpx;
-		position: relative;
+  .list-box {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: flex-start;
+    font-size: 28rpx;
+    position: relative;
 
-		.left {
-			width: 200rpx;
-			background-color: #f6f6f6;
-			line-height: normal;
-			box-sizing: border-box;
-			font-size: 32rpx;
-			position: sticky;
-			top: 0;
+    .left {
+      width: 200rpx;
+      background-color: #f6f6f6;
+      line-height: normal;
+      box-sizing: border-box;
+      font-size: 32rpx;
+      position: sticky;
+      top: 0;
 
-			// padding-bottom: 200rpx;
-			.item {
-				padding: 30rpx 30rpx;
-				// height: 92rpx;
-				// line-height: 92rpx;
-				position: relative;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				// overflow: hidden;
-				// text-overflow: ellipsis;
-				// white-space: nowrap;
+      // padding-bottom: 200rpx;
+      .item {
+        padding: 30rpx 30rpx;
+        // height: 92rpx;
+        // line-height: 92rpx;
+        position: relative;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+        display: flex;
+        align-items: center;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
+        // white-space: nowrap;
 
-				& + .item {
-					margin-top: 1px;
+        & + .item {
+          margin-top: 1px;
 
-					&::after {
-						// content: '';
-						// display: block;
-						// height: 0;
-						// border-top: #d6d6d6 solid 1px;
-						// width: 620upx;
-						// position: absolute;
-						// top: -1px;
-						// right: 0;
-						// transform: scaleY(0.5);
-						/* 1px像素 */
-					}
-				}
+          &::after {
+            // content: '';
+            // display: block;
+            // height: 0;
+            // border-top: #d6d6d6 solid 1px;
+            // width: 620upx;
+            // position: absolute;
+            // top: -1px;
+            // right: 0;
+            // transform: scaleY(0.5);
+            /* 1px像素 */
+          }
+        }
 
-				&.active {
-					color: #333;
-					background-color: #fff;
-					position: relative;
+        &.active {
+          color: #333;
+          background-color: #fff;
+          position: relative;
 
-					&::before {
-						content: '';
-						display: block;
-						position: absolute;
-						top: 0;
-						left: 0;
-						border-left: #7e5c23 solid 4px;
-						height: 100%;
-						width: 0;
-					}
+          &::before {
+            content: "";
+            display: block;
+            position: absolute;
+            top: 0;
+            left: 0;
+            border-left: #7e5c23 solid 4px;
+            height: 100%;
+            width: 0;
+          }
 
-					&::after {
-						content: '';
-						display: block;
-						position: absolute;
-						top: 0;
-						left: -15rpx;
-						bottom: 0;
-						margin: auto;
-						height: 30rpx;
-						width: 30rpx;
-						border-radius: 50%;
-						background-color: #7e5c23;
-					}
-				}
-			}
+          &::after {
+            content: "";
+            display: block;
+            position: absolute;
+            top: 0;
+            left: -15rpx;
+            bottom: 0;
+            margin: auto;
+            height: 30rpx;
+            width: 30rpx;
+            border-radius: 50%;
+            background-color: #7e5c23;
+          }
+        }
+      }
 
-			.items {
-				height: 90px;
-				position: relative;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-			}
+      .items {
+        height: 90px;
+        position: relative;
+        font-weight: 400;
+        font-size: 24rpx;
+        color: #333333;
+      }
 
-			.fill-last {
-				height: 0;
-				width: 100%;
-				background: none;
-			}
-		}
+      .fill-last {
+        height: 0;
+        width: 100%;
+        background: none;
+      }
+    }
 
-		.main {
-			background-color: #fff;
-			padding-left: 20rpx;
-			width: 0;
-			flex-grow: 1;
-			box-sizing: border-box;
-			position: relative;
+    .main {
+      background-color: #fff;
+      padding-left: 20rpx;
+      width: 0;
+      flex-grow: 1;
+      box-sizing: border-box;
+      position: relative;
 
-			.title {
-				line-height: normal;
-				padding: 30rpx 0;
-				font-size: 24rpx;
-				font-weight: bold;
-				color: #666;
-				background-color: #fff;
-				position: sticky;
-				top: 0;
-				z-index: 19;
-			}
+      .title {
+        line-height: normal;
+        padding: 30rpx 0;
+        font-size: 24rpx;
+        font-weight: bold;
+        color: #666;
+        background-color: #fff;
+        position: sticky;
+        top: 0;
+        z-index: 19;
+      }
 
-			.item {
-				padding-bottom: 16rpx;
-				border-bottom: #eee solid 1px;
-			}
+      .item {
+        padding-bottom: 16rpx;
+        border-bottom: #eee solid 1px;
+      }
 
-			.goods {
-				display: flex;
-				flex-direction: row;
-				flex-wrap: nowrap;
-				justify-content: flex-start;
-				align-content: center;
-				position: relative;
+      .goods {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+        align-content: center;
+        position: relative;
 
-				& + .goods {
-					margin-top: 16rpx;
-				}
+        & + .goods {
+          margin-top: 16rpx;
+        }
 
-				& > image {
-					width: 120rpx;
-					height: 120rpx;
-					margin-right: 18rpx;
-				}
+        & > image {
+          width: 120rpx;
+          height: 120rpx;
+          margin-right: 18rpx;
+        }
 
-				.goodsImg {
-					position: relative;
-					width: 200rpx;
-					height: 200rpx;
-					border-radius: 18rpx;
-					flex-shrink: 0;
-				}
+        .goodsImg {
+          position: relative;
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 18rpx;
+          flex-shrink: 0;
+        }
 
-				.vifgoodsImg {
-					width: 200rpx;
-					height: 100%;
-					position: absolute;
-					top: 0;
-					left: 0;
-					z-index: 9;
-					background-color: rgb(0, 0, 0, 0.5);
+        .vifgoodsImg {
+          width: 200rpx;
+          height: 100%;
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 9;
+          background-color: rgb(0, 0, 0, 0.5);
 
-					image {
-						padding: 30rpx;
-						width: 100%;
-						height: 100%;
-					}
-				}
+          image {
+            padding: 30rpx;
+            width: 100%;
+            height: 100%;
+          }
+        }
 
-				.topSort {
-					width: 92rpx;
-					height: 38rpx;
-					text-align: center;
-					line-height: 38rpx;
-					position: absolute;
-					top: 0;
-					left: 0;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #ffffff;
-					border-radius: 20rpx 0rpx 20rpx 0rpx;
-				}
+        .topSort {
+          width: 92rpx;
+          height: 38rpx;
+          text-align: center;
+          line-height: 38rpx;
+          position: absolute;
+          top: 0;
+          left: 0;
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #ffffff;
+          border-radius: 20rpx 0rpx 20rpx 0rpx;
+        }
 
-				.topSort.c1 {
-					background: #fc5c2e;
-				}
+        .topSort.c1 {
+          background: #fc5c2e;
+        }
 
-				.topSort.c2 {
-					background: #ef994e;
-				}
+        .topSort.c2 {
+          background: #ef994e;
+        }
 
-				.topSort.c3 {
-					background: #f4b951;
-				}
+        .topSort.c3 {
+          background: #f4b951;
+        }
 
-				.goods_right {
-					width: 100%;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-around;
-					position: relative;
-					padding-top: 5rpx;
-					padding-right: 20rpx;
-					box-sizing: border-box;
+        .goods_right {
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-around;
+          position: relative;
+          padding-top: 5rpx;
+          padding-right: 20rpx;
+          box-sizing: border-box;
 
-					.name {
-						font-size: 28rpx;
-						color: #333;
-						font-weight: bold;
-						margin-bottom: 8rpx;
-					}
+          .name {
+            font-size: 28rpx;
+            color: #333;
+            font-weight: bold;
+            margin-bottom: 8rpx;
+          }
 
-					.describe,
-					.monthlySale,
-					.lookBack {
-						font-weight: 400;
-						font-size: 20rpx;
-						color: #999999;
-						margin-bottom: 8rpx;
-					}
+          .describe,
+          .monthlySale,
+          .lookBack {
+            font-weight: 400;
+            font-size: 20rpx;
+            color: #999999;
+            margin-bottom: 8rpx;
+          }
 
-					.describe,
-					.name {
-						width: 270rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
+          .describe,
+          .name {
+            width: 270rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
 
-					.lookBack {
-						color: #ff534b;
-					}
+          .lookBack {
+            color: #ff534b;
+          }
 
-					.money {
-						font-weight: bold;
-						font-size: 24rpx;
-						color: #333;
-						display: flex;
-						align-items: flex-end;
+          .money {
+            font-weight: bold;
+            font-size: 24rpx;
+            color: #333;
+            display: flex;
+            align-items: flex-end;
 
-						.money_num {
-							font-size: 28rpx;
-							color: #333;
-							font-weight: bold;
-						}
-					}
+            .money_num {
+              font-size: 28rpx;
+              color: #333;
+              font-weight: bold;
+            }
+          }
 
-					.suit {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #666666;
-					}
+          .suit {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #666666;
+          }
 
-					.sku-wrap {
-						padding: 10rpx 20rpx;
-						background: #e3ad7f;
-						border-radius: 32rpx;
-						// position: absolute;
-						// bottom: 10rpx;
-						// right: 20rpx;
-						align-items: center;
-						position: relative;
+          .sku-wrap {
+            padding: 10rpx 20rpx;
+            background: #e3ad7f;
+            border-radius: 32rpx;
+            // position: absolute;
+            // bottom: 10rpx;
+            // right: 20rpx;
+            align-items: center;
+            position: relative;
 
-						.t {
-							font-size: 24rpx;
-							color: #fff;
-						}
+            .t {
+              font-size: 24rpx;
+              color: #fff;
+            }
 
-						.dot {
-							position: absolute;
-							top: -15rpx;
-							right: -10rpx;
-							background-color: #ff4b33;
-							color: #fff;
-							border-radius: 58rpx;
-							padding: 5rpx 14rpx;
-							box-sizing: border-box;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							font-size: 20rpx;
-						}
-					}
+            .dot {
+              position: absolute;
+              top: -15rpx;
+              right: -10rpx;
+              background-color: #ff4b33;
+              color: #fff;
+              border-radius: 58rpx;
+              padding: 5rpx 14rpx;
+              box-sizing: border-box;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 20rpx;
+            }
+          }
 
-					.Controls {
-						display: flex;
-						align-items: center;
-						justify-content: flex-end;
+          .Controls {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
 
-						// position: absolute;
-						// bottom: 10rpx;
-						// right: 20rpx;
-						.num {
-							margin: auto 16rpx;
-						}
+            // position: absolute;
+            // bottom: 10rpx;
+            // right: 20rpx;
+            .num {
+              margin: auto 16rpx;
+            }
 
-						.btn {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							position: relative;
+            .btn {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: relative;
 
-							.btnClick {
-								width: 100rpx;
-								height: 100rpx;
-								position: absolute;
-								// bottom: 0;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+              .btnClick {
+                width: 100rpx;
+                height: 100rpx;
+                position: absolute;
+                // bottom: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
-	.lineThrough {
-		font-weight: normal;
-		text-decoration: line-through;
-		color: #999 !important;
-		font-size: 24rpx !important;
-	}
+  .lineThrough {
+    font-weight: normal;
+    text-decoration: line-through;
+    color: #999 !important;
+    font-size: 24rpx !important;
+  }
 
-	.money_num.lineThrough {
-	}
+  .money_num.lineThrough {
+  }
 }
 
 .shop_sku {
-	width: 100%;
-	position: relative;
-	border-radius: 20rpx;
-	background: #fff;
-	box-sizing: border-box;
-	padding-bottom: 250rpx;
+  width: 100%;
+  position: relative;
+  border-radius: 20rpx;
+  background: #fff;
+  box-sizing: border-box;
+  padding-bottom: 250rpx;
 
-	.positionabsolute {
-		position: absolute;
-		top: 30rpx;
-		z-index: 999;
-		right: 30rpx;
-	}
+  .positionabsolute {
+    position: absolute;
+    top: 30rpx;
+    z-index: 999;
+    right: 30rpx;
+  }
 
-	.shop_sku_name {
-		padding: 0 28rpx;
-		margin-top: 20rpx;
-		font-weight: bold;
-		font-size: 32upx;
-		margin-bottom: 16rpx;
-	}
+  .shop_sku_name {
+    padding: 0 28rpx;
+    margin-top: 20rpx;
+    font-weight: bold;
+    font-size: 32upx;
+    margin-bottom: 16rpx;
+  }
 
-	.shop_sku_returned {
-		padding: 0 28rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #ff534b;
-	}
+  .shop_sku_returned {
+    padding: 0 28rpx;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #ff534b;
+  }
 
-	.shop_sku_description {
-		padding: 0 28rpx;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 16rpx;
-		padding-bottom: 32rpx;
-		box-sizing: border-box;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
+  .shop_sku_description {
+    padding: 0 28rpx;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #999999;
+    margin-top: 16rpx;
+    padding-bottom: 32rpx;
+    box-sizing: border-box;
+    border-bottom: 2rpx solid #f0f0f0;
+  }
 
-	.shop_sku_box:last-child {
-		padding-bottom: 60rpx;
-	}
+  .shop_sku_box:last-child {
+    padding-bottom: 60rpx;
+  }
 
-	.shop_sku_box {
-		padding: 20rpx;
+  .shop_sku_box {
+    padding: 20rpx;
 
-		.shop_sku_box_name {
-			margin-top: 20rpx;
-			font-weight: 500;
-			font-size: 28upx;
-			color: #333;
-		}
+    .shop_sku_box_name {
+      margin-top: 20rpx;
+      font-weight: 500;
+      font-size: 28upx;
+      color: #333;
+    }
 
-		.flex-start {
-			.shop_sku_box_item {
-				margin-top: 16rpx;
-				padding: 12rpx 28rpx;
-				border-radius: 8rpx;
-				font-size: 24upx;
-				margin-right: 56rpx;
-				background: #efefef;
-				border: 2rpx solid #efefef;
-				position: relative;
-				color: #666666;
+    .flex-start {
+      .shop_sku_box_item {
+        margin-top: 16rpx;
+        padding: 12rpx 28rpx;
+        border-radius: 8rpx;
+        font-size: 24upx;
+        margin-right: 56rpx;
+        background: #efefef;
+        border: 2rpx solid #efefef;
+        position: relative;
+        color: #666666;
 
-				.shop_sku_box_item_tip {
-					width: 62rpx;
-					height: 47rpx;
-					text-align: right;
-					position: absolute;
-					top: 0;
-					right: 0;
-					background: linear-gradient(45deg, transparent, transparent 50%, #cecece 50%, #cecece 100%);
+        .shop_sku_box_item_tip {
+          width: 62rpx;
+          height: 47rpx;
+          text-align: right;
+          position: absolute;
+          top: 0;
+          right: 0;
+          background: linear-gradient(
+            45deg,
+            transparent,
+            transparent 50%,
+            #cecece 50%,
+            #cecece 100%
+          );
 
-					view {
-						font-size: 18rpx;
-						color: #666666;
-						transform: rotate(45deg);
-						position: absolute;
-						top: 5rpx;
-						right: 3rpx;
-					}
-				}
-			}
+          view {
+            font-size: 18rpx;
+            color: #666666;
+            transform: rotate(45deg);
+            position: absolute;
+            top: 5rpx;
+            right: 3rpx;
+          }
+        }
+      }
 
-			.shop_sku_box_item:nth-child(1) {
-				margin-left: 0;
-			}
+      .shop_sku_box_item:nth-child(1) {
+        margin-left: 0;
+      }
 
-			.disabled {
-				color: #999;
-				background-color: #f5f5f5;
-				border: 2rpx solid #f5f5f5;
-			}
+      .disabled {
+        color: #999;
+        background-color: #f5f5f5;
+        border: 2rpx solid #f5f5f5;
+      }
 
-			.shop_sku_box_item_noselected {
-				color: #666;
-			}
+      .shop_sku_box_item_noselected {
+        color: #666;
+      }
 
-			.shop_sku_box_item_selected {
-				background: #fefaf7;
-				border-radius: 8rpx;
-				border: 2rpx solid #e8ad7b;
-				color: #e8ad7b;
-			}
-		}
-	}
+      .shop_sku_box_item_selected {
+        background: #fefaf7;
+        border-radius: 8rpx;
+        border: 2rpx solid #e8ad7b;
+        color: #e8ad7b;
+      }
+    }
+  }
 
-	.shop_skuselect {
-		margin-top: 16rpx;
-		width: 100%;
-		// background: #f7f7f7;
-		color: #999;
-		font-size: 24upx;
+  .shop_skuselect {
+    margin-top: 16rpx;
+    width: 100%;
+    // background: #f7f7f7;
+    color: #999;
+    font-size: 24upx;
 
-		.shop_skuselectname {
-			color: #000;
-			font-size: 26upx;
-		}
-	}
+    .shop_skuselectname {
+      color: #000;
+      font-size: 26upx;
+    }
+  }
 
-	.shop_bottom {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 30rpx 28rpx;
-		background-color: #fff;
-		box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
-		position: fixed;
-		left: 0;
-		bottom: 0;
+  .shop_bottom {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx 28rpx;
+    background-color: #fff;
+    box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+    position: fixed;
+    left: 0;
+    bottom: 0;
 
-		.price {
-			display: flex;
-			align-items: flex-end;
+    .price {
+      display: flex;
+      align-items: flex-end;
 
-			.i {
-				font-size: 28rpx;
-				color: #e8ad7b;
-				position: relative;
-				bottom: 4upx;
-				font-weight: bold;
-			}
+      .i {
+        font-size: 28rpx;
+        color: #e8ad7b;
+        position: relative;
+        bottom: 4upx;
+        font-weight: bold;
+      }
 
-			.num {
-				font-size: 42rpx;
-				color: #e8ad7b;
-				position: relative;
-				top: 6upx;
-				padding: 0 4upx;
-			}
-		}
+      .num {
+        font-size: 42rpx;
+        color: #e8ad7b;
+        position: relative;
+        top: 6upx;
+        padding: 0 4upx;
+      }
+    }
 
-		.operation-wrap {
-			display: flex;
-			align-items: center;
+    .operation-wrap {
+      display: flex;
+      align-items: center;
 
-			.num {
-				font-size: 32upx;
-				padding: 0 16upx;
-			}
+      .num {
+        font-size: 32upx;
+        padding: 0 16upx;
+      }
 
-			.btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: relative;
+      .btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
 
-				.btnClick {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					// bottom: 0;
-				}
-			}
-		}
+        .btnClick {
+          width: 100rpx;
+          height: 100rpx;
+          position: absolute;
+          // bottom: 0;
+        }
+      }
+    }
 
-		.addShopping {
-			width: 100%;
-			height: 96rpx;
-			line-height: 96rpx;
-			text-align: center;
-			background: #ccc;
-			border-radius: 48rpx;
-			font-weight: 400;
-			font-size: 32rpx;
-			color: #ffffff;
-			margin-top: 36rpx;
-		}
+    .addShopping {
+      width: 100%;
+      height: 96rpx;
+      line-height: 96rpx;
+      text-align: center;
+      background: #ccc;
+      border-radius: 48rpx;
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #ffffff;
+      margin-top: 36rpx;
+    }
 
-		.addShopping.active {
-			background: #e8ad7b;
-		}
-	}
+    .addShopping.active {
+      background: #e8ad7b;
+    }
+  }
 }
 
 .shop-info-wrap {
-	padding: 0 30rpx 50rpx;
-	box-sizing: border-box;
+  padding: 0 30rpx 50rpx;
+  box-sizing: border-box;
 
-	.info-wrap {
-		padding: 30rpx 0;
-		box-sizing: border-box;
+  .info-wrap {
+    padding: 30rpx 0;
+    box-sizing: border-box;
 
-		.shopName {
-			align-self: center;
-			font-size: 32rpx;
-			color: #333;
-			font-weight: bold;
-		}
-	}
+    .shopName {
+      align-self: center;
+      font-size: 32rpx;
+      color: #333;
+      font-weight: bold;
+    }
+  }
 
-	.info-wrap-title {
-		font-size: 32rpx;
-		font-weight: bold;
-		color: #333;
-	}
+  .info-wrap-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+  }
 
-	.row {
-		.col {
-			margin-bottom: 10rpx;
-		}
+  .row {
+    .col {
+      margin-bottom: 10rpx;
+    }
 
-		.l,
-		.t {
-			font-size: 24rpx;
-			color: #999;
-		}
-	}
+    .l,
+    .t {
+      font-size: 24rpx;
+      color: #999;
+    }
+  }
 }
 
 .cart-wrap {
-	width: 100%;
-	padding: 0 20rpx;
-	box-sizing: border-box;
-	position: fixed;
-	bottom: 40rpx;
-	left: 0;
-	z-index: 99;
+  width: 100%;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  position: fixed;
+  bottom: 40rpx;
+  left: 0;
+  z-index: 99;
 
-	.cart-content {
-		display: flex;
-		align-items: center;
-		height: 128rpx;
-		background: #ffffff;
-		box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
-		border-radius: 58rpx;
-		padding: 0 36rpx;
-		box-sizing: border-box;
+  .cart-content {
+    display: flex;
+    align-items: center;
+    height: 128rpx;
+    background: #ffffff;
+    box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+    border-radius: 58rpx;
+    padding: 0 36rpx;
+    box-sizing: border-box;
 
-		.left {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			position: relative;
+    .left {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      position: relative;
 
-			.iconBox {
-				position: relative;
-			}
+      .iconBox {
+        position: relative;
+      }
 
-			.icon {
-				width: 76rpx;
-				height: 88rpx;
-				margin-left: 22rpx;
-			}
+      .icon {
+        width: 76rpx;
+        height: 88rpx;
+        margin-left: 22rpx;
+      }
 
-			.u-badge {
-				position: absolute;
-				top: -30rpx;
-				right: -30rpx;
-				background-color: #ff4b33;
-				color: #fff;
-				border-radius: 58rpx;
-				padding: 5rpx 14rpx;
-				box-sizing: border-box;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 20rpx;
-			}
+      .u-badge {
+        position: absolute;
+        top: -30rpx;
+        right: -30rpx;
+        background-color: #ff4b33;
+        color: #fff;
+        border-radius: 58rpx;
+        padding: 5rpx 14rpx;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 20rpx;
+      }
 
-			.i,
-			.num {
-				color: #333;
-			}
+      .i,
+      .num {
+        color: #333;
+      }
 
-			.i {
-				font-size: 20upx;
-				position: relative;
-				top: 4upx;
-				margin-left: 64rpx;
-			}
+      .i {
+        font-size: 20upx;
+        position: relative;
+        top: 4upx;
+        margin-left: 64rpx;
+      }
 
-			.num {
-				font-size: 42upx;
-				font-weight: bold;
-			}
-		}
+      .num {
+        font-size: 42upx;
+        font-weight: bold;
+      }
+    }
 
-		.btn {
-			height: 100%;
-			width: 40%;
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
+    .btn {
+      height: 100%;
+      width: 40%;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
 
-			.t {
-				width: 160rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				background: #fefaf7;
-				border-radius: 36rpx 36rpx 36rpx 36rpx;
-				border: 2rpx solid $my-main-color;
-				font-weight: bold;
-				font-size: 28rpx;
-				color: $my-main-color;
-			}
-		}
-	}
+      .t {
+        width: 160rpx;
+        height: 64rpx;
+        line-height: 64rpx;
+        text-align: center;
+        background: #fefaf7;
+        border-radius: 36rpx 36rpx 36rpx 36rpx;
+        border: 2rpx solid $my-main-color;
+        font-weight: bold;
+        font-size: 28rpx;
+        color: $my-main-color;
+      }
+    }
+  }
 }
 
 .history_order {
-	background-color: #fff;
-	padding: 12rpx 16rpx;
-	font-size: 24rpx;
-	color: #333;
-	display: flex;
-	align-items: center;
-	box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
-	position: fixed;
-	top: 50%;
-	right: 0;
-	transform: translateY(-50%);
-	border-radius: 100px 0 0 100px;
-	z-index: 20;
+  background-color: #fff;
+  padding: 12rpx 16rpx;
+  font-size: 24rpx;
+  color: #333;
+  display: flex;
+  align-items: center;
+  box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+  position: fixed;
+  top: 50%;
+  right: 0;
+  transform: translateY(-50%);
+  border-radius: 100px 0 0 100px;
+  z-index: 20;
 
-	.img {
-		width: 36rpx;
-		margin-right: 8rpx;
-		height: 36rpx;
-	}
+  .img {
+    width: 36rpx;
+    margin-right: 8rpx;
+    height: 36rpx;
+  }
 }
 </style>
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 6e89ea4..9d7dafe 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,65 +1,13 @@
 <template>
-	<view class="u-p-30">
-		<view>
-			<up-button type="warning" @click="popupShow">初始化</up-button>
-		</view>
-		<view class="u-m-t-30">
-			<up-button type="primary" @click="toCreate">去下单</up-button>
-		</view>
-		
-		<up-popup :show="show" mode="bottom" close-on-click-overlay @close="resetForm">
-			<view class="u-p-30">
-				<up-form label-width="80" ref="refForm">
-					<up-form-item label="台桌码">
-							<up-input v-model="form.tableCode" placeholder="请输入台桌码"></up-input>
-					</up-form-item>
-				</up-form>
-				<view class="u-flex gap-20 u-m-t-30">
-					<up-button @click="show=false">取消</up-button>
-					<up-button type="primary" @click="scanCodehandle">确定</up-button>
-				</view>
-			</view>
-			
-		</up-popup>
-	</view>
+  <view class="u-p-30">
+    <birthdayGift></birthdayGift>
+  </view>
 </template>
 
 <script setup>
-	import {onLoad} from '@dcloudio/uni-app'
-	import { reactive,ref} from 'vue'
-	import {
-		productStore
-	} from '@/stores/user.js';
-	const store = productStore();
-	const scanCodehandle = async (i) => {
-		await store.scanCodeactions(form)
-	}
-	const show=ref(false);
-	const options=ref({})
-	function popupShow(){
-		show.value=true;
-	}
-	const refForm=ref(null);
-	const form=reactive({
-		tableCode:"40963902920"
-	})
-	function resetForm(){
-		form.tableCode=""
-	}
-	onLoad((opt)=>{
-		console.log(opt);
-		options.value=opt
-	})
-	function toCreate(){
-		uni.navigateTo({
-			url:'/pages/index/index'
-		})
-	}
+import birthdayGift from "@/components/birthday-modal.vue";
 </script>
 
 <style lang="scss" scoped>
-	.gap-20{
-		gap: 20rpx;
-	}
 
 </style>
diff --git a/stores/carts.js b/stores/carts.js
index ce77dd9..f692086 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -1,616 +1,657 @@
-import {
-	defineStore
-} from 'pinia';
-import yskUtils from 'ysk-utils'
-const {
-	OrderPriceCalculator,
-	BaseCartItem,
-	BackendCoupon,
-	ActivityConfig,
-	OrderExtraConfig,
-	MerchantReductionConfig,
-	MerchantReductionType,
-	GoodsType
-} = yskUtils
+import { defineStore } from "pinia";
+// import yskUtils from 'ysk-utils'
+// const {
+// 	OrderPriceCalculator,
+// 	BaseCartItem,
+// 	BackendCoupon,
+// 	ActivityConfig,
+// 	OrderExtraConfig,
+// 	MerchantReductionConfig,
+// 	MerchantReductionType,
+// 	GoodsType
+// } = yskUtils
 
+import { OrderPriceCalculator } from "@/utils/goods";
+
+import { ref, computed, reactive, watchEffect, watch } from "vue";
 import {
-	ref,
-	computed,
-	reactive,
-	watchEffect,
-	watch
-} from 'vue';
-import {
-	productminiApphotsquery,
-	APIgroupquery,
+  productminiApphotsquery,
+  APIgroupquery,
 } from "@/common/api/product/product.js";
 
-export const useCartsStore = defineStore('cart',
-	() => {
+export const useCartsStore = defineStore("cart", () => {
+  // 店铺信息
+  const shopInfo = ref(
+    uni.cache.get("shopInfo") || {
+      isMemberPrice: 0,
+      isTableFee: 1,
+    }
+  );
 
-		// 店铺信息
-		const shopInfo = ref(uni.cache.get('shopInfo') || {
-			isMemberPrice: 0,
-			isTableFee: 1
-		})
-		
-		const consumeDiscount=ref({})
+  const consumeDiscount = ref({});
 
-		// 适配工具库 BaseCartItem 接口的商品数据转换函数
-		const convertToBaseCartItem = (item) => {
-			const skuData = item.skuData ? {
-					id: item.skuData.id || item.sku_id,
-					salePrice: item.skuData.salePrice || 0,
-					memberPrice: item.skuData.memberPrice || 0
-				} :
-				undefined;
+  // 适配工具库 BaseCartItem 接口的商品数据转换函数
+  const convertToBaseCartItem = (item) => {
+    const skuData = item.skuData
+      ? {
+          id: item.skuData.id || item.sku_id,
+          salePrice: item.skuData.salePrice || 0,
+          memberPrice: item.skuData.memberPrice || 0,
+        }
+      : undefined;
 
-			const goods = getProductDetails({
-				...item,
-				product_id: item.product_id || item.productId,
-				sku_id:item.skuId||item.sku_id
-			})
-			return {
-				...item,
-				id: item.id,
-				sku_id:item.skuId||item.sku_id,
-				product_id: item.product_id || item.productId,
-				salePrice: item.salePrice || item.price,
-				number: item.number || item.num || 0,
-				product_type: item.productType,
-				is_temporary: !!(item.is_temporary || item.isTemporary),
-				is_gift: !!(item.is_gift || item.isGift),
-				returnNum: item.returnNum || 0,
-				memberPrice: item.memberPrice || 0,
-				discountSaleAmount: item.discount_sale_amount || item.discountSaleAmount || 0,
-				packFee: item.packFee || (goods?goods.packFee:0) || 0,
-				packNumber: item.pack_number || item.packNumber || 0,
-				activityInfo: item.activityInfo ? {
-					type: item.activityInfo.type,
-					discountRate: OrderPriceCalculator.formatDiscountRate(item.activityInfo.discountRate),
-					vipPriceShare: !!item.activityInfo.vipPriceShare
-				} : undefined,
-				skuData
-			};
-		};
+    const goods = getProductDetails({
+      ...item,
+      product_id: item.product_id || item.productId,
+      sku_id: item.skuId || item.sku_id,
+    });
+    return {
+      ...item,
+      id: item.id,
+      sku_id: item.skuId || item.sku_id,
+      product_id: item.product_id || item.productId,
+      salePrice: item.salePrice || item.price,
+      number: item.number || item.num || 0,
+      product_type: item.productType,
+      is_temporary: !!(item.is_temporary || item.isTemporary),
+      is_gift: !!(item.is_gift || item.isGift),
+      returnNum: item.returnNum || 0,
+      memberPrice: item.memberPrice || 0,
+      discountSaleAmount:
+        item.discount_sale_amount || item.discountSaleAmount || 0,
+      packFee: item.packFee || (goods ? goods.packFee : 0) || 0,
+      packNumber: item.pack_number || item.packNumber || 0,
+      activityInfo: item.activityInfo
+        ? {
+            type: item.activityInfo.type,
+            discountRate: OrderPriceCalculator.formatDiscountRate(
+              item.activityInfo.discountRate
+            ),
+            vipPriceShare: !!item.activityInfo.vipPriceShare,
+          }
+        : undefined,
+      skuData,
+    };
+  };
 
-		// 合并所有商品列表
-		const allGoods = ref([])
+  // 合并所有商品列表
+  const allGoods = ref([]);
 
-		function getAllGoodsList() {
-			const currentGoods = (carts.value).map(convertToBaseCartItem);
-			const giftGoods = [].map(convertToBaseCartItem);
-			// 扁平化历史订单商品
-			const oldOrderGoods = Object.values(oldOrder.value.detailMap || {})
-				.flat()
-				.map(convertToBaseCartItem);
-			return [...currentGoods, ...giftGoods, ...oldOrderGoods];
-		}
+  function getAllGoodsList() {
+    const currentGoods = carts.value.map(convertToBaseCartItem);
+    const giftGoods = [].map(convertToBaseCartItem);
+    // 扁平化历史订单商品
+    const oldOrderGoods = Object.values(oldOrder.value.detailMap || {})
+      .flat()
+      .map(convertToBaseCartItem);
+    return [...currentGoods, ...giftGoods, ...oldOrderGoods];
+  }
 
+  // 就餐类型 'dine-in' | 'take-out'
 
-		// 就餐类型 'dine-in' | 'take-out'
+  let dinnerType = ref("dine-in");
 
-		let dinnerType = ref('dine-in');
+  function setDinnerType(str) {
+    dinnerType.value = str;
+  }
+  //餐位费配置
 
-		function setDinnerType(str) {
-			dinnerType.value = str
-		}
-		//餐位费配置
+  const dinersNum = uni.cache.get("dinersNum") || 0;
+  const seatFeeConfig = ref({
+    pricePerPerson: shopInfo.value.tableFee || 0,
+    personCount: dinersNum || 0,
+    isEnabled: !shopInfo.value.isTableFee,
+  });
+  watch(
+    () => shopInfo.value.isTableFee,
+    (newval) => {
+      seatFeeConfig.value.isEnabled = !shopInfo.value.isTableFee;
+      seatFeeConfig.value.pricePerPerson = shopInfo.value.tableFee || 0;
+    },
+    {
+      deep: true,
+    }
+  );
 
-		const dinersNum = uni.cache.get('dinersNum') || 0
-		const seatFeeConfig = ref({
-			pricePerPerson: shopInfo.value.tableFee || 0,
-			personCount: dinersNum||0,
-			isEnabled: !shopInfo.value.isTableFee
-		})
-		watch(() => shopInfo.value.isTableFee, (newval) => {
-			seatFeeConfig.value.isEnabled = !shopInfo.value.isTableFee
-			seatFeeConfig.value.pricePerPerson = shopInfo.value.tableFee||0
-		},{
-			deep:true
-		})
+  function setSeatFeeConfig(key, val) {
+    seatFeeConfig.value[key] = val;
+  }
+  watch(
+    () => seatFeeConfig.value,
+    (newval) => {
+      console.log("seatFeeConfig", seatFeeConfig.value);
+    },
+    {
+      deep: true,
+    }
+  );
 
-		function setSeatFeeConfig(key, val) {
-			seatFeeConfig.value[key] = val;
-		}
-		watch(() => seatFeeConfig.value, (newval) => {
-			console.log('seatFeeConfig', seatFeeConfig.value);
-		}, {
-			deep: true
-		})
+  //积分规则
+  const pointDeductionRule = ref({
+    pointsPerYuan: 100,
+    maxDeductionAmount: Infinity,
+  });
 
-		//积分规则
-		const pointDeductionRule = ref({
-			pointsPerYuan: 100,
-			maxDeductionAmount: Infinity
-		})
+  function setPointDeductionRule(pointsPerYuan, maxDeductionAmount) {
+    pointDeductionRule.value.pointsPerYuan = pointsPerYuan;
+    pointDeductionRule.value.maxDeductionAmount = maxDeductionAmount;
+  }
 
-		function setPointDeductionRule(pointsPerYuan, maxDeductionAmount) {
-			pointDeductionRule.value.pointsPerYuan = pointsPerYuan
-			pointDeductionRule.value.maxDeductionAmount = maxDeductionAmount
-		}
+  // 初始配置：默认无减免（固定金额 0 元）
+  const merchantReductionConfig = ref({
+    type: "fixed_amount",
+    fixedAmount: 0,
+  });
+  //使用积分数量
+  const userPoints = ref(0);
 
-		// 初始配置：默认无减免（固定金额 0 元）
-		const merchantReductionConfig = ref({
-			type: 'fixed_amount',
-			fixedAmount: 0
-		});
-		//使用积分数量
-		const userPoints = ref(0);
+  function setUserPoints(newval) {
+    userPoints.value = newval;
+  }
 
-		function setUserPoints(newval) {
-			userPoints.value = newval
-		}
+  //新客立减
+  const newUserDiscount = ref(0);
+  //满减活动
+  const fullReductionActivities = ref([]);
+  //是否使用霸王餐
+  const isFreeDine = ref(false);
+  // 商家霸王餐配置
+  const freeDineConfig = ref(null);
+  // 订单额外配置
+  const orderExtraConfig = computed(() => ({
+    // 引用扩展后的商家减免配置
+    merchantReduction: merchantReductionConfig.value,
+    additionalFee: 0,
+    pointDeductionRule: pointDeductionRule.value,
+    seatFeeConfig: seatFeeConfig.value,
+    currentStoreId: "",
+    userPoints: userPoints.value,
+    isMember: useVipPrice.value,
+    memberDiscountRate: 1,
+    newUserDiscount: newUserDiscount.value,
+    fullReductionActivities: fullReductionActivities.value,
+    currentDinnerType: dinnerType.value,
+    isFreeDine: isFreeDine.value,
+    freeDineConfig: freeDineConfig.value,
+  }));
 
+  // 营销活动列表
+  const activityList = computed(() => {
+    return [];
+  });
+  // 优惠券列表
+  const backendCoupons = ref([]);
 
-		//新客立减
-		const newUserDiscount = ref(0);
-		// 订单额外配置
-		const orderExtraConfig = computed(() => ({
-			// 引用扩展后的商家减免配置
-			merchantReduction: merchantReductionConfig.value,
-			additionalFee: 0,
-			pointDeductionRule: pointDeductionRule.value,
-			seatFeeConfig: seatFeeConfig.value,
-			currentStoreId: '',
-			userPoints: userPoints.value,
-			isMember: useVipPrice.value,
-			memberDiscountRate: 1,
-			newUserDiscount: newUserDiscount.value
-		}));
+  function setCoupons(cps) {
+    console.log("setCoupons", cps);
+    backendCoupons.value = cps;
+  }
+  // 商品加入购物车顺序
+  const cartOrder = ref({});
+  // 订单费用汇总
+  const orderCostSummary = computed(() => {
+    allGoods.value = getAllGoodsList();
+    console.log("orderExtraConfig.value", orderExtraConfig.value);
+    const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
+      allGoods.value,
+      dinnerType.value,
+      backendCoupons.value,
+      activityList.value,
+      orderExtraConfig.value,
+      cartOrder.value,
+      new Date()
+    );
+    console.log(" 订单费用汇总", costSummary);
+    return costSummary;
+  });
 
-		// 营销活动列表
-		const activityList = computed(() => {
-			return [];
-		});
-		// 优惠券列表
-		const backendCoupons = ref([])
+  const goodsIsloading = ref(true);
 
-		function setCoupons(cps) {
-			console.log('setCoupons', cps);
-			backendCoupons.value = cps;
-		}
-		// 商品加入购物车顺序
-		const cartOrder = ref({});
-		// 订单费用汇总
-		const orderCostSummary = computed(() => {
-			allGoods.value = getAllGoodsList()
-			console.log('allGoods.value',allGoods.value);
-			const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
-				allGoods.value,
-				dinnerType.value,
-				backendCoupons.value,
-				activityList.value,
-				orderExtraConfig.value,
-				cartOrder.value,
-				new Date()
-			);
-			return costSummary;
-		});
+  //商品数据Map
+  const goodsMap = reactive({});
+  //获取商品数据
+  async function goodsInit() {
+    goodsIsloading.value = true;
+    //获取招牌菜商品
+    const hotres = await productminiApphotsquery();
+    for (let product of hotres) {
+      setGoodsMap(product.id, product);
+    }
+    //获取分组商品
+    const groupres = await APIgroupquery();
+    for (let group of groupres) {
+      for (let product of group.productList) {
+        setGoodsMap(product.id, product);
+      }
+    }
+    allGoods.value = getAllGoodsList();
+    console.log("allGoods.value ", allGoods.value);
+    goodsIsloading.value = false;
+  }
 
-		const goodsIsloading = ref(true);
+  function setGoodsMap(product_id, data) {
+    goodsMap[product_id] = data;
+  }
 
-		//商品数据Map
-		const goodsMap = reactive({})
-		//获取商品数据
-		async function goodsInit() {
-			goodsIsloading.value = true;
-			//获取招牌菜商品
-			const hotres = await productminiApphotsquery();
-			for (let product of hotres) {
-				setGoodsMap(product.id, product)
-			}
-			//获取分组商品
-			const groupres = await APIgroupquery()
-			for (let group of groupres) {
-				for (let product of group.productList) {
-					setGoodsMap(product.id, product)
-				}
-			}
-			allGoods.value = getAllGoodsList()
-			console.log('allGoods.value ',allGoods.value );
-			goodsIsloading.value = false
-		}
+  //websocket回执
+  const websocketsendMessage = (data) => {
+    uni.$u.debounce(sendMessage(data), 500);
+  };
 
-		function setGoodsMap(product_id, data) {
-			goodsMap[product_id] = data;
-		}
+  const isLoading = ref(true);
 
-		//websocket回执
-		const websocketsendMessage = (data) => {
-			uni.$u.debounce(sendMessage(data), 500)
-		}
+  function getProductDetails(v) {
+    const goods = goodsMap[v.product_id];
+    if (!goods) {
+      return undefined;
+    }
+    let skuData = undefined;
+    skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
 
-		const isLoading = ref(true);
+    if (skuData) {
+      return {
+        ...v,
+        productId: v.product_id,
+        salePrice: skuData ? skuData.salePrice : 0,
+        price: skuData ? skuData.salePrice : 0,
+        memberPrice: skuData ? skuData.memberPrice : 0,
+        coverImg: goods.coverImg,
+        productImg: goods.coverImg,
+        name: goods.name,
+        productName: goods.name,
+        specInfo: skuData.specInfo,
+        packFee: goods.packFee || 0,
+        type: goods.type,
+        skuData,
+        skuName: skuData.name,
+        num: v.number * 1,
+      };
+    } else {
+      return undefined;
+    }
+  }
+  // 用于记录已经处理过的消息的 msg_id
+  const processedMessageIds = new Set();
 
-		function getProductDetails(v) {
-			const goods = goodsMap[v.product_id]
-			if (!goods) {
-				return undefined
-			}
-			let skuData = undefined;
-			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-		
-			if (skuData) {
-				return {
-					...v,
-					productId: v.product_id,
-					salePrice: skuData ? skuData.salePrice : 0,
-					price: skuData ? skuData.salePrice : 0,
-					memberPrice: skuData ? skuData.memberPrice : 0,
-					coverImg: goods.coverImg,
-					productImg: goods.coverImg,
-					name: goods.name,
-					productName: goods.name,
-					specInfo: skuData.specInfo,
-					packFee: goods.packFee || 0,
-					type: goods.type,
-					skuData,
-					skuName: skuData.name,
-					num: v.number * 1
-				}
-			} else {
-				return undefined
-			}
-		}
-		// 用于记录已经处理过的消息的 msg_id
-		const processedMessageIds = new Set();
+  //购物车商品信息补全初始化
+  function cartsGoodsInfoInit(arr) {
+    carts.value = arr
+      .map((v) => {
+        return getProductDetails(v);
+      })
+      .filter((v) => v);
+  }
 
-		//购物车商品信息补全初始化
-		function cartsGoodsInfoInit(arr) {
-			carts.value = arr.map(v => {
-				return getProductDetails(v)
-			}).filter(v => v)
-		}
+  //收到socket消息时对购物车进行处理
+  async function onMessage(Message) {
+    if (Message) {
+      // 心跳返回  过滤
+      if (
+        Message.type == "ping_interval" ||
+        Message.msg_id == "ping_interval"
+      ) {
+        isLoading.value = false;
+        return false;
+      }
+      // 检查消息是否已经处理过
+      if (processedMessageIds.has(Message.msg_id)) {
+        return;
+      }
+      processedMessageIds.add(Message.msg_id);
+      const msgData = Message.data;
+      // 初始化
+      if (Message.operate_type == "init") {
+        console.log("carts init", msgData);
+        cartsGoodsInfoInit(msgData);
+        uni.hideLoading();
+        isLoading.value = false;
+      }
 
+      // 清空购物车
+      if (Message.operate_type == "cleanup") {
+        carts.value = [];
+      }
 
-		//收到socket消息时对购物车进行处理
-		async function onMessage(Message) {
-			if (Message) {
-				// 心跳返回  过滤
-				if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
-					isLoading.value = false;
-					return false
-				}
-				// 检查消息是否已经处理过
-				if (processedMessageIds.has(Message.msg_id)) {
-					return;
-				}
-				processedMessageIds.add(Message.msg_id);
-				const msgData = Message.data
-				// 初始化
-				if (Message.operate_type == "init") {
-					console.log('carts init', msgData);
-					cartsGoodsInfoInit(msgData)
-					uni.hideLoading();
-					isLoading.value = false;
-				}
+      // 删除除购物车
+      if (Message.operate_type == "del" && Message.status == 1) {
+        // 优化：使用可选链操作符避免报错
+        carts.value = carts.value.filter((item) => item.id !== msgData?.id);
+      }
 
-				// 清空购物车
-				if (Message.operate_type == 'cleanup') {
-					carts.value = []
-				}
+      // 添加或者减少购物后返回
+      if (Message.operate_type == "add" || Message.operate_type == "edit") {
+        const index = carts.value.findIndex((v) => v.id == msgData.id);
+        if (index !== -1) {
+          carts.value[index] = getProductDetails(msgData);
+        } else {
+          carts.value.push(getProductDetails(msgData));
+        }
+      }
 
-				// 删除除购物车
-				if (Message.operate_type == 'del' && Message.status == 1) {
-					// 优化：使用可选链操作符避免报错
-					carts.value = carts.value.filter(item => item.id !== msgData?.id);
-				}
+      // 历史订单
+      if (Message.operate_type == "clearOrder") {
+      }
 
-				// 添加或者减少购物后返回
-				if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-					const index = carts.value.findIndex((v => v.id == msgData.id))
-					if (index !== -1) {
-						carts.value[index] = getProductDetails(msgData);
-					} else {
-						carts.value.push(getProductDetails(msgData));
-					}
-				}
+      // 购物车数据更新从新请求
+      if (
+        Message.type == "product" &&
+        Message.data_type == "product_update" &&
+        Message.operate_type == "product_update"
+      ) {
+        await goodsInit();
+        await cartsGoodsInfoInit();
+      }
 
-				// 历史订单
-				if (Message.operate_type == 'clearOrder') {}
+      // 提示
+      if (Message.status == 0 && Message.type != "no_suit_num") {
+        uni.showToast({
+          title: Message.msg,
+          icon: "none",
+        });
+      }
 
-				// 购物车数据更新从新请求
-				if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-					.operate_type == 'product_update') {
-					await goodsInit()
-					await cartsGoodsInfoInit()
-				}
+      if (Message.type == "no_suit_num") {
+        uni.showModal({
+          title: "提示",
+          showCancel: false,
+          content: "此商品库存不足起售数量！",
+          success: async (data) => {},
+        });
+      }
+    }
+  }
 
-				// 提示
-				if (Message.status == 0 && Message.type != 'no_suit_num') {
-					uni.showToast({
-						title: Message.msg,
-						icon: "none"
-					})
-				}
+  //购物车数据
+  const carts = ref([]);
 
-				if (Message.type == 'no_suit_num') {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '此商品库存不足起售数量！',
-						success: async (data) => {
+  //历史订单数据
+  const oldOrder = ref({
+    detailMap: {},
+    originAmount: 0,
+  });
 
-						}
-					});
-				}
-			}
-		}
+  function setOldOrder(data) {
+    oldOrder.value = data;
+    allGoods.value = getAllGoodsList();
+  }
 
+  // 会员信息
+  const orderVIP = ref(
+    uni.cache.get("orderVIP") || {
+      isVip: false,
+    }
+  );
 
-		//购物车数据
-		const carts = ref([])
+  function updateData(key, newval) {
+    if (key === "orderVIP") {
+      uni.cache.set("orderVIP", newval);
+      return (orderVIP.value = newval);
+    }
+    if (key === "shopInfo") {
+      uni.cache.set("shopInfo", newval);
+      return (shopInfo.value = newval);
+    }
+  }
 
-		//历史订单数据
-		const oldOrder = ref({
-			detailMap: {},
-			originAmount: 0
-		})
+  //是否使用会员价
+  const useVipPrice = computed(() => {
+    const isUse =
+      orderVIP.value.isVip && shopInfo.value.isMemberPrice ? true : false;
+    return isUse;
+  });
 
-		function setOldOrder(data) {
-			oldOrder.value = data
-			allGoods.value=getAllGoodsList()
-		}
+  function currentCalcMpneyNumber(item) {
+    const n = item.number - (item.returnNum || 0);
+    return n <= 0 ? 0 : n;
+  }
+  //历史订单商品价格总和
+  const oldOrderMoney = computed(() => {
+    let total = 0;
+    for (let i in oldOrder.value.detailMap) {
+      total += oldOrder.value.detailMap[i].reduce((prve, cur) => {
+        if (cur.isGift) {
+          return prve + 0;
+        }
+        const discount_sale_amount = cur.discount_sale_amount * 1 || 0;
+        const memberPrice = cur.skuData
+          ? cur.skuData.memberPrice || cur.skuData.salePrice
+          : 0;
+        const price = discount_sale_amount || cur.salePrice || 0;
+        const number = currentCalcMpneyNumber(cur);
+        return (
+          prve +
+          (number <= 0 ? 0 : number) *
+            (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
+        );
+      }, 0);
+    }
+    return total;
+  });
 
+  //当前购物车总价格
+  const totalPrice = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const memberPrice = cur.memberPrice || cur.salePrice;
+      const price = useVipPrice.value ? memberPrice : cur.salePrice;
+      const curMoney = price * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
+  // 霸王餐购物车原价，不享受任何优惠
+  const totalOriginPrice = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const curMoney = cur.salePrice * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
 
-		// 会员信息
-		const orderVIP = ref(uni.cache.get('orderVIP') || {
-			isVip: false
-		})
+  //返回打包数量（称重商品打包数量最大为1）
+  function returnCartPackNumber(cur) {
+    const maxReturnNum = cur.number - (cur.returnNum || 0);
+    let pack_number = cur.number;
+    pack_number =
+      cur.product_type == "weight" && pack_number > 1 ? 1 : pack_number;
+    pack_number = Math.min(maxReturnNum, pack_number);
+    pack_number = pack_number <= 0 ? 0 : pack_number;
+    return pack_number * 1;
+  }
 
-		function updateData(key, newval) {
-			if (key === 'orderVIP') {
-				uni.cache.set('orderVIP', newval)
-				return orderVIP.value = newval
-			}
-			if (key === 'shopInfo') {
-				uni.cache.set('shopInfo', newval)
-				return shopInfo.value = newval
-			}
-		}
+  //当前购物车打包费
+  const totalPackFee = computed(() => {
+    const money = carts.value.reduce((prve, cur) => {
+      const curMoney = (cur.packFee || 0) * currentCalcMpneyNumber(cur);
+      return prve + curMoney;
+    }, 0);
+    return money;
+  });
 
+  //打包费
+  const packFee = computed(() => {
+    const nowPackFee = carts.value.reduce((acc, cur) => {
+      return acc + (cur.packFee || 0) * returnCartPackNumber(cur);
+    }, 0);
+    let oldPackfee = 0;
+    for (let i in oldOrder.value.detailMap) {
+      oldPackfee += oldOrder.value.detailMap[i].reduce((prve, cur) => {
+        return prve + (cur.packFee || 0) * returnCartPackNumber(cur);
+      }, 0);
+    }
+    return nowPackFee + oldPackfee;
+  });
 
+  //购物车是否为空
+  const isEmpty = computed(() => {
+    return !carts.value || carts.value.length <= 0;
+  });
+  // 计算向上取整
+  const roundUpToTwoDecimals = (num, i) => {
+    // 先将数字乘以 100 并转换为字符串保留足够的小数位
+    let temp = (num * 100).toFixed(10);
+    // 向上取整
+    let rounded = null;
+    if (i == "upward") {
+      rounded = Math.ceil(parseFloat(temp));
+    } else {
+      rounded = Math.floor(parseFloat(temp));
+    }
+    // 再除以 100 得到保留两位小数的结果
+    return rounded / 100;
+  };
 
-		//是否使用会员价
-		const useVipPrice = computed(() => {
-			const isUse = (orderVIP.value.isVip && shopInfo.value.isMemberPrice) ? true : false
-			return isUse
-		})
+  // 精确计算函数
+  const preciseCalculation = (num1, num2) => {
+    // 将数字转换为整数，乘以 100 以保留两位小数
+    const int1 = BigInt(Math.round(num1 * 100));
+    const int2 = BigInt(Math.round(num2 * 100));
+    // 执行乘法运算
+    const result = int1 * int2;
+    // 再除以 10000 以还原为原来的小数
+    return Number(result) / 10000;
+  };
 
-		function currentCalcMpneyNumber(item) {
-			const n = item.number - (item.returnNum || 0)
-			return n <= 0 ? 0 : n
-		}
-		//历史订单商品价格总和
-		const oldOrderMoney = computed(() => {
-			let total = 0
-			for (let i in oldOrder.value.detailMap) {
-				total += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					if (cur.isGift) {
-						return prve + 0
-					}
-					const discount_sale_amount = cur.discount_sale_amount * 1 || 0
-					const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData
-						.salePrice) : 0
-					const price = (discount_sale_amount || cur.salePrice || 0)
-					const number = currentCalcMpneyNumber(cur)
-					return prve + (number <= 0 ? 0 : number) * (discount_sale_amount || (useVipPrice
-						.value ? memberPrice : price))
-				}, 0)
-			}
-			return total
-		})
+  // 计算购物车商品总价格
+  const getTotalTotalPrices = (matchedProducts, isBwc = true) => {
+    if (!matchedProducts || !Array.isArray(matchedProducts)) {
+      return 0;
+    }
+    // 购物车总数价格
+    let cart = matchedProducts.reduce((total, item) => {
+      if (isBwc === true) {
+        return (
+          total + parseFloat(item.price) * parseFloat(item.num - item.returnNum)
+        );
+      }
+      // 是否启用会员价 0否1是
+      if (useVipPrice.value) {
+        // memberPrice会员价
+        return (
+          total +
+          parseFloat(item.memberPrice || item.price) *
+            parseFloat(item.num - item.returnNum)
+        );
+      } else {
+        // salePrice销售价
+        return (
+          total + parseFloat(item.price) * parseFloat(item.num - item.returnNum)
+        );
+      }
+    }, 0);
 
-		//当前购物车总价格
-		const totalPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const memberPrice = cur.memberPrice || cur.salePrice
-				const price = useVipPrice.value ? memberPrice : cur.salePrice;
-				const curMoney = price * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
-		// 霸王餐购物车原价，不享受任何优惠
-		const totalOriginPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = cur.salePrice * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
+    cart = cart.toFixed(2);
+    return parseFloat(cart);
+  };
 
-		//返回打包数量（称重商品打包数量最大为1）
-		function returnCartPackNumber(cur) {
-			const maxReturnNum = cur.number - (cur.returnNum || 0);
-			let pack_number = cur.number;
-			pack_number = (cur.product_type == 'weight' && pack_number > 1) ? 1 : pack_number;
-			pack_number = Math.min(maxReturnNum, pack_number);
-			pack_number = pack_number <= 0 ? 0 : pack_number
-			return pack_number * 1
-		}
+  // 计算商品卷所选择的总价格
+  const getTotalProductroll = (matchedProducts) =>
+    computed(() => {
+      if (!matchedProducts || !Array.isArray(matchedProducts)) {
+        return 0;
+      }
+      // 购物车总数价格
+      let cart = matchedProducts.reduce((total, item) => {
+        // 是否启用会员价 0否1是
+        if (useVipPrice.value) {
+          // memberPrice会员价
+          return total + parseFloat(item.memberPrice || item.price);
+        } else {
+          // salePrice销售价
+          return total + parseFloat(item.price);
+        }
+      }, 0);
+      // 向上取整并保留两位小数
+      let result = roundUpToTwoDecimals(cart, "upward");
+      return result;
+    });
 
+  // 桌位置
+  const getTotalSeatcharge = (seatNum) =>
+    computed(() => {
+      // 是否免除桌位费 0 否 1 是
+      let cart = 0;
 
-		//当前购物车打包费
-		const totalPackFee = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = (cur.packFee || 0) * currentCalcMpneyNumber(cur)
-				return prve + curMoney
-			}, 0)
-			return money
-		})
+      if (uni.cache.get("ordershopUserInfo").isTableFee == 0 && seatNum) {
+        cart =
+          parseFloat(seatNum) *
+          parseFloat(uni.cache.get("ordershopUserInfo").tableFee);
+      }
+      // 向下取整并保留两位小数
+      let result = roundUpToTwoDecimals(cart, "downward");
+      return result;
+    });
 
-		//打包费
-		const packFee = computed(() => {
-			const nowPackFee = carts.value.reduce((acc, cur) => {
-				return acc + (cur.packFee || 0) * returnCartPackNumber(cur)
-			}, 0)
-			let oldPackfee = 0;
-			for (let i in oldOrder.value.detailMap) {
-				oldPackfee += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					return prve + (cur.packFee || 0) * returnCartPackNumber(cur)
-				}, 0)
-			}
-			return nowPackFee + oldPackfee
-		})
+  // 计算购物车总打包费用（向下取整并保留两位小数）
+  const getTotalPackFee = (cartList) =>
+    computed(() => {
+      const total = cartList.reduce((sum, item) => {
+        return (
+          sum +
+          parseFloat(item.packAmount) *
+            (parseFloat(item.packNumber) ||
+              parseFloat(item.num) - parseFloat(item.returnNum))
+        );
+      }, 0);
+      // 向下取整并保留两位小数
+      let result = roundUpToTwoDecimals(total, "downward");
+      return result;
+    });
 
-		//购物车是否为空
-		const isEmpty = computed(() => {
-			return !carts.value || carts.value.length <= 0
-		})
-		// 计算向上取整
-		const roundUpToTwoDecimals = (num, i) => {
-			// 先将数字乘以 100 并转换为字符串保留足够的小数位
-			let temp = (num * 100).toFixed(10);
-			// 向上取整
-			let rounded = null
-			if (i == 'upward') {
-				rounded = Math.ceil(parseFloat(temp));
-			} else {
-				rounded = Math.floor(parseFloat(temp));
-			}
-			// 再除以 100 得到保留两位小数的结果
-			return rounded / 100;
-		};
+  function clearOrderConfig() {
+    console.log("clearOrderConfig");
+    backendCoupons.value = [];
+    allGoods.value = [];
+    carts.value = [];
+    seatFeeConfig.value.personCount = uni.cache.get("dinersNum") || 0;
+    dinnerType.value = "dine-in";
+    userPoints.value = 0;
+    fullReductionActivities.value = [];
+	isFreeDine.value = false;
+  }
 
-		// 精确计算函数
-		const preciseCalculation = (num1, num2) => {
-			// 将数字转换为整数，乘以 100 以保留两位小数
-			const int1 = BigInt(Math.round(num1 * 100));
-			const int2 = BigInt(Math.round(num2 * 100));
-			// 执行乘法运算
-			const result = int1 * int2;
-			// 再除以 10000 以还原为原来的小数
-			return Number(result) / 10000;
-		};
-
-		// 计算购物车商品总价格
-		const getTotalTotalPrices = (matchedProducts, isBwc = true) => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// 购物车总数价格
-			console.log('isBwc');
-			console.log(isBwc);
-			let cart = matchedProducts.reduce((total, item) => {
-				if (isBwc === true) {
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item
-						.num - item
-						.returnNum));
-				} else {
-					// salePrice销售价
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-			}, 0);
-
-			cart = cart.toFixed(2)
-			console.log(parseFloat(cart))
-			return parseFloat(cart);
-		};
-
-		// 计算商品卷所选择的总价格
-		const getTotalProductroll = (matchedProducts) => computed(() => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// 购物车总数价格
-			let cart = matchedProducts.reduce((total, item) => {
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + parseFloat(item.memberPrice || item.price)
-				} else {
-					// salePrice销售价
-					return total + parseFloat(item.price)
-				}
-			}, 0);
-			// 向上取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'upward')
-			return result;
-		});
-
-		// 桌位置
-		const getTotalSeatcharge = (seatNum) => computed(() => {
-			// 是否免除桌位费 0 否 1 是
-			let cart = 0
-
-			if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && seatNum) {
-				cart = parseFloat(seatNum) * parseFloat(uni.cache.get('ordershopUserInfo').tableFee)
-			}
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'downward')
-			return result;
-		});
-
-		// 计算购物车总打包费用（向下取整并保留两位小数）
-		const getTotalPackFee = (cartList) => computed(() => {
-			const total = cartList.reduce((sum, item) => {
-				return sum + (parseFloat(item.packAmount) * (parseFloat(item.packNumber) || (
-					parseFloat(item.num) - parseFloat(item.returnNum))));
-			}, 0);
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(total, 'downward')
-			return result;
-		});
-
-		
-		function clearOrderConfig(){
-			console.log('clearOrderConfig');
-			backendCoupons.value=[];
-			allGoods.value=[];
-			carts.value=[]
-			seatFeeConfig.value.personCount=uni.cache.get('dinersNum') || 0;
-			dinnerType.value='dine-in';
-			userPoints.value=0
-		}
-		
-
-		return {
-			getTotalPackFee,
-			getTotalSeatcharge,
-			getTotalTotalPrices,
-			getTotalProductroll,
-			carts,
-			isEmpty,
-			setGoodsMap,
-			goodsMap,
-			goodsIsloading,
-			goodsInit,
-			onMessage,
-			totalPrice,
-			totalPackFee,
-			updateData,
-			useVipPrice,
-			totalOriginPrice,
-			orderCostSummary,
-			setCoupons,
-			userPoints,
-			setUserPoints,
-			setPointDeductionRule,
-			setOldOrder,
-			//优惠券列表
-			backendCoupons,
-			allGoods,
-			//就餐类型
-			dinnerType,
-			setDinnerType,
-			setSeatFeeConfig,
-			seatFeeConfig,
-			shopInfo,
-			//新客立减数据
-			consumeDiscount,
-			//新客立减金额
-			newUserDiscount,
-			getAllGoodsList,
-			//清空配置
-			clearOrderConfig
-			
-		};
-	}
-);
\ No newline at end of file
+  return {
+    getTotalPackFee,
+    getTotalSeatcharge,
+    getTotalTotalPrices,
+    getTotalProductroll,
+    carts,
+    isEmpty,
+    setGoodsMap,
+    goodsMap,
+    goodsIsloading,
+    goodsInit,
+    onMessage,
+    totalPrice,
+    totalPackFee,
+    updateData,
+    useVipPrice,
+    totalOriginPrice,
+    orderCostSummary,
+    setCoupons,
+    userPoints,
+    setUserPoints,
+    setPointDeductionRule,
+    setOldOrder,
+    //优惠券列表
+    backendCoupons,
+    allGoods,
+    //就餐类型
+    dinnerType,
+    setDinnerType,
+    setSeatFeeConfig,
+    seatFeeConfig,
+    shopInfo,
+    //新客立减数据
+    consumeDiscount,
+    //新客立减金额
+    newUserDiscount,
+    getAllGoodsList,
+    //清空配置
+    clearOrderConfig,
+    //满减活动
+    fullReductionActivities, 
+    isFreeDine,//是否使用霸王餐
+    // 商家霸王餐配置
+    freeDineConfig,
+  };
+});
diff --git a/stores/pay.js b/stores/pay.js
index c346615..c33a6f8 100644
--- a/stores/pay.js
+++ b/stores/pay.js
@@ -23,10 +23,7 @@ export const Memberpay = defineStore('memberpay', {
 			return new Promise(async (resolve, reject) => {
 				try {
 					let res = await APIpayltPayVip({
-						shopId: data.shopId,
-						shopUserId: data.shopUserId,
-						amount: data.amount,
-						activateId: data.activateId,
+						...data,
 						// #ifdef MP-WEIXIN
 						payType: 'wechatPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
@@ -35,11 +32,6 @@ export const Memberpay = defineStore('memberpay', {
 						payType: 'aliPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
 						// #endif
-						returnUrl: data.returnUrl ? data.returnUrl : '',
-						buyerRemark: data.buyerRemark ? data.buyerRemark : '',
-						orderId: data.orderId,
-						userAllPack: data.userAllPack,
-						seatNum:data.seatNum
 					})
 					if (res) {
 						uni.showLoading({
@@ -67,20 +59,20 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1000)
-								resolve(res)
+								// setTimeout(() => {
+								// 	uni.navigateBack()
+								// }, 1000)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									setTimeout(() => {
-										uni.navigateBack()
-									}, 1000)
-									resolve(res)
+									// setTimeout(() => {
+									// 	uni.navigateBack()
+									// }, 1000)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"
@@ -163,14 +155,14 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								resolve(res)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									resolve(res)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"
diff --git a/stores/user.js b/stores/user.js
index d099c48..eec458a 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -104,6 +104,7 @@ export const productStore = defineStore('product', {
 		},
 		// 扫码请求
 		scanCodeactions(q) {
+			console.log('扫码内容', q)
 			return new Promise(async (resolve, reject) => {
 				if (q) {
 					console.log(q)
@@ -121,7 +122,7 @@ export const productStore = defineStore('product', {
 					// 储存卓玛
 					uni.cache.set('tableCode', tableCode)
 					if (tableCode) {
-						console.log(uni.cache.get('tableCode'));
+						console.log('台桌码', uni.cache.get('tableCode'));
 						let data = await this.actionsproductqueryShop(tableCode)
 						
 						console.log('data', data)
@@ -194,6 +195,7 @@ export const productStore = defineStore('product', {
 
 		// /通过桌码获取当前店铺信息
 		actionsproductqueryShop(tableCode) {
+			console.log('台桌码',tableCode);
 			return new Promise(async (resolve, reject) => {
 				// try {
 				try {
@@ -213,7 +215,7 @@ export const productStore = defineStore('product', {
 
 						resolve(res)
 					} else {
-						console.log(res)
+						console.error('通过桌码获取当前店铺信息失败' ,res)
 						reject()
 					}
 
diff --git a/utils/goods-utils.js b/utils/goods-utils.js
index f231c1f..c431129 100644
--- a/utils/goods-utils.js
+++ b/utils/goods-utils.js
@@ -295,6 +295,7 @@ export function calcDiscountGoodsArrPrice(discountGoodsArr, discountNum, user, s
  * @param shopInfo 店铺信息
  */
 export function returnCouponDiscount(arr, coupon, user, goodsOrderPrice, selCoupon, shopInfo) {
+  arr = returnCanDikouGoods(arr, user, shopInfo);
   const canDikouGoodsArr = returnCanDikouGoodsArr(arr, selCoupon, user);
   if (coupon.type == 2) {
     return returnCouponProductDiscount(canDikouGoodsArr, coupon, user, shopInfo);
@@ -423,7 +424,6 @@ function returnCouponBuyOneGiveOneDiscount(canDikouGoodsArr, coupon, user, shopI
   }
   let discountPrice = 0;
   let hasDiscountGoodsArr = [];
-  console.log("returnCouponBuyOneGiveOneDiscount:discountGoods", discountGoods);
   if (discountGoods) {
     discountPrice = returnGoodsPrice(discountGoods, user, shopInfo);
     hasDiscountGoodsArr = [discountGoods];
diff --git a/utils/goods.ts b/utils/goods.ts
new file mode 100644
index 0000000..086e579
--- /dev/null
+++ b/utils/goods.ts
@@ -0,0 +1,1374 @@
+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 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;
+}
+
+/** 订单费用汇总（修改：补充商家减免类型和明细） */
+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;
+}
+/**
+ * 筛选最优满减活动（对齐后端逻辑：状态→时间→周期→时段→就餐类型→排序→修改时间）
+ * @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;
+  console.log("原始满减活动列表:", activities);
+  // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
+  const baseEligible = activities.filter((activity) => {
+    return (
+      activity.isDel !== true && // 未删除
+      // activity.shopId === currentShopId && // 当前店铺
+      // activity.status === 2 && // 状态=2（进行中）
+      isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
+      activity.thresholds?.length // 至少有一个满减阈值
+    );
+  });
+  console.log("基础筛选结果:", baseEligible);
+  if (!baseEligible.length) return undefined;
+
+  // 第二步：时间筛选（有效期内+周期内+时段内）
+  const timeEligible = baseEligible.filter((activity) => {
+    // 1. 校验有效期（validStartTime ~ validEndTime）
+    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"> & {
+    activity?: ActivityConfig; // 商品参与的营销活动（如限时折扣，按商品ID匹配）
+  }
+): number {
+  const { isMember, memberDiscountRate, activity } = config;
+
+  //如果是增菜价格为0
+  if (goods.is_gift) {
+    return 0;
+  }
+
+  // 1. 优先级1：商家改价（改价后单价>0才生效）
+  if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
+    return truncateToTwoDecimals(goods.discountSaleAmount);
+  }
+
+  // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
+  const memberPrice = new BigNumber(
+    calcMemberPrice(goods, isMember, memberDiscountRate)
+  );
+
+  // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
+  const isActivityApplicable = activity
+    ? (activity.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
+    : false;
+  if (!activity || !isActivityApplicable) {
+    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">,
+  activities: ActivityConfig[] = []
+): 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 })
+    );
+    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 =
+    discountShare === 1
+      ? new BigNumber(goodsRealAmount) // 与限时折扣同享→用折扣后金额
+      : new BigNumber(goodsOriginalAmount); // 不同享→用原价
+
+  // 第二步：筛选「满金额≤基数」且「减免金额>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;
+
+  // 第三步：选择最优阈值（优先级：1.满金额最小 → 2.减免金额最大）
+  return validThresholds.sort((a, b) => {
+    const aFull = new BigNumber(a.fullAmount || 0);
+    const bFull = new BigNumber(b.fullAmount || 0);
+    const aDiscount = new BigNumber(a.discountAmount || 0);
+    const bDiscount = new BigNumber(b.discountAmount || 0);
+
+    // 先比满金额：越小越优先（满1减10 比 满100减20 更优）
+    if (!aFull.isEqualTo(bFull)) {
+      return aFull.comparedTo(bFull) || 0; // Ensure a number is always returned
+    }
+    // 再比减免金额：越大越优先
+    return bDiscount.comparedTo(aDiscount) || 0; // Ensure a number is always returned
+  })[0];
+}
+
+/**
+ * 计算满减实际减免金额（适配多门槛、同享规则）
+ * @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));
+    availableNum = Math.min(availableNum, packNumber);
+
+    if (availableNum === 0) continue;
+
+    // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
+    let 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;
+} {
+  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 } = config;
+
+  // ------------------------------ 1. 基础费用计算 ------------------------------
+  const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
+  const goodsRealAmount = calcGoodsRealAmount(
+    // 商品折扣后总和
+    goodsList,
+    {
+      isMember: config.isMember,
+      memberDiscountRate: config.memberDiscountRate,
+    },
+    activities
+  );
+  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
+  );
+
+  // 2.2 计算满减基数（先扣新客立减）
+  const baseAfterNewUserDiscount = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .isGreaterThan(0)
+    ? new BigNumber(goodsRealAmount).minus(newUserDiscount).toNumber()
+    : 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,
+    }
+  );
+  console.log("优惠券计算结果", couponResult);
+  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;
+
+  // 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券）
+  const maxPointDeductionLimit = new BigNumber(goodsRealAmount)
+    .minus(newUserDiscount)
+    .minus(fullReductionAmount)
+    .minus(couponDeductionAmount)
+    .isGreaterThan(0)
+    ? new BigNumber(goodsRealAmount)
+        .minus(newUserDiscount)
+        .minus(fullReductionAmount)
+        .minus(couponDeductionAmount)
+        .toNumber()
+    : 0;
+
+  // 若满减与积分同享（pointsShare=1），才计算积分；否则积分抵扣为0
+  if (
+    usedFullReductionActivity?.pointsShare === 1 &&
+    maxPointDeductionLimit > 0
+  ) {
+    const pointResult = calcPointDeduction(
+      config.userPoints,
+      config.pointDeductionRule,
+      maxPointDeductionLimit
+    );
+    pointDeductionAmount = pointResult.deductionAmount;
+    usedPoints = pointResult.usedPoints;
+  }
+
+  //使用霸王餐
+  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+    //不与优惠券同享
+    if (!freeDineConfig.withCoupon) {
+      couponDeductionAmount = 0;
+      productCouponDeduction = 0;
+      fullCouponDeduction = 0;
+      usedCoupon = undefined;
+      excludedProductIds = [];
+    }
+    //不与积分同享
+    if (!freeDineConfig.withPoints) {
+      pointDeductionAmount = 0;
+      usedPoints = 0;
+    }
+  }
+
+  // ------------------------------ 5. 其他费用计算（原有逻辑不变） ------------------------------
+  const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
+  let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
+  seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
+  const additionalFee = Math.max(0, config.additionalFee); // 附加费
+
+  // 商家减免计算（原有逻辑不变）
+  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();
+
+  // ------------------------------ 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/pay.js b/utils/pay.js
index 43b4c8c..9bee02a 100644
--- a/utils/pay.js
+++ b/utils/pay.js
@@ -1,57 +1,57 @@
 export const pay = (res) => {
-	return new Promise((resolve, reject) => {
-		uni.showLoading({
-			title: '支付中...',
-			mask: true
-		})
-		uni.requestPayment({
-			// #ifdef MP-WEIXIN
-			provider: 'wxpay', //支付类型-固定值
-			partnerid: res.appId, // 微信支付商户号
-			timeStamp: res.timeStamp, // 时间戳（单位：秒）
-			nonceStr: res.nonceStr, // 随机字符串
-			package: res.package, // 固定值
-			signType: res.signType, //固定值
-			paySign: res.paySign, //签名
-			// #endif
-			// #ifdef MP-ALIPAY
-			provider: 'alipay', //支付类型-固定值
-			orderInfo: res.tradeNo, // 微信支付商户号
-			// #endif
-			success: (res) => {
-				console.log('pay');
-				console.log(res);
-				uni.hideLoading()
-				// #ifdef MP-WEIXIN
-				uni.showToast({
-					title: "支付成功",
-					icon:'none'
-				})
-				console.log('支付成功')
-				resolve(res)
-				// #endif
-				// #ifdef MP-ALIPAY
-				if (res.resultCode == '9000') {
-					uni.showToast({
-						title: "支付成功",
-						icon:'none'
-					})
-					resolve(res)
-				} else {
-					uni.showToast({
-						title: "支付失败",
-						icon:'none'
-					})
-				}
-				// #endif
-			},
-			fail: (res) => {
-				setTimeout(() => {
-					uni.hideLoading()
-				}, 1000)
-				reject(false)
-			},
-			
-		});
-	})
-}
\ No newline at end of file
+  return new Promise((resolve, reject) => {
+    uni.showLoading({
+      title: "支付中...",
+      mask: true,
+    });
+    uni.requestPayment({
+      // #ifdef MP-WEIXIN
+      provider: "wxpay", //支付类型-固定值
+      partnerid: res.appId, // 微信支付商户号
+      timeStamp: res.timeStamp, // 时间戳（单位：秒）
+      nonceStr: res.nonceStr, // 随机字符串
+      package: res.package, // 固定值
+      signType: res.signType, //固定值
+      paySign: res.paySign, //签名
+      // #endif
+      // #ifdef MP-ALIPAY
+      provider: "alipay", //支付类型-固定值
+      orderInfo: res.tradeNo, // 微信支付商户号
+      // #endif
+      success: (res) => {
+        console.log("pay");
+        console.log(res);
+        uni.hideLoading();
+        // #ifdef MP-WEIXIN
+        uni.showToast({
+          title: "支付成功",
+          icon: "none",
+        });
+        console.log("支付成功");
+        resolve(true);
+        // #endif
+        // #ifdef MP-ALIPAY
+        if (res.resultCode == "9000") {
+          uni.showToast({
+            title: "支付成功",
+            icon: "none",
+          });
+          resolve(true);
+        } else {
+          uni.showToast({
+            title: "支付失败",
+            icon: "none",
+          });
+          reject(false);
+        }
+        // #endif
+      },
+      fail: (res) => {
+        setTimeout(() => {
+          uni.hideLoading();
+        }, 1000);
+        reject(false);
+      },
+    });
+  });
+};