From 80745c9d8c8e35e9cb69a2e8cf095cea3e1e3e86 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Mon, 1 Jul 2024 10:36:12 +0800
Subject: [PATCH] update

---
 index.html                |  2 --
 src/store/modules/user.ts | 19 +++++++++++------
 src/views/sys/login.vue   | 45 +++++++++++++++++++++------------------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/index.html b/index.html
index e186d28..8896a50 100644
--- a/index.html
+++ b/index.html
@@ -12,8 +12,6 @@
             securityJsCode: "1b3b86585c863d22db1e7f7636a9e495",
         }
     </script>
-    <!--    <script type="text/javascript"-->
-    <!--            src="https://webapi.amap.com/maps?v=2.0&key=4bbcb216b889f2d612cbed05ae6979c8&plugin=AMap.Driving,AMap.ToolBar,AMap.Driving,AMap.GeoJSON,AMap.MarkerCluster"></script>-->
 </head>
 <style>
     html, body, #app {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 59f9a7b..d2fe14d 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -6,6 +6,7 @@ import { getAuthCache, setAuthCache } from '/@/utils/auth.ts';
 import { useRouter } from 'vue-router';
 import { LoginInfo, LoginParams, UserInfo } from '/@/store/modules/storeType.ts';
 import { store } from '/@/store';
+import { message } from 'ant-design-vue';
 
 const router = useRouter();
 export const useUserStore = defineStore({
@@ -16,8 +17,8 @@ export const useUserStore = defineStore({
         //登录返回信息
         loginInfo: null,
         themeType: '', // dark 1, light 2
-        flag1: null, //银川权限标识
-        flag2: null, //西安权限标识
+        flag1: '', //银川权限标识
+        flag2: '', //西安权限标识
     }),
     getters: {
         getUserInfo(): UserInfo {
@@ -70,11 +71,15 @@ export const useUserStore = defineStore({
             try {
                 const { goHome = true, mode, ...loginParams } = params;
                 const data = await loginApi(loginParams, mode);
-                const { token, userInfo } = data.result;
-                // save token
-                this.setToken(token, false);
-                this.setUserInfo(userInfo);
-                return { userInfo, token };
+                if (data && data['result']) {
+                    const { token, userInfo } = data.result;
+                    // save token
+                    this.setToken(token, false);
+                    this.setUserInfo(userInfo);
+                    return { userInfo, token };
+                } else {
+                    return Promise.reject(data);
+                }
             } catch (error) {
                 return Promise.reject(error);
             }
diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue
index 6773bd3..3059f99 100644
--- a/src/views/sys/login.vue
+++ b/src/views/sys/login.vue
@@ -162,25 +162,24 @@
         return route.path == PageEnum.BASE_LOGIN_YINCHUAN ? PageEnum.YINCHUAN_HOME : PageEnum.BASE_HOME;
     }
 
+    function checkFormField(formData, fieldName, placeholderTranslationKey) {
+        if (!formData[fieldName]) {
+            createMessage.warn(t(placeholderTranslationKey));
+            return false;
+        }
+        return true;
+    }
+
     async function accountLogin() {
-        if (!formData.username) {
-            createMessage.warn(t('login.accountPlaceholder'));
-            return;
-        }
-        if (!formData.password) {
-            createMessage.warn(t('login.passwordPlaceholder'));
-            return;
-        }
-        if (!formData.inputCode) {
-            createMessage.warn(t('login.inputCodePlaceholder'));
-            return;
-        }
+        if (!checkFormField(formData, 'username', 'login.accountPlaceholder')) return;
+        if (!checkFormField(formData, 'password', 'login.passwordPlaceholder')) return;
+        if (!checkFormField(formData, 'inputCode', 'login.inputCodePlaceholder')) return;
+
         try {
             loginLoading.value = true;
             const { userInfo } = await userStore.login(
                 toRaw({
                     password: encipher(formData.password) as string,
-                    // password: formData.password,
                     username: formData.username,
                     captcha: formData.inputCode,
                     checkKey: randCodeData.checkKey,
@@ -191,20 +190,21 @@
             if (userInfo) {
                 try {
                     let { code, result, message: msg } = await getAuth();
-                    let goPath = '';
+                    let goPath = PageEnum.BASE_HOME;
                     if (code == 200) {
                         let flag1 = result?.codeList?.find((item) => ['emergency:screen:show:yinchuan'].includes(item));
                         let flag2 = result?.codeList?.find((item) => ['emergency:screen:show:xian'].includes(item));
                         userStore.setFlag1(flag1 || '');
                         userStore.setFlag2(flag2 || '');
-                        debugger;
+                        // debugger;
                         if (!flag1 && !flag2) {
-                            userStore.setToken('', false);
+                            userStore.setToken('');
                             userStore.setUserInfo({});
                             return message.warn('您没有权限访问大屏，请联系管理员！');
                         }
                         //1如果有权限
                         //1.2若果是有两种权限
+                        // debugger;
                         if (flag1 && flag2) {
                             // 1.2.1 如果是登录地址是西安
                             // 1.2.2 如果是登录地址是银川
@@ -214,12 +214,12 @@
                                 goPath = PageEnum.BASE_HOME;
                             }
                         } else {
-                            if (flag1 && route.path == PageEnum.BASE_LOGIN_YINCHUAN) {
+                            if (flag1) {
                                 goPath = PageEnum.YINCHUAN_HOME;
-                            } else if (flag2 && route.path == PageEnum.BASE_LOGIN) {
+                            } else if (flag2) {
                                 goPath = PageEnum.BASE_HOME;
                             } else {
-                                userStore.setToken('', false);
+                                userStore.setToken('');
                                 userStore.setUserInfo({});
                                 return message.warn('没有权限请联系管理员!');
                             }
@@ -235,13 +235,16 @@
                     setBaseLogin(route.path);
                     router.replace(goPath);
                 } catch (e) {
-                    message.warn(e);
+                    handleChangeCheckCode();
+                    return message.warn(e);
                 }
+            } else {
+                handleChangeCheckCode();
             }
         } catch (error) {
             notification.error({
                 message: t('api.errorTip'),
-                description: error.message || t('login.networkExceptionMsg'),
+                description: error['message'] || t('login.networkExceptionMsg'),
                 duration: 3,
             });
             handleChangeCheckCode();