From a68042fc67dfbf310138ba07875ea508f426169b Mon Sep 17 00:00:00 2001
From: AnHanTech <admin@xixingwl.cn>
Date: Fri, 10 Feb 2023 23:53:25 +0800
Subject: [PATCH] 121

Signed-off-by: AnHanTech <admin@xixingwl.cn>
---
 pages/tabbar/my/my.vue | 53 +++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index c1f30b8..0a61972 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -1,46 +1,40 @@
 <template>
-	<view> 
+	<view>
 		<page-head title="view"></page-head>
 		<view class="warp" style="margin: 10rpx 15rpx;">
 			<view class="user" style="">
-				<image class="user-avatar" mode="aspectFit" src="../../../static/logo.png"></image>
+				<image class="user-avatar" mode="aspectFit" :src="userInfo.avatar"
+					style="background-image: ../../../static/avatar.png;"></image>
 				<view class="user-info">
 					<h2> {{userInfo.nickname}} </h2>
 					<text> UID {{userInfo.uid}}</text>
 					<text> {{userInfo.account}}</text>
+					<text> 云深不知归处，爱你不会迷路</text>
 				</view>
 			</view>
 			<view style="padding: 10rpx;"></view>
 			<view class="Grid">
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
-						<view class="GSimg">
-							<image class="Image" src="../../../static/logo.png"></image>
-						</view>
+						<image class="GSimg" src="../../../static/logo.png"></image>
 						<view class="GStitle">测试功能</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
-						<view class="GSimg">
-							<image class="Image" src="../../../static/logo.png"></image>
-						</view>
+						<image class="GSimg" src="../../../static/logo.png"></image>
 						<view class="GStitle">测试功能</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
-						<view class="GSimg">
-							<image class="Image" src="../../../static/logo.png"></image>
-						</view>
+						<image class="GSimg" src="../../../static/logo.png"></image>
 						<view class="GStitle">测试功能</view>
 					</view>
 				</view>
 				<view class="Grid-Item">
 					<view class="Grid-Item-1">
-						<view class="GSimg">
-							<image class="Image" src="../../../static/logo.png"></image>
-						</view>
+						<image class="GSimg" src="../../../static/logo.png"></image>
 						<view class="GStitle">测试功能</view>
 					</view>
 				</view>
@@ -81,7 +75,10 @@
 </template>
 
 <script>
-	import {mapState,mapGetters} from 'vuex'
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex'
 	export default {
 		computed: {
 			...mapState({
@@ -89,20 +86,20 @@
 				timestamp: state => state.moduleB.timestamp
 			}),
 			...mapGetters({
-			  isLogin: 'getuserIsLogin',
-			  userInfo: 'getUserInfo'
+				isLogin: 'getuserIsLogin',
+				userInfo: 'getUserInfo'
 			})
 		},
 		data() {
 			return {}
 		},
-		onLoad(){
+		onLoad() {
 			console.log(this.isLogin);
-			if (! this.isLogin) {
+			if (!this.isLogin) {
 				uni.redirectTo({
-					url:"/pages/login/login"
+					url: "/pages/login/login"
 				})
-			}		
+			}
 		},
 		methods: {
 
@@ -123,8 +120,11 @@
 		justify-content: flex-start;
 		align-items: center;
 		padding-top: 180rpx;
+		/* #ifdef H5 */
+		padding-top: 80rpx;
+		/* #endif */
 		padding-left: 15rpx;
-		padding-bottom:25rpx;
+		padding-bottom: 25rpx;
 
 		.user-avatar {
 			width: 138rpx;
@@ -169,13 +169,8 @@
 			}
 
 			.GSimg {
-				width: 96rpx;
-				height: 96rpx;
-
-				.Image {
-					width: 96rpx;
-					height: 96rpx;
-				}
+				width: 81rpx;
+				height: 81rpx;
 			}
 
 			.GStitle {