diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 51adf7a78..e2a918eec 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -153,9 +153,9 @@ export default { methods: { ...mapActions(['loginSuccess']), login () { - if (this.loading || !this.license.valid || !this.license.token) { - return - } + // if (this.loading || !this.license.valid) { + // return + // } if (this.validateLogin() && (this.$route.path == '/' || this.$route.path == '/login')) { this.loading = true this.$post('/sys/login', this.loginData).then(res => { @@ -248,7 +248,6 @@ export default { this.license.valid = false this.license.warnInfo = response.msg } - this.license.token = response.token }) }, handleChange (file, fileList) { diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js index 4621414f9..4eba56f1a 100644 --- a/nezha-fronted/src/permission.js +++ b/nezha-fronted/src/permission.js @@ -19,14 +19,14 @@ router.beforeEach((to, from, next) => { get(config.body.baseUrl + '/sys/appearance').then(res => { // console.log(res) if (res.code === 200) { - localStorage.setItem('nz-sys-name', res.data.system_name) - localStorage.setItem('nz-sys-logo', res.data.system_logo) - localStorage.setItem('nz-sys-favicon', res.data.system_favicon) - localStorage.setItem('nz-language', res.data.lang) - localStorage.setItem('nz-sys-timezone', res.data.timezone) + localStorage.setItem('nz-sys-name', res.data.system_name || '') + localStorage.setItem('nz-sys-logo', res.data.system_logo || '') + localStorage.setItem('nz-sys-favicon', res.data.system_favicon || '') + localStorage.setItem('nz-language', res.data.lang || '') + localStorage.setItem('nz-sys-timezone', res.data.timezone || '') localStorage.setItem('nz-sys-bgImg', res.data.system_bgImg || '') - localStorage.setItem('nz-default-theme', res.data.theme) - localStorage.setItem('nz-default-dateFormat', res.data.dateFormat) + localStorage.setItem('nz-default-theme', res.data.theme || '') + localStorage.setItem('nz-default-dateFormat', res.data.dateFormat || '') changeFavicon(res.data.system_favicon) } resolve()