From f02fde734aba50a4d5b5f89d88c075e6e93cb499 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 09:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/userinfo/userinfo.vue |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index 65bb981..74e4685 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -100,36 +100,35 @@
 				}
 			}
 		},
-		
-		computed: {
-			...mapState(['member'])
-		},
-		
 		components: { tlyPictureCut, QfImageCropper },
 		
 		onLoad(option) {
-			if (this.member) {
-				this.visitorData.name = this.member.name
-				this.visitorData.phone = this.member.phone
-				this.visitorData.idcardNo = this.member.idcardDecode
-				this.visitorData.companyName = this.member.visitCompanyName
-				this.visitorData.faceImg = this.member.faceImg
-				if (this.member.faceImg) {
-					this.visitorData.faceImgUrl = this.member.prefixUrl + this.member.faceImg
-				}
-				this.visitorData.imgurl = this.member.imgurl
-				if (this.member.imgurl) {
-					this.visitorData.imgurlUrl = this.member.prefixUrl + this.member.imgurl
-				}
-				this.visitorData.idcardType = this.member.idcardType
-				if (this.member.idcardType === 0) {
-					this.visitorData.idcardTypeName = '韬唤璇�'
-				} else if (this.member.idcardType === 1) {
-					this.visitorData.idcardTypeName = '娓境璇佷欢'
-				} else if (this.member.idcardType === 2) {
-					this.visitorData.idcardTypeName = '鎶ょ収'
-				}
+			const visitorData = uni.getStorageSync('visitorData')
+			if(visitorData && visitorData.name){
+				this.visitorData = visitorData
 			}
+			// if (this.member ) {
+			// 	this.visitorData.name = this.member.name
+			// 	this.visitorData.phone = this.member.phone
+			// 	this.visitorData.idcardNo = this.member.idcardDecode
+			// 	this.visitorData.companyName = this.member.visitCompanyName
+			// 	this.visitorData.faceImg = this.member.faceImg
+			// 	if (this.member.faceImg) {
+			// 		this.visitorData.faceImgUrl = this.member.prefixUrl + this.member.faceImg
+			// 	}
+			// 	this.visitorData.imgurl = this.member.imgurl
+			// 	if (this.member.imgurl) {
+			// 		this.visitorData.imgurlUrl = this.member.prefixUrl + this.member.imgurl
+			// 	}
+			// 	this.visitorData.idcardType = this.member.idcardType
+			// 	if (this.member.idcardType === 0) {
+			// 		this.visitorData.idcardTypeName = '韬唤璇�'
+			// 	} else if (this.member.idcardType === 1) {
+			// 		this.visitorData.idcardTypeName = '娓境璇佷欢'
+			// 	} else if (this.member.idcardType === 2) {
+			// 		this.visitorData.idcardTypeName = '鎶ょ収'
+			// 	}
+			// }
 			this.visitorData.userAnswerId = option.answerId || ''
 			// this.getVisit()
 			// uni.$on('update', (data) => {
@@ -182,6 +181,7 @@
 				// 		icon: 'none'
 				// 	})
 				// }
+				uni.setStorageSync('visitorData', this.visitorData)
 				uni.navigateTo({
 					url: `/pages/visitorApplication/visitorApplication?data=${JSON.stringify(this.visitorData)}`
 				});

--
Gitblit v1.9.3