fix:修改登录界面的语言问题
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
{{$t('login.verifyContent')}}
|
||||
</div>
|
||||
<div class="login-foot">
|
||||
<button v-if="!verifyShow" id="login" v-my-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="login">Login</button>
|
||||
<button v-if="!verifyShow" id="login" v-my-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="login">{{$t("login.login")}}</button>
|
||||
<button v-if="verifyShow" id="verify" v-my-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="verify">{{$t("login.verify")}}</button>
|
||||
</div>
|
||||
<div class="license-warn" v-if="license.warnInfo">{{license.warnInfo}}</div>
|
||||
@@ -132,10 +132,10 @@ export default {
|
||||
token: '',
|
||||
valid: true
|
||||
},
|
||||
lang: this.$store.getters.getLanguage || 'en',
|
||||
uploadFileList: [],
|
||||
uploadFile: { file: '', path: '', uuid: '' },
|
||||
loading: false,
|
||||
lang: 'en', // en/cn
|
||||
verifyShow: false,
|
||||
theme: 1,
|
||||
authBindShow: false,
|
||||
@@ -373,6 +373,11 @@ export default {
|
||||
})
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
lang (n) {
|
||||
this.$i18n.locale = this.lang
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.$i18n.locale = this.lang
|
||||
document.getElementById('usernameInput').focus()
|
||||
|
||||
@@ -8,7 +8,7 @@ import VueResource from 'vue-resource'
|
||||
import bus from '@/libs/bus'
|
||||
Vue.use(VueResource)
|
||||
|
||||
const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance'] // 免登陆白名单
|
||||
const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n'] // 免登陆白名单
|
||||
const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单
|
||||
router.beforeEach((to, from, next) => {
|
||||
if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
|
||||
@@ -24,9 +24,8 @@ router.beforeEach((to, from, next) => {
|
||||
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 || '')
|
||||
if (!localStorage.getItem('nz-language')) {
|
||||
localStorage.setItem('nz-language', res.data.language || '')
|
||||
}
|
||||
localStorage.setItem('nz-language', res.data.language || '')
|
||||
store.commit('setLanguage', res.data.language)
|
||||
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 || '')
|
||||
|
||||
Reference in New Issue
Block a user