feat(custom): 地图apiKey更换，订单核销详情新增支付方式

src/pages/admin/add_order/add_menu/index.vue

@@ -62,11 +62,11 @@
 </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;

src/pages/admin/add_order/add_table/index.vue

@@ -51,10 +51,10 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import BackComponent from '../../../../components/Back.vue';
-import {checkPhone} from '../../../../api/admin';
+import { checkPhone } from '../../../../api/admin';
 
 const formVal = ref({
   seat: '',
@@ -64,7 +64,7 @@ const formVal = ref({
 
 const visible = ref(false);
 
-const formSubmit = async ({detail}: any) => {
+const formSubmit = async ({ detail }: any) => {
   if (!detail.value.seat)
     return Taro.showToast({
       title: '请填写台号',
@@ -80,7 +80,7 @@ const formSubmit = async ({detail}: any) => {
       icon: 'none',
     });
   try {
-    await checkPhone({phone: detail.value.phone});
+    await checkPhone({ phone: detail.value.phone });
     const user_info = await Taro.getStorageSync('userInfo');
     Taro.navigateTo({
       url: `/pages/admin/add_order/add_menu/index?type=1&bid=${user_info.data.bid}&seat=${formVal.value.seat}&phone=${formVal.value.phone}&notes=${formVal.value.notes}`,

src/pages/admin/add_order/index.scss

@@ -3,7 +3,8 @@
   justify-content: center;
   box-sizing: border-box;
   height: 100vh;
-  background-image: url('./static/WechatIMG10.jpg');
+  // background-image: url('./static/WechatIMG10.jpg');
+  background-image: url('https://m.360buyimg.com/i/jfs/t1/288333/5/8622/43050/682e2e18Ff3a6e2af/bbc66c081c18a467.png');
   background-size: 100% 35%;
   background-repeat: no-repeat;
 

src/pages/admin/add_order/pending_order/components/Footer.vue

@@ -78,8 +78,12 @@
 </template>
 
 <script setup lang="ts">
-import {onMounted, ref} from 'vue';
-import {cancelAfterOrder, confirmAfterOrder, editAfterOrder} from '@/api/admin';
+import { onMounted, ref } from 'vue';
+import {
+  cancelAfterOrder,
+  confirmAfterOrder,
+  editAfterOrder,
+} from '@/api/admin';
 import Taro from '@tarojs/taro';
 
 const props = defineProps({

src/pages/admin/add_order/pending_order/index.vue

@@ -66,10 +66,10 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import Footer from './components/Footer.vue';
-import {getAfterOrderList} from '@/api/admin';
+import { getAfterOrderList } from '@/api/admin';
 
 const tabsIndex = ref(0);
 
@@ -108,7 +108,7 @@ const get_list = async () => {
     title: '加载中',
   });
   const user_info = await Taro.getStorageSync('userInfo');
-  const {data: res} = await getAfterOrderList({
+  const { data: res } = await getAfterOrderList({
     bid: user_info.data.bid,
     status: tabsIndex.value,
   });

src/pages/admin/add_order/pending_order/pay/index.vue

@@ -57,9 +57,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getAfterOrder, createPayQr} from '@/api/admin';
+import { getAfterOrder, createPayQr } from '@/api/admin';
 
 const data = ref<any>({});
 
@@ -71,11 +71,11 @@ Taro.useLoad((e: any) => {
   get_data(e);
 });
 
-const get_data = async ({bid, oid}) => {
+const get_data = async ({ bid, oid }) => {
   Taro.showLoading({
     title: '加载中',
   });
-  const res = await getAfterOrder({bid, oid});
+  const res = await getAfterOrder({ bid, oid });
   data.value = res.data.data;
   Taro.hideLoading();
 };

src/pages/admin/add_order/pending_order/pending_order_detail/index.vue

@@ -79,10 +79,10 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import Footer from '../components/Footer.vue';
-import {getAfterOrder} from '@/api/admin';
+import { getAfterOrder } from '@/api/admin';
 // import BackComponent from "../../../../../components/Back.vue";
 
 const data = ref<any>({});

src/pages/admin/add_order/pending_order/wx_pay_code/index.vue

@@ -11,9 +11,9 @@
 </template>
 
 <script setup lang="ts">
-import {onUnmounted, ref} from 'vue';
+import { onUnmounted, ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getAfterOrder} from '@/api/admin';
+import { getAfterOrder } from '@/api/admin';
 
 const time_id = ref();
 
@@ -25,7 +25,7 @@ Taro.useLoad(e => {
   info.value = e;
   dataUrl.value = Taro.getStorageSync('pay_code');
   time_id.value = setInterval(async () => {
-    const {data} = await getAfterOrder({
+    const { data } = await getAfterOrder({
       bid: info.value.bid,
       oid: info.value.oid,
     });

src/pages/admin/order_manage/detail/index.vue

@@ -48,10 +48,10 @@
           info.status === 0
             ? '待付款'
             : info.status === 1
-            ? '待使用'
-            : info.status === 2
-            ? '已使用'
-            : '已失效'
+              ? '待使用'
+              : info.status === 2
+                ? '已使用'
+                : '已失效'
         ">
       </nut-cell>
       <nut-cell title="下单用户:" :desc="info.User?.nickName"></nut-cell>
@@ -75,7 +75,7 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
+import { ref } from 'vue';
 
 const info = ref<any>({});
 

src/pages/admin/order_manage/index.vue

@@ -116,10 +116,10 @@
 </template>
 
 <script lang="ts" setup>
-import {h, ref} from 'vue';
+import { h, ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {TriangleDown} from '@nutui/icons-vue-taro';
-import {orderStatistics} from '../../../api/admin';
+import { TriangleDown } from '@nutui/icons-vue-taro';
+import { orderStatistics } from '../../../api/admin';
 
 Taro.useLoad(() => {
   getData();

src/pages/admin/order_manage/list/index.vue

@@ -33,19 +33,19 @@
                 item.status === 0
                   ? '#FF850A'
                   : item.status === 1
-                  ? '#F83D3D'
-                  : item.status === 2
-                  ? '#333333'
-                  : '#9C9C9C',
+                    ? '#F83D3D'
+                    : item.status === 2
+                      ? '#333333'
+                      : '#9C9C9C',
             }"
             >{{
               item.status === 0
                 ? '待付款'
                 : item.status === 1
-                ? '待使用'
-                : item.status === 2
-                ? '已使用'
-                : '已失效'
+                  ? '待使用'
+                  : item.status === 2
+                    ? '已使用'
+                    : '已失效'
             }}
           </view>
         </view>
@@ -86,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([
   {

src/pages/admin/statistics/index.vue

@@ -116,9 +116,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref, computed, h} from 'vue';
+import { ref, computed, h } from 'vue';
 import Taro from '@tarojs/taro';
-import {growthRate} from '../../../api/admin';
+import { growthRate } from '../../../api/admin';
 import dayjs from 'dayjs';
 import uCharts from '../../../utils/js_sdk/u-charts.min.js';
 

src/pages/admin/verify/index.vue

@@ -25,19 +25,19 @@
                   item.status === 0
                     ? '#FF850A'
                     : item.status === 1
-                    ? '#F83D3D'
-                    : item.status === 2
-                    ? '#333333'
-                    : '#9C9C9C',
+                      ? '#F83D3D'
+                      : item.status === 2
+                        ? '#333333'
+                        : '#9C9C9C',
               }"
               >{{
                 item.status === 0
                   ? '待付款'
                   : item.status === 1
-                  ? '待使用'
-                  : item.status === 2
-                  ? '已使用'
-                  : '已失效'
+                    ? '待使用'
+                    : item.status === 2
+                      ? '已使用'
+                      : '已失效'
               }}
             </view>
           </view>
@@ -82,8 +82,8 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {getActiveOrderList} from '@/api/admin';
-import {ref} from 'vue';
+import { getActiveOrderList } from '@/api/admin';
+import { ref } from 'vue';
 
 // url参数转对象
 // const urlParse = (url: string) => {
@@ -128,7 +128,7 @@ const list = ref<any[]>([]);
 
 const getListOne = async () => {
   try {
-    const {data} = Taro.getStorageSync('userInfo');
+    const { data } = Taro.getStorageSync('userInfo');
     const res = await getActiveOrderList({
       PageNum: 1,
       PageSize: 1,

src/pages/admin/verify/verify_list/index.vue

@@ -59,8 +59,8 @@
 
 <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>({});
 
@@ -129,6 +129,8 @@ const getPayType = (type: number) => {
       return '平台积分支付';
     case 3:
       return '智多鑫积分支付';
+    case 3:
+      return '渔乐潮玩支付';
     default:
       return '未知';
   }

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,
@@ -195,15 +195,15 @@ Taro.useReachBottom(() => {
               item.status === 1
                 ? 'success'
                 : item.status === 1
-                ? 'danger'
-                : 'warning'
+                  ? 'danger'
+                  : 'warning'
             "
             >{{
               item.status === 1
                 ? '已打款'
                 : item.status === 2
-                ? '已拒绝'
-                : '待审核'
+                  ? '已拒绝'
+                  : '待审核'
             }}</view
           >
         </view>

src/pages/allClassList/index.vue

@@ -19,9 +19,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getAllMerCategory} from '@/api/goods';
+import { getAllMerCategory } from '@/api/goods';
 
 const list = ref<
   {

src/pages/cart/index.vue

@@ -80,10 +80,10 @@
 </template>
 
 <script lang="ts" setup>
-import {nextTick, ref} from 'vue';
+import { nextTick, ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {addCart, getAllCart} from '@/api/cart';
-import {createActiveOrder} from '@/api/goods';
+import { addCart, getAllCart } from '@/api/cart';
+import { createActiveOrder } from '@/api/goods';
 import Pay from '@/components/Pay.vue';
 
 interface CardList {
@@ -206,7 +206,7 @@ const sub = async () => {
       });
       return;
     }
-    const {data: res} = await createActiveOrder({
+    const { data: res } = await createActiveOrder({
       Bid: arr.map((item: any) => item.StoreBid),
     });
     if (res.oid) {

src/pages/category/index.vue

@@ -44,8 +44,8 @@
 
 <script lang="ts" setup>
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {getCategoryList, getCategoryGoods} from '@/api/goods';
+import { ref } from 'vue';
+import { getCategoryList, getCategoryGoods } from '@/api/goods';
 
 const val = ref(0);
 

src/pages/fastBuy/index.vue

@@ -46,11 +46,11 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getHdOrJfGoods, createActiveOrder} from '@/api/goods';
-import {getUserPoint} from '@/api/admin';
-import {addCart} from '@/api/cart';
+import { getHdOrJfGoods, createActiveOrder } from '@/api/goods';
+import { getUserPoint } from '@/api/admin';
+import { addCart } from '@/api/cart';
 import Back from '@/components/Back.vue';
 
 const par = ref<any>({});

src/pages/game/gamedetail/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import './index.scss';
 

src/pages/game/gamehome/index.vue

@@ -6,16 +6,16 @@
         class="card_item"
         v-for="item in list"
         :key="item.ID"
-        :style="{backgroundImage: `url(${item.cover})`}"
+        :style="{ backgroundImage: `url(${item.cover})` }"
         @click="toPage(item)"></view>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getPersonalInfo} from '@/api/user';
+import { getPersonalInfo } from '@/api/user';
 
 const list = ref<any[]>([]);
 
@@ -58,7 +58,7 @@ const getList = async () => {
   Taro.request({
     url: `${process.env.TARO_APP_HOME}`,
     method: 'POST',
-    success: ({data: res}) => {
+    success: ({ data: res }) => {
       list.value =
         res.data.data.sort((a: any, b: any) => b.sort - a.sort) || [];
     },

src/pages/game/view/index.vue

@@ -3,9 +3,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
-import {getStorageSync, useDidShow} from '@tarojs/taro';
-import {WebView} from '@tarojs/components';
+import { ref } from 'vue';
+import { getStorageSync, useDidShow } from '@tarojs/taro';
+import { WebView } from '@tarojs/components';
 
 const url = ref('');
 

src/pages/goods/goods_detail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="app">
-    <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" />
@@ -62,13 +62,13 @@
 </template>
 
 <script setup lang="ts">
-import {Ref, ref} from 'vue';
+import { Ref, ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {Home, Left} from '@nutui/icons-vue-taro';
-import {getActiveGoodsDetail, getMerDetail} from '@/api/goods';
+import { Home, Left } from '@nutui/icons-vue-taro';
+import { getActiveGoodsDetail, getMerDetail } from '@/api/goods';
 import Cart from '@/components/Cart.vue';
-import {Cart2} from '@nutui/icons-vue-taro';
-import {nextTick} from 'vue';
+import { Cart2 } from '@nutui/icons-vue-taro';
+import { nextTick } from 'vue';
 
 const statusBarHeight = Taro.getSystemInfoSync()?.statusBarHeight;
 const BarHeight = ref((statusBarHeight as number) + 7);
@@ -105,7 +105,7 @@ Taro.useLoad(async options => {
 });
 
 const getMerInfo = async () => {
-  const res = await getMerDetail({bid: bid.value});
+  const res = await getMerDetail({ bid: bid.value });
   mer_info.value = res.data.data;
 };
 
@@ -117,7 +117,7 @@ Taro.useShareAppMessage(() => ({
 
 const get_good_detail = async (gid: string) => {
   try {
-    const res = await getActiveGoodsDetail({gid: gid});
+    const res = await getActiveGoodsDetail({ gid: gid });
     goodInfo.value = {
       ...res.data.data,
       // details: res.data.data.details.,

src/pages/goods/order_create/index.vue

@@ -48,10 +48,10 @@
 </template>
 
 <script setup lang="ts">
-import {Find} from '@nutui/icons-vue-taro';
+import { Find } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
-import {calculateDistance} from '@/utils';
-import {ref} from 'vue';
+import { calculateDistance } from '@/utils';
+import { ref } from 'vue';
 
 const distance = ref('');
 

src/pages/goods/order_status/index.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import {Check, CloseLittle} from '@nutui/icons-vue-taro';
+import { Check, CloseLittle } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 
 const toHome = () => {

src/pages/goods/pay/index.vue

@@ -66,8 +66,8 @@
             item.number > 0
               ? `可用积分:${item.number}`
               : item.name.includes('微信')
-              ? '微信全额支付'
-              : ''
+                ? '微信全额支付'
+                : ''
           "
           @click="cellClick(item.ID)">
           <template #icon>
@@ -95,10 +95,10 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {IconFont} from '@nutui/icons-vue-taro';
-import {onUnmounted, ref} from 'vue';
-import {getActiveOrderDetail, getPayList} from '@/api/goods';
-import {payOrder} from '@/api/order';
+import { IconFont } from '@nutui/icons-vue-taro';
+import { onUnmounted, ref } from 'vue';
+import { getActiveOrderDetail, getPayList } from '@/api/goods';
+import { payOrder } from '@/api/order';
 import * as dayjs from 'dayjs';
 
 const payVal = ref();
@@ -114,7 +114,7 @@ const isLoading = ref(false);
 const opt = ref<any>({});
 
 Taro.useLoad(e => {
-  const {oid, bid, OrderType} = e;
+  const { oid, bid, OrderType } = e;
   opt.value = e;
   get_pay_list();
   getData(oid, bid, OrderType);
@@ -176,7 +176,7 @@ const pay = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
     if (!payVal.value)
-      return Taro.showToast({title: '请选择支付方式', icon: 'none'});
+      return Taro.showToast({ title: '请选择支付方式', icon: 'none' });
     await confirmPay();
   } catch (error) {
     Taro.showToast({

src/pages/hotGoods/hot_list/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import {ref} from 'vue';
+import { ref } from 'vue';
 import {
   useLoad,
   useReachBottom,
@@ -8,8 +8,8 @@ import {
   setStorageSync,
 } 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';
 
 const tabValue = ref(0);
 
@@ -189,7 +189,9 @@ const delOrder = async (oid: string) => {
         @click="tabChange(item.value)">
         <view class="text">{{ 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">
@@ -201,10 +203,10 @@ const delOrder = async (oid: string) => {
               item.status === 0
                 ? '待付款'
                 : item.status === 1
-                ? '待使用'
-                : item.status === 2
-                ? '已使用'
-                : '已失效'
+                  ? '待使用'
+                  : item.status === 2
+                    ? '已使用'
+                    : '已失效'
             }}
           </view>
         </view>

src/pages/hotGoods/index/index.vue

@@ -67,14 +67,14 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
 import {
   // getActiveGoods,
   getMerList,
 } from '../../../api/goods';
-import {IconFont} from '@nutui/icons-vue-taro';
-import {calculateDistance} from '@/utils';
+import { IconFont } from '@nutui/icons-vue-taro';
+import { calculateDistance } from '@/utils';
 
 // const list = ref<any>([]);
 

src/pages/index/index.vue

@@ -1,6 +1,6 @@
 <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>
@@ -54,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';
 
@@ -127,8 +127,18 @@ const getUserLocal = async () => {
         url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=S3GBZ-WR26O-IXNW2-SXBOD-LZXV6-WAFNO&get_poi=1`,
         method: 'GET',
         success: res => {
-          const data = res.data.result.address_component;
-          address.value = `${data.district}${data.street_number}`;
+          switch (res.data.status) {
+            case 121:
+              Taro.showToast({
+                title: res.data.message,
+                icon: 'none',
+              });
+              break;
+            default:
+              const data = res.data.result.address_component;
+              address.value = `${data.district}${data.street_number}`;
+              break;
+          }
         },
       });
     },

src/pages/marketing/scratch/index.vue

@@ -41,9 +41,9 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {getPhone, login} from '@/api/user';
-import {getQrCode, bindQrCode} from '@/api/code';
+import { ref } from 'vue';
+import { getPhone, login } from '@/api/user';
+import { getQrCode, bindQrCode } from '@/api/code';
 import './index.scss';
 
 const status = ref(0);
@@ -104,7 +104,7 @@ const getPhoneNumber = async (e: any) => {
     title: '授权手机号中',
     mask: true,
   });
-  const {code} = e.detail;
+  const { code } = e.detail;
   const res = await getPhone({
     code: code,
   });

src/pages/marketing/yq/index.vue

@@ -52,13 +52,13 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getHdOrJfGoods, createActiveOrder} from '@/api/goods';
-import {getUserPoint} from '@/api/admin';
-import {addCart} from '@/api/cart';
+import { getHdOrJfGoods, createActiveOrder } from '@/api/goods';
+import { getUserPoint } from '@/api/admin';
+import { addCart } from '@/api/cart';
 import Back from '@/components/Back.vue';
-import {RectRight} from '@nutui/icons-vue-taro';
+import { RectRight } from '@nutui/icons-vue-taro';
 import './index.scss';
 
 const data = ref<any[]>([]);

src/pages/mer/mer_detail/index.vue

@@ -1,6 +1,6 @@
 <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" />
@@ -134,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;

src/pages/product/addGoods/index.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import Taro from '@tarojs/taro';
-import {Ref, ref} from 'vue';
+import { Ref, ref } from 'vue';
 import Upload from '../../../components/Upload.vue';
 import RichEditor from '../../../components/RichEditor.vue';
-import {addGood} from '@/api/product';
+import { addGood } from '@/api/product';
 
 const ruleForm = ref(null) as Ref;
 
@@ -90,7 +90,7 @@ const confirmClass = (val: any) => {
 };
 
 const ok = async () => {
-  ruleForm.value.validate().then(({valid, errors}: any) => {
+  ruleForm.value.validate().then(({ valid, errors }: any) => {
     if (valid) {
       console.log('success', basicData.value);
     } else {

src/pages/product/list/index.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import {ref} from 'vue';
-import {productList} from '@/api/product';
+import { ref } from 'vue';
+import { productList } from '@/api/product';
 import Taro from '@tarojs/taro';
 
 const swiperCur = ref(0);
@@ -69,7 +69,7 @@ const changeState = (item: List) => {
             next-margin="0"
             :current="swiperCur"
             @change="swiperChange">
-            <swiper-item :class="{active: 0 == swiperCur}">
+            <swiper-item :class="{ active: 0 == swiperCur }">
               <view class="slide-navigator">
                 <view class="item" @click="jumpAddGoods(null, 1)">
                   <image
@@ -120,7 +120,7 @@ const changeState = (item: List) => {
                 </navigator>
               </view>
             </swiper-item>
-            <swiper-item :class="{active: 1 == swiperCur}">
+            <swiper-item :class="{ active: 1 == swiperCur }">
               <view class="slide-navigator">
                 <navigator
                   class="item"

src/pages/search/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {ref, onMounted} from 'vue';
+import { ref, onMounted } from 'vue';
 import Taro from '@tarojs/taro';
 import MerList from '@/components/MerList.vue';
 import Storelist from '@/components/StoreList.vue';

src/pages/user/index.vue

@@ -3,7 +3,7 @@
     <view
       class="user-center-card__header__transparent"
       v-if="isLogin"
-      :style="{width: isLogin ? '100%' : '70%'}">
+      :style="{ width: isLogin ? '100%' : '70%' }">
       <view
         class="user-center-card__header__avatar"
         @click="toPage('/pages/users/user_setting/index')">
@@ -182,12 +182,12 @@
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue';
-import {ArrowRight, IconFont} from '@nutui/icons-vue-taro';
+import { ref } from 'vue';
+import { ArrowRight, IconFont } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 import Auth from '@/components/Auth.vue';
-import {getPersonalInfo, getPhone, bindParent} from '@/api/user';
-import {maskString} from '@/utils';
+import { getPersonalInfo, getPhone, bindParent } from '@/api/user';
+import { maskString } from '@/utils';
 
 const isShowLogin = ref(false);
 

src/pages/users/account/index.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import {computed, ref} from 'vue';
+import { computed, ref } from 'vue';
 import Taro from '@tarojs/taro';
 import * as dayjs from 'dayjs';
-import {getIntegralDetail, getBeanDetail, getGiftRecord} from '@/api/user';
-import {TriangleDown} from '@nutui/icons-vue-taro';
+import { getIntegralDetail, getBeanDetail, getGiftRecord } from '@/api/user';
+import { TriangleDown } from '@nutui/icons-vue-taro';
 
 const tabValue = ref(1);
 

src/pages/users/bindPhone/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {getVerifyCode, phoneLogin, getPersonalInfo} from '@/api/user';
+import { ref } from 'vue';
+import { getVerifyCode, phoneLogin, getPersonalInfo } from '@/api/user';
 import logoImg from '../../../static/logo.jpg';
 
 const optData = ref<any>({});

src/pages/users/distribution/index.vue

@@ -14,7 +14,7 @@
       <view style="width: 45%"></view>
     </view>
     <!-- 二维码弹窗 -->
-    <nut-popup :style="{padding: '30px 50px'}" v-model:visible="show">
+    <nut-popup :style="{ padding: '30px 50px' }" v-model:visible="show">
       <view class="popup">
         <view>推荐人二维码绑定</view>
         <image style="margin-top: 10px" :src="urlCode" />
@@ -24,10 +24,10 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
-import {IconFont} from '@nutui/icons-vue-taro';
+import { ref } from 'vue';
+import { IconFont } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
-import {getRefereeCode} from '@/api/user';
+import { getRefereeCode } from '@/api/user';
 
 const show = ref(false);
 

src/pages/users/distribution/integral/index.vue

@@ -29,9 +29,9 @@
 </template>
 
 <script setup lang="ts">
-import {useLoad, showToast} from '@tarojs/taro';
-import {ref} from 'vue';
-import {getTGIntegralDetail} from '../../../../api/user';
+import { useLoad, showToast } from '@tarojs/taro';
+import { ref } from 'vue';
+import { getTGIntegralDetail } from '../../../../api/user';
 
 const data = ref([]);
 
@@ -59,7 +59,7 @@ const getData = async () => {
     data.value = res.data.data || [];
     page.value.ItemCount = res.data.count;
   } catch (error) {
-    showToast({title: error.msg, icon: 'none'});
+    showToast({ title: error.msg, icon: 'none' });
   }
 };
 </script>

src/pages/users/distribution/userlist/index.vue

@@ -27,9 +27,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
-import {useLoad, showToast} from '@tarojs/taro';
-import {getTGUserList} from '../../../../api/user';
+import { ref } from 'vue';
+import { useLoad, showToast } from '@tarojs/taro';
+import { getTGUserList } from '../../../../api/user';
 
 useLoad(() => {
   getData();
@@ -37,7 +37,7 @@ useLoad(() => {
 
 const data = ref([]);
 
-const page = ref({PageNum: 1, PageSize: 10, ItemCount: 0});
+const page = ref({ PageNum: 1, PageSize: 10, ItemCount: 0 });
 
 const pageChange = (e: number) => {
   page.value.PageNum = e;
@@ -53,7 +53,7 @@ const getData = async () => {
     data.value = res.data.data || [];
     page.value.ItemCount = res.data.count;
   } catch (error) {
-    showToast({title: error.msg, icon: 'none'});
+    showToast({ title: error.msg, icon: 'none' });
   }
 };
 </script>

src/pages/users/login/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
 import UserModal from '@/components/UserModal.vue';
-import {ref} from 'vue';
-import {getPhone, login, getPersonalInfo} from '@/api/user';
+import { ref } from 'vue';
+import { getPhone, login, getPersonalInfo } from '@/api/user';
 import logoImg from '../../../static/logo.jpg';
 
 const isShow = ref(false);
@@ -53,7 +53,7 @@ const getPhoneNumber = async (e: any) => {
       title: '授权手机号中',
       mask: true,
     });
-    const {code} = e.detail;
+    const { code } = e.detail;
     const res = await getPhone({
       code: code,
     });

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,
@@ -249,7 +249,9 @@ const closed = () => {
           >{{ 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">
@@ -266,19 +268,19 @@ const closed = () => {
                 item.status === 0
                   ? '#FF850A'
                   : item.status === 1
-                  ? '#F83D3D'
-                  : item.status === 2
-                  ? '#333333'
-                  : '#9C9C9C',
+                    ? '#F83D3D'
+                    : item.status === 2
+                      ? '#333333'
+                      : '#9C9C9C',
             }"
             >{{
               item.status === 0
                 ? '待付款'
                 : item.status === 1
-                ? '待使用'
-                : item.status === 2
-                ? '已使用'
-                : '已失效'
+                  ? '待使用'
+                  : item.status === 2
+                    ? '已使用'
+                    : '已失效'
             }}
           </view>
         </view>

src/pages/users/order_list_detail/index.vue

@@ -146,10 +146,10 @@
           goodInfo.status === 0
             ? '待付款'
             : goodInfo.status === 1
-            ? '待使用'
-            : goodInfo.status === 2
-            ? '已使用'
-            : '已失效'
+              ? '待使用'
+              : goodInfo.status === 2
+                ? '已使用'
+                : '已失效'
         "></nut-cell>
     </nut-cell-group>
 
@@ -232,13 +232,13 @@
 
 <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);

src/pages/users/pending_order/index.vue

@@ -74,9 +74,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getUserAfterOrderList} from '../../../api/user';
+import { getUserAfterOrderList } from '../../../api/user';
 
 const tabsIndex = ref(0);
 
@@ -121,7 +121,7 @@ const get_list = async () => {
     title: '加载中',
   });
   const user_info = await Taro.getStorageSync('userInfo');
-  const {data: res} = await getUserAfterOrderList({
+  const { data: res } = await getUserAfterOrderList({
     phone: user_info.data.phone,
     status: tabsIndex.value,
     PageNum: pageOpt.value.page,

src/pages/users/pending_order/pending_order_detail/index.vue

@@ -58,9 +58,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {getUserAfterOrderDetail} from '../../../../api/user';
+import { getUserAfterOrderDetail } from '../../../../api/user';
 
 const data = ref<any>({});
 

src/pages/users/pwd/index.vue

@@ -70,9 +70,9 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue';
+import { ref } from 'vue';
 import Taro from '@tarojs/taro';
-import {editTradePwd, getVerifyCode} from '@/api/user';
+import { editTradePwd, getVerifyCode } from '@/api/user';
 
 const userinfo = ref<any>({});
 
@@ -100,23 +100,23 @@ Taro.useLoad(() => {
 const formSubmit = async () => {
   try {
     if (!formVal.value.password)
-      return Taro.showToast({title: '请输入交易密码', icon: 'none'});
+      return Taro.showToast({ title: '请输入交易密码', icon: 'none' });
     if (!formVal.value.confirmPassword)
-      return Taro.showToast({title: '请再次输入交易密码', icon: 'none'});
+      return Taro.showToast({ title: '请再次输入交易密码', icon: 'none' });
     if (formVal.value.password !== formVal.value.confirmPassword)
-      return Taro.showToast({title: '两次密码不一致', icon: 'none'});
+      return Taro.showToast({ title: '两次密码不一致', icon: 'none' });
     if (!formVal.value.code)
-      return Taro.showToast({title: '请输入验证码', icon: 'none'});
+      return Taro.showToast({ title: '请输入验证码', icon: 'none' });
     const res = await editTradePwd({
       pay_password: formVal.value.password,
       code: formVal.value.code,
     });
-    Taro.showToast({title: res.msg, icon: 'none'});
+    Taro.showToast({ title: res.msg, icon: 'none' });
     Taro.navigateBack({
       delta: 1,
     });
   } catch (err) {
-    Taro.showToast({title: err.msg, icon: 'none'});
+    Taro.showToast({ title: err.msg, icon: 'none' });
   }
 };
 

src/pages/users/setting/index.vue

@@ -2,7 +2,7 @@
 import Taro from '@tarojs/taro';
 
 const toPage = (url: string) => {
-  if (url === '1') return Taro.showToast({title: '暂未开放', icon: 'none'});
+  if (url === '1') return Taro.showToast({ title: '暂未开放', icon: 'none' });
   Taro.navigateTo({
     url: url,
   });

src/pages/users/settled_mer/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {applyMer, getMerTypeList, getVerifyCode} from '@/api/user';
+import { ref } from 'vue';
+import { applyMer, getMerTypeList, getVerifyCode } from '@/api/user';
 import Upload from '@/components/Upload.vue';
 
 const visible = ref(false);
@@ -116,7 +116,7 @@ const onOk = async () => {
 
 // 获取验证码
 const getSmsCode = () => {
-  ruleForm.value.validate('phone').then(async ({valid}: any) => {
+  ruleForm.value.validate('phone').then(async ({ valid }: any) => {
     if (valid) {
       try {
         await getVerifyCode({
@@ -152,7 +152,7 @@ const confirmGooType = (e: any) => {
 
 // 提交
 const submit = () => {
-  ruleForm.value.validate().then(({valid, errors}: any) => {
+  ruleForm.value.validate().then(({ valid, errors }: any) => {
     if (valid) {
       console.log('success', formValue.value);
       visible.value = true;

src/pages/users/user_agreement/index.vue

@@ -4,8 +4,8 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {getAgreement} from '../../../api/user';
+import { ref } from 'vue';
+import { getAgreement } from '../../../api/user';
 
 const nodes = ref(``);
 

src/pages/users/user_setting/index.vue

@@ -1,15 +1,15 @@
 <script lang="ts" setup>
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
-import {editPersonalInfo} from '@/api/user';
-import {BASE_URL} from '@/utils/request';
+import { ref } from 'vue';
+import { editPersonalInfo } from '@/api/user';
+import { BASE_URL } from '@/utils/request';
 
 // const toPage = (e: string) => {};
 
 const userInfo = ref<any>({});
 
 Taro.useLoad(() => {
-  const {data: data} = Taro.getStorageSync('userInfo');
+  const { data: data } = Taro.getStorageSync('userInfo');
   userInfo.value = data;
 });