提交

compontent/public/exit.vue

@@ -40,10 +40,11 @@
 	}
 	const go = () => {
 		if(props.cont=='是否退出登录？'){
-			uni.clearStorage()
-			uni.reLaunch({
-				url:'/pages/login/index'
-			})
+			// uni.clearStorage()
+			wx.exitMiniProgram()
+			// uni.reLaunch({
+			// 	url:'/pages/login/index'
+			// })
 		}else{
 			emit('go');
 		}

pages/addjigou/all.vue

@@ -189,7 +189,7 @@
 	
 	const headImge0 = ref("");
 	
-	const nameArray0 = ["企业名称", "注册地址", "信用代码", "法人"];
+	const nameArray0 = ["机构名称", "注册地址", "信用代码", "法人"];
 	const textArray0 = reactive(["", "", "", "", "", "", ""]);
 	
 	const nameArray1 = ["机构位置","详细地址","机构负责人", "负责人电话", "房屋性质","建筑面积"];
@@ -503,7 +503,7 @@
 	.shu-img{
 		position: absolute;
 		right: 20rpx;
-		top: 45%;
+		top: 50%;
 		transform: translateY(-40%);
 		width: 130rpx;
 		height: 114rpx;

pages/addjigou/card.vue

@@ -81,7 +81,7 @@
 	const show = ref(false);
 	const content = ref("");
 
-	const nameArray = ["企业名称", "注册地址", "信用代码", "法人"];
+	const nameArray = ["机构名称", "注册地址", "信用代码", "法人"];
 	const textArray = reactive(["", "", "", ""]);
 	const bottomlist = [{
 		text: '拍照',

pages/addjigou/name.vue

@@ -400,7 +400,9 @@
 			show.value = true
 		}
 	}
-
+	function isValid18DigitNumber(val) {
+		return /^(\d{18})$/.test(val);
+	}
 	const next = () => {
 		if (!fontphoto.value) {
 			uni.showToast({
@@ -415,6 +417,12 @@
 			})
 			return
 		}
+		if(!isValid18DigitNumber(textArray[2])) {
+				uni.showToast({
+					title: '身份证号格式错误',
+					icon: 'none'
+				})
+			}
 		const allNonEmpty = textArray.every(item => {
 			// 如果想忽略前后空格，可用 item.trim() !== ''
 			return item !== '';

pages/addoldman/oldIDcard.vue

@@ -564,6 +564,7 @@
 			})
 			return
 		}
+		
 		if (!fontphoto.value) {
 			uni.showToast({
 				title: '请上传长者身份证人像面',
@@ -589,6 +590,12 @@
 				})
 				return
 			}
+		if(!isValid18DigitNumber(textArray[2])) {
+				uni.showToast({
+					title: '长者身份证号格式错误',
+					icon: 'none'
+				})
+			}	return
 
 		if (canshow.value) {
 			if (!form.name) {

pages/addstaff/IDcard.vue

@@ -203,6 +203,9 @@
 			return `${y}.${m}.${d}`;
 		});
 	}
+	function isValid18DigitNumber(val) {
+		return /^(\d{18})$/.test(val);
+	}
 
 	function toIsoDate(dateStr) {
 		return dateStr.replace(
@@ -412,7 +415,12 @@
 		if (!uping.value) {
 			return
 		}
-
+		if(!isValid18DigitNumber(textArray[2])) {
+			uni.showToast({
+				title: '身份证号格式错误',
+				icon: 'none'
+			})
+		}
 		if (allNonEmpty) {
 			const range = textArray[7];
 			const [start, end] = range.split('-');

pages/addstaff/all.vue

@@ -667,7 +667,7 @@
 	.shu-img {
 		position: absolute;
 		right: 20rpx;
-		top: 45%;
+		top: 40%;
 		transform: translateY(-40%);
 		width: 130rpx;
 		height: 114rpx;

pages/addsupplier/all.vue

@@ -488,7 +488,7 @@
 	.shu-img {
 		position: absolute;
 		right: 20rpx;
-		top: 45%;
+		top: 38%;
 		transform: translateY(-40%);
 		width: 130rpx;
 		height: 114rpx;

pages/oldmanindex/saoyisaothen.vue

@@ -142,6 +142,7 @@
 			background-color: #fff;
 			position: relative;
 			padding: 50rpx;
+			margin-top: 30rpx;
 
 			.white-title {
 				font-size: 32rpx;