build(deps): update deps

2024-09-24 16:02:44 +08:00
parent 097029128c
commit 8e119162f1
22 changed files with 2212 additions and 377 deletions
--- a/src/pages/admin/add_order/add_menu/index.vue
+++ b/src/pages/admin/add_order/add_menu/index.vue
@@ -2,9 +2,19 @@
  <view>
    <!-- 商品列表 -->
    <view class="good-class" v-if="class_list.length > 0">
-      <nut-tabs v-model="value" title-scroll size="large" direction="vertical" title-gutter="5" animated-time="0"
+      <nut-tabs
+        v-model="value"
+        title-scroll
+        size="large"
+        direction="vertical"
+        title-gutter="5"
+        animated-time="0"
        name="tabName">
-        <nut-tab-pane v-for="(itm, index) in good_list" :key="index" :title="itm.name" :pane-key="index">
+        <nut-tab-pane
+          v-for="(itm, index) in good_list"
+          :key="index"
+          :title="itm.name"
+          :pane-key="index">
          <view v-if="itm.Goods.length > 0">
            <view class="list" v-for="(item, index) in itm.Goods" :key="index">
              <view class="item" @click.stop="toGoodDetails(item.gid, 1)">
@@ -23,7 +33,10 @@
                        >
                      </view> -->
                    </view>
-                    <nut-button size="mini" type="primary" @click.stop="add_cart(item)">
+                    <nut-button
+                      size="mini"
+                      type="primary"
+                      @click.stop="add_cart(item)">
                      <template #icon>
                        <Cart2 />
                      </template>
@@ -40,16 +53,20 @@
    </view>
    <nut-empty v-else description="该商家暂无商品"></nut-empty>
    <!--  购物车  -->
-    <cart ref="cartRef" :mer-info="mer_info" @update-cart="updateCartNum" :IsPendingOrder="true" />
+    <cart
+      ref="cartRef"
+      :mer-info="mer_info"
+      @update-cart="updateCartNum"
+      :IsPendingOrder="true" />
  </view>
 </template>

 <script setup lang="ts">
-import { Ref, ref } from 'vue';
+import {Ref, ref} from 'vue';
 import Taro from '@tarojs/taro';
 import Cart from '../../../../components/Cart.vue';
-import { Cart2 } from '@nutui/icons-vue-taro';
-import { getGoodList, getMerCategory } from '../../../../api/goods';
+import {Cart2} from '@nutui/icons-vue-taro';
+import {getGoodList, getMerCategory} from '../../../../api/goods';

 interface goodList {
  ID: number;
--- a/src/pages/admin/order_manage/detail/index.vue
+++ b/src/pages/admin/order_manage/detail/index.vue
@@ -5,13 +5,19 @@
      <nut-cell>
        <template #default>
          <view class="center-box">
-            <view class="top" v-for="(item, index) in info.OrderGoods" :key="index">
+            <view
+              class="top"
+              v-for="(item, index) in info.OrderGoods"
+              :key="index">
              <image class="mr-10" :src="item.Goods?.cover" />
              <view class="flex-1">
                <view class="title">{{ item.Goods?.name }}</view>
                <view class="text-[#F83D3D] mt-5">
-                  <view>{{ item.pay_price }}元
-                    <text v-if="item.pay_integral > 0">+{{ item.pay_integral }}积分</text>
+                  <view
+                    >{{ item.pay_price }}元
+                    <text v-if="item.pay_integral > 0"
+                      >+{{ item.pay_integral }}积分</text
+                    >
                  </view>
                </view>
              </view>
@@ -19,11 +25,15 @@
                <view>x{{ item.number }}</view>
              </view>
            </view>
-            <view class="flex justify-between items-center mt-2 mb-2 text-[25px]">
+            <view
+              class="flex justify-between items-center mt-2 mb-2 text-[25px]">
              <view class="text-[#9C9C9C]">{{ `共${info.count}件商品` }}</view>
-              <text class="text-[26px] flex-1 text-right">{{ info.status !== 0 ? '实' : '应' }}付款:
+              <text class="text-[26px] flex-1 text-right"
+                >{{ info.status !== 0 ? '实' : '应' }}付款:
                {{ info.discount_price }} (元)
-                <text v-if="info.exchange > 0">积分抵扣: {{ info.exchange }}</text>
+                <text v-if="info.exchange > 0"
+                  >积分抵扣: {{ info.exchange }}</text
+                >
              </text>
            </view>
          </view>
@@ -32,11 +42,14 @@
    </nut-cell-group>
    <nut-cell-group>
      <nut-cell title="订单号:" :desc="info.oid"></nut-cell>
-      <nut-cell title="订单状态:" :desc="info.status === 0
-        ? '待付款'
-        : info.status === 1
-          ? '待使用'
-          : info.status === 2
+      <nut-cell
+        title="订单状态:"
+        :desc="
+          info.status === 0
+            ? '待付款'
+            : info.status === 1
+            ? '待使用'
+            : info.status === 2
            ? '已使用'
            : '已失效'
        ">
@@ -44,16 +57,25 @@
      <nut-cell title="下单用户:" :desc="info.User?.nickName"></nut-cell>
      <nut-cell title="用户手机号:" :desc="info.User?.phone"></nut-cell>
      <nut-cell title="下单时间:" :desc="info.add_time"></nut-cell>
-      <nut-cell v-if="info.status === 2" title="核销时间:" :desc="info.cancel_time"></nut-cell>
-      <nut-cell v-if="info.status === 2" title="核销人员:" :desc="info.CancelUser?.nickName"></nut-cell>
-      <nut-cell v-if="info.status === 2" title="核销人手机号:" :desc="info.CancelUser?.phone"></nut-cell>
+      <nut-cell
+        v-if="info.status === 2"
+        title="核销时间:"
+        :desc="info.cancel_time"></nut-cell>
+      <nut-cell
+        v-if="info.status === 2"
+        title="核销人员:"
+        :desc="info.CancelUser?.nickName"></nut-cell>
+      <nut-cell
+        v-if="info.status === 2"
+        title="核销人手机号:"
+        :desc="info.CancelUser?.phone"></nut-cell>
    </nut-cell-group>
  </view>
 </template>

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import { ref } from 'vue';
+import {ref} from 'vue';

 const info = ref<any>({});

--- a/src/pages/admin/order_manage/list/index.vue
+++ b/src/pages/admin/order_manage/list/index.vue
@@ -1,37 +1,52 @@
 <template>
  <view>
    <view class="tabs-1">
-      <view class="item" v-for="(item, index) in opt" :key="index" @click="tabChange(item.value)">
-        <view :style="{
-          color: item.value === tabVal ? '#333333' : '#9C9C9C',
-        }">{{ item.text }}</view>
-        <view class="line" :style="{
-          backgroundColor: item.value === tabVal ? '#FFD940' : '',
-        }"></view>
+      <view
+        class="item"
+        v-for="(item, index) in opt"
+        :key="index"
+        @click="tabChange(item.value)">
+        <view
+          :style="{
+            color: item.value === tabVal ? '#333333' : '#9C9C9C',
+          }"
+          >{{ item.text }}</view
+        >
+        <view
+          class="line"
+          :style="{
+            backgroundColor: item.value === tabVal ? '#FFD940' : '',
+          }"></view>
      </view>
    </view>
    <view v-if="dataList.length > 0">
-      <view class="order-card" v-for="(item, index) in dataList" :key="index" @click="toDetailPage(item)">
+      <view
+        class="order-card"
+        v-for="(item, index) in dataList"
+        :key="index"
+        @click="toDetailPage(item)">
        <view class="top">
          <view class="text-[#9C9C9C] text-[25px]">订单号：{{ item.oid }}</view>
-          <view :style="{
-            color:
-              item.status === 0
-                ? '#FF850A'
-                : item.status === 1
+          <view
+            :style="{
+              color:
+                item.status === 0
+                  ? '#FF850A'
+                  : item.status === 1
                  ? '#F83D3D'
                  : item.status === 2
-                    ? '#333333'
-                    : '#9C9C9C',
-          }">{{
-            item.status === 0
-              ? '待付款'
-              : item.status === 1
+                  ? '#333333'
+                  : '#9C9C9C',
+            }"
+            >{{
+              item.status === 0
+                ? '待付款'
+                : item.status === 1
                ? '待使用'
                : item.status === 2
-                  ? '已使用'
-                  : '已失效'
-          }}
+                ? '已使用'
+                : '已失效'
+            }}
          </view>
        </view>
        <view class="line"></view>
@@ -41,8 +56,11 @@
            <view class="flex-1">
              <view class="title">{{ itm.Goods?.name }}</view>
              <view class="text-[#F83D3D] mt-5">
-                <view>{{ itm.pay_price }}元
-                  <text v-if="itm.pay_integral > 0">+{{ itm.pay_integral }}积分</text>
+                <view
+                  >{{ itm.pay_price }}元
+                  <text v-if="itm.pay_integral > 0"
+                    >+{{ itm.pay_integral }}积分</text
+                  >
                </view>
              </view>
            </view>
@@ -51,9 +69,12 @@
            </view>
          </view>
        </view>
-        <view class="flex justify-between items-center mt-2 mb-2 text-[25px]" v-if="item.status !== 0">
+        <view
+          class="flex justify-between items-center mt-2 mb-2 text-[25px]"
+          v-if="item.status !== 0">
          <text class="text-[#9C9C9C]">共{{ item.count }}件商品</text>
-          <text class="text-[26px] flex-1 text-right">{{ item.status !== 0 ? '实' : '应' }}付款:
+          <text class="text-[26px] flex-1 text-right"
+            >{{ item.status !== 0 ? '实' : '应' }}付款:
            {{ item.discount_price }} (元)
            <text v-if="item.exchange > 0">积分抵扣: {{ item.exchange }}</text>
          </text>
@@ -65,9 +86,9 @@
 </template>

 <script setup lang="ts">
-import { ref } from 'vue';
+import {ref} from 'vue';
 import Taro from '@tarojs/taro';
-import { getActiveOrderList } from '../../../../api/admin';
+import {getActiveOrderList} from '../../../../api/admin';

 const opt = ref([
  {
--- a/src/pages/admin/verify/verify_list/index.vue
+++ b/src/pages/admin/verify/verify_list/index.vue
@@ -3,22 +3,31 @@
    <view class="card">
      <view class="text-[#7A7A7A]">订单号：{{ goodInfo.oid }}</view>
      <view class="line"></view>
-      <view class="container" v-for="(item, index) in goodInfo.OrderGoods" :key="index">
+      <view
+        class="container"
+        v-for="(item, index) in goodInfo.OrderGoods"
+        :key="index">
        <image class="image" :src="item.Goods.cover"></image>
        <view class="info">
          <view class="title">{{ item.Goods.name }}</view>
          <view class="text-[#7A7A7A] text-[22px]">{{
            item.Goods.profile || '此商品暂无描述'
-            }}</view>
+          }}</view>
        </view>
        <view class="text-[#9C9C9C]">x{{ item.number }}</view>
      </view>
      <view class="line"></view>
-      <view class="flex justify-between items-center mt-3 mb-2 text-[25px]" style="text-align: right">
-        <text class="text-[#9C9C9C] text-left">共{{ goodInfo.count }}件商品</text>
-        <text class="text-[26px] flex-1">实付款:
-          {{ goodInfo.discount_price }} (元)
-          <text v-if="goodInfo.exchange > 0">积分抵扣: {{ goodInfo.exchange }}</text>
+      <view
+        class="flex justify-between items-center mt-3 mb-2 text-[25px]"
+        style="text-align: right">
+        <text class="text-[#9C9C9C] text-left"
+          >共{{ goodInfo.count }}件商品</text
+        >
+        <text class="text-[26px] flex-1"
+          >实付款: {{ goodInfo.discount_price }} (元)
+          <text v-if="goodInfo.exchange > 0"
+            >积分抵扣: {{ goodInfo.exchange }}</text
+          >
        </text>
      </view>
      <!-- <view class="line"></view> -->
@@ -30,22 +39,28 @@
    </view>
    <nut-cell-group>
      <nut-cell title="订单信息"></nut-cell>
-      <nut-cell title="下单时间:" :desc="goodInfo.add_time?.slice(0, 19)"></nut-cell>
+      <nut-cell
+        title="下单时间:"
+        :desc="goodInfo.add_time?.slice(0, 19)"></nut-cell>
      <nut-cell title="下单号码:" :desc="goodInfo.User?.phone"></nut-cell>
      <nut-cell title="下单用户:" :desc="goodInfo.User?.nickName"></nut-cell>
-      <nut-cell title="付款方式:" :desc="getPayType(goodInfo.pay_type)"></nut-cell>
+      <nut-cell
+        title="付款方式:"
+        :desc="getPayType(goodInfo.pay_type)"></nut-cell>
    </nut-cell-group>

    <view class="w-[90%] mt-[40px] m-auto">
-      <nut-button type="primary" shape="square" block @click="subVerify">确定核销</nut-button>
+      <nut-button type="primary" shape="square" block @click="subVerify"
+        >确定核销</nut-button
+      >
    </view>
  </view>
 </template>

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import { getActiveVerifyList, activeOrderVerify } from '@/api/admin';
-import { ref } from 'vue';
+import {getActiveVerifyList, activeOrderVerify} from '@/api/admin';
+import {ref} from 'vue';

 const opt = ref<any>({});

--- a/src/pages/admin/withdrawal/index.vue
+++ b/src/pages/admin/withdrawal/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
+import {ref} from 'vue';
 import Taro from '@tarojs/taro';
-import { getWithdrawList, addWithdraw } from '@/api/admin';
+import {getWithdrawList, addWithdraw} from '@/api/admin';

 const user_info = ref<any>({});

@@ -57,7 +57,7 @@ const getData = async () => {

 const add = async () => {
  try {
-    formRef.value?.validate().then(async ({ valid }) => {
+    formRef.value?.validate().then(async ({valid}) => {
      if (valid) {
        const res = await addWithdraw({
          Bid: user_info.value.data.bid,
@@ -162,9 +162,17 @@ Taro.useReachBottom(() => {
      </view>
      <nut-form ref="formRef" :model-value="basicData" :rules="rules">
        <nut-form-item prop="num">
-          <nut-input v-model="basicData.num" class="nut-input-text" placeholder="请输入提现余额" type="text">
+          <nut-input
+            v-model="basicData.num"
+            class="nut-input-text"
+            placeholder="请输入提现余额"
+            type="text">
            <template #right>
-              <text class="text-[#EC4443] text-[26px]" @tap="basicData.num = row.toString()">全部</text>
+              <text
+                class="text-[#EC4443] text-[26px]"
+                @tap="basicData.num = row.toString()"
+                >全部</text
+              >
            </template>
          </nut-input>
        </nut-form-item>
@@ -181,41 +189,67 @@ Taro.useReachBottom(() => {
      <view class="item" v-for="(item, index) in data" :key="index">
        <view class="flex justify-between items-center">
          <view class="text-[25px] text-[#9C9C9C]">到账金额</view>
-          <view class="text-[27px]" :class="item.status === 1
-            ? 'success'
-            : item.status === 1
-              ? 'danger'
-              : 'warning'
-            ">{{
+          <view
+            class="text-[27px]"
+            :class="
+              item.status === 1
+                ? 'success'
+                : item.status === 1
+                ? 'danger'
+                : 'warning'
+            "
+            >{{
              item.status === 1
                ? '已打款'
                : item.status === 2
-                  ? '已拒绝'
-                  : '待审核'
-            }}</view>
+                ? '已拒绝'
+                : '待审核'
+            }}</view
+          >
        </view>
        <view>
          <view class="mt-3 mb-3 text-[35px]">￥{{ item.number }}</view>
          <view class="text-[25px] mb-1">提现金额：{{ item.integral }}</view>
-          <view class="text-[25px] mb-1">信息服务费：{{ item.commission }}</view>
-          <view class="text-[25px] mb-1">手续费：{{ item.commission_number }}%</view>
+          <view class="text-[25px] mb-1"
+            >信息服务费：{{ item.commission }}</view
+          >
+          <view class="text-[25px] mb-1"
+            >手续费：{{ item.commission_number }}%</view
+          >
          <view class="text-[25px] mb-1">时间：{{ item.add_time }}</view>
-          <view v-if="item.status === 2" class="text-[25px] text-[#9C9C9C]">备注：</view>
-          <view v-if="item.status === 1" class="text-[23px] mt-2 text-[#df3526]" @click="openPreview(item)">点我查看回执单
+          <view v-if="item.status === 2" class="text-[25px] text-[#9C9C9C]"
+            >备注：</view
+          >
+          <view
+            v-if="item.status === 1"
+            class="text-[23px] mt-2 text-[#df3526]"
+            @click="openPreview(item)"
+            >点我查看回执单
          </view>
        </view>
      </view>
    </view>
    <nut-empty v-else description="暂无提现记录"></nut-empty>
    <!--    图片预览    -->
-    <nut-image-preview :show="showPreview" :images="imgData" @close="closePreview" />
+    <nut-image-preview
+      :show="showPreview"
+      :images="imgData"
+      @close="closePreview" />

-    <nut-dialog title="提现疑问？" content="这是基础弹框。" ok-text="我已知晓" :no-cancel-btn="true" v-model:visible="visible1">
+    <nut-dialog
+      title="提现疑问？"
+      content="这是基础弹框。"
+      ok-text="我已知晓"
+      :no-cancel-btn="true"
+      v-model:visible="visible1">
      <template #default>
        <text>
          积分和人民币兑换比例为
          <text class="text-[#F83D3D]">100:1</text>
-          平台收取<text class="text-[#F83D3D]">10%服务费</text>和<text class="text-[#F83D3D]">0.038%手续费</text>
+          平台收取<text class="text-[#F83D3D]">10%服务费</text>和<text
+            class="text-[#F83D3D]"
+            >0.038%手续费</text
+          >
        </text>
      </template>
    </nut-dialog>
--- a/src/pages/goods/pay/index.scss
+++ b/src/pages/goods/pay/index.scss
@@ -1,97 +1,97 @@
-.nut-price {
-  color: #333333;
-}
-
-.nut-price--symbol-large {
-  font-size: 25px;
-}
-
-.line {
-  width: 1;
-  height: 30px;
-  border-left: 1px solid #a3a3a3;
-  margin: 0 50px;
-  display: inline-block;
-}
-
-.nut-radio {
-  margin-left: 10px;
-}
-
-.nut-radio__label {
-  margin-left: 0;
-}
-
-.nut-button {
-  border-radius: 20px;
-}
-
-.nut-short-password {
-  // .nut-icon-tips {
-  //   display: none;
-  // }
-
-  @for $i from 1 through 5 {
-    .nut-short-password__item:nth-child(#{$i}) {
-      border-right: 1px solid var(--nut-shortpassword-border-color, #ddd);
-    }
-  }
-}
-
-.order-card {
-  width: 95%;
-  box-sizing: border-box;
-  margin: 10px auto;
-  background-color: #fff;
-  border-radius: 10px;
-  padding: 20px;
-
-  .line {
-    width: 100%;
-    height: 1px;
-    background-color: #f5f5f5;
-    margin: 20px auto;
-  }
-
-  .top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .btn {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-  }
-
-  .center {
-    .top {
-      display: flex;
-      align-items: flex-start;
-
-      image {
-        width: 150px;
-        height: 150px;
-        border-radius: 15px;
-        margin-right: 20px;
-      }
-
-      .title {
-        display: -webkit-box;
-        overflow: hidden;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical;
-        text-overflow: ellipsis;
-        width: 350px;
-      }
-
-      .right {
-        margin-left: 10px;
-        font-size: 28px;
-        text-align: right;
-        color: #9c9c9c;
-      }
-    }
-  }
-}
+.nut-price {
+  color: #333333;
+}
+
+.nut-price--symbol-large {
+  font-size: 25px;
+}
+
+.line {
+  width: 1;
+  height: 30px;
+  border-left: 1px solid #a3a3a3;
+  margin: 0 50px;
+  display: inline-block;
+}
+
+.nut-radio {
+  margin-left: 10px;
+}
+
+.nut-radio__label {
+  margin-left: 0;
+}
+
+.nut-button {
+  border-radius: 20px;
+}
+
+.nut-short-password {
+  // .nut-icon-tips {
+  //   display: none;
+  // }
+
+  @for $i from 1 through 5 {
+    .nut-short-password__item:nth-child(#{$i}) {
+      border-right: 1px solid var(--nut-shortpassword-border-color, #ddd);
+    }
+  }
+}
+
+.order-card {
+  width: 95%;
+  box-sizing: border-box;
+  margin: 10px auto;
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 20px;
+
+  .line {
+    width: 100%;
+    height: 1px;
+    background-color: #f5f5f5;
+    margin: 20px auto;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .btn {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+
+  .center {
+    .top {
+      display: flex;
+      align-items: flex-start;
+
+      image {
+        width: 150px;
+        height: 150px;
+        border-radius: 15px;
+        margin-right: 20px;
+      }
+
+      .title {
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        text-overflow: ellipsis;
+        width: 350px;
+      }
+
+      .right {
+        margin-left: 10px;
+        font-size: 28px;
+        text-align: right;
+        color: #9c9c9c;
+      }
+    }
+  }
+}
--- a/src/pages/goods/pay/index.vue
+++ b/src/pages/goods/pay/index.vue
@@ -204,6 +204,7 @@ const confirmPay = async () => {
          title: '支付成功',
          icon: 'success',
        });
+        isLoading.value = false;
      },
      fail: function () {
        Taro.showToast({
@@ -217,7 +218,7 @@ const confirmPay = async () => {
            url: `/pages/users/order_list/index?type=0`,
          });
        }, 2000);
-        isLoading.value = false;
+        // isLoading.value = false;
      },
    });
  } catch (err) {
@@ -226,7 +227,7 @@ const confirmPay = async () => {
      icon: 'none',
    });
  } finally {
-    isLoading.value = false;
+    // isLoading.value = false;
  }
 };

--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,12 +1,14 @@
 <template>
  <view>
-    <view :style="{ marginTop: BarHeight + 'px' }"></view>
+    <view :style="{marginTop: BarHeight + 'px'}"></view>
    <view class="local">
      <view class="iconfont icon-dizhi" style="font-size: 20px"></view>
      <text class="text-[28px]">{{ address }}</text>
    </view>
    <view class="search">
-      <view class="iconfont icon-sousuo" style="color: #8f8f8f; margin-right: 8px"></view>
+      <view
+        class="iconfont icon-sousuo"
+        style="color: #8f8f8f; margin-right: 8px"></view>
      <input placeholder="请输入商家名称搜索" v-model="searchVal" />
      <view class="search-btn" @click="clickSearch">搜索</view>
    </view>
@@ -14,18 +16,36 @@
      <view class="title"></view>
      <navigator class="jf-btn" hover-class="none"></navigator>
      <view class="footer">
-        <navigator hover-class="none" class="btn-1" url="/pages/fastBuy/index?type=1"></navigator>
-        <navigator hover-class="none" openType="switchTab" url="/pages/game/gamehome/index" class="btn-2"></navigator>
-        <navigator hover-class="none" class="btn-3" url="/pages/fastBuy/index?type=2"></navigator>
+        <navigator
+          hover-class="none"
+          class="btn-1"
+          url="/pages/fastBuy/index?type=1"></navigator>
+        <navigator
+          hover-class="none"
+          openType="switchTab"
+          url="/pages/game/gamehome/index"
+          class="btn-2"></navigator>
+        <navigator
+          hover-class="none"
+          class="btn-3"
+          url="/pages/fastBuy/index?type=2"></navigator>
      </view>
    </view>
    <view class="navigation">
-      <view class="item" v-for="(item, index) in navigationList" :key="index" @click="toPage(item)">
+      <view
+        class="item"
+        v-for="(item, index) in navigationList"
+        :key="index"
+        @click="toPage(item)">
        <image class="icon" :src="item.icon" />
        <view class="text">{{ item.name }}</view>
      </view>
    </view>
-    <navigator class="ad" url="/pages/marketing/yq/index" open-type="navigate" hover-class="none">
+    <navigator
+      class="ad"
+      url="/pages/marketing/yq/index"
+      open-type="navigate"
+      hover-class="none">
    </navigator>
    <MerList :get-user-location="getUserLocal" />
    <Popup :imgArr="imgList" />
@@ -34,8 +54,8 @@

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import { ref } from 'vue';
-import { getHomeList } from '@/api/home';
+import {ref} from 'vue';
+import {getHomeList} from '@/api/home';
 import MerList from '@/components/MerList.vue';
 import Popup from '@/components/Popup.vue';

@@ -52,9 +72,7 @@ interface navigationType {

 const navigationList = ref<Array<navigationType>>([]);

-const imgList = ref([
-  require('../../static/popTip.png'),
-]);
+const imgList = ref([require('../../static/popTip.png')]);

 Taro.useShareAppMessage(() => ({
  title: '捷兑通',
@@ -156,11 +174,11 @@ const getNavLists = async () => {
 const toPage = item => {
  item.type !== 1
    ? Taro.navigateTo({
-      url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
-    })
+        url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
+      })
    : Taro.navigateTo({
-      url: item.url as string,
-    });
+        url: item.url as string,
+      });
 };
 </script>

--- a/src/pages/mer/mer_detail/index.vue
+++ b/src/pages/mer/mer_detail/index.vue
@@ -1,56 +1,85 @@
 <template>
  <view>
-    <view class="head-wrapper" :style="{ top: BarHeight + 'px' }">
+    <view class="head-wrapper" :style="{top: BarHeight + 'px'}">
      <view class="head-menu">
        <Left class="iconfont" @click="returns" />
        <Home class="iconfont" @click="goHome" />
      </view>
    </view>
    <!--  幻灯片  -->
-    <nut-swiper :init-page="0" :pagination-visible="false" pagination-color="red" auto-play="3000">
+    <nut-swiper
+      :init-page="0"
+      :pagination-visible="false"
+      pagination-color="red"
+      auto-play="3000">
      <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
-        <img style="width: 100%; height: 100%" :src="itm" :alt="idx.toString()" />
+        <img
+          style="width: 100%; height: 100%"
+          :src="itm"
+          :alt="idx.toString()" />
      </nut-swiper-item>
    </nut-swiper>
    <!-- 商家信息 -->
    <view class="infoBox">
      <view class="title text-[#333333]">{{ mer_info.name }}</view>
      <view class="flex items-center justify-between mt-3">
-        <nut-rate spacing="1" active-color="rgba(252, 207, 10, 1)" v-model="mer_info.rate" />
+        <nut-rate
+          spacing="1"
+          active-color="rgba(252, 207, 10, 1)"
+          v-model="mer_info.rate" />
        <view class="text-[#9E9E9E] text-[25px]">销量：10000</view>
-        <view class="text-[#9E9E9E] text-[25px]">营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
+        <view class="text-[#9E9E9E] text-[25px]"
+          >营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
        </view>
      </view>
      <view class="line"></view>
      <view class="bom">
-        <view class="iconfont icon-dizhi text-[#C4C4C4]" style="width: 15px; height: 15px; margin-right: 15px"></view>
+        <view
+          class="iconfont icon-dizhi text-[#C4C4C4]"
+          style="width: 15px; height: 15px; margin-right: 15px"></view>
        <view class="left">
          <view>{{ mer_info.address || '暂无商家地址' }}</view>
-          <view class="sub mt-1">距离您{{
-            calculateDistance(
-              userLocalNum.t,
-              userLocalNum.l,
-              Number(mer_info.lat),
-              Number(mer_info.lon),
-            )
-          }}
+          <view class="sub mt-1"
+            >距离您{{
+              calculateDistance(
+                userLocalNum.t,
+                userLocalNum.l,
+                Number(mer_info.lat),
+                Number(mer_info.lon),
+              )
+            }}
          </view>
        </view>
        <view class="right">
          <view @click="clickMap">
-            <image class="w-[50px] h-[50px]" src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
+            <image
+              class="w-[50px] h-[50px]"
+              src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
          </view>
          <view @click="clickPhone">
-            <image class="w-[50px] h-[50px]" src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
+            <image
+              class="w-[50px] h-[50px]"
+              src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
          </view>
        </view>
      </view>
    </view>
    <!-- 商品列表 -->
    <view class="good-class" v-if="class_list.length > 0">
-      <nut-tabs v-model="value" title-scroll size="large" direction="vertical" title-gutter="5" animated-time="0"
-        type="" name="tabName">
-        <nut-tab-pane v-for="(itm, index) in good_list" :key="index" :title="itm.name" :pane-key="index">
+      <nut-tabs
+        v-model="value"
+        title-scroll
+        size="large"
+        direction="vertical"
+        title-gutter="5"
+        animated-time="0"
+        type=""
+        name="tabName">
+        <nut-tab-pane
+          v-for="(itm, index) in good_list"
+          :key="index"
+          :title="itm.name"
+          :pane-key="index">
          <view v-if="itm.Goods.length > 0">
            <view class="list" v-for="(item, index) in itm.Goods" :key="index">
              <view class="item" @click.stop="toGoodDetails(item.gid, 1)">
@@ -59,18 +88,25 @@
                  <view class="name">{{ item.name }}</view>
                  <view class="bom">
                    <view class="price">
-                      <text style="font-size: 15px">{{ item.discount_price }}元
-                        <text style="font-size: 15px" v-if="item.exchange">+{{ item.exchange }}积分
+                      <text style="font-size: 15px"
+                        >{{ item.discount_price }}元
+                        <text style="font-size: 15px" v-if="item.exchange"
+                          >+{{ item.exchange }}积分
                        </text>
                      </text>
                    </view>
                  </view>
                  <view class="bom">
                    <view>
-                      <view class="stock text-[25px]">剩余:{{ item.stock }}</view>
+                      <view class="stock text-[25px]"
+                        >剩余:{{ item.stock }}</view
+                      >
                    </view>
                    <view class="flex items-center justify-between">
-                      <view v-if="item.cartNum > 0" class="btn" @click.stop="add_cart(item, 1)">
+                      <view
+                        v-if="item.cartNum > 0"
+                        class="btn"
+                        @click.stop="add_cart(item, 1)">
                        <Minus />
                      </view>
                      <view v-if="item.cartNum > 0" style="margin: 0 10px">
@@ -98,10 +134,10 @@

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import { Left, Home, Plus, Minus } from '@nutui/icons-vue-taro';
-import { Ref, ref } from 'vue';
-import { calculateDistance } from '@/utils';
-import { getGoodList, getMerCategory, getMerDetail } from '@/api/goods';
+import {Left, Home, Plus, Minus} from '@nutui/icons-vue-taro';
+import {Ref, ref} from 'vue';
+import {calculateDistance} from '@/utils';
+import {getGoodList, getMerCategory, getMerDetail} from '@/api/goods';
 import Cart from '@/components/Cart.vue';

 const statusBarHeight = Taro.getSystemInfoSync()?.statusBarHeight;
--- a/src/pages/users/order_list/index.vue
+++ b/src/pages/users/order_list/index.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
+import {ref} from 'vue';
 import Taro from '@tarojs/taro';
 import Pay from '@/components/Pay.vue';
-import { getActiveOrderList, deleteActiveOrder } from '@/api/goods';
-import { getOrderStatistics } from '@/api/order';
+import {getActiveOrderList, deleteActiveOrder} from '@/api/goods';
+import {getOrderStatistics} from '@/api/order';
 import UQRCode from 'uqrcodejs';

 const tabValue = ref(0);
@@ -162,7 +162,7 @@ const toDetail = (item: any) => {

 const delOrder = async (oid: string) => {
  try {
-    await deleteActiveOrder({ oid });
+    await deleteActiveOrder({oid});
  } catch (error) {
    Taro.showToast({
      title: error.msg,
@@ -237,37 +237,49 @@ const closed = () => {
      <image src="../static/user/order_list_top.png" />
    </view> -->
    <view class="tabs-box">
-      <view v-for="item in tabsList" :key="item.value" @click="tabChange(item.value)">
-        <view class="text" :style="{
-          color: tabValue === item.value ? '#000' : '#9C9C9C',
-        }">{{ item.title }}
+      <view
+        v-for="item in tabsList"
+        :key="item.value"
+        @click="tabChange(item.value)">
+        <view
+          class="text"
+          :style="{
+            color: tabValue === item.value ? '#000' : '#9C9C9C',
+          }"
+          >{{ item.title }}
        </view>
        <!-- <view>{{ item.num }}</view> -->
-        <view class="line" :class="{ lineColor: item.value === tabValue }"></view>
+        <view class="line" :class="{lineColor: item.value === tabValue}"></view>
      </view>
    </view>
    <view v-if="orderList.length > 0">
-      <view class="order-card" v-for="(item, index) in orderList" :key="index" @click="toDetail(item)">
+      <view
+        class="order-card"
+        v-for="(item, index) in orderList"
+        :key="index"
+        @click="toDetail(item)">
        <view class="top">
          <view class="text-[#9C9C9C] text-[28px]">订单号：{{ item.oid }}</view>
-          <view :style="{
-            color:
-              item.status === 0
-                ? '#FF850A'
-                : item.status === 1
+          <view
+            :style="{
+              color:
+                item.status === 0
+                  ? '#FF850A'
+                  : item.status === 1
                  ? '#F83D3D'
                  : item.status === 2
-                    ? '#333333'
-                    : '#9C9C9C',
-          }">{{
-            item.status === 0
-              ? '待付款'
-              : item.status === 1
+                  ? '#333333'
+                  : '#9C9C9C',
+            }"
+            >{{
+              item.status === 0
+                ? '待付款'
+                : item.status === 1
                ? '待使用'
                : item.status === 2
-                  ? '已使用'
-                  : '已失效'
-          }}
+                ? '已使用'
+                : '已失效'
+            }}
          </view>
        </view>
        <view class="line"></view>
@@ -277,8 +289,11 @@ const closed = () => {
            <view class="flex flex-col justify-between flex-1">
              <view class="title">{{ itm.Goods?.name }}</view>
              <view class="text-[#F83D3D] mt-5">
-                <view>{{ itm.Goods.discount_price }}元
-                  <text v-if="itm.Goods.exchange > 0">+{{ itm.Goods.exchange }}积分</text>
+                <view
+                  >{{ itm.Goods.discount_price }}元
+                  <text v-if="itm.Goods.exchange > 0"
+                    >+{{ itm.Goods.exchange }}积分</text
+                  >
                </view>
              </view>
            </view>
@@ -288,18 +303,28 @@ const closed = () => {
          </view>
        </view>
        <!-- <view class="line"></view> -->
-        <view class="flex justify-between items-center mt-2 mb-2 text-[25px]" v-if="item.status !== 0"
+        <view
+          class="flex justify-between items-center mt-2 mb-2 text-[25px]"
+          v-if="item.status !== 0"
          style="text-align: right">
-          <text class="text-[#9C9C9C] text-[28px]">共{{ item.count }}件商品
+          <text class="text-[#9C9C9C] text-[28px]"
+            >共{{ item.count }}件商品
          </text>
-          <text class="text-[26px]">{{ item.status !== 0 ? '实' : '应' }}付款:
+          <text class="text-[26px]"
+            >{{ item.status !== 0 ? '实' : '应' }}付款:
            {{ item.discount_price }} (元)
            <text v-if="item.exchange > 0">积分抵扣: {{ item.exchange }}</text>
          </text>
          <!-- <view class="line"></view> -->
        </view>
        <view class="btn">
-          <nut-button v-if="item.status === 0" plain size="mini" type="primary" @click.stop="delOrder(item.oid)">取消订单
+          <nut-button
+            v-if="item.status === 0"
+            plain
+            size="mini"
+            type="primary"
+            @click.stop="delOrder(item.oid)"
+            >取消订单
          </nut-button>
          <!-- <nut-button
            style="margin-left: 5px"
@@ -308,29 +333,55 @@ const closed = () => {
            @click="toDetail(item)"
            >查看详情
          </nut-button> -->
-          <nut-button style="margin-left: 5px" size="mini" type="primary" v-if="item.status === 0"
-            @click.stop="openPay(item)">立即付款
+          <nut-button
+            style="margin-left: 5px"
+            size="mini"
+            type="primary"
+            v-if="item.status === 0"
+            @click.stop="openPay(item)"
+            >立即付款
          </nut-button>
-          <nut-button style="margin-left: 5px" size="mini" type="primary" v-if="item.status === 1"
-            @click.stop="openCode(item)">出示核销码
+          <nut-button
+            style="margin-left: 5px"
+            size="mini"
+            type="primary"
+            v-if="item.status === 1"
+            @click.stop="openCode(item)"
+            >出示核销码
          </nut-button>
        </view>
      </view>
    </view>
    <nut-empty v-else description="暂无订单"></nut-empty>
    <!-- 核销码弹窗 -->
-    <nut-popup v-model:visible="isShowCode" position="center" style="padding: 20px; border-radius: 15px"
-      :maskClosable="true" safe-area-inset-bottom @click-overlay="closed" @closed="closed">
+    <nut-popup
+      v-model:visible="isShowCode"
+      position="center"
+      style="padding: 20px; border-radius: 15px"
+      :maskClosable="true"
+      safe-area-inset-bottom
+      @click-overlay="closed"
+      @closed="closed">
      <view class="code-box">
        <view>核销码</view>
        <!-- <image class="qrcode" :src="url"></image> -->
        <!-- <view class="qrcode"> -->
-        <canvas ref="qrcode" id="qrcode" style="width: 200px; height: 200px" canvas-id="qrcode"></canvas>
+        <canvas
+          ref="qrcode"
+          id="qrcode"
+          style="width: 200px; height: 200px"
+          canvas-id="qrcode"></canvas>
        <!-- </view> -->
      </view>
    </nut-popup>
-    <pay :isShowPay="isShowPay" :interval="false" :jfInfo="jfInfo" :OrderType="2" @errPay="errPay"
-      @successPay="successPay" @closePay="closePay" />
+    <pay
+      :isShowPay="isShowPay"
+      :interval="false"
+      :jfInfo="jfInfo"
+      :OrderType="2"
+      @errPay="errPay"
+      @successPay="successPay"
+      @closePay="closePay" />
  </view>
 </template>

--- a/src/pages/users/order_list_detail/index.vue
+++ b/src/pages/users/order_list_detail/index.vue
@@ -27,7 +27,8 @@
          <view class="font-bold">订单待使用</view>
          <IconFont name="rect-right" size="15" color="#333333"></IconFont>
        </view>
-        <view class="text-[#9C9C9C] text-[20px]">订单剩余
+        <view class="text-[#9C9C9C] text-[20px]"
+          >订单剩余
          <text class="text-[#FF0000]">{{ timeStr }} </text>
          过期，请尽快核销！
        </view>
@@ -49,27 +50,37 @@
    </view>
    <!--    商家信息    -->
    <view class="mer-info">
-      <image class="w-[150px] h-[150px] rounded-lg mr-2" :src="goodInfo.Store?.head_photo" />
+      <image
+        class="w-[150px] h-[150px] rounded-lg mr-2"
+        :src="goodInfo.Store?.head_photo" />
      <view class="right">
        <view class="text-[#333333]">{{ goodInfo.Store?.name }}</view>
-        <view class="flex mt-2 items-center text-[#999999] text-[23px] text-ellipsis line-clamp-3">
-          <view style="font-size: 15px" class="iconfont icon-dizhi text-[#C4C4C4]"></view>
+        <view
+          class="flex mt-2 items-center text-[#999999] text-[23px] text-ellipsis line-clamp-3">
+          <view
+            style="font-size: 15px"
+            class="iconfont icon-dizhi text-[#C4C4C4]"></view>
          <view>{{ goodInfo.Store?.address }}</view>
        </view>
        <view class="w-full flex items-center justify-between mt-1">
-          <view class="ml-3 text-[23px] text-[#999999]">距离您{{
-            calculateDistance(
-              userLocalNum.t,
-              userLocalNum.l,
-              Number(goodInfo.Store?.lat),
-              Number(goodInfo.Store?.lon),
-            )
-          }}
+          <view class="ml-3 text-[23px] text-[#999999]"
+            >距离您{{
+              calculateDistance(
+                userLocalNum.t,
+                userLocalNum.l,
+                Number(goodInfo.Store?.lat),
+                Number(goodInfo.Store?.lon),
+              )
+            }}
          </view>
          <view class="flex items-center">
-            <image @tap="toPhone()" class="w-[50px] h-[50px]"
+            <image
+              @tap="toPhone()"
+              class="w-[50px] h-[50px]"
              src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
-            <image @tap="toAdder()" class="w-[50px] h-[50px] ml-2"
+            <image
+              @tap="toAdder()"
+              class="w-[50px] h-[50px] ml-2"
              src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
          </view>
        </view>
@@ -81,13 +92,19 @@
      <nut-cell>
        <template #default>
          <view class="center-box">
-            <view class="top" v-for="(item, index) in goodInfo.OrderGoods" :key="index">
+            <view
+              class="top"
+              v-for="(item, index) in goodInfo.OrderGoods"
+              :key="index">
              <image :src="item.Goods?.cover" />
              <view class="flex flex-col justify-between flex-1">
                <view class="title">{{ item.Goods?.name }}</view>
                <view class="text-[#F83D3D] mt-5">
-                  <view>{{ item.Goods.discount_price }}元
-                    <text v-if="item.Goods.exchange > 0">+{{ item.Goods.exchange }}积分</text>
+                  <view
+                    >{{ item.Goods.discount_price }}元
+                    <text v-if="item.Goods.exchange > 0"
+                      >+{{ item.Goods.exchange }}积分</text
+                    >
                  </view>
                </view>
              </view>
@@ -95,12 +112,17 @@
                <view>x{{ item.number }}</view>
              </view>
            </view>
-            <view class="flex justify-between items-center mt-2 mb-2 text-[25px]">
-              <view class="text-[#9C9C9C]">{{ `共${goodInfo.count}件商品` }}
+            <view
+              class="flex justify-between items-center mt-2 mb-2 text-[25px]">
+              <view class="text-[#9C9C9C]"
+                >{{ `共${goodInfo.count}件商品` }}
              </view>
-              <text class="text-[26px]">{{ goodInfo.status !== 0 ? '实' : '应' }}付款:
+              <text class="text-[26px]"
+                >{{ goodInfo.status !== 0 ? '实' : '应' }}付款:
                {{ goodInfo.discount_price }} (元)
-                <text v-if="goodInfo.exchange > 0">积分抵扣: {{ goodInfo.exchange }}</text>
+                <text v-if="goodInfo.exchange > 0"
+                  >积分抵扣: {{ goodInfo.exchange }}</text
+                >
              </text>
            </view>
          </view>
@@ -109,27 +131,44 @@
    </nut-cell-group>
    <nut-cell-group>
      <nut-cell title="订单号:" :desc="goodInfo.oid"></nut-cell>
-      <nut-cell title="下单时间:" :desc="goodInfo.add_time?.slice(0, 19)"></nut-cell>
+      <nut-cell
+        title="下单时间:"
+        :desc="goodInfo.add_time?.slice(0, 19)"></nut-cell>
      <!-- <nut-cell
        v-if="goodInfo.expires !== 0"
        title="订单过期时间:"
        :desc="
          dayjs.unix(goodInfo.expires).format('YYYY-MM-DD HH:mm:ss')
        "></nut-cell> -->
-      <nut-cell title="订单状态:" :desc="goodInfo.status === 0
-        ? '待付款'
-        : goodInfo.status === 1
-          ? '待使用'
-          : goodInfo.status === 2
+      <nut-cell
+        title="订单状态:"
+        :desc="
+          goodInfo.status === 0
+            ? '待付款'
+            : goodInfo.status === 1
+            ? '待使用'
+            : goodInfo.status === 2
            ? '已使用'
            : '已失效'
        "></nut-cell>
    </nut-cell-group>

    <view class="mt-[30px] m-auto">
-      <nut-button v-if="goodInfo.status === 0" shape="square" type="primary" block @click="openPay()">继续付款
+      <nut-button
+        v-if="goodInfo.status === 0"
+        shape="square"
+        type="primary"
+        block
+        @click="openPay()"
+        >继续付款
      </nut-button>
-      <nut-button v-if="goodInfo.status === 1" shape="square" type="primary" block @click="openCode()">出示核销码
+      <nut-button
+        v-if="goodInfo.status === 1"
+        shape="square"
+        type="primary"
+        block
+        @click="openCode()"
+        >出示核销码
      </nut-button>
    </view>

@@ -160,30 +199,46 @@
    </view> -->

    <!-- 核销码弹窗 -->
-    <nut-popup v-model:visible="isShowCode" position="center" style="padding: 20px; border-radius: 15px"
-      :maskClosable="true" safe-area-inset-bottom @click-overlay="closed" @closed="closed">
+    <nut-popup
+      v-model:visible="isShowCode"
+      position="center"
+      style="padding: 20px; border-radius: 15px"
+      :maskClosable="true"
+      safe-area-inset-bottom
+      @click-overlay="closed"
+      @closed="closed">
      <view class="code-box">
        <view>核销码</view>
        <!-- <image class="qrcode" :src="url"></image> -->
        <!-- <view class="qrcode"> -->
-        <canvas ref="qrcode" id="qrcode" style="width: 200px; height: 200px" canvas-id="qrcode"></canvas>
+        <canvas
+          ref="qrcode"
+          id="qrcode"
+          style="width: 200px; height: 200px"
+          canvas-id="qrcode"></canvas>
        <!-- </view> -->
      </view>
    </nut-popup>
-    <pay :isShowPay="isShowPay" :interval="false" :jfInfo="jfInfo" :OrderType="2" @errPay="errPay"
-      @successPay="successPay" @closePay="closePay" />
+    <pay
+      :isShowPay="isShowPay"
+      :interval="false"
+      :jfInfo="jfInfo"
+      :OrderType="2"
+      @errPay="errPay"
+      @successPay="successPay"
+      @closePay="closePay" />
  </view>
 </template>

 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import { onUnmounted, ref } from 'vue';
+import {onUnmounted, ref} from 'vue';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import Pay from '@/components/Pay.vue';
-import { calculateDistance } from '@/utils';
-import { IconFont } from '@nutui/icons-vue-taro';
-import { getActiveOrderDetail } from '@/api/goods';
+import {calculateDistance} from '@/utils';
+import {IconFont} from '@nutui/icons-vue-taro';
+import {getActiveOrderDetail} from '@/api/goods';
 import UQRCode from 'uqrcodejs';

 dayjs.extend(duration);