From 461941fd698f6e18e323c8839125dd5bc9fb60b7 Mon Sep 17 00:00:00 2001 From: kola-web Date: Fri, 8 Nov 2024 11:34:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 2 ++ src/components/doctorAvatar/index.ts | 2 +- src/components/popupDoctorDetail/index.scss | 1 + src/components/uploadFile/index.ts | 1 + src/echart/components/homeLevel1/index.ts | 10 ++++++++++ src/echart/components/homeLevel1/index.wxml | 4 ++-- src/echart/components/homeLevel2/index.ts | 21 +++++++++++++++++++++ src/echart/components/homeLevel2/index.wxml | 8 ++++---- src/echart/components/homeLevel3/index.ts | 22 ++++++++++++++++++++++ src/echart/components/homeLevel3/index.wxml | 8 ++++---- src/echart/components/homeLevel4/index.ts | 17 +++++++++++++++++ src/echart/components/homeLevel4/index.wxml | 10 ++++------ src/module1/pages/casesFeedback/index.ts | 1 + src/module1/pages/entryCases/index.ts | 1 + src/module1/pages/invite/index.wxml | 2 +- src/module1/pages/setCaseDoctor/index.ts | 2 +- src/module1/pages/setChatDoctor/index.json | 2 +- src/module1/pages/setChatDoctor/index.wxml | 2 +- src/module1/pages/userInfo/index.wxml | 2 +- src/pages/cases/index.scss | 3 ++- src/pages/cases/index.ts | 18 ++++++++++++------ src/pages/cases/index.wxml | 15 +++++++++------ src/pages/chatRoomList/index.ts | 11 ++++++----- src/pages/my/index.wxml | 2 +- typings/index.d.ts | 2 ++ 25 files changed, 128 insertions(+), 41 deletions(-) diff --git a/src/app.ts b/src/app.ts index 6cf6559..ed6da4d 100644 --- a/src/app.ts +++ b/src/app.ts @@ -33,6 +33,8 @@ App({ doctorId: null, scene: null, + + needDeal: "", }, onLaunch() { Page = page as WechatMiniprogram.Page.Constructor; diff --git a/src/components/doctorAvatar/index.ts b/src/components/doctorAvatar/index.ts index 6613a4e..33ffd47 100644 --- a/src/components/doctorAvatar/index.ts +++ b/src/components/doctorAvatar/index.ts @@ -5,7 +5,7 @@ Component({ /** * 组件的属性列表 */ - externalClasses: true, + externalClasses: [], properties: { src: { type: String, diff --git a/src/components/popupDoctorDetail/index.scss b/src/components/popupDoctorDetail/index.scss index 349b31f..2df308d 100644 --- a/src/components/popupDoctorDetail/index.scss +++ b/src/components/popupDoctorDetail/index.scss @@ -17,6 +17,7 @@ font-weight: bold; } .user { + padding-top: 36rpx; display: flex; gap: 24rpx; .avatar { diff --git a/src/components/uploadFile/index.ts b/src/components/uploadFile/index.ts index a7916cd..defcdc6 100644 --- a/src/components/uploadFile/index.ts +++ b/src/components/uploadFile/index.ts @@ -160,6 +160,7 @@ Component({ duration: 0, fileType: this.data.fileTypeList[suffix] || 99, videoUrl: "", + hash: "", }; if (item.fileType === "image") { expandJson.imgUrl = data.data.Url; diff --git a/src/echart/components/homeLevel1/index.ts b/src/echart/components/homeLevel1/index.ts index 2f60ff3..3dacb38 100644 --- a/src/echart/components/homeLevel1/index.ts +++ b/src/echart/components/homeLevel1/index.ts @@ -87,6 +87,16 @@ Component({ this.getHeight(); }); }, + handleCaseUpdate() { + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleChat() { + wx.switchTab({ + url: "/pages/chatRoomList/index", + }); + }, handleQuestion(e) { const { index } = e.currentTarget.dataset; const message = { diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml index e71e624..1771916 100644 --- a/src/echart/components/homeLevel1/index.wxml +++ b/src/echart/components/homeLevel1/index.wxml @@ -20,12 +20,12 @@ 待处理事项 - + 病历更新 {{take.notReadFeedBackCount}} - + 聊天室新消息 {{take.notReadChatRoomCount}} diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts index 2ea2e71..ee2f706 100644 --- a/src/echart/components/homeLevel2/index.ts +++ b/src/echart/components/homeLevel2/index.ts @@ -122,6 +122,27 @@ Component({ url: "/module1/pages/entryCases/index", }); }, + handlePendCase() { + app.globalData.needDeal = "1"; + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleCaseUpdate() { + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleChat() { + wx.switchTab({ + url: "/pages/chatRoomList/index", + }); + }, + handleAudit() { + wx.navigateTo({ + url: "/module1/pages/auditDoctorList/index", + }); + }, }, }); diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml index 42670a8..66b725c 100644 --- a/src/echart/components/homeLevel2/index.wxml +++ b/src/echart/components/homeLevel2/index.wxml @@ -34,19 +34,19 @@ class="b-container" wx:if="{{take.dealCaseCount>0 || take.notReadFeedBackCount>0 || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}" > - + 待处理病历 {{take.dealCaseCount}} - + 病历更新 {{take.notReadFeedBackCount}} - + 聊天室消息 {{take.notReadChatRoomCount}} - + 医生待审核 {{take.toAuditDoctorCount}} diff --git a/src/echart/components/homeLevel3/index.ts b/src/echart/components/homeLevel3/index.ts index 4b5a41e..9ac4806 100644 --- a/src/echart/components/homeLevel3/index.ts +++ b/src/echart/components/homeLevel3/index.ts @@ -80,6 +80,28 @@ Component({ url: "/module1/pages/entryCases/index", }); }, + + handlePendCase() { + app.globalData.needDeal = "1"; + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleCaseUpdate() { + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleChat() { + wx.switchTab({ + url: "/pages/chatRoomList/index", + }); + }, + handleAudit() { + wx.navigateTo({ + url: "/module1/pages/auditDoctorList/index", + }); + }, }, }); diff --git a/src/echart/components/homeLevel3/index.wxml b/src/echart/components/homeLevel3/index.wxml index 35b8bdc..abbc457 100644 --- a/src/echart/components/homeLevel3/index.wxml +++ b/src/echart/components/homeLevel3/index.wxml @@ -34,19 +34,19 @@ class="b-container" wx:if="{{take.dealCaseCount>0 || take.notReadFeedBackCount>0 || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}" > - + 待处理病历 {{take.dealCaseCount}} - + 病历更新 {{take.notReadFeedBackCount}} - + 聊天室消息 {{take.notReadChatRoomCount}} - + 医生待审核 {{take.toAuditDoctorCount}} diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts index 7d450d2..c439ab2 100644 --- a/src/echart/components/homeLevel4/index.ts +++ b/src/echart/components/homeLevel4/index.ts @@ -655,6 +655,23 @@ Component({ url: "/module1/pages/org4/index", }); }, + + handlePendCase() { + app.globalData.needDeal = "1"; + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleChat() { + wx.switchTab({ + url: "/pages/chatRoomList/index", + }); + }, + handleAudit() { + wx.navigateTo({ + url: "/module1/pages/auditDoctorList/index", + }); + }, }, }); diff --git a/src/echart/components/homeLevel4/index.wxml b/src/echart/components/homeLevel4/index.wxml index 4941496..0c821d3 100644 --- a/src/echart/components/homeLevel4/index.wxml +++ b/src/echart/components/homeLevel4/index.wxml @@ -34,17 +34,15 @@ class="b-container" wx:if="{{take.dealCaseCount>0 || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}" > - + 待处理病历 {{take.dealCaseCount}} - - - 聊天室新消息 + + 聊天室消息 {{take.notReadChatRoomCount}} - - + 医生待审核 {{take.toAuditDoctorCount}} diff --git a/src/module1/pages/casesFeedback/index.ts b/src/module1/pages/casesFeedback/index.ts index a36e59e..2cbcae7 100644 --- a/src/module1/pages/casesFeedback/index.ts +++ b/src/module1/pages/casesFeedback/index.ts @@ -49,6 +49,7 @@ Page({ name: detail.name, url: detail.fileUrl, isRepeat: 2, + hash: "", }, ], }); diff --git a/src/module1/pages/entryCases/index.ts b/src/module1/pages/entryCases/index.ts index df0c368..faf7d04 100644 --- a/src/module1/pages/entryCases/index.ts +++ b/src/module1/pages/entryCases/index.ts @@ -119,6 +119,7 @@ Page({ name: detail.name, url: detail.fileUrl, isRepeat: 2, + hash: "", }, ], }); diff --git a/src/module1/pages/invite/index.wxml b/src/module1/pages/invite/index.wxml index 677497f..67c46fc 100644 --- a/src/module1/pages/invite/index.wxml +++ b/src/module1/pages/invite/index.wxml @@ -18,7 +18,7 @@ {{userInfo.HospitalName}} - {{userInfo.HospitalClassificationName}}{{userInfo.HospitalName}} + {{userInfo.HospitalClassificationName}}{{userInfo.HospitalLevelName}} diff --git a/src/module1/pages/setCaseDoctor/index.ts b/src/module1/pages/setCaseDoctor/index.ts index 6db356f..15bed1e 100644 --- a/src/module1/pages/setCaseDoctor/index.ts +++ b/src/module1/pages/setCaseDoctor/index.ts @@ -271,7 +271,7 @@ Page({ if (detailInvite) { wx.ajax({ method: "POST", url: "?r=takeda/case/invite-doctor", data: { caseId, dealDoctorId: DoctorId } }).then( (res) => { - wx.navigateTo({ + wx.reLaunch({ url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`, }); }, diff --git a/src/module1/pages/setChatDoctor/index.json b/src/module1/pages/setChatDoctor/index.json index 5e549b7..26ccae2 100644 --- a/src/module1/pages/setChatDoctor/index.json +++ b/src/module1/pages/setChatDoctor/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "指派医生", + "navigationBarTitleText": "选择医生", "navigationStyle": "default", "usingComponents": { "popupDoctorDetail": "/components/popupDoctorDetail/index", diff --git a/src/module1/pages/setChatDoctor/index.wxml b/src/module1/pages/setChatDoctor/index.wxml index 868d6b7..932c8e3 100644 --- a/src/module1/pages/setChatDoctor/index.wxml +++ b/src/module1/pages/setChatDoctor/index.wxml @@ -79,7 +79,7 @@ 返回 - 确认提交 + 确认邀请 diff --git a/src/module1/pages/userInfo/index.wxml b/src/module1/pages/userInfo/index.wxml index b9e1f84..effad6b 100644 --- a/src/module1/pages/userInfo/index.wxml +++ b/src/module1/pages/userInfo/index.wxml @@ -81,7 +81,7 @@ {{item.label}} - 确定 + 保存 diff --git a/src/pages/cases/index.scss b/src/pages/cases/index.scss index f895c35..6027235 100644 --- a/src/pages/cases/index.scss +++ b/src/pages/cases/index.scss @@ -14,9 +14,10 @@ page { padding: 20rpx; flex: 1; text-align: center; - font-size: 32rpx; + font-size: 28rpx; color: rgba(133, 133, 133, 1); line-height: 44rpx; + white-space: nowrap; &.active { position: relative; color: rgba(0, 180, 197, 1); diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts index ce04aa5..4176a48 100644 --- a/src/pages/cases/index.ts +++ b/src/pages/cases/index.ts @@ -73,6 +73,10 @@ Page({ }); }, onShow() { + this.setData({ + needDeal: app.globalData.needDeal, + }); + app.globalData.needDeal = ""; app.waitLogin().then(() => { this.getBaseInfo(); this.getList(); @@ -184,15 +188,16 @@ Page({ if (caseStatus.includes(value)) { this.setData({ caseStatus: caseStatus.filter((item) => item !== value), - caseStatusName: caseStatus - .filter((item) => item !== value) - .map((item) => caseStatusList[item]) - .join(","), + caseStatusName: + caseStatus + .filter((item) => item !== value) + .map((item) => caseStatusList[item]) + .join(",") || "全部", }); } else { this.setData({ caseStatus: [...caseStatus, value], - caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(","), + caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(",") || "全部", }); } }, @@ -436,7 +441,8 @@ Page({ const { index } = e.currentTarget.dataset; const message = { 1: "属于您所在科室的公开的病历", - 2: "平台所有优质的病历", + 2: "属于您所在科室的优质的病历 ", + 3: "???", }[index]; wx.showModal({ confirmColor: "#00B4C5", diff --git a/src/pages/cases/index.wxml b/src/pages/cases/index.wxml index 89b2a60..7d62964 100644 --- a/src/pages/cases/index.wxml +++ b/src/pages/cases/index.wxml @@ -3,14 +3,17 @@ 我的病历 - 全部病历 - + + 全部病历 + + + 公开病历 - + 优质病历 - + @@ -115,7 +118,7 @@ - + {{userInfo.HospitalName}} - {{userInfo.HospitalClassificationName}}{{userInfo.HospitalName}} + {{userInfo.HospitalClassificationName}}{{userInfo.HospitalLevelName}} {{userInfo.CityName}}{{userInfo.CountyName?'/':''}}{{userInfo.CountyName}} diff --git a/typings/index.d.ts b/typings/index.d.ts index 0573cbf..89a9df9 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -8,6 +8,8 @@ interface IAppOption { isLogin: number; doctorId: null | number; scene: null | { [key: string]: any }; + + needDeal: "" | "1"; }; userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback; waitLogin: (waitLoginState?: boolean) => Promise;