From e6f25d1df49da04cdce9b284351d9e90c4c1a6b9 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Sat, 3 Aug 2024 09:23:49 +0800
Subject: [PATCH 1/2] 1

---
 pages/mine/addUserCard/index.js   | 41 ++++++++++++++++++++-------------------
 pages/mine/addUserCard/index.wxml |  2 +-
 pages/mine/index.wxml             |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pages/mine/addUserCard/index.js b/pages/mine/addUserCard/index.js
index 03fe0d2..bad7647 100644
--- a/pages/mine/addUserCard/index.js
+++ b/pages/mine/addUserCard/index.js
@@ -23,26 +23,27 @@ Page({
 	 * 生命周期函数--监听页面显示
 	 */
 	onShow: function () {
-		//登录=================================start
-		if (app.globalData.isLogin) {
-			this.setData({
-				isLogin: app.globalData.isLogin,
-				user: app.globalData.user,
-				card: this.subCard(app.globalData.user.idcard, 1, 1),
-				healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
-			});
-		} else {
-			// 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回
-			// 所以此处加入 callback 以防止这种情况
-			app.userLoginCallback = (res) => {
-				this.setData({
-					isLogin: app.globalData.isLogin,
-					user: app.globalData.user,
-					card: this.subCard(app.globalData.user.idcard, 1, 1),
-					healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
-				});
-			};
-		}
+    //登录=================================start
+    // debugger
+		// if (app.globalData.isLogin) {
+		// 	this.setData({
+		// 		isLogin: app.globalData.isLogin,
+		// 		user: app.globalData.user,
+		// 		card: this.subCard(app.globalData.user.idcard, 1, 1),
+		// 		healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
+		// 	});
+		// } else {
+		// 	// 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回
+		// 	// 所以此处加入 callback 以防止这种情况
+		// 	app.userLoginCallback = (res) => {
+		// 		this.setData({
+		// 			isLogin: app.globalData.isLogin,
+		// 			user: app.globalData.user,
+		// 			card: this.subCard(app.globalData.user.idcard, 1, 1),
+		// 			healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
+		// 		});
+		// 	};
+		// }
 	},
 	/**
 	 * 生命周期函数--监听页面加载
diff --git a/pages/mine/addUserCard/index.wxml b/pages/mine/addUserCard/index.wxml
index c5fc724..6d8dde3 100644
--- a/pages/mine/addUserCard/index.wxml
+++ b/pages/mine/addUserCard/index.wxml
@@ -16,7 +16,7 @@
   </navigator>
 </view>
 <view wx:else class="">
-  <navigator url="../../../pages/mine/realName1/index" class="bgsfz">
+  <navigator url="/pages/mine/realName1/index" class="bgsfz">
     <image src="//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/ghLogo.png"></image>
     <text class="ml8 f18 c3 fw500">身份证</text>
     <text class="fr f14 c3">未添加</text>
diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index 4bf46ab..73eb1b2 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -98,7 +98,7 @@
 
       <view>
         <!-- url="{{isLogin? '/pages/addUserCard/index': '/pages/login/index'}}" -->
-        <navigator url="{{isLogin? './addUserCard/index': '/pages/login/index'}}" hover-class="thover" open-type="navigate">
+        <navigator url="{{isLogin? '/pages/mine/addUserCard/index': '/pages/login/index'}}" hover-class="thover" open-type="navigate">
           <image class src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/zj911.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image>
           <view>证件</view>
         </navigator>

From 788d7151242f231784fb330eacb6798801f73598 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Sat, 3 Aug 2024 09:47:01 +0800
Subject: [PATCH 2/2] 1

---
 pages/mine/addUserCard/index.js | 60 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/pages/mine/addUserCard/index.js b/pages/mine/addUserCard/index.js
index bad7647..94a664c 100644
--- a/pages/mine/addUserCard/index.js
+++ b/pages/mine/addUserCard/index.js
@@ -7,43 +7,41 @@ Page({
 	 */
 	data: {},
 
-	subCard: function (str, frontLen, endLen) {
-		console.log(str);
-		//str：要进行隐藏的变量  frontLen: 前面需要保留几位    endLen: 后面需要保留几位
-		var len = str.length - frontLen - endLen;
-		var xing = "";
-		for (var i = 0; i != len; i++) {
-			xing += "*";
-		}
-		let res = str.substring(0, frontLen) + xing + str.substring(str.length - endLen);
-		console.log(res);
-		return res;
-	},
+	maskIdCard: function (idCard) {
+    if (!idCard || idCard.length !== 18) {
+      return "******************"; // 如果身份证号码无效，则直接返回
+    }
+    // 只显示第一位和最后一位，中间用星号替换
+    const masked = idCard.slice(0, 1) + '*'.repeat(idCard.length - 2) + idCard.slice(-1);
+    return masked;
+  },
 	/**
 	 * 生命周期函数--监听页面显示
 	 */
 	onShow: function () {
+    var that = this;
+    console.log(app.globalData)
     //登录=================================start
     // debugger
-		// if (app.globalData.isLogin) {
-		// 	this.setData({
-		// 		isLogin: app.globalData.isLogin,
-		// 		user: app.globalData.user,
-		// 		card: this.subCard(app.globalData.user.idcard, 1, 1),
-		// 		healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
-		// 	});
-		// } else {
-		// 	// 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回
-		// 	// 所以此处加入 callback 以防止这种情况
-		// 	app.userLoginCallback = (res) => {
-		// 		this.setData({
-		// 			isLogin: app.globalData.isLogin,
-		// 			user: app.globalData.user,
-		// 			card: this.subCard(app.globalData.user.idcard, 1, 1),
-		// 			healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
-		// 		});
-		// 	};
-		// }
+		if (app.globalData.isLogin) {
+			this.setData({
+				isLogin: app.globalData.isLogin,
+				user: app.globalData.user,
+				card: that.maskIdCard(app.globalData.user.idcard),
+				// healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
+			});
+		} else {
+			// 由于 userLogin 是网络请求，可能会在 Page.onLoad 之后才返回
+			// 所以此处加入 callback 以防止这种情况
+			app.userLoginCallback = (res) => {
+				this.setData({
+					isLogin: app.globalData.isLogin,
+					user: app.globalData.user,
+					card: this.maskIdCard(app.globalData.user.idcard, 1, 1),
+					// healthTime: commonUtil.formatDateYMD(app.globalData.user.healthTime),
+				});
+			};
+		}
 	},
 	/**
 	 * 生命周期函数--监听页面加载