diff --git a/project.private.config.json b/project.private.config.json
index 1eadb81..89b6006 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,6 +9,27 @@
"miniprogram": {
"list": [
{
+ "name": "绑定医生结果页",
+ "pathName": "module1/pages/setApplicationDoctorResult/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "选择绑定医生",
+ "pathName": "module1/pages/setApplicationDoctor/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "医生绑定申请记录",
+ "pathName": "module1/pages/applicationRecords/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "module1/pages/chatRoom/index",
"pathName": "module1/pages/chatRoom/index",
"query": "id=28",
diff --git a/src/app.json b/src/app.json
index d34b005..ec29386 100644
--- a/src/app.json
+++ b/src/app.json
@@ -35,7 +35,10 @@
"pages/chatRoomInfo/index",
"pages/setChatDoctor/index",
"pages/doctorHome/index",
- "pages/loginOut/index"
+ "pages/loginOut/index",
+ "pages/applicationRecords/index",
+ "pages/setApplicationDoctor/index",
+ "pages/setApplicationDoctorResult/index"
]
}
],
diff --git a/src/echart/components/homeLevel1/index.scss b/src/echart/components/homeLevel1/index.scss
index b9c4787..a5bb2a7 100644
--- a/src/echart/components/homeLevel1/index.scss
+++ b/src/echart/components/homeLevel1/index.scss
@@ -95,6 +95,20 @@
font-size: 56rpx;
color: #fff;
line-height: 56rpx;
+ display: flex;
+ justify-content: center;
+ .num-center {
+ position: relative;
+ .dot {
+ position: absolute;
+ top: -10rpx;
+ right: -10rpx;
+ width: 16rpx;
+ height: 16rpx;
+ background-color: #ed4f39;
+ border-radius: 50%;
+ }
+ }
}
}
.line {
@@ -235,6 +249,43 @@
max-height: 0;
overflow: hidden;
}
+ .cooperate-options {
+ padding-bottom: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 18rpx;
+ .co-item {
+ flex: 1;
+ padding: 18rpx 36rpx;
+ background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
+ box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
+ border-radius: 16rpx 16rpx 16rpx 16rpx;
+ border: 2rpx solid #ffffff;
+ display: flex;
+ align-items: center;
+ .icon {
+ width: 76rpx;
+ height: 76rpx;
+ }
+ .content {
+ position: relative;
+ padding-left: 8rpx;
+ font-size: 32rpx;
+ color: #141515;
+ &.dot::after {
+ content: "";
+ position: absolute;
+ top: -10rpx;
+ right: -10rpx;
+ width: 16rpx;
+ height: 16rpx;
+ background-color: #ed4f39;
+ border-radius: 50%;
+ }
+ }
+ }
+ }
.doctor {
margin-bottom: 20rpx;
padding: 32rpx;
@@ -362,3 +413,25 @@
}
}
}
+
+.preview {
+ position: fixed;
+ width: 100vw;
+ height: 100vh;
+ z-index: 1000000000;
+ top: 0;
+ left: 0;
+ overflow: hidden;
+ .img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ opacity: 0;
+ display: block;
+ }
+ .show {
+ opacity: 1;
+ }
+}
diff --git a/src/echart/components/homeLevel1/index.ts b/src/echart/components/homeLevel1/index.ts
index 78f9722..ed3a5de 100644
--- a/src/echart/components/homeLevel1/index.ts
+++ b/src/echart/components/homeLevel1/index.ts
@@ -21,6 +21,10 @@ Component({
take: {},
case: {},
cooperateList: [],
+
+ guide: 0,
+ guideShow: false,
+ guideList: ["2-1", "2-2", "2-3"],
},
lifetimes: {
@@ -120,6 +124,30 @@ Component({
const { index } = e.currentTarget.dataset;
this.selectComponent(`#cooperate${index}`).handleDetail();
},
+ handleApplication() {
+ wx.navigateTo({
+ url: "/module1/pages/applicationRecords/index",
+ });
+ },
+ handleApplicationDoctor() {
+ wx.navigateTo({
+ url: "/module1/pages/setApplicationDoctor/index",
+ });
+ },
+
+ touchmovePreview() {
+ return false;
+ },
+ handleTapPreview() {
+ if (this.data.guide == this.data.guideList.length - 1) {
+ this.setData({
+ guideShow: false,
+ });
+ }
+ this.setData({
+ guide: Number(this.data.guide) + 1,
+ });
+ },
},
});
diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml
index 25319b6..9dfa1e6 100644
--- a/src/echart/components/homeLevel1/index.wxml
+++ b/src/echart/components/homeLevel1/index.wxml
@@ -22,19 +22,32 @@
-
+
待处理事项
病历更新
- {{take.notReadFeedBackCount*1 || '--'}}
+
+
+ {{take.notReadFeedBackCount*1 || '--'}}
+
+
+
学习窗消息
- {{take.notReadChatRoomCount*1 || '--'}}
+
+
+ {{take.notReadChatRoomCount*1 || '--'}}
+
+
+
@@ -48,66 +61,31 @@
总数
- {{case.totalCaseCount}}
-
+ {{case.totalCaseCount}}
新病历
-
-
- {{case.newCaseCount}}
+
+ {{case.newCaseCount}}
讨论中
-
-
- {{case.feedbackCaseCount}}
+
+ {{case.feedbackCaseCount}}
已归档
-
-
- {{case.archiveCaseCount}}
+
+ {{case.archiveCaseCount}}
@@ -137,11 +115,17 @@
-
+
+
+
+
+ 申请记录
+
+
+
+ 绑定医生
+
+
@@ -205,3 +180,13 @@
+
+
+
+
diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml
index 745af29..51378d6 100644
--- a/src/echart/components/homeLevel2/index.wxml
+++ b/src/echart/components/homeLevel2/index.wxml
@@ -6,11 +6,7 @@
src="{{userInfo.Img}}"
level="{{userInfo.DoctorLevel}}"
>
-
+
-
+
待处理事项
-
+
待处理病历
@@ -62,15 +55,30 @@
病历更新
- {{take.notReadFeedBackCount*1 || '--'}}
+
+
+ {{take.notReadFeedBackCount*1 || '--'}}
+
+
+
学习窗消息
- {{take.notReadChatRoomCount*1 || '--'}}
+
+
+ {{take.notReadChatRoomCount*1 || '--'}}
+
+
+
医生待审核
- {{take.toAuditDoctorCount*1 || '--'}}
+
+
+ {{take.toAuditDoctorCount*1 || '--'}}
+
+
+
暂时没有需要处理的事项哦~
@@ -89,30 +97,15 @@
全部
- {{case.totalCaseCount}}
-
+ {{case.totalCaseCount}}
新病历
-
-
- {{case.newCaseCount}}
+
+ {{case.newCaseCount}}
讨论中
-
-
- {{case.feedbackCaseCount}}
+
+ {{case.feedbackCaseCount}}
已归档
-
-
- {{case.archiveCaseCount}}
+
+ {{case.archiveCaseCount}}
@@ -188,11 +161,7 @@
-
+
@@ -269,11 +229,7 @@
-
+
diff --git a/src/echart/components/homeLevel3/index.wxml b/src/echart/components/homeLevel3/index.wxml
index 367d548..b8f4d1e 100644
--- a/src/echart/components/homeLevel3/index.wxml
+++ b/src/echart/components/homeLevel3/index.wxml
@@ -6,11 +6,7 @@
src="{{userInfo.Img}}"
level="{{userInfo.DoctorLevel}}"
>
-
+
-
+
待处理事项
@@ -62,15 +52,30 @@
病历更新
- {{take.notReadFeedBackCount*1 || '--'}}
+
+
+ {{take.notReadFeedBackCount*1 || '--'}}
+
+
+
学习窗消息
- {{take.notReadChatRoomCount*1 || '--'}}
+
+
+ {{take.notReadChatRoomCount*1 || '--'}}
+
+
+
医生待审核
- {{take.toAuditDoctorCount*1 || '--'}}
+
+
+ {{take.toAuditDoctorCount*1 || '--'}}
+
+
+
@@ -88,64 +93,29 @@
全部
- {{case.totalCaseCount}}
-
+ {{case.totalCaseCount}}
新病历
-
-
- {{case.newCaseCount}}
+
+ {{case.newCaseCount}}
讨论中
-
-
- {{case.feedbackCaseCount}}
+
+ {{case.feedbackCaseCount}}
已归档
-
-
- {{case.archiveCaseCount}}
+
+ {{case.archiveCaseCount}}
diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts
index 6210f84..0ad7f60 100644
--- a/src/echart/components/homeLevel4/index.ts
+++ b/src/echart/components/homeLevel4/index.ts
@@ -675,6 +675,12 @@ Component({
url: "/pages/cases/index",
});
},
+ handleCaseUpdate() {
+ app.globalData.newFeedback = "1";
+ wx.switchTab({
+ url: "/pages/cases/index",
+ });
+ },
handleChat() {
wx.switchTab({
url: "/pages/chatRoomList/index",
diff --git a/src/echart/components/homeLevel4/index.wxml b/src/echart/components/homeLevel4/index.wxml
index ad4a78a..ef425c8 100644
--- a/src/echart/components/homeLevel4/index.wxml
+++ b/src/echart/components/homeLevel4/index.wxml
@@ -1,16 +1,7 @@
-
-
+
+
-
+
待处理事项
@@ -60,25 +45,42 @@
+
+ 病历更新
+
+
+ {{take.notReadFeedBackCount*1 || '--'}}
+
+
+
+
学习窗消息
- {{take.notReadChatRoomCount*1 || '--'}}
+
+
+ {{take.notReadChatRoomCount*1 || '--'}}
+
+
+
医生待审核
- {{take.toAuditDoctorCount*1 || '--'}}
+
+
+ {{take.toAuditDoctorCount*1 || '--'}}
+
+
+
-
+
本科室全部病历
-
+
{{DepartmentName}}
@@ -91,30 +93,15 @@
全部
- {{case.totalCaseCount}}
-
+ {{case.totalCaseCount}}
新病历
-
-
- {{case.newCaseCount}}
+
+ {{case.newCaseCount}}
讨论中
-
-
- {{case.feedbackCaseCount}}
+
+ {{case.feedbackCaseCount}}
已归档
-
-
- {{case.archiveCaseCount}}
+
+ {{case.archiveCaseCount}}
@@ -207,20 +174,9 @@
-
+