diff --git a/components/SelectYear.vue b/components/SelectYear.vue index 3eb17a3..0b08fcb 100644 --- a/components/SelectYear.vue +++ b/components/SelectYear.vue @@ -30,23 +30,25 @@ 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, }; }, 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') 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/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 b398368..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]) @@ -282,6 +332,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 @@ -415,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; @@ -471,7 +539,6 @@ font-size: 28rpx; font-weight: normal; line-height: normal; - text-align: center; letter-spacing: 0; color: #AEB0B8; width:100%; @@ -618,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; + } + } }