From 1d507ee53ad4850e1f20aaf1b5e298d2d425f20b Mon Sep 17 00:00:00 2001
From: YangWork <yang@xixingwl.cn>
Date: Sat, 11 Feb 2023 18:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20Signed-off-by:=20YangWork=20<yang@xixingwl.cn>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                    |  66 +++++++++++++++--
 pages/tabbar/home/home.vue | 146 +++++++++++++------------------------
 pages/tabbar/my/my.vue     |  53 ++------------
 store/modules/user.js      |   3 +
 4 files changed, 120 insertions(+), 148 deletions(-)

diff --git a/App.vue b/App.vue
index be1b481..32e1062 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,8 @@
 <script>
-	import {mapState,mapMutations} from 'vuex'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
 	export default {
 		onLaunch: function() {
 			let that = this;
@@ -11,8 +14,10 @@
 					if (resLogin.errMsg === "login:ok") {
 						// 获取jsCode成功，通过jsCode调用微信api获取用户openId
 						console.log(resLogin)
-						that.$ajax("Demo/test",{code:resLogin.code})
-							.then(res=>{
+						that.$ajax("Demo/test", {
+								code: resLogin.code
+							})
+							.then(res => {
 								console.log(res)
 								if (res.code == 1) {
 									that.saveOpenIdSession(res.data)
@@ -40,13 +45,13 @@
 
 			})
 		},
-		methods:{
+		methods: {
 			...mapMutations(['saveOpenIdSession'])
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	/* #ifndef APP-PLUS-NVUE */
 	/* uni.css - 通用组件、模板样式库，可以当作一套ui库应用 */
 	@import './common/uni.css';
@@ -69,6 +74,7 @@
 		background-color: #F5F5F5 !important;
 		min-height: 100% !important;
 		height: auto !important;
+		background: linear-gradient(to bottom right, pink, #a900ff7a, pink);
 	}
 
 	.uni-top-window uni-tabbar .uni-tabbar {
@@ -121,4 +127,54 @@
 	}
 
 	/* #endif*/
+
+	.warp {
+		margin: 10rpx 15rpx;
+	}
+
+	.Grid {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		align-content: space-between;
+		background: #f7f7f7;
+		border-radius: 15rpx;
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+
+		.Grid-Item {
+			width: 25%;
+
+			.Grid-Item-1 {
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				text-align: center;
+				border: 1rpx solid #efeded;
+				border-radius: 25rpx;
+				box-sizing: border-box;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-around;
+				flex-direction: column;
+				align-items: center;
+				padding-top: 20rpx;
+				padding-bottom: 5rpx;
+				background-color: #fff;
+			}
+
+			.GSimg {
+				width: 81rpx;
+				height: 81rpx;
+			}
+
+			.GStitle {
+				width: 100%;
+				height: 34rpx;
+				line-height: 34rpx;
+				color: #06121e;
+				font-size: 24rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 6fa963f..066b40e 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -1,36 +1,56 @@
 <template>
-	<view class="warp">
-		<uni-search-bar @confirm="search" v-model="searchValue" @input="input" clearButton="always" cancelButton="none"
-			@clear="scan">
-			<template v-slot:clearIcon>
-				<uni-icons color="#999999" size="18" type="scan" />
-			</template>
-		</uni-search-bar>
-		<!-- 个人中心页方格列表数据 -->
-		<view class="Grid">
-			<view class="Grid-Item" v-for="item in List" :key="item.id">
-				<view class="GSimg">
-					<image class="Image" :src="item.img"></image>
-				</view>
-				<view class="GStitle">{{ item.title }}</view>
-			</view>
-		</view>
-		<view class="MsgList">
-			<view class="MlSon" v-for="item in List1" :key="item.id">
-				<view class="MlSonvBox">
-					<view class="SonOfImg">
-						<image class="Img" :src="item.img"></image>
+	<view>
+		<view class="warp">
+			<uni-search-bar @confirm="search" v-model="searchValue" @input="input" clearButton="always"
+				cancelButton="none" @clear="scan">
+				<template v-slot:clearIcon>
+					<uni-icons color="#999999" size="18" type="scan" />
+				</template>
+			</uni-search-bar>
+			<!-- 个人中心页方格列表数据 -->
+			<view class="Grid">
+				<view class="Grid-Item">
+					<view class="Grid-Item-1">
+						<image class="GSimg" src="../../../static/logo.png"></image>
+						<view class="GStitle">测试功能</view>
 					</view>
-					<view class="SonOfName">
-						<view class="SNTop">
-							{{item.title}}
+				</view>
+				<view class="Grid-Item">
+					<view class="Grid-Item-1">
+						<image class="GSimg" src="../../../static/logo.png"></image>
+						<view class="GStitle">测试功能</view>
+					</view>
+				</view>
+				<view class="Grid-Item">
+					<view class="Grid-Item-1">
+						<image class="GSimg" src="../../../static/logo.png"></image>
+						<view class="GStitle">测试功能</view>
+					</view>
+				</view>
+				<view class="Grid-Item">
+					<view class="Grid-Item-1">
+						<image class="GSimg" src="../../../static/logo.png"></image>
+						<view class="GStitle">测试功能</view>
+					</view>
+				</view>
+			</view>
+			<view class="MsgList">
+				<view class="MlSon" v-for="item in List1" :key="item.id">
+					<view class="MlSonvBox">
+						<view class="SonOfImg">
+							<image class="Img" :src="item.img"></image>
 						</view>
-						<view class="SNBom">
-							<view class="SBleft">
-								左边信息
+						<view class="SonOfName">
+							<view class="SNTop">
+								{{item.title}}
 							</view>
-							<view class="SBright">
-								右边信息
+							<view class="SNBom">
+								<view class="SBleft">
+									左边信息
+								</view>
+								<view class="SBright">
+									右边信息
+								</view>
 							</view>
 						</view>
 					</view>
@@ -45,27 +65,6 @@
 		data() {
 			return {
 				searchValue: '123123',
-				List: [{
-						id: 1,
-						img: '../../../static/logo.png',
-						title: '九宫格布局1'
-					},
-					{
-						id: 2,
-						img: '../../../static/logo.png',
-						title: '九宫格布局2'
-					},
-					{
-						id: 3,
-						img: '../../../static/logo.png',
-						title: '九宫格布局3'
-					},
-					{
-						id: 4,
-						img: '../../../static/logo.png',
-						title: '九宫格布局4'
-					}
-				],
 				List1: [{
 						id: 1,
 						img: '../../../static/logo.png',
@@ -150,54 +149,9 @@
 </script>
 
 <style lang="scss">
-	.Grid {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		align-content: space-between;
-		background: #f7f7f7;
-		padding: 10rpx 15rpx;
-
-		.Grid-Item {
-			width: 25%;
-			text-align: center;
-			border: 1rpx solid #ccc;
-			box-sizing: border-box;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			flex-direction: column;
-			align-items: center;
-			padding-top: 15rpx;
-			padding-bottom: 15rpx;
-
-			.GSimg {
-				width: 96rpx;
-				height: 96rpx;
-
-				.Image {
-					width: 96rpx;
-					height: 96rpx;
-				}
-			}
-
-			.GStitle {
-				width: 100%;
-				height: 34rpx;
-				line-height: 34rpx;
-				color: #06121e;
-				font-size: 24rpx;
-				margin-top: 20rpx;
-			}
-		}
-	}
-
 	$max:100%;
 
-	.MsgList {
-		width: 92%;
-		margin-left: 4%;
-		max-width: 690rpx;
+	.MsgList {   
 		height: auto;
 
 		.MlSon {
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 0a61972..dbd4b74 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -1,7 +1,6 @@
 <template>
-	<view>
-		<page-head title="view"></page-head>
-		<view class="warp" style="margin: 10rpx 15rpx;">
+	<view> 
+		<view class="warp warp1" style="">
 			<view class="user" style="">
 				<image class="user-avatar" mode="aspectFit" :src="userInfo.avatar"
 					style="background-image: ../../../static/avatar.png;"></image>
@@ -113,6 +112,7 @@
 </script>
 
 <style lang="scss">
+	.warp1{ }
 	.user {
 		box-sizing: border-box;
 		display: flex;
@@ -125,7 +125,9 @@
 		/* #endif */
 		padding-left: 15rpx;
 		padding-bottom: 25rpx;
-
+		// background-image: url(/static/user/back.jpg);
+		// background-size: 100% 100%;
+		// background: linear-gradient(pink,#a900ff7a, pink);
 		.user-avatar {
 			width: 138rpx;
 			height: 138rpx;
@@ -140,47 +142,4 @@
 			padding-left: 45rpx;
 		}
 	}
-
-	.Grid {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		align-content: space-between;
-		background: #f7f7f7;
-
-		.Grid-Item {
-			width: 25%;
-
-			.Grid-Item-1 {
-				margin-left: 10rpx;
-				margin-right: 10rpx;
-				text-align: center;
-				border: 1rpx solid #efeded;
-				border-radius: 25rpx;
-				box-sizing: border-box;
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: space-around;
-				flex-direction: column;
-				align-items: center;
-				padding-top: 20rpx;
-				padding-bottom: 5rpx;
-				background-color: #fff;
-			}
-
-			.GSimg {
-				width: 81rpx;
-				height: 81rpx;
-			}
-
-			.GStitle {
-				width: 100%;
-				height: 34rpx;
-				line-height: 34rpx;
-				color: #06121e;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-			}
-		}
-	}
 </style>
diff --git a/store/modules/user.js b/store/modules/user.js
index cb4702d..da7c6d7 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -31,6 +31,9 @@ export default {
 			return state.openId;
 		},
 		getUserInfo(state){
+			let userinfo = state.userinfo;
+			if ( userinfo.avatar=== "undefined" || userinfo.avatar=== "null" || userinfo.avatar=== "") 
+				userinfo.avatar = "/static/avatar1.png"
 			return state.userinfo;
 		}
 	},