From 0c1c41cbe45e1c0d97cbec7dce4e838e31cfb87f Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Tue, 3 Jun 2025 16:04:55 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors/visitors.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index c976c00..e8a70a6 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -210,7 +210,6 @@ } this.hospital_depart_name = hospital.hospital_name + ' ' + hospital.depart_name - this.type = hospital.type if(this.type == 2){ this.$pop.modelShow('该科室不允许签到', '/pages/index/index') From b96d69c8ca88d2476152a046bac8eaf15fcbe793 Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Tue, 3 Jun 2025 17:44:35 +0800 Subject: [PATCH 02/19] =?UTF-8?q?920=E3=80=81924=E9=97=AE=E9=A2=98?= =?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/modify_visitor/modify_visitor.vue | 2 +- pages/visit_detail/visit_detail.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue index 4928c97..82885db 100644 --- a/pages/modify_visitor/modify_visitor.vue +++ b/pages/modify_visitor/modify_visitor.vue @@ -134,7 +134,7 @@ if(this.vid){ uni.removeStorageSync('visitor_info_'+ this.vid) } - this.$func.toPage('/pages/visitors/visitors') + this.$func.toPage('/pages/visitors_new/visitors_new') }, submit(){ this.checkSubmit() diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue index 0e5ae4e..a817963 100644 --- a/pages/visit_detail/visit_detail.vue +++ b/pages/visit_detail/visit_detail.vue @@ -23,8 +23,8 @@ - 返回 - 取消预约 + 返回 + 取消预约 From d6c272d59a33689f3f7c1bb7178269866e649e55 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Tue, 3 Jun 2025 17:58:46 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=86=85?= =?UTF-8?q?=E9=83=A8=E8=B0=83=E7=94=A8=E5=BE=AE=E4=BF=A1=E6=89=AB=E4=B8=80?= =?UTF-8?q?=E6=89=AB=E5=90=8E=20=E6=97=A0=E6=B3=95=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tabbar.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/tabbar.vue b/components/tabbar.vue index 9d62ed6..b24c9c5 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -84,8 +84,7 @@ async scanCode() { // #ifdef MP-WEIXIN uni.scanCode({ - onlyFromCamera: true, - scanType: ['qrCode'], + onlyFromCamera: false, success: (res) => { console.log('扫码结果:', res.result); }, From 47fbe47e729d561eae20ca0e3b2b6acf7fde67d2 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Wed, 4 Jun 2025 10:26:12 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=86=85?= =?UTF-8?q?=E9=83=A8=E8=B0=83=E7=94=A8=E5=BE=AE=E4=BF=A1=E6=89=AB=E4=B8=80?= =?UTF-8?q?=E6=89=AB=E5=90=8E=20=E6=97=A0=E6=B3=95=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tabbar.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/components/tabbar.vue b/components/tabbar.vue index b24c9c5..c9b2b7e 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -84,15 +84,17 @@ async scanCode() { // #ifdef MP-WEIXIN uni.scanCode({ - onlyFromCamera: false, - success: (res) => { - console.log('扫码结果:', res.result); - }, - fail: (err) => { - console.error('扫码失败:', err); - // uni.showToast({ title: '扫码失败', icon: 'none' }); - } - }); + success: (res) => { + var url = `/${res.path}`; + uni.navigateTo({ url }); + }, + fail: (err) => { + uni.showToast({ + title: '扫码失败'+JSON.stringify(err), + icon: 'none' + }) + } + }) // #endif // #ifdef H5 From feed9016c8227eb47acbc9aa26a91e591faaaf80 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Wed, 4 Jun 2025 11:01:43 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=86=85?= =?UTF-8?q?=E9=83=A8=E8=B0=83=E7=94=A8=E5=BE=AE=E4=BF=A1=E6=89=AB=E4=B8=80?= =?UTF-8?q?=E6=89=AB=E5=90=8E=20=E6=97=A0=E6=B3=95=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=B2=A1=E6=9C=89=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tabbar.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/tabbar.vue b/components/tabbar.vue index c9b2b7e..250c9bc 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -85,6 +85,13 @@ // #ifdef MP-WEIXIN uni.scanCode({ success: (res) => { + if(res.path) { + const sceneParam = res.path.split('scene=')[1]; + if (sceneParam && sceneParam.indexOf('dp=') > -1) { + var encodedScene = encodeURIComponent(sceneParam); + res.path = res.path.replace(`scene=${sceneParam}`, `scene=${encodedScene}`); + } + } var url = `/${res.path}`; uni.navigateTo({ url }); }, From 67155ef49bf5a326c7e582393f2f0cb503acf8e1 Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Wed, 4 Jun 2025 14:34:20 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E4=B8=8E=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/visitorAccount.vue | 12 ++++++++---- pages/visitors_new/visitors_new.vue | 29 +++++++++++++++++++---------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue index ac4de3f..fe7ec67 100644 --- a/components/visitorAccount.vue +++ b/components/visitorAccount.vue @@ -1,7 +1,7 @@