fix: 用户获取

src/layout/components/Navbar.vue

@@ -19,8 +19,9 @@
 
 			<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click" size="default">
 				<div class="avatar-wrapper">
-					<span class="userName">{{ userInfo.userName || '' }}</span>
-					<el-avatar :size="30" class="user-avatar">{{ userInfo.userNameF }}</el-avatar>
+					<span class="userName">{{ userInfo.username || '' }}</span>
+					<!--					<el-avatar :size="30" class="user-avatar">{{ userInfo.userNameF }}</el-avatar>-->
+					<el-avatar v-if="userInfo.avatar" :size="30" :src="userInfo.avatar" class="user-avatar" />
 					<ArrowDown style="width: 0.6em; height: 0.6em; margin-left: 5px; font-size: 24px" />
 				</div>
 
@@ -64,7 +65,9 @@ const router = useRouter()
 const sidebar = computed(() => app.sidebar)
 const device = computed(() => app.device)
 const userInfo = computed(() => {
-	const _info: Recordable = user.userInfo || {}
+	// const _info: Recordable = user.userInfo || {}
+	// return { ..._info, userNameF: _info.userName?.substring(0, 1) }
+	const _info: Recordable = user.cur_userInfo || {}
 	return { ..._info, userNameF: _info.userName?.substring(0, 1) }
 })
 

src/store/modules/user.ts

@@ -11,6 +11,8 @@ const useUserStore = defineStore({
 	state: (): UserState => ({
 		token: ls.get('token') || '',
 		userInfo: ls.get('userInfo') || {},
+		// 当前用户详情
+		cur_userInfo: {},
 		// nickname: '',
 		// avatar: '',
 		roles: [],
@@ -51,18 +53,16 @@ const useUserStore = defineStore({
 		 *  获取用户信息（昵称、头像、角色集合、权限集合）
 		 */
 		getUserInfo() {
-			/*// 获取菜单权限
-			getMenuPermissions().then(res => {
-				console.error(res, 'res.......')
-			})*/
-			userGetApi(this.userInfo.userId).then(res => {
-				console.error(res, 'res.......')
+			return userGetApi(this.userInfo.userId).then(res => {
+				console.error(res, '用户信息 res.......')
+				this.cur_userInfo = res
+				this.isLogin = true // user/get
 			})
-			return new Promise(resolve => {
+			/*return new Promise(resolve => {
 				console.log('fetch 获取用户信息')
 				this.isLogin = true // user/get
 				resolve(true)
-			})
+			})*/
 			// return getUserInfo()
 			//   .then(({ data }) => {
 			//     if (!data) {

src/views/demo/pageConfig/index.vue

@@ -479,7 +479,7 @@ nextTick(() => {
 		projectType: '类型one'
 	}
 	// debugger
-	searchForm.value.forceUpdateInitParams(tableOpts.searchParams)
+	searchForm.value?.forceUpdateInitParams(tableOpts.searchParams)
 	window.searchForm = searchForm
 })
 /*setTimeout(() => {
@@ -493,7 +493,9 @@ nextTick(() => {
 	window.searchForm = searchForm
 })*/
 // 选中的columns
-checkedColumns.value = columns.slice(0, 2)
+setTimeout(() => {
+  checkedColumns.value = columns.slice(0, 2)
+}, 2000)
 /*const tableOpts = reactive({
 	searchParams: {
 		page: 1,