From 7e622899577a6c55b65554967b8f6b0931893e4b Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 17 Oct 2023 17:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/myinformation/myinformation.vue | 15 ++++++----
 pages/register/register.vue           | 12 --------
 pagesB/AddMembers/AddMembers.vue      | 10 ++++---
 pagesB/managefamily/managefamily.scss |  2 +-
 pagesB/managefamily/managefamily.vue  | 41 +++++++++++++++++++++++----
 5 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index 0b0cd22..5533f3c 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -225,13 +225,18 @@
 			} else {
 				that.appPersonallist = null
 			}
-			// getCurrentUser(this.valueopenid).then(res => {
-			// 	console.log(res)
-			// 	this.familyList = res.data
-				
-			// })
+			this.getpersnoal()
+			
 		},
 		methods: {
+			// 获取成员
+			getpersnoal(){
+				getCurrentUser(this.valueopenid).then(res => {
+					console.log(res)
+					this.familyList = res.data
+					
+				})
+			},
 			// 切换成员
 			changeFamilyInfo(e) {
 				console.log(e,'000')
diff --git a/pages/register/register.vue b/pages/register/register.vue
index e6517ef..9715190 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -49,7 +49,6 @@
 						<text v-if="!householdRelationship">请选择与户主关系</text>
 						<text v-else class="testitem">{{householdRelationship}}</text>
 
-
 						<image src="../../static/huijiantou.png" mode=""></image>
 					</view>
 				</view>
@@ -337,17 +336,6 @@
 						message: '请输入正确的身份证号',
 						trigger: ['blur'],
 					}],
-					householdRelationship:[{
-
-						message: '请输入户主身份证号',
-						trigger: ['change', 'blur'],
-					}, {
-						validator: (rule, value, callback) => {
-							return uni.$u.test.idCard(value);
-						},
-						message: '请输入正确的身份证号',
-						trigger: ['blur'],
-					}]
 				}
 			}
 		},
diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue
index b68590b..03f59e1 100644
--- a/pagesB/AddMembers/AddMembers.vue
+++ b/pagesB/AddMembers/AddMembers.vue
@@ -336,7 +336,6 @@
 		},
 
 		onLoad(options) {
-			console.log(this.address, '546545454');
 			this.form.openid = uni.getStorageSync('openid')
 
 		},
@@ -450,7 +449,7 @@
 			background: #FFFFFF;
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 5rpx;
-			margin: 15rpx auto;
+			margin: 0 auto;
 			position: relative;
 
 			::v-deep .u-input {
@@ -492,7 +491,8 @@
 				display: flex;
 				// align-items: center;
 				// justify-content: center;
-				width: 42%;
+				// 
+				width: 47%;
 				margin: 23rpx 30rpx 0 55rpx;
 
 				color: rgb(23, 20, 22);
@@ -534,7 +534,9 @@
 				position: relative;
 				left: 50%;
 				transform: translateX(-50%);
-				top: 4%;
+				margin-top: 100rpx;
+				    bottom: 27rpx;
+				
 			}
 
 			.contentbottom {
diff --git a/pagesB/managefamily/managefamily.scss b/pagesB/managefamily/managefamily.scss
index 0f53ff2..e3e8731 100644
--- a/pagesB/managefamily/managefamily.scss
+++ b/pagesB/managefamily/managefamily.scss
@@ -41,7 +41,7 @@
 				position: relative;
 
 				.identityname {
-					width: 100rpx;
+					// width: 100rpx;
 					height: 40rpx;
 					line-height: 40rpx;
 					text-align: center;
diff --git a/pagesB/managefamily/managefamily.vue b/pagesB/managefamily/managefamily.vue
index fd108ae..d0ca01b 100644
--- a/pagesB/managefamily/managefamily.vue
+++ b/pagesB/managefamily/managefamily.vue
@@ -1,21 +1,34 @@
 <template>
 	<view class="app">
 		<view class="forlist">
-			<view class="item" @tap='gofamilymemberdetail'>
+			<view class="item" @tap='gofamilymemberdetail' v-for="item in familyList">
 				<view class="namesigning">
 					<span class="name">
-						张三
+						{{item.patientName}}
 					</span>
 					<view class="signing">
-						未签约
+						{{}}
 					</view>
 				</view>
 				<view class="card">
-					37029828873746473
+					{{item.cardNo}}
 				</view>
 				<view class="border"></view>
 				<view class="identityname">
-					户主
+					{{item.householdRelationship=='1'?"户主本人":''}}
+					{{item.householdRelationship=='2'?"配偶":''}}
+					{{item.householdRelationship=='3'?"子女":''}}
+					{{item.householdRelationship=='4'?"(外)孙子女":''}}
+					{{item.householdRelationship=='5'?"父母":''}}
+					{{item.householdRelationship=='6'?"(外)祖父母":''}}
+					{{item.householdRelationship=='7'?"兄弟姐妹":''}}
+					{{item.householdRelationship=='8'?"儿媳":''}}
+					{{item.householdRelationship=='9'?"女婿":''}}
+					{{item.householdRelationship=='10'?"孙子女":''}}
+					{{item.householdRelationship=='11'?"侄子女":''}}
+					{{item.householdRelationship=='12'?"曾孙子女":''}}
+					{{item.householdRelationship=='13'?"祖父母":''}}
+					{{item.householdRelationship=='99'?"其他":''}}
 				</view>
 			</view>
 		</view>
@@ -31,13 +44,31 @@
 </template>
 
 <script>
+	import {
+		getCurrentUser,
+	
+	} from '@/api/pages/myinformation/myinformation.js';
 	export default {
 		data() {
 			return {
+				familyList:{}
 
 			};
 		},
+		onShow(){
+			this.valueopenid = uni.getStorageSync('openid');
+			this.getpersnoal()
+			
+		},
 		methods: {
+			// 获取成员
+			getpersnoal(){
+				getCurrentUser(this.valueopenid).then(res => {
+					console.log(res)
+					this.familyList = res.data
+					
+				})
+			},
 			// 添加家庭成员
 			add(){
 				uni.navigateTo({