fix: 修复鉴权两次的问题

src/App.vue

 <template>
   <van-config-provider>
-    <div id="nav" class="min-h-screen" style="background:#F7F7FA">
+    <div id="nav" class="min-h-screen" style="background: #f7f7fa">
       <router-view />
     </div>
     <!-- Target -->
@@ -24,32 +24,44 @@ import { ref } from "@vue/reactivity";
 import { connectionState } from "./store/connectionStore";
 import FzmMessageProtocol from "@/utils/fzm-message-protocol";
 import { generateToken } from "./utils/generateToken/generate-token";
-import { defineComponent, nextTick, onBeforeMount, onBeforeUnmount, onMounted, onUnmounted, watch } from "vue";
+import {
+  defineComponent,
+  nextTick,
+  onBeforeMount,
+  onBeforeUnmount,
+  onMounted,
+  onUnmounted,
+  watch,
+} from "vue";
 import decodeChatMessage from "./utils/fzm-message-protocol-chat/decodeChatMessage";
-import ChatDBService from "@/db/ChatDBService"
-import { checkPendingMsgAndSendIt, getMasterIdFromDisplayMsg, getTargetIdFromDisplayMsg } from "./utils/chatutils";
+import ChatDBService from "@/db/ChatDBService";
+import {
+  checkPendingMsgAndSendIt,
+  getMasterIdFromDisplayMsg,
+  getTargetIdFromDisplayMsg,
+} from "./utils/chatutils";
 import isChattingWith from "./utils/isChattingWith";
-import { ChatMessageTypes } from "@/types/chatMessageTypes"
+import { ChatMessageTypes } from "@/types/chatMessageTypes";
 import { chatCardTimeStamp } from "./store/chatCardStore";
-import { getUserMsg } from "./utils/userMsg";
+import { getUserMsg, setUserMsg } from "./utils/userMsg";
 import { chatLoginActionMark, eLoginType } from "./store/chatStore";
 import { Toast } from "vant";
 import router from "./router";
 import { useRoute } from "vue-router";
-import Bridge from '@/utils/jsBridge2'
+import Bridge from "@/utils/jsBridge2";
 import { chatAuthCheck } from "./utils/authCheck";
 import { clipboardValue, notchHeight } from "./store/AppStore";
-import ClipboardJS from "clipboard"
+import ClipboardJS from "clipboard";
 import { judgeClient } from "./utils/env";
 import { getLatestVersion } from "./service/VersionService";
-
+import UserService from "./service/UserService";
 
 export default defineComponent({
   setup() {
-    const btn = ref<HTMLButtonElement | null>(null)
+    const btn = ref<HTMLButtonElement | null>(null);
 
     const getNewestApp = async () => {
-      const client = judgeClient()
+      const client = judgeClient();
 
       function formatUpdateType(t: number) {
         if (t === 1) {
@@ -59,19 +71,19 @@ export default defineComponent({
         }
       }
 
-      if (client === 'iOS') {
-        const ret = await getLatestVersion({ os: 'ios' })
+      if (client === "iOS") {
+        const ret = await getLatestVersion({ os: "ios" });
         if (ret.code === 200) {
           new Bridge().bridge_getNewestApp({
             status: formatUpdateType(ret.data.update_type), // 0代表强制更新  1代表普通更新
             modifyContent: ret.data.content, // 代表本次更新的修改内容
             versionCode: ret.data.version_num, // 版本号
             versionName: ret.data.version_name, //版本名称
-            downloadUrl_ios: ret.data.url   // 下载链接
-          })
+            downloadUrl_ios: ret.data.url, // 下载链接
+          });
         }
-      } else if (client === 'Android') {
-        const ret = await getLatestVersion({ os: 'android' })
+      } else if (client === "Android") {
+        const ret = await getLatestVersion({ os: "android" });
         if (ret.code === 200) {
           new Bridge().bridge_getNewestApp({
             status: formatUpdateType(ret.data.update_type), // 0代表强制更新  1代表普通更新
@@ -79,77 +91,82 @@ export default defineComponent({
             versionCode: ret.data.version_num, // 版本号
             versionName: ret.data.version_name, //版本名称
             downloadUrl: ret.data.url,
-          })
-        }
+          });
         }
       }
+    };
 
     onMounted(() => {
       getNewestApp();
-      const clipboard = new ClipboardJS('.clipboardBtn');
-      clipboard.on('success', function (e) {
-        Toast.success('复制成功')
+      const clipboard = new ClipboardJS(".clipboardBtn");
+      clipboard.on("success", function (e) {
+        Toast.success("复制成功");
       });
 
-      clipboard.on('error', function (e) {
-        Toast.fail("复制失败")
+      clipboard.on("error", function (e) {
+        Toast.fail("复制失败");
+      });
     });
-    })
 
     watch(clipboardValue, (newValue) => {
-      if (newValue !== '') {
+      if (newValue !== "") {
         nextTick(() => {
           btn.value?.click();
-          clipboardValue.value = '';
-        })
+          clipboardValue.value = "";
+        });
       }
-    })
-
+    });
 
     onBeforeMount(() => {
       setTimeout(() => {
         new Bridge().getNotchHeight(null, (height: any) => {
-          console.log('getNotchHeight', height);
-        })
+          console.log("getNotchHeight", height);
+        });
       }, 3000);
 
       new Bridge().getNotchHeight(null, (height: any) => {
-        height = Number(height)
+        height = Number(height);
         notchHeight.value = height;
-      })
-    })
+      });
+    });
 
     const route = useRoute();
     const initError = ref(false);
 
-    const connect = () => {
+    const connect = async () => {
       connectionState.error = false;
       initError.value = false;
 
-      let prefix = 'ws://';
-      if (window.location.protocol === 'https:') {
-        prefix = 'wss://'
+      let prefix = "ws://";
+      if (window.location.protocol === "https:") {
+        prefix = "wss://";
       }
-      const fmp = new FzmMessageProtocol(`${prefix}${window.location.host}/proxyWs/sub`);
+      const fmp = new FzmMessageProtocol(
+        `${prefix}${window.location.host}/proxyWs/sub`
+      );
 
       const UserMsg = getUserMsg();
       if (!UserMsg) {
-        Toast('未登录')
+        Toast("未登录");
         router.push({
-          name: 'Login'
-        })
+          name: "Login",
+        });
         return;
       }
 
+      const chatTokenRet = await UserService.getInstance().getChatToken();
+      if (chatTokenRet.code !== 200) {
+        return;
+      }
+
+      UserMsg.userInfo.addr = chatTokenRet.data.addr;
+
+      setUserMsg(UserMsg);
 
       fmp
         .authorize({
           appId: "dtalk",
-          token: generateToken({
-            address: UserMsg.userInfo.addr,
-            privateKeyHex: UserMsg.userInfo.pri_key,
-            publicKeyHex: UserMsg.userInfo.pub_key,
-          }),
+          token: chatTokenRet.data.token,
         })
         .then((conn) => {
           connectionState.connection = conn;
@@ -163,69 +180,88 @@ export default defineComponent({
 
     watch(chatLoginActionMark, (newMark) => {
       if (newMark === eLoginType.login) {
-        chatAuthCheck(connect)
+        chatAuthCheck(connect);
       } else if (newMark === eLoginType.logout) {
         connectionState.connection?.disconnect();
       }
-    })
+    });
 
     const checkRoute = (n: string) => {
       switch (n) {
-        case '/home':
-          return true
-        case '/chatList':
-          return true
-        case '/loan':
-          return true
-        case '/mine':
-          return true
+        case "/home":
+          return true;
+        case "/chatList":
+          return true;
+        case "/loan":
+          return true;
+        case "/mine":
+          return true;
         default:
-          return false
-      }
+          return false;
       }
+    };
 
-    watch(() => route.path, (n) => {
-      console.log(n)
-      const result = checkRoute(n)
-      console.log(result, ' result')
-      new Bridge().bridge_quitApp(result)
+    watch(
+      () => route.path,
+      (n) => {
+        console.log(n);
+        const result = checkRoute(n);
+        console.log(result, " result");
+        new Bridge().bridge_quitApp(result);
       }
-    )
+    );
 
     onMounted(() => {
       if (getUserMsg()) {
-        chatAuthCheck(connect)
+        chatAuthCheck(connect);
       }
-    })
+    });
 
-    watch(() => connectionState.error, () => {
+    watch(
+      () => connectionState.error,
+      () => {
         if (connectionState.error) {
           chatAuthCheck(connect);
         }
-    })
-
-    watch(() => connectionState.connection, () => {
+      }
+    );
 
+    watch(
+      () => connectionState.connection,
+      () => {
         if (!connectionState.connection) return;
         // 连接后，指定每次收到消息要做的事
         connectionState.connection.onReceiveMessage = (msgData) => {
           const msg = decodeChatMessage(msgData);
 
           const displayMsg = msg && {
-          target: msg.target, content: msg.content, from: msg.from,
-          uuid: msg.uuid, state: null, type: ((msg.type as unknown) as ChatMessageTypes),
-          datetime: msg.datetime
+            target: msg.target,
+            content: msg.content,
+            from: msg.from,
+            uuid: msg.uuid,
+            state: null,
+            type: msg.type as unknown as ChatMessageTypes,
+            datetime: msg.datetime,
           };
 
-        console.log(displayMsg, 'in receive');
+          console.log(displayMsg, "in receive");
 
-        msg && displayMsg && (ChatDBService.getInstance().handleEveryReceive({
+          msg &&
+            displayMsg &&
+            ChatDBService.getInstance()
+              .handleEveryReceive({
                 msg: displayMsg,
                 masterId: getMasterIdFromDisplayMsg(displayMsg),
-          isChattingWithTargetId: isChattingWith(getMasterIdFromDisplayMsg(displayMsg), getTargetIdFromDisplayMsg(displayMsg), route.query.targetId as string)
-        })).then(() => {
+                isChattingWithTargetId: isChattingWith(
+                  getMasterIdFromDisplayMsg(displayMsg),
+                  getTargetIdFromDisplayMsg(displayMsg),
+                  route.query.targetId as string
+                ),
+              })
+              .then(() => {
                 console.log(displayMsg);
-          chatCardTimeStamp.value = new Date().getTime() + (Math.ceil(Math.random() * 1000))
+                chatCardTimeStamp.value =
+                  new Date().getTime() + Math.ceil(Math.random() * 1000);
               });
         };
 
@@ -234,21 +270,20 @@ export default defineComponent({
           connectionState.connection = undefined;
           connectionState.error = true;
         };
-    })
+      }
+    );
 
     onBeforeUnmount(() => {
       connectionState.connection?.disconnect();
     });
     return {
       btn,
-      clipboardValue
-    }
-  }
-})
-
+      clipboardValue,
+    };
+  },
+});
 </script>
 
-
 <style lang="less">
 .fade-enter-active,
 .fade-leave-active {

src/service/UserManagementService/index.ts

-import { eLevel, eNewRoleRelatedToBackEnd, eRole } from '@/types/roleType'
-import baseAxios from '../index'
-import { eCheckPhoneStatus } from './types'
+import { eLevel, eNewRoleRelatedToBackEnd, eRole } from "@/types/roleType";
+import baseAxios from "../index";
+import { eCheckPhoneStatus } from "./types";
 
-const prefix = '/user'
+const prefix = "/user";
 
 /* 成功修改后会退出登录 */
 export function userChangePhone(data: {
-  newPhone: string
-  newVerifyCode: string
-  phone: string
-  verifyCode: string
+  newPhone: string;
+  newVerifyCode: string;
+  phone: string;
+  verifyCode: string;
 }) {
   return baseAxios({
-    method: 'post',
-    url: prefix + '/change/phone',
+    method: "post",
+    url: prefix + "/change/phone",
     data,
-  })
+  });
 }
 
 /* 成功修改后会退出登录 */
 export function userChangePwd(data: {
-  new_pwd: string
-  phone: string
-  verify_code: string
+  new_pwd: string;
+  phone: string;
+  verify_code: string;
 }) {
   return baseAxios({
-    method: 'post',
-    url: '/change/pwd',
+    method: "post",
+    url: "/change/pwd",
     data,
-  })
+  });
 }
 
 export function userCheckPhone(phone: string) {
   return baseAxios<eCheckPhoneStatus>({
-    url: prefix + '/check/phone',
-    method: 'get',
+    url: prefix + "/check/phone",
+    method: "get",
     params: {
       phone,
     },
-  })
+  });
 }
 
 export function userCreate(data: {
-  phone: string
-  staffID?: string
-  verifyCode: string
+  phone: string;
+  staffID?: string;
+  verifyCode: string;
 }) {
   return baseAxios({
-    url: prefix + '/create',
-    method: 'POST',
+    url: prefix + "/create",
+    method: "POST",
     data,
-  })
+  });
 }
 
 /* 用户可通过验证码或密码登录 */
 export function userLogin(data: {
-  is_admin: boolean
-  phone: string
-  use_pwd: boolean
-  pwd?: string
-  verify_code?: string
+  is_admin: boolean;
+  phone: string;
+  use_pwd: boolean;
+  pwd?: string;
+  verify_code?: string;
 }) {
   return baseAxios<{
-    accessToken: string
-    level: eLevel
-    phone: string
-    role: eNewRoleRelatedToBackEnd
-    pri_key: string
-    pub_key: string
-    addr: string
+    accessToken: string;
+    level: eLevel;
+    phone: string;
+    role: eNewRoleRelatedToBackEnd;
   }>({
-    url: '/login',
-    method: 'POST',
+    url: "/login",
+    method: "POST",
     data,
-  })
+  });
 }
 
 export function userLogout() {
   return baseAxios({
-    url: '/logout',
-    method: 'GET',
-  })
+    url: "/logout",
+    method: "GET",
+  });
 }
 
 export function userRegister(data: { phone: string; verify_code: string }) {
   return baseAxios<{
-    accessToken: string
-    phone: string
-    role: eNewRoleRelatedToBackEnd
-    pri_key: string
-    pub_key: string
-    addr: string
+    accessToken: string;
+    phone: string;
+    role: eNewRoleRelatedToBackEnd;
   }>({
-    url: '/user/register',
-    method: 'post',
+    url: "/user/register",
+    method: "post",
     data,
-  })
+  });
 }
 
 // function padding(all: number): any;

src/service/UserService/index.ts

-import baseAxios from '../index'
-import { iContact, iUserinfo } from './types'
+import baseAxios from "../index";
+import { iContact, iUserinfo } from "./types";
 class UserService {
-  static instance: UserService
+  static instance: UserService;
   static getInstance() {
     if (!UserService.instance) {
-      UserService.instance = new UserService()
+      UserService.instance = new UserService();
     }
-    return UserService.instance
+    return UserService.instance;
   }
 
   contact_custom_service(data: { outLetID: number }) {
     return baseAxios<iContact>({
-      url: '/user/contact_custom_service',
-      method: 'post',
+      url: "/user/contact_custom_service",
+      method: "post",
       data,
-    })
+    });
   }
 
   staffInfo(data: { addrs: string[] }) {
     return baseAxios<{
-      total: number
-      item: (iContact & { out_let_name: string })[]
+      total: number;
+      item: (iContact & { out_let_name: string })[];
     }>({
-      url: '/user/staff_info',
-      method: 'get',
+      url: "/user/staff_info",
+      method: "get",
       params: data,
       paramsSerializer: (data: { addrs: string[] }) => {
-        console.log(data)
-        return `addrs=${data.addrs.toString()}`
+        console.log(data);
+        return `addrs=${data.addrs.toString()}`;
       },
-    })
+    });
   }
 
   userInfo(data: { addrs: string[] }) {
     return baseAxios<iUserinfo[]>({
-      url: '/user/user_info',
-      method: 'get',
+      url: "/user/user_info",
+      method: "get",
       params: data,
       paramsSerializer: (data: { addrs: string[] }) => {
-        console.log(data)
-        return `addrs=${data.addrs.toString()}`
+        console.log(data);
+        return `addrs=${data.addrs.toString()}`;
       },
-    })
+    });
+  }
+
+  getChatToken() {
+    return baseAxios<{ addr: string; token: string }>({
+      url: "/chat_info",
+    });
   }
 }
 
-export default UserService
+export default UserService;

src/types/userMsg.ts

-import { eRole } from './roleType'
+import { eRole } from "./roleType";
 
 export interface iUserMsg {
-  token: string
-  role: eRole
-  role2: eRole
+  token: string;
+  role: eRole;
+  role2: eRole;
   userInfo: {
-    phone?: string
-    addr: string
-    pri_key: string
-    pub_key: string
-    [key: string]: any
-  }
+    phone?: string;
+    addr?: string;
+  };
 }

src/utils/userMsg.ts

-import { dispatchLoginAction } from '@/store/chatStore'
-import { iUserMsg } from '@/types/userMsg'
-import Bridge from '@/utils/jsBridge2'
-import userAvatarUrl from '@/assets/icons/avatar.png'
-import staffAvatarUrl from '@/assets/icons/staff.png'
-import { eRole } from '@/types/roleType'
+import { dispatchLoginAction } from "@/store/chatStore";
+import { iUserMsg } from "@/types/userMsg";
+import Bridge from "@/utils/jsBridge2";
+import userAvatarUrl from "@/assets/icons/avatar.png";
+import staffAvatarUrl from "@/assets/icons/staff.png";
+import { eRole } from "@/types/roleType";
 
-const USER_MSG = 'USER_MSG'
+const USER_MSG = "USER_MSG";
 
 export function setUserMsg(msg: iUserMsg) {
-  dispatchLoginAction('login')
-  const { token } = msg
+  const { token } = msg;
   new Bridge().bridge_sendToken({
     msg,
     url:
       window.location.protocol +
-      '//' +
+      "//" +
       window.location.host +
-      '/proxyApi/api/v1',
-  })
-  localStorage.setItem(USER_MSG, JSON.stringify(msg))
+      "/proxyApi/api/v1",
+  });
+  localStorage.setItem(USER_MSG, JSON.stringify(msg));
 }
 
 export function getUserMsg(): iUserMsg | undefined {
-  const value = localStorage.getItem(USER_MSG)
-  return (value && JSON.parse(value)) || undefined
+  const value = localStorage.getItem(USER_MSG);
+  return (value && JSON.parse(value)) || undefined;
 }
 
 export function deleteUserMsg() {
-  dispatchLoginAction('logout')
-  localStorage.removeItem(USER_MSG)
+  dispatchLoginAction("logout");
+  localStorage.removeItem(USER_MSG);
 }
 
 export function getCurrentUserAvatarUrl() {
   if (getUserMsg()?.role === eRole.staff) {
-    return staffAvatarUrl
+    return staffAvatarUrl;
   } else if (getUserMsg()?.role === eRole.user) {
-    return userAvatarUrl
+    return userAvatarUrl;
   } else {
-    return userAvatarUrl
+    return userAvatarUrl;
   }
 }

src/views/Auth/index.vue

@@ -9,15 +9,22 @@
 </template>
 
 <script lang="ts">
-import { userChangePwd, userCheckPhone, userCreate, userLogin, userRegister } from '@/service/UserManagementService'
-import { eCheckPhoneStatus } from '@/service/UserManagementService/types'
-import { eSmsType, sendVerifyCode } from '@/service/VerificationService'
-import { eNewRoleRelatedToBackEnd, eRole } from '@/types/roleType'
-import transformRole from '@/utils/transformRole'
-import { setUserMsg } from '@/utils/userMsg'
-import { defineComponent } from 'vue'
-import LoginService from './Login/LoginService'
-import { eAccountType } from './Login/types'
+import {
+  userChangePwd,
+  userCheckPhone,
+  userCreate,
+  userLogin,
+  userRegister,
+} from "@/service/UserManagementService";
+import { eCheckPhoneStatus } from "@/service/UserManagementService/types";
+import { eSmsType, sendVerifyCode } from "@/service/VerificationService";
+import { dispatchLoginAction } from "@/store/chatStore";
+import { eNewRoleRelatedToBackEnd, eRole } from "@/types/roleType";
+import transformRole from "@/utils/transformRole";
+import { setUserMsg } from "@/utils/userMsg";
+import { defineComponent } from "vue";
+import LoginService from "./Login/LoginService";
+import { eAccountType } from "./Login/types";
 
 export default defineComponent({
   provide(): object {
@@ -29,48 +36,50 @@ export default defineComponent({
       loginByPwdFunc: this.loginByPwdFunc,
       setPwdFunc: this.setPwdFunc,
       modifyPwdFunc: this.modifyPwdFunc,
-    }
+    };
   },
   methods: {
     async sendSmsFunc(phone: string, smsType?: eSmsType) {
       return sendVerifyCode({
         phone: phone,
         smsType: smsType !== undefined ? smsType : eSmsType.registerOrLogin,
-      })
+      });
     },
     async accountStatusCheckFunc(phone: string) {
-      const ret = await userCheckPhone(phone)
+      const ret = await userCheckPhone(phone);
       if (ret && ret.code === 200) {
-        if (ret.data === eCheckPhoneStatus.staff || ret.data === eCheckPhoneStatus.user) {
-          return eAccountType.REG_PDSET
+        if (
+          ret.data === eCheckPhoneStatus.staff ||
+          ret.data === eCheckPhoneStatus.user
+        ) {
+          return eAccountType.REG_PDSET;
         } else if (ret.data === eCheckPhoneStatus.no_reg) {
-          return eAccountType.NO_REG
+          return eAccountType.NO_REG;
         }
       }
     },
     async registerFunc(phone: string, code: string) {
       const ret = await userRegister({
         phone,
-        verify_code: code
-      })
+        verify_code: code,
+      });
       if (ret.code === 200) {
-        const { accessToken, role, phone, addr, pri_key, pub_key } = ret.data
+        const { accessToken, role, phone } = ret.data;
         setUserMsg({
           token: accessToken,
-          role: role === eNewRoleRelatedToBackEnd.ACM ? eRole.staff : eRole.user,
+          role:
+            role === eNewRoleRelatedToBackEnd.ACM ? eRole.staff : eRole.user,
           role2: transformRole(role),
           userInfo: {
             phone: phone,
-            addr,
-            pri_key,
-            pub_key
           },
-        })
+        });
+        dispatchLoginAction("login");
         this.$router.push({
-          name: 'Home',
-        })
+          name: "Home",
+        });
       } else {
-        throw new Error(ret.msg)
+        throw new Error(ret.msg);
       }
     },
     async loginByCodeFunc(phone: string, code: string) {
@@ -78,73 +87,72 @@ export default defineComponent({
         is_admin: false,
         use_pwd: false,
         verify_code: code,
-        phone: phone
-      })
+        phone: phone,
+      });
       if (ret.code === 200) {
-        const { accessToken, phone, role, pri_key, pub_key, addr } = ret.data
+        const { accessToken, phone, role } = ret.data;
         setUserMsg({
           token: accessToken,
           role2: transformRole(role),
-          role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
+          role:
+            eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
           userInfo: {
             phone,
-            addr,
-            pri_key,
-            pub_key
-          }
-        })
+          },
+        });
+        dispatchLoginAction("login");
         this.$router.push({
-          name: 'Home'
-        })
+          name: "Home",
+        });
       }
-
     },
-    async loginByPwdFunc(phone: string, pwd: string, config = { gohome: true }) {
+    async loginByPwdFunc(
+      phone: string,
+      pwd: string,
+      config = { gohome: true }
+    ) {
       const ret = await userLogin({
         is_admin: false,
         use_pwd: true,
         pwd,
-        phone: phone
-      })
+        phone: phone,
+      });
       if (ret.code === 200) {
-        const { accessToken, phone, role, addr, pub_key, pri_key } = ret.data
+        const { accessToken, phone, role } = ret.data;
         setUserMsg({
           token: accessToken,
           role2: transformRole(role),
-          role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
+          role:
+            eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
           userInfo: {
             phone,
-            addr,
-            pub_key,
-            pri_key
-          }
-        })
-        config.gohome && this.$router.push({
-          name: 'Home'
-        })
+          },
+        });
+        dispatchLoginAction("login");
+        config.gohome &&
+          this.$router.push({
+            name: "Home",
+          });
       } else {
-        throw new Error(ret.msg)
+        throw new Error(ret.msg);
       }
-
     },
     async setPwdFunc(phone: string, code: string, pwd: string) {
-
       const ret = await userChangePwd({
         new_pwd: pwd,
         phone,
-        verify_code: code
-      })
+        verify_code: code,
+      });
       if (ret.code !== 200) {
-        throw new Error(ret.msg)
+        throw new Error(ret.msg);
       }
-      await this.loginByPwdFunc(phone, pwd, { gohome: true })
+      await this.loginByPwdFunc(phone, pwd, { gohome: true });
     },
     async modifyPwdFunc(phone: string, originalPwd: string, newPwd: string) {
-      console.log(phone, originalPwd, newPwd)
+      console.log(phone, originalPwd, newPwd);
     },
   },
-})
+});
 </script>
 
-<style lang="less">
-</style>
+<style lang="less"></style>

src/views/withMenu/Loan/index.vue

@@ -74,12 +74,8 @@
         class="mt-24"
         @seeMore="$router.push({ name: 'LoanList', params: { mode: mode } })"
       />
-      <Skeleton
-        :row="3"
-        :loading="skeLoading"
-        style="margin-top: 20px"
-        v-if="state.allProductList"
-      >
+      <div style="margin-top: 20px" v-if="state.allProductList"></div>
+      <Skeleton :row="3" :loading="skeLoading" v-if="state.allProductList">
         <LoanCard
           v-for="item in state.allProductList"
           :key="item.uuid"