From e27aa65d479626dfb6899b6934135e1db4faa13e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 15:49:55 +0800
Subject: [PATCH] modified: .env.development modified: src/layout/components/Navbar.vue modified: src/store/modules/user.js modified: src/views/login/index.vue
---
.env.development | 2 +-
src/store/modules/user.js | 2 +-
src/views/login/index.vue | 41 +++++++++++++++++++++++++++--------------
src/layout/components/Navbar.vue | 1 +
4 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/.env.development b/.env.development
index ab9be2d..d00c942 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.107:1234/'
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ba4d987..01ad010 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -108,6 +108,7 @@
async logout() {
// await this.$store.dispatch('user/logout')
sessionStorage.removeItem("user")
+ localStorage.removeItem("autoenter");
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
this.$router.replace({path: '/login'});
location.reload();
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3ff12ca..8f614de 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -42,7 +42,7 @@
commit('SET_REFRESH', data.refresh)
setToken(data.token)
setRefresh(data.refresh)
- resolve()
+ resolve(response)
}).catch(error => {
reject(error)
})
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9dee500..80d1a0c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -150,8 +150,8 @@
data() {
return {
ruleForm: {
- username: "admin",
- password: "admin",
+ username: "",
+ password: "",
remumberme: false,
autoenter: false
},
@@ -177,11 +177,11 @@
var user = JSON.parse(localStorage.getItem('user'))
if (user != null && user != undefined) {
if (this.ruleForm.remumberme==true) {
- this.ruleForm.username = user.username
- this.ruleForm.password = user.password
+ this.ruleForm.username = user.username;
+ this.ruleForm.password = user.password;
}
if (this.ruleForm.autoenter==true) {
- this.submitForm('ruleForm')
+ this.submitForm('ruleForm');
}
}
},
@@ -198,20 +198,33 @@
this.btnload = true
this.$refs[formName].validate((valid) => {
if (valid) {
- this.$store.dispatch('user/login', this.ruleForm).then(async () => {
+ this.$store.dispatch('user/login', this.ruleForm).then(async (res) => {
+ let name = "";
await get(this.$url.info).then(res => {
- this.user = res.data;
- sessionStorage.setItem("user", JSON.stringify(res.data));
- sessionStorage.setItem("flushPage",0);
- })
+ this.user = res.data;
+ name = res.data.name;
+ sessionStorage.setItem("user", JSON.stringify(res.data));
+ sessionStorage.setItem("flushPage",0);
+ })
+ localStorage.setItem('rememberme', this.ruleForm.remumberme);
+ localStorage.setItem('autoenter', this.ruleForm.autoenter);
+ if (this.ruleForm.remumberme==true||this.ruleForm.autoenter==true) {
+ localStorage.setItem("user", JSON.stringify({
+ username: this.ruleForm.username,
+ password: this.ruleForm.password,
+ name: name,
+ }));
+ }
+ this.$message.success("鐧诲綍鎴愬姛")
+ this.btnload = false
this.$router.push({ path: this.redirect || '/' })
- this.loading = false
- }).catch(() => {
- this.loading = false
+ }).catch((error) => {
+ this.$message.error(error.message)
+ this.btnload = false
})
} else {
this.btnload = false
- this.$message.error('鐧诲綍澶辫触锛�')
+ this.$message.error('璐﹀彿鎴栧瘑鐮佹湭杈撳叆锛�')
return false;
}
})
--
Gitblit v1.9.3