diff --git a/pages/product/index.vue b/pages/product/index.vue
index 94cc1d0..708b376 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1,1133 +1,710 @@
 <template>
-  <view>
-    <Nav />
-    <!-- 顶部面板 -->
-    <view class="top--panel" :class="{ grayscale: !isBusinessTime }">
-      <template v-if="shopExtend">
-        <image
-          class="panelimgbackground"
-          :src="
-            shopExtend
-              ? shopExtend.value
-              : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'
-          "
-          mode="aspectFill"
-          v-if="!isJsonArrayString(shopExtend.value)"
-        ></image>
-        <swiper
-          class="panelimgbackground"
-          autoplay
-          indicator-dots
-          circular
-          v-else
-        >
-          <swiper-item
-            v-for="(item, index) in JSON.parse(shopExtend.value)"
-            :key="index"
-          >
-            <image :src="item" mode="aspectFill"></image>
-          </swiper-item>
-        </swiper>
-      </template>
-      <template v-else>
-        <image
-          class="panelimgbackground"
-          src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png"
-          mode="aspectFill"
-        ></image>
-      </template>
-      <view class="panelone">
-        <text>
-          {{ shopInfo.shopName }}
-        </text>
-        <view class="paneltow">距离您{{ distance }}</view>
-        <!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
-      </view>
-      <view class="new-user-discount u-font-28" v-if="newUserDiscount">
-        <text class="">新客立减¥</text>
-        <text class="u-font-32">{{ newUserDiscount.amount }}</text>
-        <!-- <text class="u-m-l-60">新客可随机减免金额</text> -->
-      </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"
-            >
-              <!-- <view class="limitDiscount" v-if="showLimitDiscount(item)"
+	<view>
+		<Nav />
+		<!-- 顶部面板 -->
+		<view class="top--panel" :class="{ grayscale: !isBusinessTime }">
+			<template v-if="shopExtend">
+				<image
+					class="panelimgbackground"
+					:src="shopExtend ? shopExtend.value : 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
+					mode="aspectFill"
+					v-if="!isJsonArrayString(shopExtend.value)"
+				></image>
+				<swiper class="panelimgbackground" autoplay indicator-dots circular v-else>
+					<swiper-item class="panelimgbackground" v-for="(item, index) in JSON.parse(shopExtend.value)" :key="index">
+						<image class="panelimgbackground" :src="item" mode="aspectFill"></image>
+					</swiper-item>
+				</swiper>
+			</template> 
+			<template v-else>
+				<image class="panelimgbackground" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png" mode="aspectFill"></image>
+			</template>
+			<view class="panelone">
+				<text>
+					{{ shopInfo.shopName }}
+				</text>
+				<view class="paneltow">距离您{{ distance }}</view>
+				<!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
+			</view>
+			<view class="new-user-discount u-font-28" v-if="newUserDiscount">
+				<text class="">新客立减¥</text>
+				<text class="u-font-32">{{ newUserDiscount.amount }}</text>
+				<!-- <text class="u-m-l-60">新客可随机减免金额</text> -->
+			</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">
+							<!-- <view class="limitDiscount" v-if="showLimitDiscount(item)"
                 >限时折扣{{limitDiscountCountdown}}</view
               > -->
 
-              <view class="relative">
-                <image
-                  @click.stop="getImgs(item)"
-                  class="panelfiveitemimage"
-                  :src="item.coverImg"
-                  mode="aspectFill"
-                ></image>
-                <view class="limitDiscount" v-if="item.is_time_discount"
-                  >限时折扣{{ limitDiscountCountdown }}</view
-                >
-              </view>
+							<view class="relative">
+								<image @click.stop="getImgs(item)" class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
+								<view class="limitDiscount" v-if="item.is_time_discount">限时折扣{{ limitDiscountCountdown }}</view>
+							</view>
 
-              <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="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
+								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>
 
-                    <text class="old-price">¥{{ item.salePrice }}</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>
+										<text class="old-price">¥{{ item.salePrice }}</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
-                    >
-                    <!-- 会员价与价格 -->
-                    <view class="price">
-                      <GoodsPrice
-                        :limitDiscount="limitTimeDiscountRes"
-                        :cart="item"
-                        :shopUserInfo="shopUserInfo"
-                        :key="item.id"
-                        :shopInfo="shopInfo"
-                      ></GoodsPrice>
-                    </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>
+										<!-- 会员价与价格 -->
+										<view class="price">
+											<GoodsPrice
+												:limitDiscount="limitTimeDiscountRes"
+												:cart="item"
+												:shopUserInfo="shopUserInfo"
+												:key="item.id"
+												:shopInfo="shopInfo"
+											></GoodsPrice>
+										</view>
 
-                    <text class="unit" v-if="item.unitName"
-                      >/{{ item.unitName }}</text
-                    >
-                    <text class="old-price">¥{{ item.salePrice }}</text>
-                    <!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
+										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
+										<text class="old-price">¥{{ item.salePrice }}</text>
+										<!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
 											style="font-size: 16rpx;">「{{item.suitNum}}{{item.unitName}}起点」</text> -->
-                  </view>
-                </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"
-              >
-                <view class="relative">
-                  <image
-                    class="goodsImg"
-                    @click.stop="getImgs(item1)"
-                    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="limitDiscount" v-if="item1.is_time_discount"
-                    >限时折扣{{ limitDiscountCountdown }}</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">
+								<view class="relative">
+									<image
+										class="goodsImg"
+										@click.stop="getImgs(item1)"
+										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="limitDiscount" v-if="item1.is_time_discount">限时折扣{{ limitDiscountCountdown }}</view>
+								</view>
 
-                <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
+									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 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="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>
-                      <view class="money_num">
-                        <GoodsPrice
-                          :limitDiscount="limitTimeDiscountRes"
-                          :cart="item1"
-                          :shopUserInfo="shopUserInfo"
-                          :shopInfo="shopInfo"
-                        ></GoodsPrice>
-                      </view>
-                      <text class="money_num" v-if="item1.unitName"
-                        >/{{ item1.unitName }}</text
-                      >
-                      <!-- <text class="old-price" v-if=" showLimitDiscount(item1)"
+									<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>
+											<view class="money_num">
+												<GoodsPrice :limitDiscount="limitTimeDiscountRes" :cart="item1" :shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+											</view>
+											<text class="money_num" v-if="item1.unitName">/{{ item1.unitName }}</text>
+											<!-- <text class="old-price" v-if=" showLimitDiscount(item1)"
                         >￥{{ item1.salePrice }}</text
                       > -->
-                      <text class="old-price" v-if="item1.is_time_discount"
-                        >￥{{ item1.salePrice }}</text
-                      >
+											<text class="old-price" v-if="item1.is_time_discount">￥{{ item1.salePrice }}</text>
 
-                      <!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
+											<!-- <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"
-      :limitDiscount="limitTimeDiscountRes"
-      @customevent="websocketsendMessage"
-      @close="showCart = !showCart"
-      :orderinfo="orderinfo"
-      @clickcancelOrder="clickcancelOrder"
-      v-if="cartLists_count > 0"
-      :nextFullAmountActivty="nextFullAmountActivty"
-    ></shoppingCartes>
+		<!-- 店铺详情 -->
+		<shopindex ref="showShopInfoRef"></shopindex>
+		<!-- 购物车 -->
+		<shoppingCartes
+			:cartLists_count="cartLists_count"
+			:cartList="matchedProducts"
+			:showCart="showCart"
+			:limitDiscount="limitTimeDiscountRes"
+			@customevent="websocketsendMessage"
+			@close="showCart = !showCart"
+			:orderinfo="orderinfo"
+			@clickcancelOrder="clickcancelOrder"
+			v-if="cartLists_count > 0"
+			:nextFullAmountActivty="nextFullAmountActivty"
+		></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">{{ actualPrice }}</text>
+					<text class="i">￥</text>
+					<text class="num">{{ actualPrice }}</text>
 
-          <text class="allDiscountMoney" v-if="allDiscountMoney * 1 > 0"
-            >共减¥{{ allDiscountMoney }}</text
-          >
-        </view>
-        <view
-          class="btn"
-          @tap="$u.debounce(orderdetail, 500)"
-          v-if="orderType == 'scan'"
-        >
-          <text class="t">结算</text>
-        </view>
-        <view class="btn" v-else>
-          <u-button
-            type="primary"
-            shape="circle"
-            plain
-            @click="beforehandHandle"
-            >扫码下单</u-button
-          >
-        </view>
-      </view>
-      <!-- 满减活动 -->
-      <view class="fullAmount-activity" v-if="nextFullAmountActivty">
-        <text>再买</text>
-        <text class="price"
-          >¥{{
-            BigNumber(nextFullAmountActivty.fullAmount)
-              .minus(totalPrices * 1)
-              .toFixed(2)
-          }}</text
-        >
-        <text>，</text>
-        <text>可再减</text>
-        <text class="price">¥{{ nextFullAmountActivty.discountAmount }}</text>
-      </view>
-    </view>
+					<text class="allDiscountMoney" v-if="allDiscountMoney * 1 > 0">共减¥{{ allDiscountMoney }}</text>
+				</view>
+				<view class="btn" @tap="$u.debounce(orderdetail, 500)" v-if="orderType == 'scan'">
+					<text class="t">结算</text>
+				</view>
+				<view class="btn" v-else>
+					<u-button type="primary" shape="circle" plain @click="beforehandHandle">扫码下单</u-button>
+				</view>
+			</view>
+			<!-- 满减活动 -->
+			<view class="fullAmount-activity" v-if="nextFullAmountActivty">
+				<text>再买</text>
+				<text class="price">
+					¥{{
+						BigNumber(nextFullAmountActivty.fullAmount)
+							.minus(totalPrices * 1)
+							.toFixed(2)
+					}}
+				</text>
+				<text>，</text>
+				<text>可再减</text>
+				<text class="price">¥{{ nextFullAmountActivty.discountAmount }}</text>
+			</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"
-            @change="swiperChange"
-            :current="swiperCurrent"
-            radius="6px"
-            height="250"
-            @click="
-              prveImgs(
-                specifications.item.images,
-                specifications.item.images[swiperCurrent]
-              )
-            "
-          >
-            <!-- <template v-slot:default="{item}">
+		<!-- 规格 -->
+		<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"
+						@change="swiperChange"
+						:current="swiperCurrent"
+						radius="6px"
+						height="250"
+						@click="prveImgs(specifications.item.images, specifications.item.images[swiperCurrent])"
+					>
+						<!-- <template v-slot:default="{item}">
             <image :src=item></image>
           </templte> -->
-          </up-swiper>
+					</up-swiper>
 
-          <view class="shop_sku_name">{{ specifications.item.name }}</view>
-          <view class="shop_sku_description" v-if="isSkuGoods">
-            {{
-              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: isSkuSelected(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 price-sku"
-              v-if="
-                specifications.item.type != 'package' &&
-                specifications.item.result
-              "
-            >
-              <text class="i">￥</text>
-              <view class="num">
-                <GoodsPrice
-                  :limitDiscount="limitTimeDiscountRes"
-                  :cart="specifications.item.result"
-                  :shopUserInfo="shopUserInfo"
-                  :shopInfo="shopInfo"
-                ></GoodsPrice>
-              </view>
+					<view class="shop_sku_name">{{ specifications.item.name }}</view>
+					<view class="shop_sku_description" v-if="isSkuGoods">
+						{{ 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: isSkuSelected(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 price-sku" v-if="specifications.item.type != 'package' && specifications.item.result">
+							<text class="i">￥</text>
+							<view class="num">
+								<GoodsPrice :limitDiscount="limitTimeDiscountRes" :cart="specifications.item.result" :shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+							</view>
 
-              <text class="num" v-if="false">
-                {{
-                  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 price-package" v-else>
-              <text class="i">￥</text>
-              <view class="num">
-                <GoodsPrice
-                  :limitDiscount="limitTimeDiscountRes"
-                  :cart="specifications.item"
-                  :shopUserInfo="shopUserInfo"
-                  :shopInfo="shopInfo"
-                ></GoodsPrice>
-              </view>
-              <text class="num" v-if="false">
-                {{
-                  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>
+							<text class="num" v-if="false">
+								{{
+									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 price-package" v-else>
+							<text class="i">￥</text>
+							<view class="num">
+								<GoodsPrice :limitDiscount="limitTimeDiscountRes" :cart="specifications.item" :shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
+							</view>
+							<text class="num" v-if="false">
+								{{
+									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>
-          <template v-if="isSkuGoods">
-            <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>
-          </template>
-          <template v-else>
-            <view
-              class="addShopping"
-              :class="shopCartNumber > 0 ? 'active' : ''"
-              @click="submitSelection()"
-            >
-              {{ skuBtnText }}
-            </view>
-          </template>
-        </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>
-    <recommendGoodsModal
-      v-if="isDataLoaded"
-      @onBuyClick="onBuyClick"
-    ></recommendGoodsModal>
-    <goodsModal></goodsModal>
-    <xbSwiperPreview
-      :visable="showPrveImg"
-      :imgs="prveImgsList"
-      @update:visable="showPrveImg = $event"
-    ></xbSwiperPreview>
-    <!-- 显示选择人数popup -->
-    <u-popup
-      mode="bottom"
-      :safe-area-inset-bottom="false"
-      :show="showTableInfoPeopleNumPopup"
-    >
-      <view class="select_num_wrap">
-        <image
-          class="top_bg"
-          src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/order/orderAMeal.png"
-          mode="aspectFill"
-        ></image>
-        <view class="sn-bnottom">
-          <view class="sn-header">
-            <text class="t1">请选择就餐人数</text>
-            <text class="t2">桌号{{ shopTable.name }}</text>
-          </view>
-          <view class="sn-num-wrap">
-            <view class="sn-num">
-              <view
-                class="item"
-                :class="{ active: tableInfoPeopleActive == index }"
-                v-for="(item, index) in 10"
-                :key="item"
-                @click="tableInfoPeopleNumHandle(item, index)"
-              >
-                <text class="t">{{ item }}</text>
-              </view>
-            </view>
-            <view class="input">
-              <u-input
-                v-model="tableInfoPeopleNum"
-                :maxlength="2"
-                placeholder="请输入自定义人数"
-                clearable
-                @change="tableInfoPeopleNumInput"
-              ></u-input>
-            </view>
-          </view>
-          <view class="sn-footer-wrap">
-            <view class="btn">
-              <u-button
-                plain
-                shape="circle"
-                size="large"
-                @click="closeTableInfoPeopleNum"
-                >取消</u-button
-              >
-            </view>
-            <view class="btn">
-              <u-button
-                type="primary"
-                size="large"
-                shape="circle"
-                @click="tableInfoPeopleNumConfirm"
-                >确认</u-button
-              >
-            </view>
-          </view>
-        </view>
-      </view>
-    </u-popup>
-  </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>
+					<template v-if="isSkuGoods">
+						<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>
+					</template>
+					<template v-else>
+						<view class="addShopping" :class="shopCartNumber > 0 ? 'active' : ''" @click="submitSelection()">
+							{{ skuBtnText }}
+						</view>
+					</template>
+				</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>
+		<recommendGoodsModal v-if="isDataLoaded" @onBuyClick="onBuyClick"></recommendGoodsModal>
+		<goodsModal></goodsModal>
+		<xbSwiperPreview :visable="showPrveImg" :imgs="prveImgsList" @update:visable="showPrveImg = $event"></xbSwiperPreview>
+		<!-- 显示选择人数popup -->
+		<u-popup mode="bottom" :safe-area-inset-bottom="false" :show="showTableInfoPeopleNumPopup">
+			<view class="select_num_wrap">
+				<image class="top_bg" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/order/orderAMeal.png" mode="aspectFill"></image>
+				<view class="sn-bnottom">
+					<view class="sn-header">
+						<text class="t1">请选择就餐人数</text>
+						<text class="t2">桌号{{ shopTable.name }}</text>
+					</view>
+					<view class="sn-num-wrap">
+						<view class="sn-num">
+							<view
+								class="item"
+								:class="{ active: tableInfoPeopleActive == index }"
+								v-for="(item, index) in 10"
+								:key="item"
+								@click="tableInfoPeopleNumHandle(item, index)"
+							>
+								<text class="t">{{ item }}</text>
+							</view>
+						</view>
+						<view class="input">
+							<u-input v-model="tableInfoPeopleNum" :maxlength="2" placeholder="请输入自定义人数" clearable @change="tableInfoPeopleNumInput"></u-input>
+						</view>
+					</view>
+					<view class="sn-footer-wrap">
+						<view class="btn">
+							<u-button plain shape="circle" size="large" @click="closeTableInfoPeopleNum">取消</u-button>
+						</view>
+						<view class="btn">
+							<u-button type="primary" size="large" shape="circle" @click="tableInfoPeopleNumConfirm">确认</u-button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script setup>
-import xbSwiperPreview from "@/components/xb-swiper-preview/index.vue";
+import xbSwiperPreview from '@/components/xb-swiper-preview/index.vue';
 //价格计算辅助函数
 // import * as limitUtils from '@/utils/order-utils.js';
-import { limitUtils } from "ysk-utils";
+import { limitUtils } from 'ysk-utils';
 
 // 满减活动api
-import * as discountActivityApi from "@/common/api/market/discountActivity";
+import * as discountActivityApi from '@/common/api/market/discountActivity';
 
-import BigNumber from "bignumber.js";
-import { consumeDiscount } from "@/common/api/market/index.js";
+import BigNumber from 'bignumber.js';
+import { consumeDiscount } from '@/common/api/market/index.js';
 
-import GoodsPrice from "@/components/goods-price.vue";
+import GoodsPrice from '@/components/goods-price.vue';
 
-import * as limitTimeDiscountapi from "@/common/api/market/limitTimeDiscount.js";
-import ModalList from "@/components/modal-list.vue";
-import recommendGoodsModal from "./components/recommend-goods-modal.vue";
-import {
-  ref,
-  reactive,
-  onMounted,
-  watchEffect,
-  getCurrentInstance,
-  computed,
-  provide,
-  watch,
-} from "vue";
+import * as limitTimeDiscountapi from '@/common/api/market/limitTimeDiscount.js';
+import ModalList from '@/components/modal-list.vue';
+import recommendGoodsModal from './components/recommend-goods-modal.vue';
+import { ref, reactive, onMounted, watchEffect, getCurrentInstance, computed, provide, watch } from 'vue';
 
-import {
-  onLoad,
-  onReady,
-  onShow,
-  onHide,
-  onUnload,
-  onPageScroll,
-} from "@dcloudio/uni-app";
+import { onLoad, onReady, onShow, onHide, onUnload, onPageScroll } from '@dcloudio/uni-app';
 
 //导航栏
-import Nav from "@/components/CustomNavbar.vue";
-import shopindex from "./components/shopindex.vue";
-import goodsModal from "./components/goods-modal.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 goodsModal from './components/goods-modal.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);
-import { filterNumberInput, isJsonArrayString } from "@/utils/util.js";
-import { APIproductqueryShop } from "@/common/api/member.js";
-import { getDistance } from "@/utils/address.js";
+import { filterNumberInput, isJsonArrayString } from '@/utils/util.js';
+import { APIproductqueryShop } from '@/common/api/member.js';
+import { getDistance } from '@/utils/address.js';
 
 //点单智能推荐
 function onBuyClick(item) {
-  console.log("onBuyClick", item);
-  console.log("shopProductList", shopProductList);
-  let index = -1;
-  let index1 = -1;
-  if (!item.isHot) {
-    if (
-      item.type == "sku" ||
-      (item.type == "package" && item.groupType == "1")
-    ) {
-      for (let i in shopProductList.productInfo) {
-        const cate = shopProductList.productInfo[i];
-        const goodsList = cate.productList;
-        const index1 = goodsList.findIndex((goods) => goods.id == item.id);
-        if (index1 > -1) {
-          index = i;
-          clickspecifications(item, index, index1);
-          break;
-        }
-      }
-    } else {
-      uni.$u.throttle(() => singleclick(item, "+"), 500);
-    }
-  } else {
-    if (
-      item.type == "sku" ||
-      (item.type == "package" && item.groupType == "1")
-    ) {
-      for (let i in shopProductList.hots) {
-        const goods = shopProductList.hots[i];
-        if (goods.id == item.id) {
-          index = i;
-          clickspecifications(item, index, index);
-          break;
-        }
-      }
-    } else {
-      uni.$u.throttle(() => singleclick(item, "+"), 500);
-    }
-  }
+	console.log('onBuyClick', item);
+	console.log('shopProductList', shopProductList);
+	let index = -1;
+	let index1 = -1;
+	if (!item.isHot) {
+		if (item.type == 'sku' || (item.type == 'package' && item.groupType == '1')) {
+			for (let i in shopProductList.productInfo) {
+				const cate = shopProductList.productInfo[i];
+				const goodsList = cate.productList;
+				const index1 = goodsList.findIndex((goods) => goods.id == item.id);
+				if (index1 > -1) {
+					index = i;
+					clickspecifications(item, index, index1);
+					break;
+				}
+			}
+		} else {
+			uni.$u.throttle(() => singleclick(item, '+'), 500);
+		}
+	} else {
+		if (item.type == 'sku' || (item.type == 'package' && item.groupType == '1')) {
+			for (let i in shopProductList.hots) {
+				const goods = shopProductList.hots[i];
+				if (goods.id == item.id) {
+					index = i;
+					clickspecifications(item, index, index);
+					break;
+				}
+			}
+		} else {
+			uni.$u.throttle(() => singleclick(item, '+'), 500);
+		}
+	}
 }
 
 // 获取全局属性
 const { proxy } = getCurrentInstance();
 
 //接口引入
-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 = reactive({});
-Object.assign(shopInfo, uni.cache.get("shopInfo"));
-const shopTable = uni.cache.get("shopTable");
-const distance = uni.cache.get("distance"); //距离
+Object.assign(shopInfo, uni.cache.get('shopInfo'));
+const shopTable = uni.cache.get('shopTable');
+const distance = uni.cache.get('distance'); //距离
 
 const swiperCurrent = ref(0);
 function swiperChange(e) {
-  swiperCurrent.value = e.current;
+	swiperCurrent.value = e.current;
 }
 
 //店铺详情
@@ -1138,19 +715,19 @@ const isLoading = ref(true);
 
 //调用shop组件
 const callChildMethod = () => {
-  if (showShopInfoRef.value) {
-    showShopInfoRef.value.childMethod();
-  }
+	if (showShopInfoRef.value) {
+		showShopInfoRef.value.childMethod();
+	}
 };
 
 // const shopExtend = ref(uni.cache.get('shopTable').shopExtendMap.shopinfo_bg);
 // console.log('shopExtend', shopExtend);
 
 // 分步取值 + 每层兜底，避免某一环不存在导致 undefined
-const shopExtendShopTable = uni.cache.get("shopTable") || {}; // 兜底空对象
+const shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
 const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
 // 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
-const shopExtend = ref(shopExtendMap.shopinfo_bg || "");
+const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
 
 // try {
 // 	const shopExtend = uni.cache.get('shopTable').shopExtendMap.shopinfo_bg;
@@ -1161,20 +738,20 @@ 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;
 };
 
 // 计算左侧位置
 const leftIndex = ref(0);
 
 //元素最低端的距离
-const lastbottom = ref("");
+const lastbottom = ref('');
 
 //储存元素的下标
 const topArr = ref([]);
@@ -1187,56 +764,51 @@ 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
+		}
+	});
 };
 
 // 定时器
@@ -1244,39 +816,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);
 });
 
 // 点击详情
@@ -1284,19 +856,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);
@@ -1308,73 +880,73 @@ 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]);
 });
 
 function isSkuSelected(specType, option) {
-  return selectedSpecs.value[specType] === option;
+	return selectedSpecs.value[specType] === option;
 }
 
 // 处理规格选择的方法
 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;
+	}
 };
 
-const shopUserInfo = ref(uni.cache.get("shopUserInfo"));
+const shopUserInfo = ref(uni.cache.get('shopUserInfo'));
 
 // 监听 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(() => []);
+		}
+	}
 );
 
 // 存储选中的选项，二维数组
@@ -1382,57 +954,50 @@ 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;
+	});
 });
 
 // 提交选择，套餐选中最后处理的数据
@@ -1440,8 +1005,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('，');
 });
 
 //添加购物车数量
@@ -1449,375 +1014,336 @@ const shopCartNumber = ref(0);
 
 // 多规格 套餐 单规格添加数量
 const shopCart = async (i) => {
-  if (i == "-" && shopCartNumber.value >= 0) {
-    shopCartNumber.value = 0;
-    return false;
-  }
-  let res = await shoppingcart();
-  // if (!isSkuGoods.value) {
-  //   console.log("specifications.item", specifications.item);
-  //   if (i == "-") {
-  //     shopCartNumber.value--;
-  //   } else {
-  //     shopCartNumber.value++;
-  //   }
-  //   specifications.item.cartNumber = shopCartNumber.value;
-  //   singleclick(specifications.item, i);
-  //   return;
-  // }
-  if(specifications.item.result==='kong'){
-    //没有满足可添加或者编辑的规格
-    return
-  }
-  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) {
-      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 (!isSkuGoods.value) {
+	//   console.log("specifications.item", specifications.item);
+	//   if (i == "-") {
+	//     shopCartNumber.value--;
+	//   } else {
+	//     shopCartNumber.value++;
+	//   }
+	//   specifications.item.cartNumber = shopCartNumber.value;
+	//   singleclick(specifications.item, i);
+	//   return;
+	// }
+	if (specifications.item.result === 'kong') {
+		//没有满足可添加或者编辑的规格
+		return;
+	}
+	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) {
+			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 (specifications.item.type == "sku") {
-    if (!canSubmit.value) {
-      return false;
-    }
-    res = await matchingProduct(specifications.item.result);
-  } else {
-    // 单规格
-    res = await matchingProduct(specifications.item);
-  }
-  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 (specifications.item.type == 'sku') {
+		if (!canSubmit.value) {
+			return false;
+		}
+		res = await matchingProduct(specifications.item.result);
+	} else {
+		// 单规格
+		res = await matchingProduct(specifications.item);
+	}
+	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;
-  }
-  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;
+	}
+	let res = await shoppingcart();
 
-  if (
-    (specifications.item.type == "package" && allConditionsSatisfied.value) ||
-    (specifications.item.type == "sku" && canSubmit.value)
-  ) {
-    // 是否是套餐 有就传
-    if (specifications.item.type == "package") {
-      // 需求更改:所所有商品套餐都是add,没有修改
-      res = null;
-    } else {
-      selectedGroupSnap.value = [];
-    }
-    console.log("specifications.item", specifications.item);
-    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" : "",
-      memberPrice: specifications.item.memberPrice,
-      is_print: 1,
-      product_type: specifications.item.type,
-      is_time_discount: specifications.item.is_time_discount,
-    });
-    // 清空套餐选中
-    selectedGroupSnap.value = [];
-    showShopsku.value = false;
-  } else {
-    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,
-      memberPrice: specifications.item.memberPrice,
-      is_print: 1,
-      product_type: specifications.item.type,
-      is_time_discount: specifications.item.is_time_discount,
-    });
-    showShopsku.value = false;
+	if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type == 'sku' && canSubmit.value)) {
+		// 是否是套餐 有就传
+		if (specifications.item.type == 'package') {
+			// 需求更改:所所有商品套餐都是add,没有修改
+			res = null;
+		} else {
+			selectedGroupSnap.value = [];
+		}
+		console.log('specifications.item', specifications.item);
+		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' : '',
+			memberPrice: specifications.item.memberPrice,
+			is_print: 1,
+			product_type: specifications.item.type,
+			is_time_discount: specifications.item.is_time_discount
+		});
+		// 清空套餐选中
+		selectedGroupSnap.value = [];
+		showShopsku.value = false;
+	} else {
+		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,
+			memberPrice: specifications.item.memberPrice,
+			is_print: 1,
+			product_type: specifications.item.type,
+			is_time_discount: specifications.item.is_time_discount
+		});
+		showShopsku.value = false;
 
-    return;
-  }
+		return;
+	}
 };
 
 //返回是否是多规格商品
 function returnIsSkuGoods(item) {
-  if (
-    item.type == "single" ||
-    item.type == "weight" ||
-    (item.type == "package" && item.groupType == "0")
-  ) {
-    return false;
-  }
-  return true;
+	if (item.type == 'single' || item.type == 'weight' || (item.type == 'package' && item.groupType == '0')) {
+		return false;
+	}
+	return true;
 }
 
 const isSkuGoods = computed(() => {
-  return returnIsSkuGoods(specifications.item);
+	return returnIsSkuGoods(specifications.item);
 });
 
 //预览图
 const showPrveImg = ref(false);
 const prveImgsList = ref([]);
 function prveImgs(images) {
-  prveImgsList.value = images;
-  showPrveImg.value = true;
-  return;
-  uni.previewImage({
-    urls: images,
-    current: swiperCurrent.value,
-  });
+	prveImgsList.value = images;
+	showPrveImg.value = true;
+	return;
+	uni.previewImage({
+		urls: images,
+		current: swiperCurrent.value
+	});
 }
 
 async function getImgs(item) {
-  let res = await APIminiAppinfo(item.id);
-  prveImgs(res.images);
+	let res = await APIminiAppinfo(item.id);
+	prveImgs(res.images);
 }
 
 //获取多规格数据
 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;
-  // }
+	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;
+	// }
 
-  if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)) {
-    return false;
-  }
+	if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)) {
+		return false;
+	}
 
-  shopCartNumber.value = 0;
+	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);
+	// 数量清零
+	// 初始化
+	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);
 
-  console.log("res", res);
-  console.log("item", item);
-  specifications.item = {
-    ...res,
-    ...item,
-    product_id: res.id,
-    sku_id: item.skuId,
-  };
-  if (specifications.item.type == "package") {
-    selectedOptions.value = [];
-    specifications.product_id = res.id;
-    specifications.sku_id = item.skuId;
-    shopCartNumber.value = 1;
-  } else {
-    specifications.product_id = res.id || specifications.item.product_id;
-    specifications.sku_id = item.skuId || specifications.item.sku_id;
-  }
-  // 购物车是否有商品
-  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('res', res);
+	console.log('item', item);
+	specifications.item = {
+		...res,
+		...item,
+		product_id: res.id,
+		sku_id: item.skuId
+	};
+	if (specifications.item.type == 'package') {
+		selectedOptions.value = [];
+		specifications.product_id = res.id;
+		specifications.sku_id = item.skuId;
+		shopCartNumber.value = 1;
+	} else {
+		specifications.product_id = res.id || specifications.item.product_id;
+		specifications.sku_id = item.skuId || specifications.item.sku_id;
+	}
+	// 购物车是否有商品
+	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;
 };
 
 /**
@@ -1825,93 +1351,88 @@ const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
  * @param {Object} item
  */
 function juageProductAvailable(item) {
-  if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
-    uni.showToast({
-      title: "不在可售时间内",
-    });
-    return false;
-  }
-  if (item.isStock && item.stockNumber < item.suitNum) {
-    uni.showToast({
-      title: "库存不足",
-      icon: "none",
-    });
-    return false;
-  }
-  return true;
+	if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
+		uni.showToast({
+			title: '不在可售时间内'
+		});
+		return false;
+	}
+	if (item.isStock && item.stockNumber < item.suitNum) {
+		uni.showToast({
+			title: '库存不足',
+			icon: 'none'
+		});
+		return false;
+	}
+	return true;
 }
 
 // 单规格
 const singleclick = async (item, i) => {
-  console.log("单规格商品点击事件:", item, i);
-  if (!juageProductAvailable(item)) {
-    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
-  }
+	console.log('单规格商品点击事件:', item, i);
+	if (!juageProductAvailable(item)) {
+		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;
-  }
-  const sendMsg = {
-    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,
-    memberPrice: item.memberPrice,
-    number: await calculateValue(item.cartNumber, i, suitNum),
-    is_print: 1,
-    product_type: item.type,
-    is_time_discount: item.is_time_discount,
-  };
-  if (item.cartListId) {
-    sendMsg.id = item.cartListId;
-  }
-  websocketsendMessage(sendMsg);
+	// 是否起售 如果小于或者大于都是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;
+	}
+	const sendMsg = {
+		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,
+		memberPrice: item.memberPrice,
+		number: await calculateValue(item.cartNumber, i, suitNum),
+		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) => {
-  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);
@@ -1923,53 +1444,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("websocketsendMessage", data);
-  delete data.memberPrice;
-  uni.$u.debounce(() => {
-    useSocket.sendMessage(data);
-  }, 500);
+	console.log('websocketsendMessage', data);
+	delete data.memberPrice;
+	uni.$u.debounce(() => {
+		useSocket.sendMessage(data);
+	}, 500);
 };
 
 // 用于记录已经处理过的消息的 msg_id
@@ -1977,246 +1495,236 @@ 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,
-  });
+	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;
-      cartStore.limitTimeDiscount = Message.time_dis_info;
-      uni.hideLoading();
-      isLoading.value = false;
-      // 初始化商品数量
-      // setGoodsInitSel(Message.data)
-    }
+		// 初始化
+		if (Message.operate_type == 'init') {
+			cartStore.carts = Message.data;
+			cartStore.limitTimeDiscount = Message.time_dis_info;
+			uni.hideLoading();
+			isLoading.value = false;
+			// 初始化商品数量
+			// setGoodsInitSel(Message.data)
+		}
 
-    // 转桌成功
-    if (Message.operate_type == "rottable" && Message.status == 1) {
-      console.log("转桌成功了");
+		// 转桌成功
+		if (Message.operate_type == 'rottable' && Message.status == 1) {
+			console.log('转桌成功了');
 
-      // uni.showToast({
-      // 	title: '扫码成功，请下单',
-      // 	icon: 'none'
-      // });
+			// uni.showToast({
+			// 	title: '扫码成功，请下单',
+			// 	icon: 'none'
+			// });
 
-      orderType.value = "scan";
-      uni.cache.set("tableCode", Message.data.new_table_code);
+			orderType.value = 'scan';
+			uni.cache.set('tableCode', Message.data.new_table_code);
 
-      if (showTableInfoPeopleNumPopup.value == true) {
-        showTableInfoPeopleNumPopup.value = false;
-      }
+			if (showTableInfoPeopleNumPopup.value == true) {
+				showTableInfoPeopleNumPopup.value = false;
+			}
 
-      const data = {
-        type: "shopping",
-        operate_type: "init",
-        table_code: uni.cache.get("tableCode"),
-        shop_id: uni.cache.get("shopId"),
-      };
+			const data = {
+				type: 'shopping',
+				operate_type: 'init',
+				table_code: uni.cache.get('tableCode'),
+				shop_id: uni.cache.get('shopId')
+			};
 
-      useSocket.sendMessage(data);
-    }
+			useSocket.sendMessage(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" &&
-      Message.type != "time_discount"
-    ) {
-      uni.showToast({
-        title: Message.msg,
-        icon: "none",
-      });
-    }
+		// 提示
+		if (Message.status == 0 && Message.type != 'no_suit_num' && Message.type != 'time_discount') {
+			uni.showToast({
+				title: Message.msg,
+				icon: 'none'
+			});
+		}
 
-    if (Message.type == "no_suit_num") {
-      // console.log(specifications)
-      uni.showModal({
-        title: "提示",
-        showCancel: false,
-        content: "此商品库存不足起售数量！",
-        success: (data) => {
-          delGoods();
-        },
-      });
-    }
-    if (Message.operate_type == "time_discount_save") {
-      cartStore.limitTimeDiscount = Message.data;
-      console.log("time_discount_save", cartStore.limitTimeDiscount);
-    }
+		if (Message.type == 'no_suit_num') {
+			// console.log(specifications)
+			uni.showModal({
+				title: '提示',
+				showCancel: false,
+				content: '此商品库存不足起售数量！',
+				success: (data) => {
+					delGoods();
+				}
+			});
+		}
+		if (Message.operate_type == 'time_discount_save') {
+			cartStore.limitTimeDiscount = Message.data;
+			console.log('time_discount_save', cartStore.limitTimeDiscount);
+		}
 
-    //除去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();
 };
 
 // 储存是否存在多次下单
@@ -2225,1759 +1733,1699 @@ 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"),
-  });
-  return;
-  try {
-    await Historicalorders();
-  } catch (error) {}
-  confirmordershow.value = true;
-  showCart.value = false;
+	isAutoClose = 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 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;
-          }
-        });
-      }
-      if (
-        limitTimeDiscountRes.value &&
-        limitTimeDiscountRes.value.id &&
-        item.is_time_discount == 1
-      ) {
-        //限时折扣
-        const price = limitUtils.returnPrice({
-          goods: item,
-          shopInfo,
-          limitTimeDiscountRes: limitTimeDiscountRes.value,
-          shopUserInfo: shopUserInfo.value,
-          idKey: "id",
-        });
-        return total + parseFloat(price) * parseFloat(item.cartNumber);
-      }
-      // 是否启用会员价 0否1是
-      if (
-        shopUserInfo.value.isVip == 1 &&
-        shopUserInfo.value.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 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;
+					}
+				});
+			}
+			if (limitTimeDiscountRes.value && limitTimeDiscountRes.value.id && item.is_time_discount == 1) {
+				//限时折扣
+				const price = limitUtils.returnPrice({
+					goods: item,
+					shopInfo,
+					limitTimeDiscountRes: limitTimeDiscountRes.value,
+					shopUserInfo: shopUserInfo.value,
+					idKey: 'id'
+				});
+				return total + parseFloat(price) * parseFloat(item.cartNumber);
+			}
+			// 是否启用会员价 0否1是
+			if (shopUserInfo.value.isVip == 1 && shopUserInfo.value.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 allDiscountMoney=computed(()=>{
-  let discountMoney=0
-  // 新客立减
-  if (newUserDiscount.value && newUserDiscount.value.discountAmount) {
-    discountMoney+=newUserDiscount.value.discountAmount
-  }
-  // 满减活动
-  if (fullAmountActivty.value && fullAmountActivty.value.discountAmount) {
-    discountMoney+=fullAmountActivty.value.discountAmount
-  }
-  return discountMoney.toFixed(2)
-})
+const allDiscountMoney = computed(() => {
+	let discountMoney = 0;
+	// 新客立减
+	if (newUserDiscount.value && newUserDiscount.value.discountAmount) {
+		discountMoney += newUserDiscount.value.discountAmount;
+	}
+	// 满减活动
+	if (fullAmountActivty.value && fullAmountActivty.value.discountAmount) {
+		discountMoney += fullAmountActivty.value.discountAmount;
+	}
+	return discountMoney.toFixed(2);
+});
 
 // 计算实际金额（购物车商品费用-新客立减-满减活动）
 const actualPrice = computed(() => {
-  let price = BigNumber(totalPrices.value*1).minus(allDiscountMoney.value*1).toFixed(2);
-  return price<=0?0:price;
+	let price = BigNumber(totalPrices.value * 1)
+		.minus(allDiscountMoney.value * 1)
+		.toFixed(2);
+	return price <= 0 ? 0 : price;
 });
 
 // 计算购物车商品总数量
 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 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
-        );
-        product.is_time_discount = showLimitDiscount(product) ? 1 : 0;
-        product.limitSalePrice = returnLimitPrice(product);
+	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);
+				product.is_time_discount = showLimitDiscount(product) ? 1 : 0;
+				product.limitSalePrice = returnLimitPrice(product);
 
-        cartStore.setGoodsMap(product.id, product);
-      });
-    });
-    shopProductList.hots.forEach(async (i) => {
-      i.cartNumber = 0;
-      i.isSaleTimeshow = await isProductAvailable(
-        i.days,
-        i.startTime,
-        i.endTime
-      );
-      i.is_time_discount = showLimitDiscount(i) ? 1 : 0;
-      i.limitSalePrice = returnLimitPrice(i);
-      cartStore.setGoodsMap(i.id, i);
-    });
-    console.log("shopProductList", shopProductList);
-    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.setGoodsMap(product.id, product);
+			});
+		});
+		shopProductList.hots.forEach(async (i) => {
+			i.cartNumber = 0;
+			i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
+			i.is_time_discount = showLimitDiscount(i) ? 1 : 0;
+			i.limitSalePrice = returnLimitPrice(i);
+			cartStore.setGoodsMap(i.id, i);
+		});
+		console.log('shopProductList', shopProductList);
+		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;
+	}
 };
 
-provide("cartStore", cartStore);
-provide("shopUserInfo", shopUserInfo);
-provide("shopInfo", shopInfo);
+provide('cartStore', cartStore);
+provide('shopUserInfo', shopUserInfo);
+provide('shopInfo', shopInfo);
 
-const orderType = ref("scan");
+const orderType = ref('scan');
 
 // 扫码下单
 
 // 台桌信息
 const showTableInfoPeopleNumPopup = ref(false);
-const tableInfo = ref("");
-const tableShopInfo = ref(uni.cache.get("shopInfo"));
+const tableInfo = ref('');
+const tableShopInfo = ref(uni.cache.get('shopInfo'));
 
 // 选择的人数
 const tableInfoPeopleActive = ref(-1);
-const tableInfoPeopleNum = ref("");
+const tableInfoPeopleNum = ref('');
 
 // 选择人数
 function tableInfoPeopleNumHandle(num, index) {
-  tableInfoPeopleActive.value = index;
-  tableInfoPeopleNum.value = num;
+	tableInfoPeopleActive.value = index;
+	tableInfoPeopleNum.value = num;
 }
 
 // 人数输入框
 function tableInfoPeopleNumInput(e) {
-  tableInfoPeopleActive.value = -1;
-  setTimeout(() => {
-    tableInfoPeopleNum.value = filterNumberInput(e, 1);
-  }, 50);
+	tableInfoPeopleActive.value = -1;
+	setTimeout(() => {
+		tableInfoPeopleNum.value = filterNumberInput(e, 1);
+	}, 50);
 }
 
 // 取消选择人数
 function closeTableInfoPeopleNum() {
-  showTableInfoPeopleNumPopup.value = false;
-  tableInfoPeopleActive.value = -1;
-  tableInfoPeopleNum.value = "";
+	showTableInfoPeopleNumPopup.value = false;
+	tableInfoPeopleActive.value = -1;
+	tableInfoPeopleNum.value = '';
 }
 
 // 确认选择人数
 function tableInfoPeopleNumConfirm() {
-  if (tableInfoPeopleNum.value > 0) {
-    uni.cache.set("dinersNum", tableInfoPeopleNum.value);
-    startUseTable();
-  } else {
-    uni.showToast({
-      title: "请选择就餐人数",
-      icon: "none",
-    });
-  }
+	if (tableInfoPeopleNum.value > 0) {
+		uni.cache.set('dinersNum', tableInfoPeopleNum.value);
+		startUseTable();
+	} else {
+		uni.showToast({
+			title: '请选择就餐人数',
+			icon: 'none'
+		});
+	}
 }
 
 // 开始换桌
 function startUseTable() {
-  tableShopInfo.value = uni.cache.get("shopInfo");
-  const oldTableCode = uni.cache.get("tableCode");
-  const cartIds = cartStore.carts.map((item) => item.id);
+	tableShopInfo.value = uni.cache.get('shopInfo');
+	const oldTableCode = uni.cache.get('tableCode');
+	const cartIds = cartStore.carts.map((item) => item.id);
 
-  const data = {
-    type: "shopping",
-    operate_type: "rottable",
-    account: tableShopInfo.value.phone,
-    table_code: oldTableCode,
-    new_table_code: uni.cache.get("shopTable").tableCode,
-    cart_id: cartIds,
-    shop_id: tableShopInfo.value.id,
-  };
+	const data = {
+		type: 'shopping',
+		operate_type: 'rottable',
+		account: tableShopInfo.value.phone,
+		table_code: oldTableCode,
+		new_table_code: uni.cache.get('shopTable').tableCode,
+		cart_id: cartIds,
+		shop_id: tableShopInfo.value.id
+	};
 
-  websocketsendMessage(data);
+	websocketsendMessage(data);
 }
 
 //计算距离判断是否可以点餐
 async function computedDistance(shopInfo) {
-  return new Promise((resolve, reject) => {
-    console.log("店铺经纬度", shopInfo.lat, shopInfo.lng);
-    console.log(
-      "用户经纬度",
-      userStore.location.latitude,
-      userStore.location.longitude
-    );
+	return new Promise((resolve, reject) => {
+		console.log('店铺经纬度', shopInfo.lat, shopInfo.lng);
+		console.log('用户经纬度', userStore.location.latitude, userStore.location.longitude);
 
-    const juli = getDistance(
-      userStore.location.latitude,
-      userStore.location.longitude,
-      shopInfo.lat,
-      shopInfo.lng
-    );
-    const orderFenceDistance = (
-      (shopInfo.orderFenceDistance || 2000) / 2000
-    ).toFixed(2);
+		const juli = getDistance(userStore.location.latitude, userStore.location.longitude, shopInfo.lat, shopInfo.lng);
+		const orderFenceDistance = ((shopInfo.orderFenceDistance || 2000) / 2000).toFixed(2);
 
-    console.log("距离", juli);
+		console.log('距离', juli);
 
-    if (shopInfo.isOrderFence && juli > orderFenceDistance) {
-      uni.showModal({
-        title: "提示",
-        confirmText: "重新定位",
-        content:
-          "抱歉，您当前距离店铺过远，为保障您的用餐体验，请您到店后或在门店附近再下单。若您已在店铺附近，可尝试重新定位",
-        success: async (res) => {
-          if (res.confirm) {
-            console.log("用户点击了确认");
-            await userStore.getLocation();
-            // computedDistance();
-            uni.showToast({
-              title: "定位成功，请重新扫码",
-              icon: "none",
-            });
-          } else if (res.cancel) {
-            console.log("用户点击了取消");
-          }
-        },
-      });
-      reject();
-      return;
-    }
-    resolve(juli);
-  });
+		if (shopInfo.isOrderFence && juli > orderFenceDistance) {
+			uni.showModal({
+				title: '提示',
+				confirmText: '重新定位',
+				content: '抱歉，您当前距离店铺过远，为保障您的用餐体验，请您到店后或在门店附近再下单。若您已在店铺附近，可尝试重新定位',
+				success: async (res) => {
+					if (res.confirm) {
+						console.log('用户点击了确认');
+						await userStore.getLocation();
+						// computedDistance();
+						uni.showToast({
+							title: '定位成功，请重新扫码',
+							icon: 'none'
+						});
+					} else if (res.cancel) {
+						console.log('用户点击了取消');
+					}
+				}
+			});
+			reject();
+			return;
+		}
+		resolve(juli);
+	});
 }
 
 // 预点单扫码下单
 function beforehandHandle() {
-  uni.scanCode({
-    success: async (res) => {
-      try {
-        const newTableCode = userStore.getQueryString(res.result, "code");
+	uni.scanCode({
+		success: async (res) => {
+			try {
+				const newTableCode = userStore.getQueryString(res.result, 'code');
 
-        const shopInfoRes = await APIproductqueryShop({
-          tableCode: newTableCode,
-        });
+				const shopInfoRes = await APIproductqueryShop({
+					tableCode: newTableCode
+				});
 
-        console.log("shopInfoRes===", shopInfoRes);
+				console.log('shopInfoRes===', shopInfoRes);
 
-        await computedDistance(shopInfoRes.shopInfo);
+				await computedDistance(shopInfoRes.shopInfo);
 
-        if (shopInfoRes.shopInfo.id !== tableShopInfo.value.id) {
-          uni.showModal({
-            title: "注意",
-            content: "扫码店铺与当前店铺不一致，请重新加载页面",
-            showCancel: false,
-            success: async (res) => {
-              uni.cache.set("tableCode", newTableCode);
-              await userStore.actionsproductqueryShop(newTableCode);
-              await userStore.actionsproductqueryProduct();
-              useSocket.closeSocket();
-              userStore.jumpToOrderPage();
-            },
-          });
-        } else {
-          await userStore.actionsproductqueryShop(newTableCode);
-          await userStore.actionsproductqueryProduct();
-          if (shopInfoRes.shopInfo.isTableFee === 1) {
-            // 免桌位费，直接换桌
-            startUseTable();
-          } else {
-            // 不免桌位费，显示选择人数
-            tableInfo.value = uni.cache.get("shopTable");
-            showTableInfoPeopleNumPopup.value = true;
-          }
-        }
-      } catch (error) {
-        console.log(error);
-      }
-    },
-  });
+				if (shopInfoRes.shopInfo.id !== tableShopInfo.value.id) {
+					uni.showModal({
+						title: '注意',
+						content: '扫码店铺与当前店铺不一致，请重新加载页面',
+						showCancel: false,
+						success: async (res) => {
+							uni.cache.set('tableCode', newTableCode);
+							await userStore.actionsproductqueryShop(newTableCode);
+							await userStore.actionsproductqueryProduct();
+							useSocket.closeSocket();
+							userStore.jumpToOrderPage();
+						}
+					});
+				} else {
+					await userStore.actionsproductqueryShop(newTableCode);
+					await userStore.actionsproductqueryProduct();
+					if (shopInfoRes.shopInfo.isTableFee === 1) {
+						// 免桌位费，直接换桌
+						startUseTable();
+					} else {
+						// 不免桌位费，显示选择人数
+						tableInfo.value = uni.cache.get('shopTable');
+						showTableInfoPeopleNumPopup.value = true;
+					}
+				}
+			} catch (error) {
+				console.log(error);
+			}
+		}
+	});
 }
 
 onLoad(async (e) => {
-  if (e.type) {
-    orderType.value = e.type;
-  }
+	if (e.type) {
+		orderType.value = e.type;
+	}
 
-  console.log("onLoad:e", e);
-  cartStore.setOldOrder({
-    detailMap: {},
-    originAmount: 0,
-  });
-  await proxy.$onLaunched;
+	console.log('onLoad:e', e);
+	cartStore.setOldOrder({
+		detailMap: {},
+		originAmount: 0
+	});
+	await proxy.$onLaunched;
 });
 
 const limitTimeDiscountRes = ref(null);
-const nowTime=ref(getEndTimeInSeconds(dayjs().format('HH:mm')) )
-let timer=setInterval(() => {
-  nowTime.value=getEndTimeInSeconds(dayjs().format('HH:mm'))
+const nowTime = ref(getEndTimeInSeconds(dayjs().format('HH:mm')));
+let timer = setInterval(() => {
+	nowTime.value = getEndTimeInSeconds(dayjs().format('HH:mm'));
 }, 1000);
 
-
-
-
-function getEndTimeInSeconds(endTime){
-  const [hour, minute] = endTime.split(':').map(Number);
-  return hour * 60 * 60 + minute * 60;
+function getEndTimeInSeconds(endTime) {
+	const [hour, minute] = endTime.split(':').map(Number);
+	return hour * 60 * 60 + minute * 60;
 }
 // 将秒再转为hh::mm
 function secondsToHHMM(seconds) {
-  const hours = Math.floor(seconds / 60 / 60);
-  const minutes = Math.floor(seconds / 60) % 60;
-  return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+	const hours = Math.floor(seconds / 60 / 60);
+	const minutes = Math.floor(seconds / 60) % 60;
+	return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
 }
 
-
-
-const limitDiscountCountdown=computed(()=>{
-  if(!limitTimeDiscountRes.value&&!limitTimeDiscountRes.value.id){
-    return ''
-  }
-  if(limitTimeDiscountRes.value.useTimeType!="custom"){
-    return ''
-  }
-  //根据当前时间和限时折扣的结束时间计算倒计时,结束时间是hh:mm,将hh:mm转换为时间多少秒，然后再减去当前时间，就得到了倒计时
-  const endTime=getEndTimeInSeconds(limitTimeDiscountRes.value.useEndTime)
-  const countdown=endTime-nowTime.value
-  if(countdown<=0){
-    return ''
-  }
-  return secondsToHHMM(countdown)
-
-})
+const limitDiscountCountdown = computed(() => {
+	if (!limitTimeDiscountRes.value && !limitTimeDiscountRes.value.id) {
+		return '';
+	}
+	if (limitTimeDiscountRes.value.useTimeType != 'custom') {
+		return '';
+	}
+	//根据当前时间和限时折扣的结束时间计算倒计时,结束时间是hh:mm,将hh:mm转换为时间多少秒，然后再减去当前时间，就得到了倒计时
+	const endTime = getEndTimeInSeconds(limitTimeDiscountRes.value.useEndTime);
+	const countdown = endTime - nowTime.value;
+	if (countdown <= 0) {
+		return '';
+	}
+	return secondsToHHMM(countdown);
+});
 
 function showLimitDiscount(item) {
-  if (!cartStore.limitTimeDiscount || !cartStore.limitTimeDiscount.id) {
-    return false;
-  }
-  return limitUtils.canUseLimitTimeDiscount(
-    item,
-    cartStore.limitTimeDiscount,
-    shopInfo,
-    shopUserInfo.value,
-    "id"
-  );
+	if (!cartStore.limitTimeDiscount || !cartStore.limitTimeDiscount.id) {
+		return false;
+	}
+	return limitUtils.canUseLimitTimeDiscount(item, cartStore.limitTimeDiscount, shopInfo, shopUserInfo.value, 'id');
 }
 
 function returnLimitPrice(item) {
-  return limitUtils.returnPrice({
-    goods: item,
-    limitTimeDiscountRes: cartStore.limitTimeDiscount,
-    shopInfo: shopInfo,
-    shopUserInfo: shopUserInfo.value,
-    idKey: "id",
-  });
+	return limitUtils.returnPrice({
+		goods: item,
+		limitTimeDiscountRes: cartStore.limitTimeDiscount,
+		shopInfo: shopInfo,
+		shopUserInfo: shopUserInfo.value,
+		idKey: 'id'
+	});
 }
 
 onShow(async () => {
-  isAutoClose = true;
-  // 监听页面显示和隐藏
-  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: "",
-    };
-  }
+	isAutoClose = true;
+	// 监听页面显示和隐藏
+	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: ''
+		};
+	}
 });
 
 //是否自动关闭socket
 let isAutoClose = true;
 function closeSocket() {
-  if (isAutoClose) {
-    useSocket.closeSocket();
-  }
-  useSocket.setOnMessage(() => {});
+	if (isAutoClose) {
+		useSocket.closeSocket();
+	}
+	useSocket.setOnMessage(() => {});
 }
 onHide(() => {
-  closeSocket();
+	closeSocket();
 });
 onUnload(() => {
-  closeSocket();
+	closeSocket();
 });
 
 // 获取新客立减
 
 const newUserDiscount = ref(null);
 async function getNewUserDiscount() {
-  let res = await consumeDiscount({
-    shopId: uni.cache.get("shopId"),
-  });
-  if (res&&typeof res == "object") {
-    newUserDiscount.value = res;
-  }
+	let res = await consumeDiscount({
+		shopId: uni.cache.get('shopId')
+	});
+	if (res && typeof res == 'object') {
+		newUserDiscount.value = res;
+	}
 }
 
 const fullAmountActivity = ref(null);
 //获取满减活动
 async function getDiscountActivity() {
-  const res = await discountActivityApi.config({
-    shopId: uni.cache.get("shopId"),
-  });
-  if (res) {
-    fullAmountActivity.value = res;
-  }
+	const res = await discountActivityApi.config({
+		shopId: uni.cache.get('shopId')
+	});
+	if (res) {
+		fullAmountActivity.value = res;
+	}
 }
 
 //返回当前满足的满减的活动
 const fullAmountActivty = computed(() => {
-  if (!fullAmountActivity.value) {
-    return null;
-  }
-  //下一个满足满减的
-  let fullAmount = null;
-  for (let item of fullAmountActivity.value.thresholds) {
-    if (totalPrices.value * 1 >= item.fullAmount) {
-      fullAmount = item;
-      break;
-    }
-  }
-  return fullAmount;
+	if (!fullAmountActivity.value) {
+		return null;
+	}
+	//下一个满足满减的
+	let fullAmount = null;
+	for (let item of fullAmountActivity.value.thresholds) {
+		if (totalPrices.value * 1 >= item.fullAmount) {
+			fullAmount = item;
+			break;
+		}
+	}
+	return fullAmount;
 });
 
 //返回下一个满减活动
 const nextFullAmountActivty = computed(() => {
-  if (!fullAmountActivity.value) {
-    return null;
-  }
-  //下一个满足满减的
-  let nextFullAmount = null;
-  for (let item of fullAmountActivity.value.thresholds) {
-    if (totalPrices.value * 1 < item.fullAmount) {
-      nextFullAmount = item;
-      break;
-    }
-  }
-  return nextFullAmount;
+	if (!fullAmountActivity.value) {
+		return null;
+	}
+	//下一个满足满减的
+	let nextFullAmount = null;
+	for (let item of fullAmountActivity.value.thresholds) {
+		if (totalPrices.value * 1 < item.fullAmount) {
+			nextFullAmount = item;
+			break;
+		}
+	}
+	return nextFullAmount;
 });
 
-
 const oldOrder = ref(null);
 onMounted(async () => {
-  await proxy.$onLaunched;
-  // 获取当前页面栈
-  const pages = getCurrentPages();
-  // 获取当前页面实例
-  const currentPage = pages[pages.length - 1];
-  // 获取页面参数
-  const options = currentPage.options;
-  console.log("onMounted", options);
-  //新客立减
-  getNewUserDiscount();
-  // 满减活动
-  getDiscountActivity();
-  let res = await APIhistoryOrder({
-    tableCode: uni.cache.get("tableCode"),
-  });
-  oldOrder.value = res;
-  const limitRes = await limitTimeDiscountapi.getConfig({
-    shopId: uni.cache.get("shopId"),
-  });
-  if (limitRes && typeof limitRes == "object") {
-    limitTimeDiscountRes.value = limitRes;
-    cartStore.limitTimeDiscount = limitRes;
-    websocketsendMessage({
-      type: "shopping",
-      operate_type: "time_discount_save",
-      table_code: uni.cache.get("tableCode"),
-      shop_id: uni.cache.get("shopId"),
-      operate_type: "time_discount_save",
-      data: limitRes,
-    });
-  } else {
-    cartStore.limitTimeDiscount = null;
-    websocketsendMessage({
-      type: "shopping",
-      operate_type: "time_discount_save",
-      table_code: uni.cache.get("tableCode"),
-      shop_id: uni.cache.get("shopId"),
-      operate_type: "time_discount_save",
-      data: null,
-    });
-  }
+	await proxy.$onLaunched;
+	// 获取当前页面栈
+	const pages = getCurrentPages();
+	// 获取当前页面实例
+	const currentPage = pages[pages.length - 1];
+	// 获取页面参数
+	const options = currentPage.options;
+	console.log('onMounted', options);
+	//新客立减
+	getNewUserDiscount();
+	// 满减活动
+	getDiscountActivity();
+	let res = await APIhistoryOrder({
+		tableCode: uni.cache.get('tableCode')
+	});
+	oldOrder.value = res;
+	const limitRes = await limitTimeDiscountapi.getConfig({
+		shopId: uni.cache.get('shopId')
+	});
+	if (limitRes && typeof limitRes == 'object') {
+		limitTimeDiscountRes.value = limitRes;
+		cartStore.limitTimeDiscount = limitRes;
+		websocketsendMessage({
+			type: 'shopping',
+			operate_type: 'time_discount_save',
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId'),
+			operate_type: 'time_discount_save',
+			data: limitRes
+		});
+	} else {
+		cartStore.limitTimeDiscount = null;
+		websocketsendMessage({
+			type: 'shopping',
+			operate_type: 'time_discount_save',
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId'),
+			operate_type: 'time_discount_save',
+			data: null
+		});
+	}
 
-  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() {
-  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,
-  });
+	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
+	});
 }
 </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-weight: 500;
-    font-size: 32rpx;
-    color: #333333;
-    display: flex;
-    justify-content: space-between;
-    font-weight: 700;
-  }
+	.panelone {
+		padding: 20rpx 20rpx 0 20rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+		display: flex;
+		justify-content: space-between;
+		font-weight: 700;
+	}
 
-  .paneltow {
-    font-weight: 400;
-    font-size: 24rpx;
-    color: #999999;
-  }
+	.paneltow {
+		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 {
-          display: flex;
-          align-items: baseline;
-          .tips {
-            font-family: Source Han Sans CN, Source Han Sans CN;
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #333333;
-          }
+			.panelfiveitemsex {
+				.panelfiveitemsex_oen {
+					display: flex;
+					align-items: baseline;
+					.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;
-      width: 156rpx;
-      background-color: #f6f6f6;
-      line-height: normal;
-      box-sizing: border-box;
-      font-size: 32rpx;
-      position: sticky;
-      top: 0;
+		.left {
+			// width: 200rpx;
+			width: 156rpx;
+			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;
-          border-radius: 18rpx;
-          top: 0;
-          left: 0;
-          z-index: 9;
-          background-color: rgb(0, 0, 0, 0.5);
+				.vifgoodsImg {
+					width: 200rpx;
+					height: 100%;
+					position: absolute;
+					border-radius: 18rpx;
+					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;
-          z-index: 10;
-        }
+				.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;
+					z-index: 10;
+				}
 
-        .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: 20rpx;
-            color: #333;
-            display: flex;
-            align-items: baseline;
-            white-space: nowrap;
+					.money {
+						font-weight: bold;
+						font-size: 20rpx;
+						color: #333;
+						display: flex;
+						align-items: baseline;
+						white-space: nowrap;
 
-            .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: 200rpx;
+	width: 100%;
+	position: relative;
+	border-radius: 20rpx;
+	background: #fff;
+	box-sizing: border-box;
+	padding-bottom: 200rpx;
 
-  .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: 140rpx;
-  }
+	.shop_sku_box:last-child {
+		padding-bottom: 140rpx;
+	}
 
-  .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: 22rpx 54rpx;
-  box-sizing: border-box;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
-  padding-bottom: calc(env(safe-area-inset-bottom) + 1px);
-  background: #ffffff;
+	width: 100%;
+	padding: 22rpx 54rpx;
+	box-sizing: border-box;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 99;
+	padding-bottom: calc(env(safe-area-inset-bottom) + 1px);
+	background: #ffffff;
 
-  .cart-content {
-    display: flex;
-    align-items: center;
-    // height: 128rpx;
-    // padding: 0 36rpx;
-    box-sizing: border-box;
-    position: relative;
-    z-index: 99;
-    .left {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      position: relative;
+	.cart-content {
+		display: flex;
+		align-items: center;
+		// height: 128rpx;
+		// padding: 0 36rpx;
+		box-sizing: border-box;
+		position: relative;
+		z-index: 99;
+		.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: 28rpx;
-        position: relative;
-        top: 4upx;
-        margin-left: 64rpx;
-      }
+			.i {
+				font-size: 28rpx;
+				position: relative;
+				top: 4upx;
+				margin-left: 64rpx;
+			}
 
-      .num {
-        font-size: 42upx;
-        font-weight: bold;
-      }
-    }
+			.num {
+				font-size: 42upx;
+				font-weight: bold;
+			}
+		}
 
-    .btn {
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
+		.btn {
+			height: 100%;
+			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;
+	}
 }
 .old-price {
-  color: #999;
-  font-size: 24rpx;
-  text-decoration: line-through;
-  margin-left: 8rpx;
+	color: #999;
+	font-size: 24rpx;
+	text-decoration: line-through;
+	margin-left: 8rpx;
 }
 .relative {
-  position: relative;
+	position: relative;
 }
 .limitDiscount {
-  background-color: #fff0f0;
-  padding: 8rpx 24rpx;
-  white-space: nowrap;
-  text-align: center;
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  font-size: 24rpx;
-  color: #ffffff;
-  border-radius: 0;
-  z-index: 9;
-  color: #ff1c1c;
+	background-color: #fff0f0;
+	padding: 8rpx 24rpx;
+	white-space: nowrap;
+	text-align: center;
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	font-size: 24rpx;
+	color: #ffffff;
+	border-radius: 0;
+	z-index: 9;
+	color: #ff1c1c;
 }
 .select_num_wrap {
-  width: 100vw;
-  height: 100vh;
-  position: relative;
-  .top_bg {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1;
-  }
-  .sn-bnottom {
-    width: 90vw;
-    border-radius: 20upx;
-    background-color: #fff;
-    position: absolute;
-    left: 5vw;
-    bottom: 20vw;
-    z-index: 2;
-    .sn-header {
-      height: 120upx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border-bottom: 1px solid #ececec;
-      padding: 0 28upx;
-      .t1 {
-        color: #333;
-        font-size: 32upx;
-      }
-      .t2 {
-        color: #999;
-        font-size: 28upx;
-      }
-    }
-    .sn-num-wrap {
-      padding: 38upx 28upx;
-      border-bottom: 1px solid #ececec;
-      .sn-num {
-        display: grid;
-        grid-template-columns: repeat(5, 1fr);
-        gap: 14px;
-        .item {
-          height: 40px;
-          border-radius: 6px;
-          background-color: #fef4eb;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          &.active {
-            background-color: #e8ad7b;
-            .t {
-              color: #fff;
-            }
-          }
-          .t {
-            color: #333333;
-            font-size: 32upx;
-          }
-        }
-      }
-      .input {
-        display: flex;
-        padding-top: 28upx;
-      }
-    }
-    .sn-footer-wrap {
-      display: flex;
-      gap: 28upx;
-      padding: 28upx;
-      .btn {
-        flex: 1;
-      }
-    }
-  }
+	width: 100vw;
+	height: 100vh;
+	position: relative;
+	.top_bg {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 1;
+	}
+	.sn-bnottom {
+		width: 90vw;
+		border-radius: 20upx;
+		background-color: #fff;
+		position: absolute;
+		left: 5vw;
+		bottom: 20vw;
+		z-index: 2;
+		.sn-header {
+			height: 120upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1px solid #ececec;
+			padding: 0 28upx;
+			.t1 {
+				color: #333;
+				font-size: 32upx;
+			}
+			.t2 {
+				color: #999;
+				font-size: 28upx;
+			}
+		}
+		.sn-num-wrap {
+			padding: 38upx 28upx;
+			border-bottom: 1px solid #ececec;
+			.sn-num {
+				display: grid;
+				grid-template-columns: repeat(5, 1fr);
+				gap: 14px;
+				.item {
+					height: 40px;
+					border-radius: 6px;
+					background-color: #fef4eb;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					&.active {
+						background-color: #e8ad7b;
+						.t {
+							color: #fff;
+						}
+					}
+					.t {
+						color: #333333;
+						font-size: 32upx;
+					}
+				}
+			}
+			.input {
+				display: flex;
+				padding-top: 28upx;
+			}
+		}
+		.sn-footer-wrap {
+			display: flex;
+			gap: 28upx;
+			padding: 28upx;
+			.btn {
+				flex: 1;
+			}
+		}
+	}
 }
 
 .new-user-discount {
-  margin-top: 32rpx;
-  color: #ff1c1c;
-  font-weight: 700;
-  padding-left: 20rpx;
+	margin-top: 32rpx;
+	color: #ff1c1c;
+	font-weight: 700;
+	padding-left: 20rpx;
 }
 .fullAmount-activity {
-  position: absolute;
-  bottom: 100%;
-  left: 0;
-  font-size: 28rpx;
-  right: 0;
-  color: #666666;
-  background: linear-gradient(90deg, #ffdfe9 0%, #fef4ea 100%);
-  padding: 8rpx 78rpx 8rpx 42rpx;
-  .price {
-    color: #ff1c1c;
-  }
+	position: absolute;
+	bottom: 100%;
+	left: 0;
+	font-size: 28rpx;
+	right: 0;
+	color: #666666;
+	background: linear-gradient(90deg, #ffdfe9 0%, #fef4ea 100%);
+	padding: 8rpx 78rpx 8rpx 42rpx;
+	.price {
+		color: #ff1c1c;
+	}
 }
 
 .allDiscountMoney {
-  color: #ff1c1c;
-  font-size: 12px;
-  margin-left: 20rpx;
+	color: #ff1c1c;
+	font-size: 12px;
+	margin-left: 20rpx;
 }
 </style>