diff --git a/src/images/checkbox-active.png b/src/images/checkbox-active.png index 2dff512..6322f28 100644 Binary files a/src/images/checkbox-active.png and b/src/images/checkbox-active.png differ diff --git a/src/images/icon1.png b/src/images/icon1.png index b0bcb7f..84e41b3 100644 Binary files a/src/images/icon1.png and b/src/images/icon1.png differ diff --git a/src/images/icon68.png b/src/images/icon68.png new file mode 100644 index 0000000..5aa2440 Binary files /dev/null and b/src/images/icon68.png differ diff --git a/src/images/title1.png b/src/images/title1.png index 57ad7cb..e77351d 100644 Binary files a/src/images/title1.png and b/src/images/title1.png differ diff --git a/src/pages/d_interactive/index.ts b/src/pages/d_interactive/index.ts index 94ecf61..a831432 100644 --- a/src/pages/d_interactive/index.ts +++ b/src/pages/d_interactive/index.ts @@ -96,7 +96,7 @@ Page({ wx.showModal({ title: '提示', content: '确认清空消息吗？', - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/pages/d_interactiveDoctor/index.scss b/src/pages/d_interactiveDoctor/index.scss index 640d12c..b7e1216 100644 --- a/src/pages/d_interactiveDoctor/index.scss +++ b/src/pages/d_interactiveDoctor/index.scss @@ -40,6 +40,7 @@ page { color: rgba(255, 255, 255, 1); font-weight: normal; background-color: rgba(185, 130, 255, 1); + vertical-align: middle; } } .date { @@ -521,7 +522,7 @@ page { background-color: #fff; &.active { color: #fff; - background-color: rgba(103, 186, 202, 1); + background-color: #B982FF; } } } @@ -532,7 +533,7 @@ page { font-size: 36rpx; color: rgba(255, 255, 255, 1); font-weight: bold; - background: #67baca; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); display: flex; align-items: center; justify-content: center; diff --git a/src/pages/d_interactiveDoctor/index.ts b/src/pages/d_interactiveDoctor/index.ts index ce2a42d..fa90677 100644 --- a/src/pages/d_interactiveDoctor/index.ts +++ b/src/pages/d_interactiveDoctor/index.ts @@ -178,7 +178,7 @@ Page({ title: '完善出诊时间？', content: '您还没有录入出诊时间', confirmText: '录入', - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { wx.navigateTo({ @@ -192,7 +192,7 @@ Page({ wx.showModal({ title: '提示', content: '将您的出诊时间发送给患者？', - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { this.setData({ @@ -275,7 +275,7 @@ Page({ }[id] wx.showModal({ title, - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { this.handleSendUser(id) @@ -411,7 +411,7 @@ Page({ title: '', content: '您将给患者发送复诊时间填写卡片？', confirmText: '发送', - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/pages/d_interactiveDoctor/index.wxml b/src/pages/d_interactiveDoctor/index.wxml index d149637..eb9fd4e 100644 --- a/src/pages/d_interactiveDoctor/index.wxml +++ b/src/pages/d_interactiveDoctor/index.wxml @@ -1,5 +1,5 @@ - + {{patientDetail.patientName}} - EDC患者 + EDC患者 - 上次就诊时间:2025-08-10 + 入组时间:2025-08-10 查看档案 diff --git a/src/pages/d_invite/index.json b/src/pages/d_invite/index.json index 6a47e59..2429938 100644 --- a/src/pages/d_invite/index.json +++ b/src/pages/d_invite/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "重症肌无力医生端", + "navigationBarTitleText": " 我的医生码", "navigationStyle": "default", "usingComponents": { "customPoster": "/components/customPoster/index" diff --git a/src/pages/d_invite/index.scss b/src/pages/d_invite/index.scss index 446a9ba..d987c86 100644 --- a/src/pages/d_invite/index.scss +++ b/src/pages/d_invite/index.scss @@ -1,5 +1,5 @@ page{ - background-color: #c65174; + background-color: #d68dfc; } .page { position: relative; diff --git a/src/pages/d_invite/index.ts b/src/pages/d_invite/index.ts index 9b87de7..11448d4 100644 --- a/src/pages/d_invite/index.ts +++ b/src/pages/d_invite/index.ts @@ -21,7 +21,7 @@ Page({ wx.showLoading({ title: '加载中', }) - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' }) + app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' }) this.getDetail() }) }, diff --git a/src/pages/d_patient/index.scss b/src/pages/d_patient/index.scss index 8c2cd55..a602512 100644 --- a/src/pages/d_patient/index.scss +++ b/src/pages/d_patient/index.scss @@ -165,6 +165,7 @@ page { border-radius: 4rpx; font-weight: normal; background-color: rgba(185, 130, 255, 1); + vertical-align: middle; } } } diff --git a/src/pages/d_patient/index.ts b/src/pages/d_patient/index.ts index f5a9475..2edd43a 100644 --- a/src/pages/d_patient/index.ts +++ b/src/pages/d_patient/index.ts @@ -61,6 +61,11 @@ Page({ app.waitLogin().then((_res) => { app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTLIST' }) this.getList() + app.getUserInfo(2).then((userInfo) => { + this.setData({ + userInfo, + }) + }) }) }, handleReset() { diff --git a/src/pages/d_patient/index.wxml b/src/pages/d_patient/index.wxml index 35fcd0e..f4a99f2 100644 --- a/src/pages/d_patient/index.wxml +++ b/src/pages/d_patient/index.wxml @@ -15,7 +15,7 @@ bind:tap="handleTapSearch" /> - + 我的患者 {{unReadCount}} diff --git a/src/pages/d_patientDetail/index.scss b/src/pages/d_patientDetail/index.scss index 83e6554..081ff70 100644 --- a/src/pages/d_patientDetail/index.scss +++ b/src/pages/d_patientDetail/index.scss @@ -42,8 +42,8 @@ page { } .icon { position: absolute; - bottom: 0; - right: 0; + bottom: 10rpx; + right: 10rpx; width: 40rpx; height: 40rpx; } @@ -55,12 +55,11 @@ page { color: rgba(33, 29, 46, 1); font-weight: bold; .age { + margin-left: 10rpx; display: inline; color: rgba(173, 172, 178, 1); font-weight: normal; - .sub { - font-size: 28rpx; - } + font-size: 28rpx; } } .tel { @@ -415,7 +414,7 @@ page { display: flex; justify-content: center; align-items: center; - background: #67baca; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); font-size: 36rpx; color: #fff; border-radius: 64rpx 64rpx 64rpx 64rpx; @@ -505,5 +504,3 @@ page { } } } - - diff --git a/src/pages/d_patientDetail/index.ts b/src/pages/d_patientDetail/index.ts index e4994b8..c32d44c 100644 --- a/src/pages/d_patientDetail/index.ts +++ b/src/pages/d_patientDetail/index.ts @@ -170,6 +170,11 @@ Page({ app.zdMpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTDETAIL' }) this.getDoctorDetail() await this.getDetail() + app.getUserInfo(2).then((userInfo) => { + this.setData({ + userInfo, + }) + }) }) }, getDoctorDetail() { diff --git a/src/pages/d_patientDetail/index.wxml b/src/pages/d_patientDetail/index.wxml index d985e57..645e7e4 100644 --- a/src/pages/d_patientDetail/index.wxml +++ b/src/pages/d_patientDetail/index.wxml @@ -46,8 +46,12 @@ {{detail.HasTedSurgeryName}} + + 备注 + {{detail.remark}} + - + 标识为EDC患者 diff --git a/src/pages/d_userInfo/index.scss b/src/pages/d_userInfo/index.scss index 2cf4280..a01c023 100644 --- a/src/pages/d_userInfo/index.scss +++ b/src/pages/d_userInfo/index.scss @@ -11,7 +11,6 @@ page { .row { padding: 32rpx 0; display: flex; - align-items: center; justify-content: space-between; border-bottom: 1px solid rgba(173, 172, 178, 0.1); &:last-of-type { @@ -42,6 +41,7 @@ page { flex: 1; font-size: 32rpx; color: rgba(33, 29, 46, 1); + white-space: pre-line; } .option { flex-shrink: 0; @@ -121,7 +121,7 @@ page { display: flex; align-items: center; justify-content: center; - background-color: rgba(103, 186, 202, 1); + background-color: rgba(185, 130, 255, 1); } .item { position: relative; @@ -140,7 +140,8 @@ page { display: none; } &.active { - background-color: rgba(237, 252, 255, 1); + background-color: rgba(214, 181, 255, 1); + color: #fff; .icon { display: block; } @@ -154,7 +155,7 @@ page { display: flex; justify-content: center; align-items: center; - background: #67baca; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); font-size: 36rpx; color: #fff; border-radius: 64rpx 64rpx 64rpx 64rpx; @@ -187,7 +188,7 @@ page { display: flex; justify-content: center; align-items: center; - background: #67baca; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); font-size: 36rpx; color: #fff; border-radius: 64rpx 64rpx 64rpx 64rpx; diff --git a/src/pages/d_userInfo/index.ts b/src/pages/d_userInfo/index.ts index 51075b2..e419768 100644 --- a/src/pages/d_userInfo/index.ts +++ b/src/pages/d_userInfo/index.ts @@ -209,7 +209,7 @@ Page({ handleLoginOut() { wx.showModal({ title: '确认退出?', - confirmColor: '#62bed0', + confirmColor: '#8c75d0', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/pages/d_userInfo/index.wxml b/src/pages/d_userInfo/index.wxml index a18968d..54c206b 100644 --- a/src/pages/d_userInfo/index.wxml +++ b/src/pages/d_userInfo/index.wxml @@ -15,24 +15,24 @@ 电话 {{doctor.Telephone}} - 更换 + 医院 {{hospital.Name}} - - 多院区出诊 - - - - + + + + + + + + + + + 门诊时间 {{doctor.weekName || '暂无'}} diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index 0e02a22..d82a375 100644 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -104,6 +104,11 @@ page { color: rgba(173, 172, 178, 1); } } + .content{ + margin-top: 16rpx; + font-size: 28rpx; + color: rgba(173, 172, 178, 1); + } } } } diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts index c54bf03..54daf33 100644 --- a/src/pages/home/index.ts +++ b/src/pages/home/index.ts @@ -18,6 +18,8 @@ Page({ userInfo: {}, current: 0, + stat: {}, + notice: [], bannerList: [], @@ -44,6 +46,7 @@ Page({ this.getBriefingList() this.getSopList() this.getList() + this.getStat() app.getUserInfo(2).then((userInfo) => { this.setData({ userInfo, @@ -70,6 +73,17 @@ Page({ } }) }, + getStat() { + wx.ajax({ + method: 'GET', + url: '?r=zd/doctor/index/get-latest-static', + data: {}, + }).then((res) => { + this.setData({ + stat: res, + }) + }) + }, handleWebview() { // wx.showToast({ // title: '访问路径：公众号“TED关爱中心”底部菜单栏', diff --git a/src/pages/home/index.wxml b/src/pages/home/index.wxml index 7c1886a..f08299b 100644 --- a/src/pages/home/index.wxml +++ b/src/pages/home/index.wxml @@ -18,7 +18,7 @@ -