diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts index 80ffe1e..9417b9b 100644 --- a/src/echart/components/homeLevel4/index.ts +++ b/src/echart/components/homeLevel4/index.ts @@ -288,10 +288,10 @@ Component({ devicePixelRatio: dpr, // new }); canvas.setChart(chart); - const x: string[] = ["2024-09", "2024-10"]; - const y1: string[] = ["10", "30"]; - const y2: string[] = ["10", "30"]; - const y3: string[] = ["20", "60"]; + const x: string[] = []; + const y1: string[] = []; + const y2: string[] = []; + const y3: string[] = []; list.forEach((item) => { x.push(item.YearMonth); y1.push(item.DoctorLevel1TotalCases); @@ -448,10 +448,10 @@ Component({ devicePixelRatio: dpr, // new }); canvas.setChart(chart); - const x: string[] = ["2024-09", "2024-10"]; - const y1: string[] = ["10", "30"]; - const y2: string[] = ["10", "30"]; - const y3: string[] = ["20", "60"]; + const x: string[] = []; + const y1: string[] = []; + const y2: string[] = []; + const y3: string[] = []; list.forEach((item) => { x.push(item.YearMonth); y1.push(item.DoctorLevel1MonthCases); diff --git a/src/module1/pages/auditDoctorDetail/index.scss b/src/module1/pages/auditDoctorDetail/index.scss index efd9e29..4ba4d63 100644 --- a/src/module1/pages/auditDoctorDetail/index.scss +++ b/src/module1/pages/auditDoctorDetail/index.scss @@ -106,6 +106,7 @@ page { font-size: 32rpx; color: rgba(20, 21, 21, 1); font-weight: bold; + text-align: center; } .btn1 { margin-top: 32rpx; diff --git a/src/module1/pages/auditDoctorDetail/index.ts b/src/module1/pages/auditDoctorDetail/index.ts index 544c21f..8e9c8a5 100644 --- a/src/module1/pages/auditDoctorDetail/index.ts +++ b/src/module1/pages/auditDoctorDetail/index.ts @@ -82,6 +82,9 @@ Page({ }, handleSubmit() { const { detail } = this.data; + this.setData({ + show: false, + }); wx.ajax({ method: "POST", url: "?r=takeda/doctor/audit-pass", @@ -95,7 +98,10 @@ Page({ }, handleSetDoctor() { const { detail } = this.data; - wx.navigateTo({ + this.setData({ + show: false, + }); + wx.redirectTo({ url: `/module1/pages/setDoctor/index?id=${detail.AuditId}`, }); }, diff --git a/src/module1/pages/setDoctor/index.ts b/src/module1/pages/setDoctor/index.ts index 8f79268..b8c5954 100644 --- a/src/module1/pages/setDoctor/index.ts +++ b/src/module1/pages/setDoctor/index.ts @@ -226,7 +226,7 @@ Page({ const { DoctorId } = this.data; if (!DoctorId) { wx.showToast({ - title: "请选择指派医生", + title: "请选择医生", icon: "none", }); return; diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml index ed1a806..bc52a6c 100644 --- a/src/pages/chatRoomList/index.wxml +++ b/src/pages/chatRoomList/index.wxml @@ -283,7 +283,7 @@ - +