From e31d10e3464e7e8d626e5bdd3ad8b954f849cf9b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 20 Mar 2024 10:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue | 6 +++---
 src/store/modules/user.js | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 45cad563..62a6be11 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -35,12 +35,12 @@
 			</scroll-view>
 			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box"
 				@scroll="rightScroll">
-				<view class="page-view" style="margin-bottom: 200rpx;">
+				<view class="page-view" style="padding-bottom: 100rpx;">
 					<view class="class-item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
 						<view class="item-title">
 							<text>{{item.name}}</text>
 						</view>
-						<view class="item-container">
+						<view class="item-container" >
 							<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
 								@click="openCheck(item1.path)">
 								<view class="" style="position: relative; ">
@@ -108,7 +108,7 @@
 					uni.hideLoading()
 					if (res.menus.length > 0) {
 						var menus = res.menus.filter(item => item.name == "PDA菜单管理")
-						if (menus.length > 0) {
+						if (menus!=undefined&&menus.length > 0) {
 							var tab = menus[0].children.filter(res => res.visible == true)
 							tab.forEach(res => {
 								for (var i = 0; i < res.children.length; i++) {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ea66dfdf..dab7585d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,6 +5,7 @@ import {
 	getPermissionInfo,
 	getTenantInfo
 } from '@/api/request2'
+// import picUrl from "../../static/images/profile.jpg";
 
 
 const user = {
@@ -81,8 +82,9 @@ const user = {
 				getPermissionInfo().then(res => {
 					res = res.data; // 读取 data 数据
 					const user = res.user
-					const avatar = (user == null || user.avatar === "" || user.avatar == null) ?
-						require("@/static/images/profile.jpg") : user.avatar
+					const avatar=""
+					// const avatar = (user == null || user.avatar == "" || user.avatar == null||user.avatar == undefined) ?
+					// 	picUrl: user.avatar
 					const nickname = (user == null || user.nickname === "" || user.nickname ==
 						null) ? "" : user.nickname
 					if (res.roles && res.roles.length > 0) {