diff --git a/components/drainage.vue b/components/drainage.vue
index 297888b..e0d1ceb 100644
--- a/components/drainage.vue
+++ b/components/drainage.vue
@@ -2,7 +2,7 @@
   <view>
     <!-- 私域引流 -->
     <up-popup
-      :show="showPreview"
+      :show="show"
       mode="center"
       round="16rpx"
       closeOnClickOverlay
@@ -53,10 +53,12 @@ const showPreview = defineModel({
   type: Boolean,
   default: false,
 });
+
+const show=ref(false);
 const emit = defineEmits(["close"]);
 
 function close() {
-  showPreview.value = false;
+  show.value = false;
   emit("close");
 }
 const drainageConfig = ref({});
@@ -67,7 +69,7 @@ async function getDrainageConfig() {
   });
   drainageConfig.value = drainageConfigRes;
   if (drainageConfig.value.isEnable) {
-    showPreview.value = true;
+    show.value = true;
   } else {
     close();
   }
diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
index 027b806..584e0a4 100644
--- a/pages/order/components/order-item.vue
+++ b/pages/order/components/order-item.vue
@@ -61,7 +61,9 @@
               :shopInfo="shopInfo"
               idKey="product_id"
             ></goodsPrice>
-            <view class="old-price" v-if="showLimitDiscount(item)">¥{{ item.salePrice }}</view>
+            <view class="old-price" v-if="showLimitDiscount(item)"
+              >¥{{ item.salePrice }}</view
+            >
           </view>
           <view class="num">x{{ item.num }}</view>
         </view>
@@ -110,16 +112,24 @@ const shopUserInfo = inject("shopUserInfo");
 const shopInfo = inject("shopInfo");
 
 function showLimitDiscount(item) {
-  if (!props.limitDiscount || !props.limitDiscount.id) {
-    return false;
+  if (
+    (item.is_time_discount || item.isTimeDiscount) &&
+    props.limitDiscount &&
+    props.limitDiscount.id
+  ) {
+    return true;
   }
-  return orderUtils.canUseLimitTimeDiscount(
-    item,
-    props.limitDiscount,
-    shopInfo.value,
-    shopUserInfo.value,
-    "productId"
-  );
+  return false;
+  // if (!props.limitDiscount || !props.limitDiscount.id) {
+  //   return false;
+  // }
+  // return orderUtils.canUseLimitTimeDiscount(
+  //   item,
+  //   props.limitDiscount,
+  //   shopInfo.value,
+  //   shopUserInfo.value,
+  //   "productId"
+  // );
 }
 onMounted(() => {
   console.log("props.nowCarts");
@@ -542,4 +552,4 @@ const showOldPrice = computed(() => {});
   text-decoration: line-through;
   text-align: right;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index b5a3c14..5ae8db4 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -158,7 +158,10 @@
           "
         >
           <view class="u-m-t-40 u-p-l-20 u-p-r-20">
-            <view class="youhui-item" v-if="cartStore.orderCostSummary.fullReduction.actualAmount">
+            <view
+              class="youhui-item"
+              v-if="cartStore.orderCostSummary.fullReduction.actualAmount"
+            >
               <view class="u-flex align-center">
                 <image
                   src="/static/icon/coup.png"
@@ -169,10 +172,15 @@
               </view>
 
               <view class="red font-12 u-flex align-center"
-                >-￥{{ cartStore.orderCostSummary.fullReduction.actualAmount }}</view
+                >-￥{{
+                  cartStore.orderCostSummary.fullReduction.actualAmount
+                }}</view
               >
             </view>
-            <view class="youhui-item" v-if="cartStore.orderCostSummary.vipDiscountAmount">
+            <view
+              class="youhui-item"
+              v-if="cartStore.orderCostSummary.vipDiscountAmount"
+            >
               <view class="u-flex align-center">
                 <image
                   src="/static/icon/newUserDiscount.png"
@@ -685,17 +693,17 @@ async function getMaxPointsDiscount() {
       res.equivalentPoints || 0,
       res.maxDeductionAmount || 0
     );
-  }
-  Object.assign(pointsRes, res);
-  maxPointDiscount.value = res.maxDeductionAmount || 0;
-  console.log("积分可抵扣最大金额", maxPointDiscount.value);
+    Object.assign(pointsRes, res);
+    maxPointDiscount.value = res.maxDeductionAmount || 0;
+    console.log("积分可抵扣最大金额", maxPointDiscount.value);
 
-  if (usePoints.value && res.usable) {
-    console.log("积分抵扣金额", res.maxDeductionAmount);
-    cartStore.setUserPoints(res.maxUsablePoints || 0);
-  }
-  if (!res.usable) {
-    cartStore.setUserPoints(0);
+    if (usePoints.value && res.usable) {
+      console.log("积分抵扣金额", res.maxDeductionAmount);
+      cartStore.setUserPoints(res.maxUsablePoints || 0);
+    }
+    if (!res.usable) {
+      cartStore.setUserPoints(0);
+    }
   }
 }
 watch(
@@ -852,8 +860,13 @@ function calcDiscountActivity() {
   const res = discountActivityRes.value;
   const user = uni.cache.get("shopUserInfo");
 
-  const usedFullReductionActivityFullAmount=cartStore.orderCostSummary.fullReduction.usedFullReductionActivityFullAmount;
-  console.log("usedFullReductionActivityFullAmount", usedFullReductionActivityFullAmount);
+  const usedFullReductionActivityFullAmount =
+    cartStore.orderCostSummary.fullReduction
+      .usedFullReductionActivityFullAmount;
+  console.log(
+    "usedFullReductionActivityFullAmount",
+    usedFullReductionActivityFullAmount
+  );
 
   if (res && res.thresholds && res.thresholds.length > 0) {
     const canUseThresholds = res.thresholds
@@ -874,8 +887,6 @@ function calcDiscountActivity() {
     return;
   }
   console.log("当前满减门槛", discountActivity.value);
-
-  
 }
 async function getDiscountActivity() {
   const res = await discountActivityApi.config({
@@ -1593,4 +1604,4 @@ onMounted(async () => {
   z-index: 9;
   color: #fff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 1d9329d..eab0664 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1,188 +1,292 @@
 <template>
-	<view class="container">
-		<up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
-		<view class="headStatus">
-			<view class="status">
-				<up-icon v-if="listinfo.status == 'done' || listinfo.status == 'unpaid' || !listinfo.id" name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
-				<view class="statusName" v-if="listinfo.status == 'unpaid' || !listinfo.id">待支付</view>
-				<view class="statusName" v-if="listinfo.status == 'done'">已完成</view>
-				<view class="statusName" v-if="listinfo.status == 'refund'">退单</view>
-				<view class="statusName" v-if="listinfo.status == 'part-refund'">部分退单</view>
-				<view class="statusName" v-if="listinfo.status == 'cancelled'">取消订单</view>
-			</view>
-			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
-			<view class="time" v-if="listinfo.paidTime && (listinfo.status != 'cancelled' || listinfo.status != 'unpaid')">付款时间：{{ listinfo.paidTime }}</view>
-		</view>
+  <view class="container">
+    <up-navbar :title="navTitle" @leftClick="onback" placeholder></up-navbar>
+    <view class="headStatus">
+      <view class="status">
+        <up-icon
+          v-if="
+            listinfo.status == 'done' ||
+            listinfo.status == 'unpaid' ||
+            !listinfo.id
+          "
+          name="checkmark-circle-fill"
+          color="#03C061"
+          size="23"
+        ></up-icon>
+        <view
+          class="statusName"
+          v-if="listinfo.status == 'unpaid' || !listinfo.id"
+          >待支付</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'done'">已完成</view>
+        <view class="statusName" v-if="listinfo.status == 'refund'">退单</view>
+        <view class="statusName" v-if="listinfo.status == 'part-refund'"
+          >部分退单</view
+        >
+        <view class="statusName" v-if="listinfo.status == 'cancelled'"
+          >取消订单</view
+        >
+      </view>
+      <view class="time" v-if="listinfo.createTime"
+        >下单时间：{{ listinfo.createTime }}</view
+      >
+      <view
+        class="time"
+        v-if="
+          listinfo.paidTime &&
+          (listinfo.status != 'cancelled' || listinfo.status != 'unpaid')
+        "
+        >付款时间：{{ listinfo.paidTime }}</view
+      >
+    </view>
 
-		<view class="wxQrcode" v-if="shopQrcode">
-			<view class="left">
-				<text class="title">扫码加好友，优惠多多</text>
-				<text>优惠活动多</text>
-				<text>充值有好礼</text>
-				<text>会员享低价</text>
-				<text>长按保存，微信内扫一扫加好友</text>
-			</view>
-			<!-- #ifdef MP-WEIXIN -->
-			<u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
-			<!-- #endif -->
-			<!-- #ifdef MP-ALIPAY -->
-			<image style="height: 150rpx; width: 150rpx" :src="shopQrcode" @longpress="saveImage(shopQrcode)" mode="aspectFill"></image>
-			<!-- #endif -->
-		</view>
+    <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"
-			: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 && (listinfo.status == 'unpaid' || !listinfo.id)"
-			@changeFree="changeFree"
-		></rechargeFree>
+    <!-- 详情 -->
+    <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"
+      :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 && (listinfo.status == 'unpaid' || !listinfo.id)"
+      @changeFree="changeFree"
+    ></rechargeFree>
 
-		<!-- 充值享优惠 -->
-		<view v-if="!showFreeDine && (listinfo.status == 'unpaid' || !listinfo.id) && cartStore.orderCostSummary.finalPayAmount > 0">
-			<ChargeVue
-				@updateChargeSel="(e) => updateChargeSel(e)"
-				@updateRechargeId="updateRechargeId"
-				@updateIsShow="updateIsShow"
-				v-if="listinfo.status == 'unpaid' || !listinfo.id"
-			></ChargeVue>
-		</view>
-		<!-- 支付方式 -->
-		<paymentMethodes
-			ref="paymentMethodref"
-			:orderVIP="orderVIP"
-			@groupChange="groupChange"
-			:disablePayType="disablePayType"
-			:changeFreeenable="isBwc"
-			v-model="paymentmethod"
-			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.name }}
-					</view>
-					<!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
+    <!-- 充值享优惠 -->
+    <view
+      v-if="
+        !showFreeDine &&
+        (listinfo.status == 'unpaid' || !listinfo.id) &&
+        cartStore.orderCostSummary.finalPayAmount > 0
+      "
+    >
+      <ChargeVue
+        @updateChargeSel="(e) => updateChargeSel(e)"
+        @updateRechargeId="updateRechargeId"
+        @updateIsShow="updateIsShow"
+        v-if="listinfo.status == 'unpaid' || !listinfo.id"
+      ></ChargeVue>
+    </view>
+    <!-- 支付方式 -->
+    <paymentMethodes
+      ref="paymentMethodref"
+      :orderVIP="orderVIP"
+      @groupChange="groupChange"
+      :disablePayType="disablePayType"
+      :changeFreeenable="isBwc"
+      v-model="paymentmethod"
+      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 ? paymentmethod.name : "" }}
+          </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="(e) => accountPayevent(e)" @close="pwdClose" />
-		<!-- 私域引流配置 -->
-		<OrderFinshModal v-model="showDrainage"></OrderFinshModal>
-	</view>
+        </view>
+      </view>
+    </view>
+    <view style="width: 100%; height: 200rpx; color: #fff; color: #fff"></view>
+    <payPassword
+      ref="payPasswordref"
+      :isShow="ispws"
+      @inputComplete="(e) => accountPayevent(e)"
+      @close="pwdClose"
+    />
+    <!-- 私域引流配置 -->
+    <OrderFinshModal v-model="showDrainage"></OrderFinshModal>
+  </view>
 </template>
 <script setup>
-import { back } from '@/utils/uniapp.js';
-import { onLoad, onUnload } from '@dcloudio/uni-app';
-import ChargeVue from './components/charge.vue';
-import { pay } from '@/utils/pay.js';
-import OrderFinshModal from '@/components/order-finish-modal.vue';
-import _ from 'lodash';
-import { ref, reactive, computed, onMounted, onUnmounted, nextTick, watch, onBeforeMount, onBeforeUnmount, provide } from 'vue';
-provide('shopUserInfo', ref(uni.cache.get('shopUserInfo')));
-provide('shopInfo', ref(uni.cache.get('shopInfo')));
-import { getTableInfo } from '@/common/api/shop/index.js';
-import { APIgetOrderById, 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';
+import { back } from "@/utils/uniapp.js";
+import { onLoad, onUnload } from "@dcloudio/uni-app";
+import ChargeVue from "./components/charge.vue";
+import { pay } from "@/utils/pay.js";
+import OrderFinshModal from "@/components/order-finish-modal.vue";
+import _ from "lodash";
+import {
+  ref,
+  reactive,
+  computed,
+  onMounted,
+  onUnmounted,
+  nextTick,
+  watch,
+  onBeforeMount,
+  onBeforeUnmount,
+  provide,
+} from "vue";
+provide("shopUserInfo", ref(uni.cache.get("shopUserInfo")));
+provide("shopInfo", ref(uni.cache.get("shopInfo")));
+import { getTableInfo } from "@/common/api/shop/index.js";
+import {
+  APIgetOrderById,
+  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";
 import * as chatApi from "@/http/php/chat";
 
 function pwdClose() {
-	ispws.value = false;
-	pay_unlock();
+  ispws.value = false;
+  pay_unlock();
 }
 
 onUnload(() => {
-	console.log('onUnload');
-	closeSocket();
+  console.log("onUnload");
+  closeSocket();
 });
 onBackPress(() => {
-	console.log('返回拦截');
-	closeSocket();
+  console.log("返回拦截");
+  closeSocket();
 });
 function onback() {
-	closeSocket();
-	console.log('返回');
-	back();
+  closeSocket();
+  console.log("返回");
+  back();
 }
 const customStyle = {
-	width: '180rpx',
-	height: '70rpx',
-	background: 'FFFFFF',
-	'border-radius': '106rpx',
-	border: '2rpx solid #E8AD7B'
+  width: "180rpx",
+  height: "70rpx",
+  background: "FFFFFF",
+  "border-radius": "106rpx",
+  border: "2rpx solid #E8AD7B",
 };
 
 const cartStore = useCartsStore();
@@ -191,129 +295,133 @@ const cartStore = useCartsStore();
 //充值和余额支付是否可用
 const isCanUseCharge = ref(true);
 function updateIsShow(e) {
-	isCanUseCharge.value = e;
+  isCanUseCharge.value = e;
 }
 const rechargeItem = ref({
-	id: ''
+  id: "",
 });
 const rechargeId = ref(null);
 
 function updateRechargeId(e) {
-	rechargeId.value = e;
+  rechargeId.value = e;
 }
 
 function updateChargeSel(newval) {
-	rechargeItem.value = newval;
-	console.log('updateChargeSel', newval);
+  rechargeItem.value = newval;
+  console.log("updateChargeSel", newval);
 }
 //充值相关end
 
 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') {
-		console.log('onMessage:cleanup', Message);
-		console.log('onMessage:options', options);
-		console.log('onMessage:listinfo', listinfo);
-		youhuiReset();
-		if (listinfo.id || options.tableCode) {
-			let res = listinfo.id
-				? await APIgetOrderById({
-						orderId: listinfo.id
-				  })
-				: await APIhistoryOrder({
-						tableCode: options.tableCode || ''
-				  });
+  cartStore.onMessage(Message, cartsSocket);
+  listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1;
+  if (Message.operate_type == "init") {
+    youhuiReset();
+  }
+  if (Message.operate_type == "cleanup") {
+    console.log("onMessage:cleanup", Message);
+    console.log("onMessage:options", options);
+    console.log("onMessage:listinfo", listinfo);
+    youhuiReset();
+    if (listinfo.id || options.tableCode) {
+      let res = listinfo.id
+        ? await APIgetOrderById({
+            orderId: listinfo.id,
+          })
+        : await APIhistoryOrder({
+            tableCode: options.tableCode || "",
+          });
 
-			console.log('onMessage:APIgetOrderById', res);
-			Object.assign(listinfo, res);
-			if (res) {
-				orderRemarker.value = res.remark;
-				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;
+      console.log("onMessage:APIgetOrderById", res);
+      Object.assign(listinfo, res);
+      if (res) {
+        orderRemarker.value = res.remark;
+        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')
+  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);
+  cartsSocket = useWebSocket();
+  cartsSocket.connect(socketInitPar, onMessage);
 }
 const noPayStatus = {
-	cancelled: '订单已取消',
-	done: '订单已关闭'
+  cancelled: "订单已取消",
+  done: "订单已关闭",
 };
 
 function youhuiReset() {
-	listinfo.pointsDiscountAmount = 0;
-	listinfo.pointsNum = 0;
-	listinfo.pointsDiscountAmount = 0;
-	listinfo.Productroll = 0;
-	try {
-		orderInfoAfterRef.value?.IntegralInputclose();
-	} catch {}
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.pointsNum = 0;
+  listinfo.pointsDiscountAmount = 0;
+  listinfo.Productroll = 0;
+  try {
+    orderInfoAfterRef.value?.IntegralInputclose();
+  } catch {}
 }
 
 // 结账管理
-import { Memberpay } from '@/stores/pay.js';
+import { Memberpay } from "@/stores/pay.js";
 
 const storeMemberpay = Memberpay();
 
-import { productStore } from '@/stores/user.js';
+import { productStore } from "@/stores/user.js";
 const storeuser = productStore();
 
-import payPassword from '@/components/payPassword.vue';
-import orderInfo from './components/orderInfo.vue';
+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';
+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);
-let userInfo = uni.cache.get('userInfo');
+let userInfo = uni.cache.get("userInfo");
 
 // 会员信息
-const orderVIP = ref(uni.cache.get('orderVIP'));
+const orderVIP = ref(uni.cache.get("orderVIP"));
 // 商品订单关联的店铺信息
-const ordershopUserInfo = ref(uni.cache.get('shopInfo'));
+const ordershopUserInfo = ref(uni.cache.get("shopInfo"));
 
-cartStore.updateData('orderVIP', orderVIP.value);
-cartStore.updateData('shopInfo', ordershopUserInfo.value);
+cartStore.updateData("orderVIP", orderVIP.value);
+cartStore.updateData("shopInfo", ordershopUserInfo.value);
 // 是否显示商家二维码信息
 const shopQrcode = ref(ordershopUserInfo.shopInfo || false);
 
@@ -323,24 +431,24 @@ const isBwc = ref(false);
 const showFreeDine = ref(false);
 
 //订单备注
-const orderRemarker = ref('');
+const orderRemarker = ref("");
 // 订单详情
 const listinfo = reactive({
-	combinedArray: [],
-	Productroll: 0,
-	coupondiscountAmount: 0,
-	pointsDiscountAmount: 0,
-	packFeess: 0,
-	totalPrices: 0,
-	Seatcharge: 0,
-	id: null
+  combinedArray: [],
+  Productroll: 0,
+  coupondiscountAmount: 0,
+  pointsDiscountAmount: 0,
+  packFeess: 0,
+  totalPrices: 0,
+  Seatcharge: 0,
+  id: null,
 });
 
 //判断是否是打包商品
 const is_type = ref(0);
 //打包商品切换
 const istype = (newValue) => {
-	is_type.value = newValue;
+  is_type.value = newValue;
 };
 //积分
 
@@ -349,129 +457,131 @@ let backtimer = null;
 let historyTotalPrices = 0;
 // * 获取订单详情接口
 const orderorderInfo = async (isNpwGetOrderDetail = false) => {
-	console.log('listinfo.id', listinfo.id);
+  console.log("listinfo.id", listinfo.id);
 
-	if (!listinfo.id && !options.tableCode) {
-		return;
-	}
-	if (!isNpwGetOrderDetail) {
-		if (isPayBefor() && !listinfo.id) {
-			return;
-		}
-	}
+  if (!listinfo.id && !options.tableCode) {
+    return;
+  }
+  if (!isNpwGetOrderDetail) {
+    if (isPayBefor() && !listinfo.id) {
+      return;
+    }
+  }
 
-	let res = listinfo.id
-		? await APIgetOrderById({
-				orderId: listinfo.id
-		  })
-		: await APIhistoryOrder({
-				tableCode: options.tableCode || ''
-		  });
-	orderRemarker.value = res.remark;
-	Object.assign(listinfo, res);
-	if (res && res.tableCode) {
-		socketInitPar.table_code = res.tableCode;
-		let tableRes = await getTableInfo({
-			tableCode: options.tableCode || ''
-		});
-		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);
+  let res = listinfo.id
+    ? await APIgetOrderById({
+        orderId: listinfo.id,
+      })
+    : await APIhistoryOrder({
+        tableCode: options.tableCode || "",
+      });
+  orderRemarker.value = res.remark;
+  Object.assign(listinfo, res);
+  if (res && res.tableCode) {
+    socketInitPar.table_code = res.tableCode;
+    let tableRes = await getTableInfo({
+      tableCode: options.tableCode || "",
+    });
+    console.log("tableRes", tableRes);
+    listinfo.tableName = tableRes.name;
+  } else {
+    if (options.tableCode) {
+      socketInitPar.table_code = options.tableCode;
+      let tableRes = await getTableInfo({
+        tableCode: options.tableCode || "",
+      });
+      console.log("tableRes", tableRes);
+      listinfo.tableName = tableRes.name;
+    }
+  }
+  cartStore.setOldOrder(res);
+  socketInit();
+  console.log(res);
+  console.log(res);
 
-	getOrderInfoAfterCalcInit(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;
+  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;
-	}
+      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)
+  // uni.showToast({
+  // 	title:'订单已取消或已付款',
+  // 	icon:'none'
+  // })
+  // backtimer=setTimeout(()=>{
+  // 	const arr=getCurrentPages()
+  // 	if(arr.length<=1){
+  // 		toJiacai()
+  // 	}else{
+  // 		uni.navigateBack({delta:1})
+  // 	}
+  // },1000)
 }
 
 const changeFree = (e) => {
-	if (JSON.stringify(e) == '{}') {
-		return;
-	}
-	isBwc.value = e;
-	console.log('changeFree', e);
+  if (JSON.stringify(e) == "{}") {
+    return;
+  }
+  isBwc.value = e;
+  console.log("changeFree", e);
 
-	// 支付方式切换
-	// #ifdef MP-WEIXIN
-	// #endif
-	// #ifdef MP-ALIPAY
-	// #endif
+  // 支付方式切换
+  // #ifdef MP-WEIXIN
+  // #endif
+  // #ifdef MP-ALIPAY
+  // #endif
 };
 
 const saveImage = (url) => {
-	uni.saveImage({
-		url: url,
-		success: () => {
-			uni.showToast({
-				title: '保存成功',
-				icon: 'none'
-			});
-		}
-	});
+  uni.saveImage({
+    url: url,
+    success: () => {
+      uni.showToast({
+        title: "保存成功",
+        icon: "none",
+      });
+    },
+  });
 };
 
 //
@@ -480,26 +590,26 @@ const paymentmethod = ref({});
 // 支付方式
 // #ifdef MP-WEIXIN
 paymentmethod.value = {
-	name: '微信支付',
-	type: 2,
-	url: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png',
-	payType: 'wechatPay'
+  name: "微信支付",
+  type: 2,
+  url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png",
+  payType: "wechatPay",
 };
 // #endif
 // #ifdef MP-ALIPAY
 paymentmethod.value = {
-	name: '支付宝支付',
-	type: 3,
-	url: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png',
-	payType: 'aliPay'
+  name: "支付宝支付",
+  type: 3,
+  url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/alipay.png",
+  payType: "aliPay",
 };
 // #endif
 
 const groupChange = async (e) => {
-	if (e == 5) {
-		return;
-	}
-	paymentmethod.value = e;
+  if (e == 5) {
+    return;
+  }
+  paymentmethod.value = e;
 };
 
 // 操作下单时候
@@ -507,1106 +617,1148 @@ const orderInfoAfterRef = ref(null);
 
 //取消订单
 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);
-			}
-		}
-	});
+  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');
+  await APIputuserorder(listinfo.id);
+  uni.showToast({
+    title: "删除成功",
+    icon: "none",
+  });
+  uni.pro.switchTab("order/index");
 };
 async function onlyCreateOrder() {
-	await createOrder();
-	orderorderInfo();
+  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 || '', //
-		limitRate:
-			cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
-				? {
-						id: cartStore.limitTimeDiscount.id,
-						discountRate: cartStore.limitTimeDiscount.discountRate,
-						discountPriority: cartStore.limitTimeDiscount.discountPriority,
-						foodType: cartStore.limitTimeDiscount.foodType,
-						foods: cartStore.limitTimeDiscount.foods
-				  }
-				: null
-	});
-	// 清空购物车
-	if (res) {
-		Object.assign(listinfo, res);
-		// cartStore.setOldOrder(res)
-		getOrderInfoAfterCalcInit(res);
+  // 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: cartStore.orderCostSummary.goodsRealAmount, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+    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 || "", //
+    limitRate:
+      cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
+        ? {
+            id: cartStore.limitTimeDiscount.id,
+            discountRate: cartStore.limitTimeDiscount.discountRate,
+            discountPriority: cartStore.limitTimeDiscount.discountPriority,
+            foodType: cartStore.limitTimeDiscount.foodType,
+            foods: cartStore.limitTimeDiscount.foods,
+          }
+        : null,
+  });
+  // 清空购物车
+  if (res) {
+    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: '生成订单失败'
-		});
-	}
+    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;
+  return ordershopUserInfo.value.registerType == "before" ? true : false;
 }
 
 function pay_lock() {
-	cartsSocket.sendMessage({
-		...socketInitPar,
-		operate_type: 'pay_lock'
-	});
+  cartsSocket.sendMessage({
+    ...socketInitPar,
+    operate_type: "pay_lock",
+  });
 }
 
 function pay_unlock() {
-	console.log('pay_unlock');
-	clearInterval(payStatusTimer);
-	cartsSocket.sendMessage({
-		...socketInitPar,
-		operate_type: 'pay_unlock'
-	});
+  console.log("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));
-		});
-	});
+  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;
 
 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: isBwc.value ? cartStore.orderCostSummary.orderOriginFinalPayAmount : 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, //满减抵扣金额
-		discountActId: cartStore.orderCostSummary.fullReduction.usedActivity ? cartStore.orderCostSummary.fullReduction.usedActivity.id : null,
-		userId: uni.cache.get('userInfo').id || '', //
-		limitRate:
-			cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
-				? {
-						id: cartStore.limitTimeDiscount.id,
-						discountRate: cartStore.limitTimeDiscount.discountRate,
-						discountPriority: cartStore.limitTimeDiscount.discountPriority,
-						foodType: cartStore.limitTimeDiscount.foodType,
-						foods: cartStore.limitTimeDiscount.foods
-				  }
-				: null,
-		vipDiscountAmount: cartStore.orderCostSummary.vipDiscountAmount //会员折扣减免金额
-	};
-	return {
-		isBwc: isBwc.value,
-		checkOrderPay,
-		payType: paymentmethod.value.payType,
-		buyerRemark: '',
-		returnUrl: '',
-		rechargeId: rechargeId.value,
-		rechargeDetailId: rechargeItem.value.id,
-		shopUserId: orderVIP.value.id,
-		shopId: orderVIP.value.shopId,
-		pwd: '',
-		userId: uni.cache.get('userInfo').id || '', //
-		discountActld: cartStore.orderCostSummary.fullReduction.usedActivity ? cartStore.orderCostSummary.fullReduction.usedActivity.id : '' //满减活动id
-	};
+  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: isBwc.value
+      ? cartStore.orderCostSummary.orderOriginFinalPayAmount
+      : 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, //满减抵扣金额
+    discountActId: cartStore.orderCostSummary.fullReduction.usedActivity
+      ? cartStore.orderCostSummary.fullReduction.usedActivity.id
+      : null,
+    userId: uni.cache.get("userInfo").id || "", //
+    limitRate:
+      cartStore.limitTimeDiscount && cartStore.limitTimeDiscount.id
+        ? {
+            id: cartStore.limitTimeDiscount.id,
+            discountRate: cartStore.limitTimeDiscount.discountRate,
+            discountPriority: cartStore.limitTimeDiscount.discountPriority,
+            foodType: cartStore.limitTimeDiscount.foodType,
+            foods: cartStore.limitTimeDiscount.foods,
+          }
+        : null,
+    vipDiscountAmount: cartStore.orderCostSummary.vipDiscountAmount, //会员折扣减免金额
+  };
+  return {
+    isBwc: isBwc.value,
+    checkOrderPay,
+    payType: paymentmethod.value.payType,
+    buyerRemark: "",
+    returnUrl: "",
+    rechargeId: rechargeId.value,
+    rechargeDetailId: rechargeItem.value.id,
+    shopUserId: orderVIP.value.id,
+    shopId: orderVIP.value.shopId,
+    pwd: "",
+    userId: uni.cache.get("userInfo").id || "", //
+    discountActld: cartStore.orderCostSummary.fullReduction.usedActivity
+      ? cartStore.orderCostSummary.fullReduction.usedActivity.id
+      : "", //满减活动id
+  };
 }
 
 const istoricalorders = async () => {
-	const payParams = returnPayParams();
+  const payParams = returnPayParams();
 
-	console.log('istoricalorders:payParams', payParams);
-	//先付
-	if (isPayBefor()) {
-		// 购物车有数据
-		if (!cartStore.isEmpty) {
-			const res = await createOrder();
-			//历史订单数据
-			const res1 = await APIgetOrderById({
-				orderId: res.id
-			});
-			Object.assign(listinfo, res1);
-			orderRemarker.value = res1.remark;
-			cartStore.setOldOrder(res1);
-		}
-		goToPay(payParams);
-		// goToPay()
-	} else {
-		//后付
+  console.log("istoricalorders:payParams", payParams);
+  //先付
+  if (isPayBefor()) {
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      Object.assign(listinfo, res1);
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+    }
+    goToPay(payParams);
+    // goToPay()
+  } else {
+    //后付
 
-		// 购物车有数据
-		if (!cartStore.isEmpty) {
-			const res = await createOrder();
-			//历史订单数据
-			const res1 = await APIgetOrderById({
-				orderId: res.id
-			});
-			Object.assign(listinfo, res1);
+    // 购物车有数据
+    if (!cartStore.isEmpty) {
+      const res = await createOrder();
+      //历史订单数据
+      const res1 = await APIgetOrderById({
+        orderId: res.id,
+      });
+      Object.assign(listinfo, res1);
 
-			orderRemarker.value = res1.remark;
-			cartStore.setOldOrder(res1);
-			goToPay(payParams);
-			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(payParams);
-			} else {
-				uni.showToast({
-					title: '你的订单已更新！',
-					icon: 'none'
-				});
-				orderorderInfo();
-			}
-		} else {
-			uni.showToast({
-				title: '你的小伙伴已提交订单~',
-				icon: 'none'
-			});
-			setTimeout(() => {
-				orderorderInfo();
-			}, 1000);
-		}
-	}
+      orderRemarker.value = res1.remark;
+      cartStore.setOldOrder(res1);
+      goToPay(payParams);
+      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(payParams);
+      } else {
+        uni.showToast({
+          title: "你的订单已更新！",
+          icon: "none",
+        });
+        orderorderInfo();
+      }
+    } else {
+      uni.showToast({
+        title: "你的小伙伴已提交订单~",
+        icon: "none",
+      });
+      setTimeout(() => {
+        orderorderInfo();
+      }, 1000);
+    }
+  }
 };
 
 //开始锁单
 function start_lock_order() {
-	clearInterval(payStatusTimer);
-	pay_lock();
-	payStatusTimer = setInterval(() => {
-		pay_lock();
-	}, 1000);
+  clearInterval(payStatusTimer);
+  pay_lock();
+  payStatusTimer = setInterval(() => {
+    pay_lock();
+  }, 1000);
 }
 
 // * 去支付
 const goToPay = async (payParams) => {
-	console.log('goToPay:payParams', payParams);
+  console.log("goToPay:payParams", payParams);
 
-	const canPayRes = await search_pay_lock();
-	const canPay = canPayRes.status == 1 ? true : false;
-	if (!canPay) {
-		uni.showToast({
-			title: '有人正在付款中！',
-			icon: 'none'
-		});
-		const shopUserInfo = uni.cache.get('shopUserInfo');
-		console.log('shopUserInfo', shopUserInfo);
-		console.log('listinfo', listinfo);
-		if (shopUserInfo) {
-			if (shopUserInfo.userId == listinfo.userId) {
-				pay_unlock();
-			}
-		}
-		return;
-	}
+  const canPayRes = await search_pay_lock();
+  const canPay = canPayRes.status == 1 ? true : false;
+  if (!canPay) {
+    uni.showToast({
+      title: "有人正在付款中！",
+      icon: "none",
+    });
+    const shopUserInfo = uni.cache.get("shopUserInfo");
+    console.log("shopUserInfo", shopUserInfo);
+    console.log("listinfo", listinfo);
+    if (shopUserInfo) {
+      if (shopUserInfo.userId == listinfo.userId) {
+        pay_unlock();
+      }
+    }
+    return;
+  }
 
-	// 余额支付
-	if (payParams.payType == 'accountPay') {
-		console.log('orderVIP.value', orderVIP.value);
-		if (orderVIP.value.payPwd == '' && userInfo.usePayPwd) {
-			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;
-		}
-		start_lock_order();
-		if (userInfo.usePayPwd) {
-			ispws.value = true;
-			return;
-		}
-		accountPayevent();
-		return;
-	}
-	console.log('canPay:goToPay:payParams', payParams);
+  // 余额支付
+  if (payParams.payType == "accountPay") {
+    console.log("orderVIP.value", orderVIP.value);
+    if (orderVIP.value.payPwd == "" && userInfo.usePayPwd) {
+      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;
+    }
+    start_lock_order();
+    if (userInfo.usePayPwd) {
+      ispws.value = true;
+      return;
+    }
+    accountPayevent();
+    return;
+  }
+  console.log("canPay:goToPay:payParams", payParams);
 
-	start_lock_order();
+  start_lock_order();
 
-	console.log('霸王餐前payParams', payParams);
-	if (payParams.isBwc) {
-		payParams.checkOrderPay.orderId = listinfo.id;
-		console.log('霸王餐支付参数：', payParams);
-		try {
-			const isPaySuccess = await storeMemberpay.actionspayltPayVip({
-				...payParams,
-				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, //订单原金额（不包含打包费+餐位费）
+  console.log("霸王餐前payParams", payParams);
+  if (payParams.isBwc) {
+    payParams.checkOrderPay.orderId = listinfo.id;
+    console.log("霸王餐支付参数：", payParams);
+    try {
+      const isPaySuccess = await storeMemberpay.actionspayltPayVip({
+        ...payParams,
+        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();
-				pay_unlock();
-			}
-		} catch (error) {
-			console.log('error', error);
-			pay_unlock();
-		}
+        returnUrl: "", //跳转地址
+        buyerRemark: "",
+        seatNum: is_type.value == 0 ? cartStore.seatFeeConfig.personCount : 0, //用餐人数
+      });
+      if (isPaySuccess) {
+        paySucessCallback();
+        orderorderInfo();
+        pay_unlock();
+      }
+    } catch (error) {
+      console.log("error", error);
+      pay_unlock();
+    }
 
-		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();
+    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();
 };
 
 //
 const clickPointsamount = (Pointsamount) => {
-	listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount;
-	listinfo.pointsNum = Pointsamount.pointsNum;
+  listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount;
+  listinfo.pointsNum = Pointsamount.pointsNum;
 };
 
 const payPasswordref = ref(null);
 // 余额支付
 const accountPayevent = async (pwd) => {
-	console.log('账户支付', pwd);
-	if (JSON.stringify(pwd) === '{}') {
-		return;
-	}
-	const payParams = returnPayParams();
-	ispws.value = false;
-	payParams.checkOrderPay.userId = uni.cache.get('userInfo').id;
-	payParams.checkOrderPay.orderId = listinfo.id;
-	payParams.pwd = pwd;
-	try {
-		const isPaySuccess = await storeMemberpay.balancePayOrder(payParams);
-		if (isPaySuccess) {
-			uni.showToast({
-				title: '支付成功',
-				icon: 'none'
-			});
-			pay_unlock();
+  console.log("账户支付", pwd);
+  if (JSON.stringify(pwd) === "{}") {
+    return;
+  }
+  const payParams = returnPayParams();
+  ispws.value = false;
+  payParams.checkOrderPay.userId = uni.cache.get("userInfo").id;
+  payParams.checkOrderPay.orderId = listinfo.id;
+  payParams.pwd = pwd;
+  try {
+    const isPaySuccess = await storeMemberpay.balancePayOrder(payParams);
+    if (isPaySuccess) {
+      uni.showToast({
+        title: "支付成功",
+        icon: "none",
+      });
+      pay_unlock();
 
-			paySucessCallback();
-		}
-	} catch (error) {
-		//TODO handle the exception
-		pay_unlock();
-	}
-	orderorderInfo();
+      paySucessCallback();
+    }
+  } catch (error) {
+    //TODO handle the exception
+    pay_unlock();
+  }
+  orderorderInfo();
 };
 
 onBeforeUnmount(() => {
-	clearTimeout(backtimer);
-	clearInterval(payStatusTimer);
-	closeSocket();
+  clearTimeout(backtimer);
+  clearInterval(payStatusTimer);
+  closeSocket();
 });
 onHide(() => {
-	closeSocket();
-	clearInterval(payStatusTimer);
+  closeSocket();
+  clearInterval(payStatusTimer);
 });
 
 function closeSocket() {
-	// cartsSocket.closeExistingConnection()
+  // cartsSocket.closeExistingConnection()
 }
 
 onShow(() => {
-	userInfo = uni.cache.get('userInfo');
-	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
-	}
+  userInfo = uni.cache.get("userInfo");
+  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);
-		cartStore.setCoupons(_.cloneDeep(data));
-	});
+  orderorderInfo();
+  uni.$off("selCoupon");
+  uni.$on("selCoupon", function (data) {
+    console.log("selCoupon", data);
+    cartStore.setCoupons(_.cloneDeep(data));
+  });
 });
 let options = {};
 
 // 跳转到加菜页面
 function toJiacai() {
-	console.log('跳转到加菜页面');
-	back();
+  console.log("跳转到加菜页面");
+  back();
 }
 const packfee = computed(() => {
-	return cartStore.orderCostSummary.packFee;
+  return cartStore.orderCostSummary.packFee;
 });
 //不计算各种折扣前的实付金额
 const shifu = computed(() => {
-	const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0;
-	return payAmount + cartStore.totalPrice * 1 + packfee.value * 1;
+  const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0;
+  return payAmount + cartStore.totalPrice * 1 + packfee.value * 1;
 });
 //减去各种折扣后的金额
 const lastPayMoney = computed(() => {
-	return shifu.value * 1;
+  return shifu.value * 1;
 });
 
 const payStatus = {
-	unpaid: '待支付',
-	done: '已完成',
-	refund: '已退款',
-	'part-refund': '部分退款',
-	cancelled: '已取消'
+  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 '待确认';
-	}
+  if (!listinfo.id && !cartStore.isEmpty) {
+    return "待确认";
+  }
+  if (cartStore.isEmpty && listinfo.id) {
+    return payStatus[listinfo.status] || "待确认";
+  } else {
+    return "待确认";
+  }
 });
 
 //支付成功后的处理
 async function paySucessCallback() {
-	console.log('paySucessCallback');
-	cartsSocket.closeSocket();
-	showDrainage.value = true;
-	const groupinfo=await chatApi.groupShopinfo({shop_id:cartStore.shopInfo.id})
-	if(groupinfo&&groupinfo[0]){
-		console.log('groupinfo',groupinfo[0].id);
-		chatApi.groupJoin({
-			group_id:groupinfo[0].id
-	})
-	}
-
+  console.log("paySucessCallback");
+  cartsSocket.closeSocket();
+  showDrainage.value = true;
+  // const groupinfo=await chatApi.groupShopinfo({shop_id:cartStore.shopInfo.id})
+  // if(groupinfo&&groupinfo[0]){
+  // 	console.log('groupinfo',groupinfo[0].id);
+  // 	chatApi.groupJoin({
+  // 		group_id:groupinfo[0].id
+  // })
+  // }
 }
 
 //私域引流配置
 const drainageConfig = ref({});
 //私域引流弹窗
 const showDrainage = ref(false);
+
+function setOrder(res) {
+  uni.cache.set("tableCode", res.tableCode);
+  uni.cache.set("dinersNum", res.seatNum);
+  options.tableCode = res.tableCode || "";
+  cartStore.setSeatFeeConfig("personCount", res.seatNum);
+  cartStore.setDinnerType(res.dineMode || "dine-in");
+  cartStore.setOldOrder(res);
+  if (res.limitRate) {
+    cartStore.limitTimeDiscount = res.limitRate;
+  }
+  orderRemarker.value = res.remark;
+  Object.assign(listinfo, res);
+}
 async function init(opt) {
-	await storeuser.actionsproductqueryProduct();
+  await storeuser.actionsproductqueryProduct();
 
-	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.cache.set('shopId', options.shopId);
-	}
-	//如果已经生成订单，根据历史订信息设置相关配置
-	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');
-			cartStore.setOldOrder(res);
-			if (res.limitRate) {
-				cartStore.limitTimeDiscount = res.limitRate;
-			}
-			orderRemarker.value = res.remark;
-			Object.assign(listinfo, res);
-		}
-	}
-	//获取店铺信息
-	const shopInfoRes = await APIusershopInfodetail({
-		shopId: options.shopId
-	});
-	if (shopInfoRes) {
-		cartStore.shopInfo = shopInfoRes.shopInfo;
-	}
-	await cartStore.goodsInit();
-	// * 获取会员信息
-	await nextTick();
+  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.cache.set("shopId", options.shopId);
+  }
+  //如果已经生成订单，根据历史订信息设置相关配置
+  if (options.orderId) {
+    let res = await APIgetOrderById({
+      orderId: listinfo.id,
+    });
+    if (res&&typeof res=='object') {
+      setOrder(res);
+    }
+  }
+  //获取店铺信息
+  const shopInfoRes = await APIusershopInfodetail({
+    shopId: options.shopId,
+  });
+  if (!isPayBefor()&&options.tableCode) {
+    const res = await APIhistoryOrder({
+      tableCode: options.tableCode || "",
+    });
+	if (res&&typeof res=='object') {
+      setOrder(res);
+    }
+  }
+  if (shopInfoRes) {
+    cartStore.shopInfo = shopInfoRes.shopInfo;
+  }
+  await cartStore.goodsInit();
+  // * 获取会员信息
+  await nextTick();
 
-	orderVIP.value = uni.cache.get('orderVIP');
-	cartStore.freeDineConfig = orderVIP.value.freeDineConfig;
-	const shopUserInfo = uni.cache.get('shopUserInfo');
-	cartStore.shopUserInfo = shopUserInfo;
-	if (options.tableCode) {
-		socketInitPar.table_code = options.tableCode;
-		socketInit();
-	} else {
-		orderorderInfo();
-	}
+  orderVIP.value = uni.cache.get("orderVIP");
+  cartStore.freeDineConfig = orderVIP.value.freeDineConfig;
+  const shopUserInfo = uni.cache.get("shopUserInfo");
+  cartStore.shopUserInfo = shopUserInfo;
+  if (options.tableCode) {
+    socketInitPar.table_code = options.tableCode;
+    socketInit();
+  } else {
+    orderorderInfo();
+  }
 }
 onLoad((opt) => {
-	init(opt);
+  init(opt);
 });
 
 watch(
-	() => cartStore.orderCostSummary.orderOriginFinalPayAmount,
-	(newval) => {
-		console.log('cartStore.orderCostSummary.orderOriginFinalPayAmount', orderVIP.value);
-		if (JSON.stringify(orderVIP.value) == '{}') {
-			return;
-		}
-		if (!orderVIP.value) {
-			return;
-		}
-		if (!orderVIP.value.freeDineConfig || !orderVIP.value.freeDineConfig.enable) {
-			//未开始霸王餐后面代码不执行
-			isBwc.value = false;
-			showFreeDine.value = false;
-			return;
-		}
+  () => cartStore.orderCostSummary.orderOriginFinalPayAmount,
+  (newval) => {
+    console.log(
+      "cartStore.orderCostSummary.orderOriginFinalPayAmount",
+      orderVIP.value
+    );
+    if (JSON.stringify(orderVIP.value) == "{}") {
+      return;
+    }
+    if (!orderVIP.value) {
+      return;
+    }
+    if (
+      !orderVIP.value.freeDineConfig ||
+      !orderVIP.value.freeDineConfig.enable
+    ) {
+      //未开始霸王餐后面代码不执行
+      isBwc.value = false;
+      showFreeDine.value = false;
+      return;
+    }
 
-		const bwc_fullaniunt_money = newval + cartStore.orderCostSummary.fullReduction.actualAmount;
-		if (bwc_fullaniunt_money <= 0 || bwc_fullaniunt_money < orderVIP.value.freeDineConfig.rechargeThreshold) {
-			isBwc.value = false;
-			showFreeDine.value = false;
-			return;
-		}
+    const bwc_fullaniunt_money =
+      newval + cartStore.orderCostSummary.fullReduction.actualAmount;
+    if (
+      bwc_fullaniunt_money <= 0 ||
+      bwc_fullaniunt_money < orderVIP.value.freeDineConfig.rechargeThreshold
+    ) {
+      isBwc.value = false;
+      showFreeDine.value = false;
+      return;
+    }
 
-		if ((listinfo.status == 'unpaid' || !listinfo.id) && orderVIP.value.freeDineConfig.enable && bwc_fullaniunt_money >= orderVIP.value.freeDineConfig.rechargeThreshold) {
-			showFreeDine.value = true;
-		}
-	},
-	{
-		immediate: true
-	}
+    if (
+      (listinfo.status == "unpaid" || !listinfo.id) &&
+      orderVIP.value.freeDineConfig.enable &&
+      bwc_fullaniunt_money >= orderVIP.value.freeDineConfig.rechargeThreshold
+    ) {
+      showFreeDine.value = true;
+    }
+  },
+  {
+    immediate: true,
+  }
 );
 
 watch(
-	() => isBwc.value,
-	(newval) => {
-		cartStore.isFreeDine = newval;
-	}
+  () => isBwc.value,
+  (newval) => {
+    cartStore.isFreeDine = newval;
+  }
 );
 
 const disablePayType = computed(() => {
-	const arr = new Set([]);
-	if (isBwc.value) {
-		if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
-			arr.add('微信支付');
-		} else {
-			arr.add('余额支付');
-		}
-	}
-	if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
-		arr.add('微信支付');
-	}
+  const arr = new Set([]);
+  if (isBwc.value) {
+    if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+      arr.add("微信支付");
+    } else {
+      arr.add("余额支付");
+    }
+  }
+  if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+    arr.add("微信支付");
+  }
 
-	//充值并付款时只能微信支付
-	if (rechargeItem.value.id) {
-		arr.add('余额支付');
-	}
-	if (!orderVIP.value || !orderVIP.value.amount) {
-		arr.add('余额支付');
-	}
-	if (orderVIP.value) {
-		if (orderVIP.value.amount < cartStore.orderCostSummary.orderOriginFinalPayAmount) {
-			arr.add('余额支付');
-		}
-	}
+  //充值并付款时只能微信支付
+  if (rechargeItem.value.id) {
+    arr.add("余额支付");
+  }
+  if (!orderVIP.value || !orderVIP.value.amount) {
+    arr.add("余额支付");
+  }
+  if (orderVIP.value) {
+    if (
+      orderVIP.value.amount <
+      cartStore.orderCostSummary.orderOriginFinalPayAmount
+    ) {
+      arr.add("余额支付");
+    }
+  }
 
-	// if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
-	//   arr.add("微信支付");
-	// }
-	if (!isCanUseCharge.value) {
-		arr.add('余额支付');
-	}
+  // if (cartStore.orderCostSummary.orderOriginFinalPayAmount <= 0) {
+  //   arr.add("微信支付");
+  // }
+  if (!isCanUseCharge.value) {
+    arr.add("余额支付");
+  }
 
-	return Array.from(arr);
+  return Array.from(arr);
 });
 </script>
 
 <style lang="scss">
 page {
-	background-color: #f7f7f7;
+  background-color: #f7f7f7;
 }
 
 .container {
-	padding: 32rpx 28rpx 32rpx 28rpx;
+  padding: 32rpx 28rpx 32rpx 28rpx;
 }
 
 .headStatus {
-	display: flex;
-	flex-direction: column;
-	margin-bottom: 32rpx;
-	align-items: center;
+  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;
+  .status {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #333333;
 
-		.statusName {
-			margin-left: 16rpx;
-		}
-	}
+    .statusName {
+      margin-left: 16rpx;
+    }
+  }
 
-	.time {
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 18rpx;
-	}
+  .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;
+  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;
-	}
+  .left {
+    display: flex;
+    flex-direction: column;
+  }
 
-	.title {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-		margin-bottom: 16rpx;
-	}
+  .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;
+  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_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_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;
+  // 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 {
+    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;
-			}
+    .head_left {
+      .shopName {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+      }
 
-			.tableName {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
-			}
-		}
+      .tableName {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+      }
+    }
 
-		.status {
-			text {
-				font-weight: 500;
-				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;
+  .number-wrap {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 32rpx;
 
-		.t {
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-		}
+    .t {
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #333333;
+    }
 
-		.number {
-			font-weight: bold;
-			font-size: 56rpx;
-			color: #333333;
-		}
-	}
+    .number {
+      font-weight: bold;
+      font-size: 56rpx;
+      color: #333333;
+    }
+  }
 
-	.price {
-		.i {
-			font-size: 20upx;
-		}
+  .price {
+    .i {
+      font-size: 20upx;
+    }
 
-		.num {
-			font-size: 38upx;
-		}
-	}
+    .num {
+      font-size: 38upx;
+    }
+  }
 
-	.shop-box {
-		padding: 36rpx 34rpx 30rpx 34rpx;
-		border-bottom: 2rpx dashed #e3e3e3;
+  .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 {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
 
-			.shop-head-left {
-				display: flex;
-				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-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;
-					}
-				}
+          .tag {
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #e3ad7f;
+          }
+        }
 
-				.title {
-					font-weight: bold;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
+        .title {
+          font-weight: bold;
+          font-size: 28rpx;
+          color: #333333;
+        }
+      }
+    }
 
-		.shop-info {
-			margin-top: 32rpx;
+    .shop-info {
+      margin-top: 32rpx;
 
-			.item:nth-child(1) {
-				margin-top: 0;
-			}
+      .item:nth-child(1) {
+        margin-top: 0;
+      }
 
-			.item {
-				padding: 32rpx 0 !important;
-				display: flex;
+      .item {
+        padding: 32rpx 0 !important;
+        display: flex;
 
-				.cover {
-				}
+        .cover {
+        }
 
-				.info {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					padding-left: 16upx;
+        .info {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          padding-left: 16upx;
 
-					.productName {
-						font-weight: bold;
-						font-size: 28rpx;
-						color: #333333;
-						margin-top: 20rpx;
-					}
+          .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;
-					}
+          .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;
-					}
-				}
+          .n {
+            font-size: 24upx;
+            color: #999;
+          }
+        }
 
-				.price {
-					display: flex;
-					flex-direction: column;
-					align-items: flex-end;
-					padding-left: 68rpx;
+        .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;
-					}
+          .priceAmount {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 26rpx;
+          }
 
-					.num {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-						margin-top: 22rpx;
-					}
-				}
-			}
-		}
+          .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;
+    .total-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      font-weight: 500;
+      font-size: 28rpx;
 
-			.price {
-				font-weight: bold;
-				font-size: 32rpx;
-			}
-		}
-	}
+      .price {
+        font-weight: bold;
+        font-size: 32rpx;
+      }
+    }
+  }
 
-	.order_footer {
-		display: flex;
-		flex-direction: column;
-		padding: 34rpx;
-		position: relative;
+  .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_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_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);
-			}
-		}
+      .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;
-		}
+    .title {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #333333;
+    }
 
-		.order-info {
-			.row {
-				display: flex;
-				justify-content: space-between;
-				padding-top: 32upx;
+    .order-info {
+      .row {
+        display: flex;
+        justify-content: space-between;
+        padding-top: 32upx;
 
-				.t {
-					font-weight: normal;
-					font-size: 28rpx;
-					color: #333333;
-				}
+        .t {
+          font-weight: normal;
+          font-size: 28rpx;
+          color: #333333;
+        }
 
-				.info {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #666666;
-				}
-			}
-		}
-	}
+        .info {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #666666;
+        }
+      }
+    }
+  }
 }
 
 .pay-info-wrap {
-	padding: 0;
-	box-sizing: border-box;
+  padding: 0;
+  box-sizing: border-box;
 
-	.info-wrap {
-		padding: 64rpx 30rpx 30rpx 30rpx;
-		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;
-		}
-	}
+    .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;
+  .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;
-			}
-		}
+      text {
+        font-size: 60rpx;
+        color: #333;
+      }
+    }
 
-		.pay-password {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 64rpx;
+    .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;
+      .list {
+        width: 88rpx;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 2rpx solid #999;
+        border-radius: 8rpx;
 
-				text {
-					font-size: 32rpx;
-				}
-			}
-		}
+        text {
+          font-size: 32rpx;
+        }
+      }
+    }
 
-		.hint {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			height: 100rpx;
+    .hint {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100rpx;
 
-			text {
-				font-size: 28rpx;
-				color: #ccc;
-			}
-		}
-	}
+      text {
+        font-size: 28rpx;
+        color: #ccc;
+      }
+    }
+  }
 }
 
 .fixedview {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	z-index: 999;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 999;
 
-	// height: 80rpx;
-	.flex-between {
-		width: 100%;
-		padding: 36rpx 36rpx 70rpx 36rpx;
-		background: #ffffff;
+  // height: 80rpx;
+  .flex-between {
+    width: 100%;
+    padding: 36rpx 36rpx 70rpx 36rpx;
+    background: #ffffff;
+	
+    .fixedview_one {
+      display: flex;
+	  flex-direction: column;
+	  justify-content: center;
+	  align-items: center;
+    //   align-items: flex-end;
 
-		.fixedview_one {
-			display: flex;
-			align-items: flex-end;
 
-			.fixedview_oneone {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #666666;
-			}
+      .fixedview_oneone {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
 
-			.fixedview_onetow {
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #333333;
+      .fixedview_onetow {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
 
-				text {
-					font-size: 24rpx;
-				}
-			}
-		}
+        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;
-			}
+    .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;
-			}
-		}
-	}
+      .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;
+  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;
-	}
+  .t {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #333333;
+    flex-shrink: 0;
+  }
 
-	.info {
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #666666;
-	}
+  .info {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #666666;
+  }
 }
 </style>
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 2d19c32..b9a8b09 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -555,7 +555,8 @@
 <script setup>
 import xbSwiperPreview from '@/components/xb-swiper-preview/index.vue';
 //价格计算辅助函数
-import * as orderUtils from '@/utils/order-utils.js';
+// import * as limitUtils from '@/utils/order-utils.js';
+import {limitUtils }  from 'ysk-utils'
 import BigNumber from 'bignumber.js';
 
 import GoodsPrice from '@/components/goods-price.vue';
@@ -1341,8 +1342,7 @@ const singleclick = async (item, i) => {
 	} else if (item.suitNum >= cartNumberFloat && i === '-') {
 		suitNum = item.cartNumber;
 	}
-	websocketsendMessage({
-		id: res ? item.cartListId : '',
+	const sendMsg={
 		type: 'shopping',
 		suitNum: item.suitNum,
 		table_code: uni.cache.get('tableCode'),
@@ -1355,7 +1355,11 @@ const singleclick = async (item, i) => {
 		is_print: 1,
 		product_type: item.type,
 		is_time_discount: item.is_time_discount
-	});
+	}
+	if(item.cartListId){
+		sendMsg.id=item.cartListId;
+	}
+	websocketsendMessage(sendMsg);
 };
 
 const calculateValue = (cartNumber, i, step = 1) => {
@@ -1677,6 +1681,7 @@ const confirmorderref = ref(null);
 
 // 结账
 const orderdetail = async () => {
+	isAutoClose = false;	
 	uni.navigateTo({
 		url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni.cache.get('shopId')
 	});
@@ -1734,7 +1739,7 @@ const totalPrices = computed(() => {
 			}
 			if (limitTimeDiscountRes.value && limitTimeDiscountRes.value.id && item.is_time_discount == 1) {
 				//限时折扣
-				const price = orderUtils.returnPrice({
+				const price = limitUtils.returnPrice({
 					goods: item,
 					shopInfo,
 					limitTimeDiscountRes: limitTimeDiscountRes.value,
@@ -2083,11 +2088,11 @@ function showLimitDiscount(item) {
 	if (!cartStore.limitTimeDiscount || !cartStore.limitTimeDiscount.id) {
 		return false;
 	}
-	return orderUtils.canUseLimitTimeDiscount(item, cartStore.limitTimeDiscount, shopInfo, shopUserInfo.value, 'id');
+	return limitUtils.canUseLimitTimeDiscount(item, cartStore.limitTimeDiscount, shopInfo, shopUserInfo.value, 'id');
 }
 
 function returnLimitPrice(item) {
-	return orderUtils.returnPrice({
+	return limitUtils.returnPrice({
 		goods: item,
 		limitTimeDiscountRes: cartStore.limitTimeDiscount,
 		shopInfo: shopInfo,
@@ -2097,6 +2102,7 @@ function returnLimitPrice(item) {
 }
 
 onShow(async () => {
+	isAutoClose=true
 	// 监听页面显示和隐藏
 	useSocket.setOnMessage(onMessage);
 	useSocket.onShowconnect();
@@ -2116,17 +2122,23 @@ onShow(async () => {
 	}
 });
 
-onHide(() => {
-	console.log('product index onHide');
+//是否自动关闭socket
+let isAutoClose = true;
+function closeSocket(){
+	if(isAutoClose){
 	useSocket.closeSocket();
+	}
 	useSocket.setOnMessage(() => {});
+
+}
+onHide(() => {
+	closeSocket()
 });
 onUnload(() => {
-	console.log('product index onUnload');
-	useSocket.closeSocket();
-	useSocket.setOnMessage(() => {});
+	closeSocket()
 });
 
+const oldOrder=ref(null)
 onMounted(async () => {
 	await proxy.$onLaunched;
 	// 获取当前页面栈
@@ -2139,6 +2151,7 @@ onMounted(async () => {
 	let res = await APIhistoryOrder({
 		tableCode: uni.cache.get('tableCode')
 	});
+	oldOrder.value = res;
 	const limitRes = await limitTimeDiscountapi.getConfig({
 		shopId: uni.cache.get('shopId')
 	});
@@ -2179,10 +2192,17 @@ onMounted(async () => {
 
 //跳转历史订单
 function toHistory() {
+ isAutoClose = false;
 	const tableCode = uni.cache.get('tableCode');
 	const shopId = uni.cache.get('shopId');
+	let url= `/pages/order/confirm-order?tableCode=${tableCode}&shopId=${shopId}`
+	const res=oldOrder.value;
+	console.log('toHistory',res);
+	// if (res && res.id && shopInfo.registerType == 'after') {
+	// 	url+='&orderId='+res.id
+	// }
 	uni.navigateTo({
-		url: `/pages/order/confirm-order?tableCode=${tableCode}&shopId=${shopId}`
+		url
 	});
 }
 </script>
diff --git a/stores/carts.js b/stores/carts.js
index f93df0b..421db17 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -11,7 +11,8 @@ import { defineStore } from "pinia";
 // 	GoodsType
 // } = yskUtils
 
-import { OrderPriceCalculator } from "@/utils/goods";
+import yskUtils from 'ysk-utils'
+const {OrderPriceCalculator}=yskUtils
 
 import { ref, computed, reactive, watchEffect, watch } from "vue";
 import {