From a0c54b7d99a2585431e030ff49cfd2a44bc7fe12 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 30 Oct 2023 14:56:03 +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

---
 api/pages/myinformation/myinformation.js |  6 ++---
 pages/myinformation/myinformation.vue    |  4 +--
 pagesB/managefamily/managefamily.vue     | 31 ++++++++++++------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/api/pages/myinformation/myinformation.js b/api/pages/myinformation/myinformation.js
index 9ffd2b7..ff16787 100644
--- a/api/pages/myinformation/myinformation.js
+++ b/api/pages/myinformation/myinformation.js
@@ -37,12 +37,12 @@ export function registerdata(data) {
 	})
 }
 // 获取当前注册居民
-export function getCurrentUser(openid, cityCode) {
+export function getCurrentUser(openid) {
 	return request({
-		url: `/applet/register/getCurrentResident/${openid}/${cityCode}`,
+		url: `/applet/register/getList/${openid}`,
 		method: 'GET',
 		header: {
-			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			// Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
 	})
 }
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index c2ac30e..19bdd42 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -256,8 +256,8 @@
 				}
 			},
 			// 获取成员
-			getpersnoal() {
-				getCurrentUser(this.valueopenid, this.cityCode).then(res => {
+			getpersnoal() {	
+				getCurrentUser(this.valueopenid).then(res => {
 					this.familyList = res.data
 				})
 			},
diff --git a/pagesB/managefamily/managefamily.vue b/pagesB/managefamily/managefamily.vue
index 42a1f47..4fdb238 100644
--- a/pagesB/managefamily/managefamily.vue
+++ b/pagesB/managefamily/managefamily.vue
@@ -14,7 +14,7 @@
 					{{item.cardNo}}
 				</view>
 				<view class="border"></view>
-				<view class="identityname">
+				<view class="identityname" v-if="item.householdRelationship">
 					{{item.householdRelationship=='1'?"户主本人":''}}
 					{{item.householdRelationship=='2'?"配偶":''}}
 					{{item.householdRelationship=='3'?"子女":''}}
@@ -46,19 +46,20 @@
 <script>
 	import {
 		getCurrentUser,
-	
+
 	} from '@/api/pages/myinformation/myinformation.js';
 	export default {
 		data() {
 			return {
-				familyList:{}
+				familyList:{},
+				valueopenid:'',
 
 			};
 		},
 		onShow(){
 			this.valueopenid = uni.getStorageSync('openid');
 			this.getpersnoal()
-			
+
 		},
 		methods: {
 			// 获取成员
@@ -66,7 +67,7 @@
 				getCurrentUser(this.valueopenid).then(res => {
 					console.log(res)
 					this.familyList = res.data
-					
+
 				})
 			},
 			// 添加家庭成员
@@ -84,16 +85,16 @@
 				})
 			}
 		},
-		onReachBottom() { //下滑加载
-			if (this.couponlist.length >= this.total) {} else {
-				this.pageNum++;
-				selectCoupon(this.pageNum, this.pageSize, this.patientId, this.couponstatus).then(res => {
-					res.rows.forEach(e => {
-						this.couponlist.push(e)
-					})
-				})
-			}
-		},
+		// onReachBottom() { //下滑加载
+		// 	if (this.couponlist.length >= this.total) {} else {
+		// 		this.pageNum++;
+		// 		selectCoupon(this.pageNum, this.pageSize, this.patientId, this.couponstatus).then(res => {
+		// 			res.rows.forEach(e => {
+		// 				this.couponlist.push(e)
+		// 			})
+		// 		})
+		// 	}
+		// },
 		onPullDownRefresh() { //下拉刷新
 			this.pageNum = 1;
 			this.getlist();