Merge branch 'master' of http://182.92.174.150:3000/tiegu/czo

src/layout/components/Navbar.vue

@@ -8,7 +8,6 @@
 		<div class="right-menu">
 			<template v-if="device !== 'mobile'">
 				<search id="header-search" class="right-menu-item" />
-
 				<screenfull id="screenfull" class="right-menu-item hover-effect" />
 			</template>
 

src/layout/index.vue

@@ -2,7 +2,7 @@
 	<div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
 		<div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
 		<sidebar class="sidebar-container" v-if="!enlarge" />
-		<div :class="{ hasTagsView: needTagsView }" class="main-container" :style="{ marginLeft: !enlarge ? '200px' : 0 }">
+		<div :class="{ hasTagsView: needTagsView, left0: enlarge }" class="main-container">
 			<div :class="{ 'fixed-header': fixedHeader }">
 				<navbar />
 				<tags-view v-if="needTagsView" />
@@ -105,4 +105,7 @@
 	.mobile .fixed-header {
 		width: 100%;
 	}
+	.left0 {
+		margin-left: 0 !important;
+	}
 </style>

src/store/modules/user.js

@@ -54,7 +54,7 @@ const user = {
 				getInfo()
 					.then((res) => {
 						const user = res.user
-						//const avatar = user.avatar == '' ? require('@/assets/images/profile.jpg') : process.env.VUE_APP_BASE_API + user.avatar
+						const avatar = user.avatar == '' ? require('@/assets/images/profile.jpg') : process.env.VUE_APP_BASE_API + user.avatar
 						if (res.roles && res.roles.length > 0) {
 							// 验证返回的roles是否是一个非空数组
 							commit('SET_ROLES', res.roles)
@@ -63,7 +63,7 @@ const user = {
 							commit('SET_ROLES', ['ROLE_DEFAULT'])
 						}
 						commit('SET_NAME', user.userName)
-						//commit('SET_AVATAR', avatar)
+						commit('SET_AVATAR', avatar)
 						resolve(res)
 					})
 					.catch((error) => {