From 34bbe788b4fba6b66f76388e8dcb3c7be7103918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 10 May 2023 10:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/information/information.vue     | 85 ++++++++++++++++-----------
 pages/modifyAddress/modifyAddress.vue |  1 +
 2 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/pages/information/information.vue b/pages/information/information.vue
index 83feaa0..a73c6f6 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -113,6 +113,9 @@
 </template>
 
 <script>
+	import {
+		AppIdentification
+	} from '@/api/AppIdentification/index.js'
 	import {
 		getRegionAndStreetInfo,
 		getNurseType,
@@ -202,27 +205,47 @@
 									type: 'error'
 								})
 							} else {
-								information(that.query).then(res => {
-									if (res.code == 200) {
-										uni.removeStorageSync('invitationPatientId');
-										that.$refs.uToast.show({
-											title: '完善信息成功',
-											type: 'success',
-											duration: '1500'
-										})
-										if (that.timer) {
-											clearTimeout(that.timer)
-										}
-										that.timer = setTimeout(e => {
-											uni.navigateBack({
-												delta: 1
+								const patientId = uni.getStorageSync('patientId');
+								AppIdentification(patientId).then(resp => {
+									if (resp.code == 200) {
+										if (res.data.loginFlag) {
+											that.$refs.uToast.show({
+												title: '您已完善',
+												type: 'success',
 											})
-										}, 1500)
-									} else if (res.code == 500) {
-										that.$refs.uToast.show({
-											title: res.msg,
-											type: 'error',
-										})
+											if (that.timer) {
+												clearTimeout(that.timer)
+											}
+											that.timer = setTimeout(e => {
+												uni.navigateBack({
+													delta: 1
+												})
+											}, 1500)
+										} else {
+											information(that.query).then(res => {
+												if (res.code == 200) {
+													uni.removeStorageSync('invitationPatientId');
+													that.$refs.uToast.show({
+														title: '完善信息成功',
+														type: 'success',
+														duration: '1500'
+													})
+													if (that.timer) {
+														clearTimeout(that.timer)
+													}
+													that.timer = setTimeout(e => {
+														uni.navigateBack({
+															delta: 1
+														})
+													}, 1500)
+												} else if (res.code == 500) {
+													that.$refs.uToast.show({
+														title: res.msg,
+														type: 'error',
+													})
+												}
+											})
+										}
 									}
 								})
 							}
@@ -294,20 +317,16 @@
 			},
 			// 三级地址联动回调
 			getpickerParentValue(e) {
+				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
 				this.addresslength = e
-				if (e.length == 4) {
-					this.address = e[0].localName + e[1].localName + e[2].localName + e[3]
-						.localName
-					this.query.areaCode = e[3].id
-				} else if (e.length == 3) {
-					this.address = e[0].localName + e[1].localName + e[2].localName
-					this.query.areaCode = e[2].id
-				} else if (e.length == 2) {
-					this.address = e[0].localName + e[1].localName
-					this.query.areaCode = e[1].id
-				} else if (e.length == 1) {
-					this.address = e[0].localName
-					this.query.areaCode = e[0].id
+				this.address = ''
+				this.query.areaCode = ''
+				if (e && e.length >= 1) {
+					e.forEach(el => {
+						this.address = this.address + el.localName
+					})
+					this.query.areaCode = e[e.length - 1].id
 				} else {
 					this.address = ''
 					this.query.areaCode = ''
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index c9e89dd..2488fd6 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -167,6 +167,7 @@
 			// 三级地址联动回调
 			getpickerParentValue(e) {
 				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
 				this.addresslength = e
 				this.infolist.address = ''
 				this.infolist.areaCode = ''