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

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;
 });