From 2e63fd90d9bf2e7a98dfa83b3d1593b80dbef89d Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 2 Mar 2026 16:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
compontent/public/downmenu.vue | 2 +-
compontent/public/gongyingshnagdownmenu.vue | 2 +-
compontent/public/oldmandownmenu.vue | 2 +-
compontent/public/yuangongdownmenu.vue | 2 +-
pages/addoldman/oldIDcard.vue | 26 ++++++++++++++-------
pages/addstaff/IDcard.vue | 2 +-
pages/addstaff/successpush.vue | 2 +-
pages/addsupplier/successpush.vue | 2 +-
pages/index/index.vue | 2 +-
pages/login/specialsmall.vue | 2 +-
pages/oldmanindex/oldmansuccess.vue | 4 ++--
pages/yuangongindex/index.vue | 2 +-
12 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/compontent/public/downmenu.vue b/compontent/public/downmenu.vue
index 765a3c7..7186cba 100644
--- a/compontent/public/downmenu.vue
+++ b/compontent/public/downmenu.vue
@@ -143,6 +143,6 @@
}
.bottom-text {
- margin-top: -15rpx;
+ margin-top: -8rpx;
}
\ No newline at end of file
diff --git a/compontent/public/gongyingshnagdownmenu.vue b/compontent/public/gongyingshnagdownmenu.vue
index bcfb4a0..e3b3a16 100644
--- a/compontent/public/gongyingshnagdownmenu.vue
+++ b/compontent/public/gongyingshnagdownmenu.vue
@@ -143,6 +143,6 @@
}
.bottom-text {
- margin-top: -15rpx;
+ margin-top: -8rpx;
}
\ No newline at end of file
diff --git a/compontent/public/oldmandownmenu.vue b/compontent/public/oldmandownmenu.vue
index f8b1b13..84b2003 100644
--- a/compontent/public/oldmandownmenu.vue
+++ b/compontent/public/oldmandownmenu.vue
@@ -143,6 +143,6 @@
}
.bottom-text {
- margin-top: -15rpx;
+ margin-top: -8rpx;
}
\ No newline at end of file
diff --git a/compontent/public/yuangongdownmenu.vue b/compontent/public/yuangongdownmenu.vue
index b0a0ee3..2161492 100644
--- a/compontent/public/yuangongdownmenu.vue
+++ b/compontent/public/yuangongdownmenu.vue
@@ -143,6 +143,6 @@
}
.bottom-text {
- margin-top: -15rpx;
+ margin-top: -8rpx;
}
\ No newline at end of file
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index 05e62b3..8e05aca 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -118,7 +118,7 @@
医保类型
-
@@ -127,7 +127,7 @@
value-name="value" @confirm="confirmmarry">
失能等级
-
@@ -375,22 +375,30 @@
} else if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.back) {
let father = JSON.parse(JSON.parse(uploadRes.data).result.data).data.back.data;
let regex = /[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/;
- if(!regex.test(father.validPeriod)||father.validPeriod.indexOf('长期')){
+ console.log(regex.test(father.validPeriod))
+ if(!regex.test(father.validPeriod)){
textArray[6] = father.issueAuthority;
textArray[7] = father.validPeriod;
backImge.value = filePath;
savephoto(filePath, 1);
}else{
- uni.showToast({
- title: '识别失败',
- icon: 'none',
- duration: 2000
- })
+ if(father.validPeriod.indexOf('长期')>-1){
+ textArray[6] = father.issueAuthority;
+ textArray[7] = father.validPeriod;
+ backImge.value = filePath;
+ }else{
+ textArray[7] = "";
+ uni.showToast({
+ title: '识别失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
uping.value = true;
return
}
-
+ uni.hideLoading()
} else {
uni.hideLoading()
uni.showToast({
diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue
index 57de3ce..cae8a6b 100644
--- a/pages/addstaff/IDcard.vue
+++ b/pages/addstaff/IDcard.vue
@@ -13,7 +13,7 @@
入职登记表
-
+
diff --git a/pages/addstaff/successpush.vue b/pages/addstaff/successpush.vue
index 97cf3fa..ae7dced 100644
--- a/pages/addstaff/successpush.vue
+++ b/pages/addstaff/successpush.vue
@@ -8,7 +8,7 @@
:src="`https://www.focusnu.com/media/directive/index/jumpImge/yuangongruzhu.png`" />
- {{ uni.getStorageSync('isstaffchange') ? '变更信息已提交' : '提交成功' }}
+ 提交成功
diff --git a/pages/addsupplier/successpush.vue b/pages/addsupplier/successpush.vue
index d155718..fb563f1 100644
--- a/pages/addsupplier/successpush.vue
+++ b/pages/addsupplier/successpush.vue
@@ -8,7 +8,7 @@
:src="`https://www.focusnu.com/media/directive/index/jumpImge/yuangongruzhu.png`" />
- {{ uni.getStorageSync('isstaffchange') ? '变更信息已提交' : '提交成功' }}
+ 提交成功
diff --git a/pages/index/index.vue b/pages/index/index.vue
index af4210b..2d9f626 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -966,7 +966,7 @@
.fuwu-button-bottom {
width: 100%;
height: 50%;
- margin-top: -15rpx;
+ margin-top: -8rpx;
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/pages/login/specialsmall.vue b/pages/login/specialsmall.vue
index 46e2a1e..d71b8de 100644
--- a/pages/login/specialsmall.vue
+++ b/pages/login/specialsmall.vue
@@ -3,7 +3,7 @@
- {{ uni.getStorageSync('isstaffchange') ? '变更信息已提交' : '提交成功' }}
+ 提交成功
尊敬的用户，您的机构{{ uni.getStorageSync('isstaffchange') ? `变更`:`加盟` }}申请已成功提交,请耐心等待审核结果！
diff --git a/pages/oldmanindex/oldmansuccess.vue b/pages/oldmanindex/oldmansuccess.vue
index 4bb9840..14eda73 100644
--- a/pages/oldmanindex/oldmansuccess.vue
+++ b/pages/oldmanindex/oldmansuccess.vue
@@ -4,10 +4,10 @@
- {{ uni.getStorageSync('isstaffchange') ? '变更信息已提交' : '提交成功' }}
+ 提交成功
- 尊敬的用户，您已成功{{ ischange? '修改':"添加" }}{{ isjianhu?`监护人`: `长者` }}信息{{ ischange? ',请等待机构审核':"" }}
+ 尊敬的用户，您已成功{{ uni.getStorageSync('isstaffchange') ? '修改':"添加" }}{{ isjianhu?`监护人`: `长者` }}信息{{ uni.getStorageSync('isstaffchange') ? ',请等待机构审核':"" }}
diff --git a/pages/yuangongindex/index.vue b/pages/yuangongindex/index.vue
index ef308ff..1be959e 100644
--- a/pages/yuangongindex/index.vue
+++ b/pages/yuangongindex/index.vue
@@ -1126,7 +1126,7 @@
.fuwu-button-bottom {
width: 100%;
height: 50%;
- margin-top: -15rpx;
+ margin-top: -8rpx;
display: flex;
align-items: center;
justify-content: space-between;