diff --git a/baseData/index.js b/baseData/index.js index eb40923..9cc6d25 100644 --- a/baseData/index.js +++ b/baseData/index.js @@ -20,7 +20,33 @@ export const ToDoEventType = { followupAppointment: "复诊预约", confirmArrival: "确认到院", prenatalFollowUp: "孕期回访", -}; + childHealthFollowUp: "儿童保健回访", + benefitExecution: "权益执行", +} +// { +// followUpNoShow: "未到院回访", +// followUpNoDeal: "未成交回访", +// followUp: "诊后回访", +// followUpPostSurgery: "术后回访", +// followUpPostTreatment: "治疗后回访", +// appointmentReminder: "就诊提醒", +// followUpReminder: "复诊提醒", +// medicationReminder: "用药提醒", +// serviceSummary: "咨询服务", +// eventNotification: "活动通知", +// ContentReminder: "宣教发送", +// questionnaire: "问卷调查", +// followUpComplaint: "投诉回访", +// followUpActivity: "活动回访", +// other: "其他", +// Feedback: "意见反馈", +// // 预约相关服务类型 +// treatmentAppointment: "治疗预约", +// followupAppointment: "复诊预约", +// confirmArrival: "确认到院", +// prenatalFollowUp: "孕期回访", +// }; + export const statusNames = { notStart: "未开始", diff --git a/components/ww-user/index.vue b/components/ww-user/index.vue new file mode 100644 index 0000000..a8d3c3a --- /dev/null +++ b/components/ww-user/index.vue @@ -0,0 +1,48 @@ + + + diff --git a/pages/case/archive-detail.vue b/pages/case/archive-detail.vue index 88e5ef8..d5b2d80 100644 --- a/pages/case/archive-detail.vue +++ b/pages/case/archive-detail.vue @@ -118,6 +118,12 @@ :reachBottomTime="reachBottomTime" :floatingBottom="floatingBottom" /> + { fetchArchive(); }); -onShow(() => { +onShow(async () => { + // 每次进入用户详情页重新获取医生信息,及时同步管理端变更的权益权限。 + await getDoctorInfo(); + const cached = uni.getStorageSync(STORAGE_KEY); const cachedId = cached && typeof cached === 'object' ? String(cached._id || cached.id || '') : ''; if (cached && typeof cached === 'object' && (!cachedId || !archiveId.value || cachedId === archiveId.value)) { diff --git a/pages/case/components/archive-detail/benefit-project-tab.vue b/pages/case/components/archive-detail/benefit-project-tab.vue new file mode 100644 index 0000000..957600d --- /dev/null +++ b/pages/case/components/archive-detail/benefit-project-tab.vue @@ -0,0 +1,452 @@ + + + + + diff --git a/pages/case/components/archive-detail/follow-up-manage-tab.vue b/pages/case/components/archive-detail/follow-up-manage-tab.vue index cab762f..0723ee9 100644 --- a/pages/case/components/archive-detail/follow-up-manage-tab.vue +++ b/pages/case/components/archive-detail/follow-up-manage-tab.vue @@ -1599,8 +1599,8 @@ watch( display: flex; align-items: center; justify-content: center; - box-shadow: 0 20rpx 36rpx rgba(79, 110, 247, 0.35); - z-index: 20; + box-shadow: 0 10px 18px rgba(79, 110, 247, 0.35); + z-index: 1000; } .popup { diff --git a/pages/case/components/archive-detail/health-profile-tab.vue b/pages/case/components/archive-detail/health-profile-tab.vue index 3eaa824..0465428 100644 --- a/pages/case/components/archive-detail/health-profile-tab.vue +++ b/pages/case/components/archive-detail/health-profile-tab.vue @@ -915,7 +915,7 @@ watch( right: 32rpx; width: 104rpx; height: 104rpx; - z-index: 20; + z-index: 1000; } .fab { diff --git a/pages/case/components/archive-detail/service-info-tab.vue b/pages/case/components/archive-detail/service-info-tab.vue index e84bef3..b52dcd9 100644 --- a/pages/case/components/archive-detail/service-info-tab.vue +++ b/pages/case/components/archive-detail/service-info-tab.vue @@ -885,7 +885,7 @@ watch( align-items: center; justify-content: center; box-shadow: 0 20rpx 36rpx rgba(79, 110, 247, 0.35); - z-index: 20; + z-index: 1000; } .popup { diff --git a/pages/case/followup-detail.vue b/pages/case/followup-detail.vue index 743978b..9d4f781 100644 --- a/pages/case/followup-detail.vue +++ b/pages/case/followup-detail.vue @@ -47,13 +47,8 @@ 回访结果 -