diff --git a/src/module1/pages/auditDoctorDetail/index.scss b/src/module1/pages/auditDoctorDetail/index.scss index aedb3bf..efd9e29 100644 --- a/src/module1/pages/auditDoctorDetail/index.scss +++ b/src/module1/pages/auditDoctorDetail/index.scss @@ -148,6 +148,7 @@ page { } .reject { + width: 648rpx; background-color: transparent; .r-badge { position: relative; diff --git a/src/module1/pages/chatRoom/index.scss b/src/module1/pages/chatRoom/index.scss index c893f53..de33801 100644 --- a/src/module1/pages/chatRoom/index.scss +++ b/src/module1/pages/chatRoom/index.scss @@ -299,6 +299,7 @@ page { .page-footer { flex-shrink: 0; background-color: #fff; + padding-bottom: env(safe-area-inset-bottom); .header { padding: 32rpx; display: flex; diff --git a/src/module1/pages/chatRoom/index.wxml b/src/module1/pages/chatRoom/index.wxml index 27a7fa5..5c47943 100644 --- a/src/module1/pages/chatRoom/index.wxml +++ b/src/module1/pages/chatRoom/index.wxml @@ -69,7 +69,7 @@ - {{item.Children.length}}人 + {{item.ChildCount}}人 @@ -106,7 +106,7 @@ level="{{item.DoctorInfo.doctorLevel}}" > - {{item.Children.length}}人 + {{item.ChildCount}}人 @@ -168,7 +168,7 @@ level="{{subItem.DoctorInfo.doctorLevel}}" > - {{subItem.Children.length}}人 + {{subItem.ChildCount}}人 @@ -345,7 +345,7 @@ level="{{item.DoctorInfo.doctorLevel}}" > - {{item.Children.length}}人 + {{item.ChildCount}}人 diff --git a/src/module1/pages/userInfo/index.scss b/src/module1/pages/userInfo/index.scss index b5cac28..167318c 100644 --- a/src/module1/pages/userInfo/index.scss +++ b/src/module1/pages/userInfo/index.scss @@ -36,6 +36,10 @@ page { padding: 32rpx 0; display: flex; justify-content: space-between; + border-bottom: 1px solid #e5e6eb; + &:last-of-type { + border-bottom: none; + } .label { width: 5em; flex-shrink: 0; diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts index 495af81..a557cda 100644 --- a/src/pages/cases/index.ts +++ b/src/pages/cases/index.ts @@ -74,6 +74,7 @@ Page({ }, onShow() { this.setData({ + nav: "0", needDeal: app.globalData.needDeal, }); app.globalData.needDeal = ""; @@ -349,6 +350,7 @@ Page({ deptName: newDeptName || "全部", labelList, labelId: [], + labelName: "全部", }); }, handleLabel(e) { @@ -451,7 +453,7 @@ Page({ const message = { 1: "属于您所在科室的公开的病历", 2: "属于您所在科室的优质的病历 ", - 3: "???", + 3: "属于您所在科室的所有病历", }[index]; wx.showModal({ confirmColor: "#00B4C5", diff --git a/src/pages/chatRoomList/index.scss b/src/pages/chatRoomList/index.scss index adfe901..2c8e130 100644 --- a/src/pages/chatRoomList/index.scss +++ b/src/pages/chatRoomList/index.scss @@ -200,6 +200,7 @@ page { } .inner { .hostipal { + margin-right: 16rpx; display: inline; font-size: 32rpx; color: rgba(20, 21, 21, 1); diff --git a/src/pages/chatRoomList/index.ts b/src/pages/chatRoomList/index.ts index 4bd2855..9c278dc 100644 --- a/src/pages/chatRoomList/index.ts +++ b/src/pages/chatRoomList/index.ts @@ -4,7 +4,7 @@ const app = getApp(); Page({ data: { - fold: false, + fold: true, show1: false, show2: false, @@ -370,6 +370,7 @@ Page({ deptName: newDeptName || "全部", labelList, labelId: [], + labelName: "全部", }); }, handleLabel(e) { @@ -439,7 +440,7 @@ Page({ }, handleReadAll() { wx.showModal({ - title:"确认全部标为已读", + title: "确认全部标为已读", confirmColor: "#00B4C5", cancelColor: "#141515", success: (res) => { diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml index df06afe..ed1a806 100644 --- a/src/pages/chatRoomList/index.wxml +++ b/src/pages/chatRoomList/index.wxml @@ -144,7 +144,6 @@ {{item.hospitalName}} - {{item.cityName}}{{item.countyName?'/':''}}{{item.countyName}} @@ -179,7 +178,7 @@ - 保存 + 确定 @@ -200,7 +199,7 @@ - 保存 + 确定 @@ -280,7 +279,7 @@ {{item.label}} - 保存 + 确定 diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 9ef53c7..084a635 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -52,12 +52,12 @@ - +