+
+
+
+
+
+
+
+
+
+
+
+
登录
- {{ userInfo.mobile }}
-
-
+ {{ userInfo.mobile }}
+
+
+
+
@@ -50,9 +66,9 @@ const store = useAppStore()
const {setLoginVisible, setInfo, setToken} = useUserInfo()
const token = computed(() => useUserInfo().$state.token);
const userInfo = ref()
-
-function handleCommand(command:string) {
- if (command === '4') {
+const keyword = ref('')
+function handleCommand(command: string) {
+ if (command === '5') {
ElMessageBox.confirm(
'确定要退出登录吗？',
'提示',
@@ -73,11 +89,18 @@ function handleCommand(command:string) {
message: '已取消退出登录',
})
})
+ }else {
+ router.push({
+ path: '/translate',
+ query:{
+ type: command
+ }
+ })
}
}
-watchEffect(()=>{
+watchEffect(() => {
console.log('useUserInfo().$state.info>>>>>>> header', useUserInfo().$state.info)
userInfo.value = useUserInfo().$state.info;
})
@@ -90,9 +113,9 @@ function handleChange(val: any) {
store.setHomeBanner(false)
} else {
store.setMenuTheme('light')
- if(val.meta.hasOwnProperty('homeBanner') && val.meta.homeBanner){
+ if (val.meta.hasOwnProperty('homeBanner') && val.meta.homeBanner) {
store.setHomeBanner(true)
- }else{
+ } else {
store.setHomeBanner(false)
}
}
@@ -105,9 +128,9 @@ watch(() => route, (val) => {
store.setHomeBanner(false)
} else {
store.setMenuTheme('light')
- if(val.meta.hasOwnProperty('homeBanner') && val.meta.homeBanner){
+ if (val.meta.hasOwnProperty('homeBanner') && val.meta.homeBanner) {
store.setHomeBanner(true)
- }else{
+ } else {
store.setHomeBanner(false)
}
}
@@ -129,6 +152,7 @@ $prefix-cls: '#{$name-prefix}-header-wrap';
.el-menu-item {
border-bottom: unset;
+ padding: 0 17px;
//font-size: 20px;
transition: font-size .5s;
background-color: unset;
@@ -189,9 +213,7 @@ $prefix-cls: '#{$name-prefix}-header-wrap';
font-weight: 400;
//@apply ;
}
-.login-action-wrap {
- padding-right: 30px;
-}
+
.is-host {
* {
color: $white;
@@ -199,12 +221,15 @@ $prefix-cls: '#{$name-prefix}-header-wrap';
}
diff --git a/composables/useUserInfo.ts b/composables/useUserInfo.ts
index 6c726d5..aa0ea3e 100644
--- a/composables/useUserInfo.ts
+++ b/composables/useUserInfo.ts
@@ -5,12 +5,14 @@ export interface UserState {
token: string;
info: any;
loginVisible: boolean;
+ redirect: any
}
const useUserInfo = defineStore('user', {
state: (): UserState => ({
token: '',
info: {},
loginVisible: false,
+ redirect: {}
}),
actions: {
@@ -20,21 +22,26 @@ const useUserInfo = defineStore('user', {
setInfo(info: any):void {
this.info = info;
},
- setLoginVisible(val: boolean):void {
+ setLoginVisible(val: boolean, redirect?: {} | boolean):void {
this.loginVisible = val;
+ if (redirect) {
+ this.redirect = redirect;
+ }else {
+ this.redirect = false;
+ }
},
- async login(data: any, redirect?: string){
+ async login(data: any){
const { commonApi } = useApi()
const res = await commonApi.login(data);
- // this.setInfo(res.data)
- // this.setToken(res.data.token)
- // this.setLoginVisible(false)
this.token = res.data.userinfo.token;
this.loginVisible = false
this.info = res.data.userinfo
- if(redirect) {
- useRouter().push(redirect)
+ if(this.redirect) {
+ useRouter().push(this.redirect)
+ this.redirect = false;
+ }else {
+ location.reload()
}
return res;
}
@@ -42,6 +49,7 @@ const useUserInfo = defineStore('user', {
},
getters:{
getLoginVisible:(state)=> state.loginVisible,
+ getToken:(state)=> state.token,
},
persist: process.client && {
storage: localStorage,
diff --git a/layouts/tabLayout.vue b/layouts/tabLayout.vue
index 252ef47..ce0ad98 100644
--- a/layouts/tabLayout.vue
+++ b/layouts/tabLayout.vue
@@ -1,8 +1,10 @@
-
-
-
+
+
+
+
+
@@ -13,7 +15,7 @@
\ No newline at end of file
+
diff --git a/pages/warning.vue b/pages/warning.vue
index cb5856d..ad77ebd 100644
--- a/pages/warning.vue
+++ b/pages/warning.vue
@@ -35,6 +35,7 @@
:pages="pagesRef"
@change="onChangePage"
/>
+