From d9b23974d29a59fa5d5c410d7a40e7f2dc854a04 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Thu, 19 Jun 2025 10:11:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E6=82=A3=E8=80=85=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=82=A3=E8=80=85=E5=87=BA=E7=94=9F=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E5=BD=93=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E5=89=8D10=E5=B9=B4=E7=9A=84=E5=B9=B4=E4=BB=BD/2.=E6=82=A3?= =?UTF-8?q?=E8=80=85=E7=AB=AF=E6=82=A3=E8=80=85=E9=A2=84=E7=BA=A6=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=9C=AA=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=82=A3=E8=80=85?= =?UTF-8?q?,=E9=A6=96=E9=A1=B5=E7=82=B9=E5=87=BB=E2=80=9C=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E9=A2=84=E7=BA=A6=E2=80=9D=E7=9B=B4=E6=8E=A5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=B7=BB=E5=8A=A0=E6=82=A3=E8=80=85=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/SelectYear.vue | 8 +++++--- pages/index/index.vue | 1 - pages/visitors/visitors.vue | 5 +++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/components/SelectYear.vue b/components/SelectYear.vue index 3eb17a3..309c976 100644 --- a/components/SelectYear.vue +++ b/components/SelectYear.vue @@ -30,13 +30,15 @@ export default { const date = new Date() const years = [] const year = date.getFullYear() - for (let i = 1900; i <= date.getFullYear(); i++) { + for (let i = 1900; i <= year; i++) { years.push(i) } + var currentYear = year - 10 + var value = [years.indexOf(currentYear)] return { + value, + currentYear, cssUrl:this.cssUrl, - value:[90], - currentYear: 1990, years: years, }; }, diff --git a/pages/index/index.vue b/pages/index/index.vue index dd481ea..7cdbc79 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -343,7 +343,6 @@ export default { uni.setStorageSync('depart', JSON.stringify(hospital)) uni.setStorageSync('doctor_info', JSON.stringify(this.doctorInfo)) this.$nav.navToPath("/pages/visitors/visitors?type=1&is_preview=1") - }, toPrebookList() { this.$nav.navToPath("/pages/prebook_list/prebook_list") diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index b398368..1c053eb 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -282,6 +282,11 @@ this.$http.req('api/user/get_visitors', obj, 'POST').then(data=>{ this.visitUsers = data; + if(this.visitUsers.length == 0) { + this.addVisitor() + return; + } + this.visitUsers = [...this.visitUsers] this.popMsgs = [] this.selectCount = 0 From fb06ed19d9028c2372628afaa49e4ec696d6ee4d Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Thu, 19 Jun 2025 18:38:01 +0800 Subject: [PATCH 2/4] visitor_first_preview --- components/SelectYear.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/SelectYear.vue b/components/SelectYear.vue index 309c976..0b08fcb 100644 --- a/components/SelectYear.vue +++ b/components/SelectYear.vue @@ -44,11 +44,11 @@ export default { }, methods: { handleYearChange(e) { - this.currentYear = this.years[e.detail.value]; + this.currentYear = this.years[e.detail.value]; }, comfirmYear(){ - this.$emit('change', this.currentYear) - this.closePop() + this.$emit('change', this.currentYear) + this.closePop() }, show(){ this.$refs.selectDate.open('bottom') From ed09a23d5c012892aca9a3a033144777bf524129 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 20 Jun 2025 11:17:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 +- pages/usercenter/usercenter.vue | 2 +- pages/visitors/visitors.vue | 194 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 194 insertions(+), 6 deletions(-) diff --git a/main.js b/main.js index a2ad206..329477d 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -// const NODE_ENV = 'development'; -const NODE_ENV = 'production'; +const NODE_ENV = 'development'; +// const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; diff --git a/pages/usercenter/usercenter.vue b/pages/usercenter/usercenter.vue index beaf637..7624e0d 100644 --- a/pages/usercenter/usercenter.vue +++ b/pages/usercenter/usercenter.vue @@ -26,7 +26,7 @@ - 就诊人 + 预约人 diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 1c053eb..94129ae 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -13,11 +13,12 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 + 初诊/初访 - {{item.sex}}| {{ item.age }} + {{item.sex}}| {{ item.age }}岁 |手机号：{{ item.phone }} @@ -89,6 +90,39 @@ @confirm="popConfirm" @cancel="popCancel" > + + + + + + + 初诊/初访咨询 + 首次到访，请向工作人员说明个人情况 + + 联系电话 + + {{doctorInfo.doctor_info.approver_phone}} + + + 拨打 + + + + + + 联系微信 + + + 长按识别或保存到相册，微信扫一扫二维码添加微信 + + + + + 我知道了 + + + + @@ -192,6 +226,13 @@ }, methods: { + callPhone(number) { + uni.makePhoneCall({ + phoneNumber: number, + success: () => console.log('拨打成功'), + fail: (err) => console.error('失败:', err) + }) + }, reback(){ this.$nav.navToPath('/pages/index/index') }, @@ -265,7 +306,16 @@ } }); }, + closeKefu() { + this.$refs.kefu.close() + + }, chooseVisitor(info, key){ + if(this.is_preview && info.first_visit) { + if(this.doctorInfo.doctor_info.approver_phone || this.doctorInfo.doctor_info.approver_wechat) this.$refs.kefu.open('bottom') + return + } + this.selectCount = 0 this.visitUsers[key].select = !this.visitUsers[key].select this.$set(this.visitUsers, key, this.visitUsers[key]) @@ -420,9 +470,22 @@ color: #30C563; flex-shrink: 0; } + .book-date-first{ + width: 160rpx; + height: 40rpx; + line-height: 40rpx; + box-sizing: border-box; + padding: 0rpx 16rpx; + border-radius: 6rpx; + background: #FFFAF7; + border: 1rpx solid #FE6710; + font-size: 26rpx; + color: #FE6710; + text-align:center; + } .aam_times{ color: #79624A; - text-align: center; + text-align:center; font-size: 28rpx; background: rgba(254, 232, 198, 0.66); border-radius: 6rpx; @@ -476,7 +539,6 @@ font-size: 28rpx; font-weight: normal; line-height: normal; - text-align: center; letter-spacing: 0; color: #AEB0B8; width:100%; @@ -623,5 +685,131 @@ } } } + + .popup-container { + position: relative; + max-height: calc(100vh - 200rpx); + overflow-y: scroll; + background: #ffffff; + border-radius: 40rpx 40rpx 0px 0px; + .popup-container-inner{ + padding: 42rpx 54rpx 14rpx; + box-sizing: border-box; + width: 100%; + overflow: hidden; + } + + .close-icon{ + width: 40rpx; + height: 40rpx; + position: absolute; + top: 48rpx; + right: 54rpx; + z-index: 2; + } + .kefu-header{ + font-size: 36rpx; + line-height: 50rpx; + text-align: center; + color: #333333; + } + .kefu-desc{ + font-size: 28rpx; + line-height: 38rpx; + color: #666666; + margin-top:12rpx; + margin-bottom: 70rpx; + text-align: center; + } + .kefu-title{ + height: 45rpx; + font-size: 32rpx; + color: #000000; + display: flex; + align-items: center; + column-gap: 12rpx; + view{ + width: 8rpx; + height: 34rpx; + border-radius: 10rpx; + background: #58CA7F; + } + } + .kefu-phone{ + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 20rpx; + box-sizing: border-box; + margin-top: 12rpx; + .phonenum{ + font-size: 30rpx; + color: #666666; + } + .callphone{ + display: flex; + align-items: center; + justify-content: space-between; + column-gap: 12rpx; + font-size: 28rpx; + color: #39D067; + img{ + width: 34rpx; + height: 34rpx; + } + } + } + .kefu-line{ + height: 2rpx; + background: #F1F1F1; + width: 100%; + margin: 46rpx 0; + } + .kefu-wechat{ + width: 100%; + height: 414rpx; + padding: 24rpx 0px; + box-sizing: border-box; + background: #F8F8F8; + margin-bottom: 42rpx; + margin-top: 24rpx; + image{ + width: 320rpx; + height: 320rpx; + margin: 0 auto; + display: block; + } + view{ + height: 34rpx; + text-align:center; + margin-top: 12rpx; + font-size: 24rpx; + color: #999999; + } + } + } + + .kefu-btn{ + justify-content: center; + display: flex; + align-items: center; + width: 100%; + height: 124rpx; + background: #FFFFFF; + backdrop-filter: blur(54.4rpx); + box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181, 181, 181, 0.1319); + .btn{ + border-radius: 12rpx; + width: 666rpx; + height: 90rpx; + line-height: 90rpx; + border-radius: 16rpx; + background: #39D067; + font-size: 32rpx; + font-weight: 500; + text-align: center; + color: #FFFFFF; + } + } } From 20ed17d5d2ba8cb49fced264ece46138ba250704 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 20 Jun 2025 11:19:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 329477d..a2ad206 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -const NODE_ENV = 'development'; -// const NODE_ENV = 'production'; +// const NODE_ENV = 'development'; +const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/';