修复了无限刷新和未登录设置语言

This commit is contained in:
luyuan 2020-11-09 16:59:29 +08:00
parent 3ece8985ca
commit 9c24b82cf2
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
6 changed files with 20 additions and 9 deletions

View File

@ -25,8 +25,10 @@ export default defineComponent({
store.commit("login", true) store.commit("login", true)
store.dispatch("setUserInfo"); store.dispatch("setUserInfo");
}else{ }else{
console.log('ip') console.log('ip')
store.dispatch("getip"); store.dispatch("getip");
store.commit('setWlan')
router.push("/") router.push("/")
} }
const zh = zhCN const zh = zhCN

View File

@ -32,10 +32,8 @@ export async function loginpass(phone: string, password: string,type?: number,sm
setToken(); setToken();
store.commit("login", true); store.commit("login", true);
store.dispatch("setUserInfo"); store.dispatch("setUserInfo");
router.push("/mine/archives") await router.push("/mine/archives")
setTimeout(()=>{
location.reload(); location.reload();
}, 1000)
} }
} }
} }
@ -47,7 +45,9 @@ export async function userinfo(){
const user = await get<UserInfo>('personalInfo'); const user = await get<UserInfo>('personalInfo');
// console.log(user.data.img) // console.log(user.data.img)
if(user.code == 1001){ if(user.code == 1001){
saveValue("token","")
router.push("/") router.push("/")
return '未登录'; return '未登录';
} }
return user.data; return user.data;

View File

@ -209,6 +209,7 @@ import { useRoute } from 'vue-router';
import axios from 'axios' import axios from 'axios'
import { useI18n } from '@/utils/i18n'; import { useI18n } from '@/utils/i18n';
import { setLanvuage } from '@/api/base'; import { setLanvuage } from '@/api/base';
import { saveValue } from '@/utils/common';
export default defineComponent({ export default defineComponent({
props:{ props:{
@ -322,7 +323,9 @@ export default defineComponent({
if(store.state.islogin){ if(store.state.islogin){
editsystemsetting({language:e}) editsystemsetting({language:e})
}else { }else {
setLanvuage(e) saveValue("Lanvuage", e)
location.reload();
// setLanvuage(e)
} }
lan.locale.value = e lan.locale.value = e

View File

@ -2,6 +2,7 @@ import { getValue } from '@/utils/common';
import axios from 'axios' import axios from 'axios'
axios.defaults.baseURL = 'https://case.sy-my.net/beelink/public/home/'; axios.defaults.baseURL = 'https://case.sy-my.net/beelink/public/home/';
axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token"); axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token");
axios.defaults.headers.common['Language'] = "Bearer " + getValue("Lanvuage");
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
export default axios export default axios

View File

@ -1,4 +1,5 @@
import { getaddr, userinfo } from '@/api'; import { getaddr, userinfo } from '@/api';
import { getValue } from '@/utils/common';
import { isProxy } from 'vue'; import { isProxy } from 'vue';
import { createStore } from 'vuex' import { createStore } from 'vuex'
@ -67,6 +68,9 @@ export default createStore({
state.userinfo.languageValue = data[0] // 'en' 'zh' state.userinfo.languageValue = data[0] // 'en' 'zh'
state.userinfo.zoneStr = timeZoneFormatted; state.userinfo.zoneStr = timeZoneFormatted;
state.userinfo.currency = data[2]; state.userinfo.currency = data[2];
},
setWlan(state){
state.userinfo.languageValue = getValue("Lanvuage")
} }
}, },
actions: { actions: {

View File

@ -551,9 +551,7 @@ export default defineComponent({
watch(userinfo, () => { watch(userinfo, () => {
formData.value = toRaw(userinfo.value); formData.value = toRaw(userinfo.value);
// console.log(lan.$s(), formData.value.languageValue) // console.log(lan.$s(), formData.value.languageValue)
if(lan.$s() != formData.value.languageValue){
location.reload();
}
console.log(userinfo.value.currencyValue, "listsssss"); console.log(userinfo.value.currencyValue, "listsssss");
currencyindex.value = userinfo.value.currency; currencyindex.value = userinfo.value.currency;
console.log(currencyindex.value, "listsssss"); console.log(currencyindex.value, "listsssss");
@ -885,7 +883,10 @@ export default defineComponent({
// console.log(zonelist.value[i].city + zonelist.value[i].gmt, uesrinfo.zoneStr) // console.log(zonelist.value[i].city + zonelist.value[i].gmt, uesrinfo.zoneStr)
} }
if (reg.test(userinfo.value.email)) { if (reg.test(userinfo.value.email)) {
putmember(uesrinfo); await putmember(uesrinfo);
if(lan.$s() != uesrinfo.languageValue){
location.reload();
}
} else { } else {
message.error(lan.$t('youxiangcuowu')); message.error(lan.$t('youxiangcuowu'));
} }