diff --git a/README.md b/README.md index 7a161dc..5e7aeac 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ 3. 图像识别模糊 可以反向确认 通过ocr识别接口 接入ocr同时识别不到 姓名,年龄等字样,及判断该病历已被涂抹 + https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567 images svn 地址 @@ -24,3 +25,12 @@ wx.showModal({ cancelColor: "#141515", }); ``` + +医生待审核 /module1/pages/auditDoctorList/index +医生端首页 /pages/home/index +身份信息编辑页 /module1/pages/userInfo/index +医院信息编辑页面 /module1/pages/cHostipal/index +我的病历列表 /pages/cases/index +病历详情页 /module1/pages/casesDetail/index?id=病例id +病历编辑页面 /module1/pages/entryCases/index?id=病例id +聊天室互动页 /module1/pages/chatRoom/index?id=聊天室id diff --git a/project.private.config.json b/project.private.config.json index be88c8b..1eadb81 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,6 +9,13 @@ "miniprogram": { "list": [ { + "name": "module1/pages/chatRoom/index", + "pathName": "module1/pages/chatRoom/index", + "query": "id=28", + "launchMode": "default", + "scene": null + }, + { "name": "注销", "pathName": "module1/pages/loginOut/index", "query": "", diff --git a/src/app.ts b/src/app.ts index 729468c..5d75d0b 100644 --- a/src/app.ts +++ b/src/app.ts @@ -36,6 +36,9 @@ App({ needDeal: "", caseNav: "0", + caseStatus: "", + caseStatusName: "全部", + newFeedback: "", }, onLaunch() { Page = page as WechatMiniprogram.Page.Constructor; diff --git a/src/echart/components/homeLevel1/index.ts b/src/echart/components/homeLevel1/index.ts index 31ef7f9..78f9722 100644 --- a/src/echart/components/homeLevel1/index.ts +++ b/src/echart/components/homeLevel1/index.ts @@ -1,4 +1,4 @@ -const _app = getApp(); +const app = getApp(); // pages/story/a.ts Component({ @@ -88,6 +88,7 @@ Component({ }); }, handleCaseUpdate() { + app.globalData.newFeedback = "1"; wx.switchTab({ url: "/pages/cases/index", }); @@ -101,6 +102,24 @@ Component({ const { index } = e.currentTarget.dataset; this.triggerEvent("question", index); }, + handleCase(e) { + const { type } = e.currentTarget.dataset; + const name = { + 0: "全部", + 2: "新病历", + 3: "讨论中", + 4: "已归档", + }[type]; + app.globalData.caseStatus = type === "0" ? "" : type; + app.globalData.caseStatusName = name; + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleCooperateDetail(e) { + const { index } = e.currentTarget.dataset; + this.selectComponent(`#cooperate${index}`).handleDetail(); + }, }, }); diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml index 47a176e..25319b6 100644 --- a/src/echart/components/homeLevel1/index.wxml +++ b/src/echart/components/homeLevel1/index.wxml @@ -1,6 +1,11 @@ - + {{userInfo.Name}} @@ -17,10 +22,7 @@ - - - + + + {{item.DoctorName}} @@ -123,8 +176,17 @@ - - {{item.SpecialtyName}} + + {{item.SpecialtyName}} + diff --git a/src/echart/components/homeLevel2/index.scss b/src/echart/components/homeLevel2/index.scss index 7238219..6505a4c 100644 --- a/src/echart/components/homeLevel2/index.scss +++ b/src/echart/components/homeLevel2/index.scss @@ -135,6 +135,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 { diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts index a3e4b33..f9fe91e 100644 --- a/src/echart/components/homeLevel2/index.ts +++ b/src/echart/components/homeLevel2/index.ts @@ -130,6 +130,21 @@ Component({ }); }, handleCaseUpdate() { + app.globalData.newFeedback = "1"; + wx.switchTab({ + url: "/pages/cases/index", + }); + }, + handleCase(e) { + const { type } = e.currentTarget.dataset; + const name = { + 0: "全部", + 2: "新病历", + 3: "讨论中", + 4: "已归档", + }[type]; + app.globalData.caseStatus = type === "0" ? "" : type; + app.globalData.caseStatusName = name; wx.switchTab({ url: "/pages/cases/index", }); @@ -159,6 +174,14 @@ Component({ newCaseShow: false, }); }, + handleCooperateDetail(e) { + const { index } = e.currentTarget.dataset; + this.selectComponent(`#cooperate${index}`).handleDetail(); + }, + handleInviteDetail(e) { + const { index } = e.currentTarget.dataset; + this.selectComponent(`#invite${index}`).handleDetail(); + }, }, }); diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml index 69c7a8e..745af29 100644 --- a/src/echart/components/homeLevel2/index.wxml +++ b/src/echart/components/homeLevel2/index.wxml @@ -6,7 +6,11 @@ src="{{userInfo.Img}}" level="{{userInfo.DoctorLevel}}" > - + {{userInfo.Name}} @@ -27,26 +31,34 @@ - - {{item.SpecialtyName}} + + {{item.SpecialtyName}} +