From 683172055713bba0e1a41be94dc506abee2a9190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Thu, 22 Apr 2021 17:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ucenter/ucenter.vue                     | 19 ++-----------------
 .../uni-id-users/pages/uni-id-users/edit.vue  | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index a073caf8..e4e0ec3b 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -110,9 +110,6 @@
 			// #endif
 		},
 		methods: {
-			...mapMutations({
-				logout: 'user/logout'
-			}),
 			toSettings() {
 				uni.navigateTo({
 					url: "/pages/ucenter/settings/settings"
@@ -130,20 +127,8 @@
 				console.log(await callCheckVersion());
 				checkUpdate()
 			},
-			goLogin() {
-				if (!this.login) {
-					console.log('点击前往登录');
-					uni.navigateTo({
-						url: '/uni_modules/uni-login-page/pages/index/index'
-					});
-				} else {
-					console.log('点击编辑信息');
-					uni.navigateTo({
-						url: './edit/edit'
-					})
-				}
-			},
-			tapGrid(index) {
+			tapGrid(index) {
+				console.log(this.userInfo);
 				uni.showToast({
 					title: '你点击了，第' + (index + 1) + '个',
 					icon: 'none'
diff --git a/uni_modules/uni-id-users/pages/uni-id-users/edit.vue b/uni_modules/uni-id-users/pages/uni-id-users/edit.vue
index eaf387d1..ac48d9a1 100644
--- a/uni_modules/uni-id-users/pages/uni-id-users/edit.vue
+++ b/uni_modules/uni-id-users/pages/uni-id-users/edit.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="uni-container">
 		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
-			<uni-list-item>
-				<template v-slot:body>
+			<uni-forms-item name="avatar">
+				<template>
 					<view class="avatar-box">
 						<image class="avatar-img" :src="formData.avatar || '/static/uni-center/logo.png'" @click="chooseImg" mode="aspectFill"></image>
 					</view>
 				</template>
-			</uni-list-item>
+			</uni-forms-item>
 			<uni-forms-item name="gender" label="性别" required>
 				<uni-data-checkbox v-model="formData.gender" :localdata="formOptions.gender_localdata" />
 			</uni-forms-item>
@@ -29,7 +29,8 @@
 		validator
 	} from '../../js_sdk/validator/uni-id-users.js';
 	import {
-		mapMutations
+		mapMutations,
+		mapGetters
 	} from 'vuex';
 	const db = uniCloud.database();
 	const dbCollectionName = 'uni-id-users';
@@ -71,10 +72,14 @@
 					...getValidator(["avatar", "gender", "nickname"])
 				}
 			}
+		},
+		computed:{
+			...mapGetters({
+				userInfo:'user/info'
+			})
 		},
 		onLoad(e) {
-			let id = "60795c140983f8000192f235";
-			id = uni.getStorageSync('uni_id_uid');
+			let id = uni.getStorageSync('uni_id_uid') || this.userInfo._id;
 			this.formDataId = id
 			this.getDetail(id)
 		},
@@ -138,7 +143,6 @@
 						title: '修改成功'
 					})
 					this.setUserInfo(value);
-					// this.getOpenerEventChannel().emit('refreshData')
 					setTimeout(() => uni.navigateBack(), 500)
 				}).catch((err) => {
 					uni.showModal({
-- 
GitLab