From 47a9d0b2711203995fd5eeb00df1bebda7d63ad8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 21 三月 2024 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/login.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index a63965f..e855493 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -41,7 +41,7 @@
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
+ <el-checkbox v-model="loginForm.rememberMe" style=" margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
<el-form-item style="width:100%;">
<el-button
:loading="loading"
@@ -59,7 +59,7 @@
</el-form-item>
</el-form>
- <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin==0?true:false">
+ <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin==0">
<el-form>
<el-form-item label="鏂板瘑鐮�">
<el-input v-model="newPassword" autocomplete="off"></el-input>
@@ -149,6 +149,7 @@
watch: {
$route: {
handler: function(route) {
+ console.log(route);
this.redirect = route.query && route.query.redirect;
},
immediate: true
@@ -198,6 +199,8 @@
this.loginInfo = loginInfo.user
//濡傛灉杩斿洖涓�1姝ｅ父璺宠浆
if(this.loginInfo.firstLogin == 1){
+ this.$router.push({ path: "/" }).catch(()=>{});
+ return;
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
} else {
localStorage.setItem('firstLogin',0)
--
Gitblit v1.8.0