Commit 1cf4da6f authored by liwenhong's avatar liwenhong

fix: 简网刷新重定向登录+认证head样式

parent 82c4ebeb
...@@ -19,11 +19,13 @@ export default { ...@@ -19,11 +19,13 @@ export default {
if (this.$store.state.permissions && this.$store.state.userInfo) return; if (this.$store.state.permissions && this.$store.state.userInfo) return;
if(!getCookie('username')) { if(!getCookie('username')) {
this.$message('请先登录'); this.$message('请先登录');
redirectToLogin(); return redirectToLogin();
} }
const { status, user } = await fetchCurrentUser(); const { status, user } = await fetchCurrentUser();
// let isDefault = window.localStorage.getItem('isDefault'); // let isDefault = window.localStorage.getItem('isDefault');
// if (isDefault == 2) return; // if (isDefault == 2) return;
console.log('status',status)
console.log('user',user)
if (status === "success") { if (status === "success") {
this.$store.commit("updateUserInfo", user); this.$store.commit("updateUserInfo", user);
this.$store.dispatch("updateUserPermission", { email: user.email }); this.$store.dispatch("updateUserPermission", { email: user.email });
...@@ -32,7 +34,7 @@ export default { ...@@ -32,7 +34,7 @@ export default {
appId: "merchant-op-auditing", appId: "merchant-op-auditing",
}); });
} else { } else {
redirectToLogin(); return redirectToLogin();
} }
}, },
computed: { computed: {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
text-color="#fff" text-color="#fff"
:default-active="activeMenu" :default-active="activeMenu"
active-text-color="#ffd04b" active-text-color="#ffd04b"
mode="vertical" mode="horizontal"
> >
<el-menu-item <el-menu-item
v-for="item in menuItemsWithAuth" v-for="item in menuItemsWithAuth"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{{ item.name }} {{ item.name }}
</el-menu-item> </el-menu-item>
<el-menu-item key="usermenu" class="user-menu"> <el-menu-item key="usermenu" class="user-menu">
<user></user> <user @logout="handleLogout"></user>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
</div> </div>
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<script> <script>
import { HEADER_CONFIG } from "@/config/pageconfig"; import { HEADER_CONFIG } from "@/config/pageconfig";
import User from './User.vue'; import User from './User.vue';
import { createNamespacedHelpers } from 'vuex'
const { mapActions } = createNamespacedHelpers('login')
const { menuItems } = HEADER_CONFIG; const { menuItems } = HEADER_CONFIG;
export default { export default {
...@@ -50,7 +51,12 @@ export default { ...@@ -50,7 +51,12 @@ export default {
}, },
beforeMount () { beforeMount () {
}, },
methods: {}, methods: {
...mapActions(['logout']),
handleLogout() {
this.logout()
},
},
}; };
</script> </script>
...@@ -60,7 +66,7 @@ export default { ...@@ -60,7 +66,7 @@ export default {
line-height: 60px; line-height: 60px;
width: 100%; width: 100%;
} }
.header-menu .user-menu { .user-menu {
float: right !important; float: right !important;
margin-right: 20px; margin-right: 20px;
} }
......
<template> <template>
<RoleDetail appId="merchant-op" /> <RoleDetail />
</template> </template>
<script> <script>
import RoleDetail from "@/components/Roles/RoleDetail"; import RoleDetail from "@/components/Roles/RoleDetail";
......
...@@ -14,7 +14,7 @@ export async function j_login (userInfo) { ...@@ -14,7 +14,7 @@ export async function j_login (userInfo) {
export async function fetchCurrentUser () { export async function fetchCurrentUser () {
let isDefault = window.localStorage.getItem('isDefault'); let isDefault = window.localStorage.getItem('isDefault');
let username = getCookie('username') let username = getCookie('username')
if(isDefault == 2) return {user: {email:username, status: 'success'}}; if(isDefault == 2) return {user:{email:username}, status: 'success'};
return await axios.get("/api/v1/fetch_user"); return await axios.get("/api/v1/fetch_user");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment