From 3ea011d565ef7b6f303b6dc0cf7f8e27770567ad Mon Sep 17 00:00:00 2001
From: YangWork <yang@xixingwl.cn>
Date: Fri, 17 Feb 2023 18:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: YangWork <yang@xixingwl.cn>
---
 App.vue                    |  3 +--
 common/ajax.js             |  2 +-
 member/profile/profile.vue | 44 +++++++++++++++-----------------------
 pages/tabbar/home/home.vue |  3 ++-
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/App.vue b/App.vue
index ec1fd2a..5ea5f17 100644
--- a/App.vue
+++ b/App.vue
@@ -70,8 +70,7 @@
 		    right: 0;
 		} */
 
-	uni-page-body {
-		background-color: #F5F5F5 !important;
+	uni-page-body { 
 		min-height: 100% !important;
 		height: auto !important;
 		background: linear-gradient(to bottom right, pink, #a900ff7a, pink);
diff --git a/common/ajax.js b/common/ajax.js
index 09a3c78..a041ac3 100644
--- a/common/ajax.js
+++ b/common/ajax.js
@@ -29,7 +29,7 @@ instance.interceptors.response.use(
 	response => {
 		if (response.statusCode == 200) {
 			let res = response.data;
-			if (res.hasOwnProperty('token'))
+			if (res.hasOwnProperty('token') && res.token!= "")
 				uni.setStorageSync('token', res.token);
 			return response.data
 		}
diff --git a/member/profile/profile.vue b/member/profile/profile.vue
index 11c3750..fcb6721 100644
--- a/member/profile/profile.vue
+++ b/member/profile/profile.vue
@@ -39,8 +39,8 @@
 				<uni-forms-item label="家乡" name="hometown">
 					<uni-data-picker v-model="formData.hometown" popup-title="请选择班级" :readonly="isDisabled"></uni-data-picker>
 				</uni-forms-item>
-				<uni-forms-item label="简介" name="introduction">
-					<uni-easyinput type="textarea" v-model="formData.introduction" placeholder="请输入自我介绍"
+				<uni-forms-item label="简介" name="intro">
+					<uni-easyinput type="textarea" v-model="formData.intro" placeholder="请输入自我介绍"
 						:disabled="isDisabled" />
 				</uni-forms-item>
 
@@ -66,7 +66,13 @@
 	</view>
 </template>
 <script>
+	import {mapGetters} from 'vuex'
 	export default {
+		computed: {
+			...mapGetters({
+				userInfo: 'getUserInfo'
+			})
+		},
 		data() {
 			return {
 				isDisabled: true,
@@ -82,7 +88,7 @@
 					job:"",
 					company:"",
 					hometown:"", 
-					introduction: '',
+					intro: '',
 					income:"",
 					marriage:"",
 					house:"",  
@@ -158,27 +164,6 @@
 							format: 'number',
 							errorMessage: '年龄只能输入数字'
 						}]
-					}
-				},
-				// 自定义表单数据
-				customFormData: {
-					name: '',
-					age: '',
-					hobby: []
-				},
-				// 自定义表单校验规则
-				customRules: {
-					name: {
-						rules: [{
-							required: true,
-							errorMessage: '姓名不能为空'
-						}]
-					},
-					age: {
-						rules: [{
-							required: true,
-							errorMessage: '年龄不能为空'
-						}]
 					},
 					hobby: {
 						rules: [{
@@ -198,11 +183,17 @@
 				}
 			}
 		},
-		onLoad() {},
+		
+		
 		onReady() {
 			// 设置自定义表单校验规则，必须在节点渲染完毕后执行
 			//this.$refs.customForm.setRules(this.customRules)
 		},
+		onLoad(){
+			this.$ajax("/User/profile",{uid: this.userInfo.uid}).then(res=>{
+				console.log(res);
+			})
+		},
 		methods: {
 			editTrue(){
 				this.isDisabled = false;
@@ -231,8 +222,7 @@
 	}
 
 	.example {
-		padding: 15px;
-		background-color: #fff;
+		padding: 15px; 
 		background-color: transparent;
 	}
 
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index a3363da..6595831 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -1253,7 +1253,8 @@
 				display: flex;
 				justify-content: space-around;
 				background: #fff;
-				border: 1px solid red;
+				border: 1px solid fff;
+				border-radius: 25rpx;
 				margin-top: 10px;
 
 				.SonOfImg {