From 52d175d89b4801cc30c258b93789b783be0bba3b Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 07 二月 2023 10:48:04 +0800
Subject: [PATCH] 菜单

---
 src/views/loginPage/component/accountLogin.vue |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/loginPage/component/accountLogin.vue b/src/views/loginPage/component/accountLogin.vue
index 167d6b1..96d52e9 100644
--- a/src/views/loginPage/component/accountLogin.vue
+++ b/src/views/loginPage/component/accountLogin.vue
@@ -1,14 +1,14 @@
 <template>
     <el-form size="large" class="login-content-form">
         <el-form-item class="login-animation1">
-            <el-input type="text" :placeholder="$t('message.account.accountPlaceholder1')" v-model="ruleForm.username" clearable autocomplete="off" size="large">
+            <el-input type="text" :placeholder="$t('message.account.accountPlaceholder1')" v-model="ruleForm.name" clearable autocomplete="off" size="large">
                 <template #prefix>
                     <el-icon class="el-input__icon" style="margin-right: 20px"><img src="../../../assets/loginPage/login_icon_user.png" style="width: 24px; height: 24px" /></el-icon>
                 </template>
             </el-input>
         </el-form-item>
         <el-form-item class="login-animation2">
-            <el-input :type="isShowPassword ? 'text' : 'password'" :placeholder="$t('message.account.accountPlaceholder2')" v-model="ruleForm.password" autocomplete="off" size="large" @keyup.enter.native="onSignIn">
+            <el-input :type="isShowPassword ? 'text' : 'password'" :placeholder="$t('message.account.accountPlaceholder2')" v-model="ruleForm.pwd" autocomplete="off" size="large" @keyup.enter.native="onSignIn">
                 <template #prefix>
                     <el-icon class="el-input__icon" style="margin-right: 20px"><img src="../../../assets/loginPage/login_icon_password.png" style="width: 24px; height: 24px" /></el-icon>
                 </template>
@@ -100,8 +100,8 @@
             showRePass: false,
             saveCode: false,
             ruleForm: {
-                username: '',
-                password: ''
+                name: '',
+                pwd: ''
             },
             loading: {
                 signIn: false
@@ -125,7 +125,7 @@
 
         const hasUserCodeOrPassword =()=> {
             if (localStorage.getItem('userCode') && localStorage.getItem('userPassword')) {
-                state.ruleForm.username = localStorage.getItem('userCode') as string
+                state.ruleForm.name = localStorage.getItem('userCode') as string
                 state.ruleForm.password = Base64.decode(localStorage.getItem('userPassword'))//解密
                 state.saveCode = true
             }
@@ -175,7 +175,7 @@
             realName: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
             identify: [{ required: true, validator: checkCode, trigger: 'blur'}],
             phone: [{ required: true, validator: checkPhone, trigger: 'blur' }],
-            password: [{ required: true, validator: validatePass, trigger: 'blur' }],
+            pwd: [{ required: true, validator: validatePass, trigger: 'blur' }],
             rePassword: [{ required: true, validator: validatePass2, trigger: 'blur' }]
         });
 
@@ -188,17 +188,15 @@
             state.loading.signIn = true;
             // 存储 token 到浏览器缓存
             let res = await useLoginApi().signIn(state.ruleForm);
-            if (res.data.code === '200') {
+            if (res.data.code === 100) {
                 await userInfo.setUserInfos(res.data.data);
-                Cookies.set('token', res.data.data.accessToken);
-                Cookies.set('projectId', '');
+                Cookies.set('token', res.data.data.tk);
                 Cookies.set('uid', res.data.data.uid);
-                Cookies.set('depId', res.data.data.depId);
                 // Session.set('token', res.data.data.accessToken);
                 // Session.set('projectId', '');
                 // Session.set('uid', res.data.data.uid);
                 if (state.saveCode) {
-                    localStorage.setItem('userCode', state.ruleForm.username)
+                    localStorage.setItem('userCode', state.ruleForm.name)
                     localStorage.setItem('userPassword', Base64.encode(state.ruleForm.password),)
                 } else {
                     localStorage.removeItem('userCode')
@@ -215,7 +213,7 @@
             state.loading.signIn = false;
             // Session.set('token', Math.random().toString(36).substr(0));
             // // 模拟数据,对接接口时,记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断(模拟数据)
-            // Cookies.set('userName', state.ruleForm.username);
+            // Cookies.set('name', state.ruleForm.name);
             // if (!themeConfig.value.isRequestRoutes) {
             // 	// 前端控制路由,2、请注意执行顺序
             // 	await initFrontEndControlRoutes();
@@ -234,11 +232,11 @@
             let currentTimeInfo = currentTime.value;
             // 登录成功,跳到转首页
             // 如果是复制粘贴的路径,非首页/登录页,那么登录成功后重定向到对应的路径中
-            // if (route.query?.redirect) {
-            router.push('/newMenu');
+            // if (route.json.query?.redirect) {
+            router.push('/newHome');
             // router.push({
-            // 	path: <string>route.query?.redirect,
-            // 	query: Object.keys(<string>route.query?.params).length > 0 ? JSON.parse(<string>route.query?.params) : '',
+            // 	path: <string>route.json.query?.redirect,
+            // 	query: Object.keys(<string>route.json.query?.params).length > 0 ? JSON.parse(<string>route.json.query?.params) : '',
             // });
             // } else {
             //     router.push('/loginPage');

--
Gitblit v1.9.2