diff --git a/project.private.config.json b/project.private.config.json index 836ad66..ce70062 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,11 +23,18 @@ "miniprogram": { "list": [ { + "name": "11", + "pathName": "patient/pages/certReslove/index", + "query": "", + "scene": null, + "launchMode": "default" + }, + { "name": "药房", "pathName": "gift/pages/dtpDurg/index", "query": "id=10", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "就诊地图", diff --git a/src/components/pickerArea/index.scss b/src/components/pickerArea/index.scss index de262c0..e5aba1a 100644 --- a/src/components/pickerArea/index.scss +++ b/src/components/pickerArea/index.scss @@ -41,7 +41,7 @@ padding: 18rpx 30rpx; box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.11); border-radius: 12rpx 12rpx 12rpx 12rpx; - border: 2rpx solid #e04775; + border: 2rpx solid #B982FF; display: flex; align-items: center; justify-content: space-between; @@ -69,7 +69,7 @@ display: flex; align-items: center; justify-content: center; - background: #e04775; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); border-radius: 12rpx 12rpx 12rpx 12rpx; } } @@ -91,7 +91,7 @@ background: #f7f8f9; &.active { color: #fff; - background-color: rgba(224, 71, 117, 1); + background-color: #B982FF; } } } @@ -118,9 +118,9 @@ height: 36rpx; } &.active { - color: rgba(224, 71, 117, 1); + color: #B982FF; .word { - color: rgba(224, 71, 117, 1); + color: #B982FF; } } } diff --git a/src/components/pickerArea/index.wxml b/src/components/pickerArea/index.wxml index 669ec1f..4f2617c 100644 --- a/src/components/pickerArea/index.wxml +++ b/src/components/pickerArea/index.wxml @@ -4,7 +4,8 @@ - 选择省份和地区 + 选择您的地区 + 选择您的省份 diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 3644340..9b974b2 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -207,6 +207,36 @@ } } +.popup9 { + padding: 32rpx; + width: 530rpx; + height: 452rpx; + box-sizing: border-box; + background-color: #fff; + text-align: center; + .icon { + width: 128rpx; + height: 128rpx; + } + .title { + margin-top: 24rpx; + font-size: 32rpx; + color: #211d2e; + font-weight: bold; + line-height: 40rpx; + } + .btn { + margin: 36rpx auto 0; + width: 418rpx; + height: 88rpx; + line-height: 88rpx; + font-size: 32rpx; + color: #FFFFFF; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 100rpx 100rpx 100rpx 100rpx; + } +} + .close { margin: 48rpx auto 0; display: block; diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 4c0cb79..b2509ea 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -72,6 +72,15 @@ + + + + 文字包含不合规内容 + + 请修改后重新提交 + + 知道了 + (); +const _app = getApp() // pages/story/a.ts Component({ @@ -16,37 +16,33 @@ Component({ notice: false, tabbar: [ { - path: "/pages/home/index", - name: "首页", - icon: "tab1.png", - iconActive: "tab-active1.png", - activeIndex: 1, + path: '/pages/home/index', + name: '首页', + icon: 'tab1.png', + iconActive: 'tab-active1.png', + activeIndex: 0, }, { - path: "/pages/cases/index", - name: "病历", - icon: "tab2.png", - iconActive: "tab-active2.png", - activeIndex: 2, + path: '/pages/information/index', + name: '资料库', + icon: 'tab2.png', + iconActive: 'tab-active2.png', + activeIndex: 1, }, { - custom: true, - path: "/module1/pages/entryCases/index", + path: '/pages/d_interactive/index', + name: '互动', + icon: 'tab3.png', + iconActive: 'tab-active3.png', + activeIndex: 2, }, { - path: "/pages/chatRoomList/index", - name: "学习窗", - icon: "tab3.png", - iconActive: "tab-active3.png", + path: '/pages/my/index', + name: '我的', + icon: 'tab4.png', + iconActive: 'tab-active4.png', activeIndex: 3, }, - { - path: "/pages/my/index", - name: "我的", - icon: "tab4.png", - iconActive: "tab-active4.png", - activeIndex: 4, - }, ], userInfo: {}, }, @@ -55,20 +51,16 @@ Component({ */ methods: { handleTab(e: any) { - const { index } = e.currentTarget.dataset; - const tab = this.data.tabbar[index]; - if (tab.custom) { - this.handleClsoeCaseTip(); - wx.navigateTo({ - url: tab.path, - }); - } else { - wx.switchTab({ - url: tab.path, - }); - } + const { index } = e.currentTarget.dataset + const tab = this.data.tabbar[index] + this.setData({ + active: tab.activeIndex, + }) + wx.switchTab({ + url: tab.path, + }) }, }, -}); +}) -export {}; +export {} diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index dd31ede..7e04463 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -1,27 +1,6 @@ - - - - - - 点击 - + - ,可录入病历 - - 邀约合作医生一起讨论哦 - - - 去录入 - - - - + diff --git a/src/gift/pages/dtpDurg/index.scss b/src/gift/pages/dtpDurg/index.scss index 756220b..078f94e 100644 --- a/src/gift/pages/dtpDurg/index.scss +++ b/src/gift/pages/dtpDurg/index.scss @@ -12,7 +12,7 @@ width: 100%; min-height: 100vh; border-radius: 24rpx 24rpx 0 0; - background-color: #FFFFFF; + background-color: #ffffff; box-sizing: border-box; .title { font-size: 36rpx; @@ -26,12 +26,12 @@ justify-content: space-between; .inner { .site { - font-size: 28rpx; - color: #adacb2; + font-size: 32rpx; + color: #211d2e; } .tel { - font-size: 28rpx; - color: #adacb2; + font-size: 32rpx; + color: #211d2e; } } } @@ -50,6 +50,7 @@ border-radius: 60rpx 60rpx 60rpx 60rpx; border: 1px solid #b982ff; .icon { + margin-right: 8rpx; display: inline-block; width: 36rpx; height: 36rpx; @@ -65,6 +66,7 @@ text-align: center; background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); .icon { + margin-right: 8rpx; display: inline-block; width: 32rpx; height: 32rpx; @@ -77,16 +79,17 @@ margin-top: 56rpx; padding: 32rpx; border-radius: 24rpx; - background-color: #FAFAFA; + background-color: #fafafa; .r-title { font-size: 32rpx; - color: #211D2E; + color: #211d2e; font-weight: bold; } .r-content { margin-top: 20rpx; font-size: 28rpx; - color: #69686E; + color: #69686e; + word-break: break-all; } } } diff --git a/src/gift/pages/dtpDurg/index.wxml b/src/gift/pages/dtpDurg/index.wxml index 51f5198..5bf2960 100644 --- a/src/gift/pages/dtpDurg/index.wxml +++ b/src/gift/pages/dtpDurg/index.wxml @@ -1,6 +1,6 @@ - - + + {{detail.Name}} @@ -16,7 +16,7 @@ - 地址 + 地址{{detail.dist}} diff --git a/src/images/bg33.png b/src/images/bg33.png new file mode 100644 index 0000000..bf0d748 Binary files /dev/null and b/src/images/bg33.png differ diff --git a/src/images/bg34.png b/src/images/bg34.png new file mode 100644 index 0000000..6a89cf9 Binary files /dev/null and b/src/images/bg34.png differ diff --git a/src/images/bg35.png b/src/images/bg35.png new file mode 100644 index 0000000..2cbc0d9 Binary files /dev/null and b/src/images/bg35.png differ diff --git a/src/images/icon100.png b/src/images/icon100.png new file mode 100644 index 0000000..95f3fdb Binary files /dev/null and b/src/images/icon100.png differ diff --git a/src/images/icon90.png b/src/images/icon90.png index f9fa44a..749f697 100644 Binary files a/src/images/icon90.png and b/src/images/icon90.png differ diff --git a/src/images/icon92.png b/src/images/icon92.png index ba7fabf..e1b513c 100644 Binary files a/src/images/icon92.png and b/src/images/icon92.png differ diff --git a/src/images/icon93.png b/src/images/icon93.png index ff6c6ae..e1b513c 100644 Binary files a/src/images/icon93.png and b/src/images/icon93.png differ diff --git a/src/images/icon94.png b/src/images/icon94.png index b31b48f..749f697 100644 Binary files a/src/images/icon94.png and b/src/images/icon94.png differ diff --git a/src/images/icon97.png b/src/images/icon97.png index d149f65..8bef043 100644 Binary files a/src/images/icon97.png and b/src/images/icon97.png differ diff --git a/src/images/icon98.png b/src/images/icon98.png new file mode 100644 index 0000000..4c54f51 Binary files /dev/null and b/src/images/icon98.png differ diff --git a/src/images/icon99.png b/src/images/icon99.png new file mode 100644 index 0000000..dd0edbf Binary files /dev/null and b/src/images/icon99.png differ diff --git a/src/images/za-images/3/icon-send-date.png b/src/images/za-images/3/icon-send-date.png index d31fae5..e446a5e 100644 Binary files a/src/images/za-images/3/icon-send-date.png and b/src/images/za-images/3/icon-send-date.png differ diff --git a/src/images/za-images/icon6.png b/src/images/za-images/icon6.png index 66d1325..4daef4b 100644 Binary files a/src/images/za-images/icon6.png and b/src/images/za-images/icon6.png differ diff --git a/src/pages/d_interactive/index.scss b/src/pages/d_interactive/index.scss index 907024c..91c3f0d 100644 --- a/src/pages/d_interactive/index.scss +++ b/src/pages/d_interactive/index.scss @@ -62,12 +62,18 @@ page { .dot { position: absolute; top: 0; - right: 0; - width: 18rpx; - height: 18rpx; + right: 10rpx; + transform: translateX(50%); + padding: 0 5rpx; + min-width: 32rpx; + height: 32rpx; + text-align: center; + font-size: 20rpx; + color: #ffffff; border: 2rpx solid #ffffff; - border-radius: 50%; - background: #d76c6c; + border-radius: 16rpx; + background: #ef3939; + box-sizing: border-box; } } .wrap { diff --git a/src/pages/d_interactive/index.wxml b/src/pages/d_interactive/index.wxml index 698a127..f6127de 100644 --- a/src/pages/d_interactive/index.wxml +++ b/src/pages/d_interactive/index.wxml @@ -33,7 +33,7 @@ - + 1 diff --git a/src/pages/d_interactiveDoctor/index.scss b/src/pages/d_interactiveDoctor/index.scss index 6b23bb9..558d331 100644 --- a/src/pages/d_interactiveDoctor/index.scss +++ b/src/pages/d_interactiveDoctor/index.scss @@ -468,26 +468,34 @@ page { padding: 32rpx 30rpx calc(32rpx + env(safe-area-inset-bottom)); box-sizing: border-box; display: flex; - gap: 28rpx; + gap: 10rpx; border-radius: 32rpx 32rpx 0 0; box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(40, 48, 49, 0.04); border: 2rpx solid #ffffff; background-color: #fff; .send { + padding: 0 12rpx 0 32rpx; flex: 1; display: flex; align-items: center; - justify-content: center; - font-size: 32rpx; - color: rgba(40, 48, 49, 1); - height: 76rpx; - background: #ffffff; - box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(40, 48, 49, 0.04); - border-radius: 140rpx 140rpx 140rpx 140rpx; - border: 2rpx solid #f2f4f5; - .icon { - width: 36rpx; - height: 36rpx; + justify-content: space-between; + border-radius: 98rpx; + background-color: #f6f8f9; + .content { + padding: 10rpx 0; + flex: 1; + color: #adacb2; + } + .btn { + flex-shrink: 0; + width: 188rpx; + height: 64rpx; + line-height: 64rpx; + font-size: 32rpx; + color: #ffffff; + text-align: center; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 111rpx 111rpx 111rpx 111rpx; } } .send-date { @@ -503,6 +511,74 @@ page { } } +.custom-input { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + padding: 30rpx; + box-sizing: border-box; + border-radius: 32rpx 32rpx 0 0; + background-color: #fff; + .icon { + position: relative; + width: 36rpx; + height: 36rpx; + overflow: visible; + &::after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 60rpx; + height: 60rpx; + background-color: transparent; + } + } + .wrap { + margin-top: 14rpx; + position: relative; + padding: 32rpx 32rpx 24rpx; + border-radius: 24rpx; + background-color: #f6f8f9; + .textarea { + width: 100%; + display: block; + height: 300rpx; + box-sizing: border-box; + padding-bottom: 80rpx; + .ka-container { + padding: 30rpx 62rpx; + display: flex; + align-items: center; + justify-content: space-between; + .stat { + font-size: 28rpx; + color: #adacb2; + } + .send-btn { + width: 128rpx; + height: 64rpx; + text-align: center; + line-height: 64rpx; + font-size: 32rpx; + color: #ffffff; + background: #b982ff linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 111rpx 111rpx 111rpx 111rpx; + } + } + } + } + &.custom-input-max { + .wrap { + .textarea { + height: 43vh; + } + } + } +} + .popup-message { padding: 30rpx; background-color: rgba(242, 244, 245, 1); @@ -526,7 +602,7 @@ page { background-color: #fff; &.active { color: #fff; - background-color: #B982FF; + background-color: #b982ff; } } } @@ -537,7 +613,7 @@ page { font-size: 36rpx; color: rgba(255, 255, 255, 1); font-weight: bold; - background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); + 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 a52aa0f..637c2e0 100644 --- a/src/pages/d_interactiveDoctor/index.ts +++ b/src/pages/d_interactiveDoctor/index.ts @@ -28,6 +28,10 @@ Page({ messageListShow: false, patientDetail: {}, + inputShow: false, + maxTextArea: false, + focus: false, + isLoad: false, isFinish: false, scrollTop: 0, @@ -97,7 +101,8 @@ Page({ }) }, getMessageList() { - if (this.data.isLoad || this.data.isFinish) return + if (this.data.isLoad || this.data.isFinish) + return this.setData({ isLoad: true, }) @@ -236,6 +241,17 @@ Page({ messageListShow: false, }) }, + handleInputShow() { + this.setData({ + inputShow: true, + focus: true, + }) + }, + toggleMaxTextarea() { + this.setData({ + maxTextArea: !this.data.maxTextArea, + }) + }, handleWord(e) { const { index } = e.currentTarget.dataset this.setData({ @@ -325,11 +341,14 @@ Page({ let msgCreateTimeName = '' if (dayjs().format('YYYY-MM-DD') === dayjs(date).format('YYYY-MM-DD')) { msgCreateTimeName = dayjs(date).format('HH:mm') - } else if (dayjs().format('YYYY-MM-DD') === dayjs(date).add(1, 'day').format('YYYY-MM-DD')) { + } + else if (dayjs().format('YYYY-MM-DD') === dayjs(date).add(1, 'day').format('YYYY-MM-DD')) { msgCreateTimeName = `昨天 ${dayjs(date).format('HH:mm')}` - } else if (dayjs().diff(date, 'day') < 7) { + } + else if (dayjs().diff(date, 'day') < 7) { msgCreateTimeName = dayjs(date).format(`dddd HH:mm`) - } else { + } + else { msgCreateTimeName = dayjs(date).format('YYYY-MM-DD HH:mm') } return msgCreateTimeName @@ -344,7 +363,8 @@ Page({ item.showTime = true preTime = dayjs(item.msgCreateTime).valueOf() item.msgCreateTimeName = this.formatTime(item.msgCreateTime) - } else { + } + else { const curTime = dayjs(item.msgCreateTime).valueOf() if (curTime - preTime > gapTime) { item.showTime = true @@ -443,6 +463,14 @@ Page({ }, }) }, + handleHideKeyboard() { + if (this.data.inputShow) { + this.setData({ + inputShow: false, + focus: false, + }) + } + }, handleBack() { wx.navigateBack() }, diff --git a/src/pages/d_interactiveDoctor/index.wxml b/src/pages/d_interactiveDoctor/index.wxml index 833f7d7..a6f0a07 100644 --- a/src/pages/d_interactiveDoctor/index.wxml +++ b/src/pages/d_interactiveDoctor/index.wxml @@ -4,6 +4,7 @@ @@ -146,14 +147,48 @@ - 发送消息 + + 输入文字 + 发送消息 + - 我的出诊时间 + 出诊时间 + + + + + + + + + { app.mpBehavior({ doctor: true, PageName: 'PG_DoctorHome' }) this.getNotice() @@ -136,7 +140,8 @@ Page({ }) }, }) - } else { + } + else { this.handleNotice() } }, @@ -167,7 +172,8 @@ Page({ handleBanner(e) { const { index } = e.currentTarget.dataset const { LinkUrl } = this.data.bannerList[index] - if (!LinkUrl) return + if (!LinkUrl) + return wx.navigateTo({ url: LinkUrl, fail() { @@ -267,7 +273,8 @@ Page({ if (params.ContentType === '5' && params.FileList[0]) { app.oldMpBehavior({ PositionId: '1', OperateType: '1', OperateId: id as string }) this.handleFile(params.FileList[0]) - } else { + } + else { wx.navigateTo({ url: `/pages/informationDetail/index?id=${id}`, }) @@ -293,7 +300,8 @@ Page({ wx.hideLoading() }, }) - } else { + } + else { wx.hideLoading() wx.showToast({ title: '下载文件失败', @@ -357,7 +365,7 @@ Page({ 4: '根据GO-QOL变化情况激素用量情况,判断筛选的不达标需干预的患者。', }[question] wx.showModal({ - content: content, + content, confirmColor: '#8c75d0', showCancel: false, confirmText: '知道了', diff --git a/src/pages/home/index.wxml b/src/pages/home/index.wxml index 00f73ce..bb039fb 100644 --- a/src/pages/home/index.wxml +++ b/src/pages/home/index.wxml @@ -68,7 +68,7 @@ {{item.Composite}} - 例入组 + 入组 diff --git a/src/pages/message/index.wxml b/src/pages/message/index.wxml index 802a6c2..bb2a1bd 100644 --- a/src/pages/message/index.wxml +++ b/src/pages/message/index.wxml @@ -18,7 +18,7 @@ {{item.Composite}} - 例入组 + 入组 diff --git a/src/patient/pages/doctor/index.ts b/src/patient/pages/doctor/index.ts index 063603b..f37649c 100644 --- a/src/patient/pages/doctor/index.ts +++ b/src/patient/pages/doctor/index.ts @@ -392,7 +392,6 @@ Page({ return { title: '【就诊地图】帮您快速找到医生和医院', - imageUrl: `${app.globalData.imageUrl}5/share1.png?t=${app.globalData.Timestamp}`, path, } }, diff --git a/src/patient/pages/hospital/index.scss b/src/patient/pages/hospital/index.scss index 083797b..2965bab 100644 --- a/src/patient/pages/hospital/index.scss +++ b/src/patient/pages/hospital/index.scss @@ -3,6 +3,7 @@ } .page { background-color: #fafafa; + min-height: 70vh; .banner { padding: 44rpx 30rpx 0; display: flex; @@ -27,8 +28,9 @@ align-items: center; .name { font-size: 36rpx; - color: #211D2E; + color: #211d2e; word-break: break-all; + font-weight: bold; } .tag { flex-shrink: 0; @@ -37,23 +39,26 @@ font-size: 22rpx; line-height: 1; color: #ffffff; - background: #FFA300; + background: #ffa300; border-radius: 8rpx; } } .content { - margin-top: 28rpx; - display: flex; - align-items: center; - justify-content: space-between; + margin-top: 18rpx; .inner { .site { - font-size: 24rpx; - color: #ADACB2; + margin-bottom: 16rpx; + font-size: 32rpx; + color: #211d2e; + .icon { + width: 36rpx; + height: 36rpx; + vertical-align: -8rpx; + } } .site-num { font-size: 24rpx; - color: #ADACB2; + color: #adacb2; } } .options { @@ -70,6 +75,45 @@ } } } + .options { + margin: 60rpx 30rpx 0; + display: flex; + align-items: center; + justify-content: center; + gap: 30rpx; + .phone { + flex: 1; + line-height: 70rpx; + font-size: 32rpx; + color: #b982ff; + text-align: center; + border-radius: 60rpx 60rpx 60rpx 60rpx; + border: 1px solid #b982ff; + .icon { + margin-right: 8rpx; + display: inline-block; + width: 36rpx; + height: 36rpx; + vertical-align: middle; + } + } + .site { + flex: 1; + line-height: 76rpx; + font-size: 32rpx; + color: #ffffff; + border-radius: 60rpx; + text-align: center; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + .icon { + margin-right: 8rpx; + display: inline-block; + width: 32rpx; + height: 32rpx; + vertical-align: middle; + } + } + } .module { margin-top: 64rpx; padding: 0 30rpx; @@ -105,13 +149,13 @@ padding-left: 20rpx; .name { font-size: 32rpx; - color: #211D2E; + color: #211d2e; font-weight: bold; } .p { margin-top: 8rpx; font-size: 24rpx; - color: #ADACB2; + color: #adacb2; &.ellipsis { min-width: 0; overflow: hidden; @@ -130,7 +174,7 @@ margin-bottom: 10rpx; width: 120rpx; height: 32rpx; - background: #FAF6FF; + background: #faf6ff; border-radius: 8rpx; display: flex; .week { @@ -138,14 +182,14 @@ font-size: 20rpx; line-height: 32rpx; color: #ffffff; - background-color: #B982FF; + background-color: #b982ff; text-align: center; border-radius: 8rpx 0 8rpx 8rpx; } .value { flex: 1; font-size: 20rpx; - color: #B982FF; + color: #b982ff; text-align: center; line-height: 32rpx; } diff --git a/src/patient/pages/hospital/index.wxml b/src/patient/pages/hospital/index.wxml index 90f0d2d..7767e89 100644 --- a/src/patient/pages/hospital/index.wxml +++ b/src/patient/pages/hospital/index.wxml @@ -1,8 +1,5 @@ - + - + + + + 电话 + + + + 地址{{detail.dist}} + + + diff --git a/src/patient/pages/infusionCenter/index.scss b/src/patient/pages/infusionCenter/index.scss index db1e06b..a5f2263 100644 --- a/src/patient/pages/infusionCenter/index.scss +++ b/src/patient/pages/infusionCenter/index.scss @@ -26,12 +26,12 @@ justify-content: space-between; .inner { .site { - font-size: 28rpx; - color: #adacb2; + font-size: 32rpx; + color: #211D2E; } .tel { - font-size: 28rpx; - color: #adacb2; + font-size: 32rpx; + color: #211D2E; } } } @@ -50,6 +50,7 @@ border-radius: 60rpx 60rpx 60rpx 60rpx; border: 1px solid #b982ff; .icon { + margin-right: 8rpx; display: inline-block; width: 36rpx; height: 36rpx; @@ -65,6 +66,7 @@ text-align: center; background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); .icon { + margin-right: 8rpx; display: inline-block; width: 32rpx; height: 32rpx; @@ -87,6 +89,7 @@ margin-top: 20rpx; font-size: 28rpx; color: #69686e; + word-break: break-all; } } } diff --git a/src/patient/pages/infusionCenter/index.wxml b/src/patient/pages/infusionCenter/index.wxml index 51f5198..5f5ccd4 100644 --- a/src/patient/pages/infusionCenter/index.wxml +++ b/src/patient/pages/infusionCenter/index.wxml @@ -1,6 +1,6 @@ - - + + {{detail.Name}} @@ -16,7 +16,7 @@ - 地址 + 地址{{detail.dist}} diff --git a/src/patient/pages/interactivePatient/index.json b/src/patient/pages/interactivePatient/index.json index 7e66841..af8a0b1 100644 --- a/src/patient/pages/interactivePatient/index.json +++ b/src/patient/pages/interactivePatient/index.json @@ -5,6 +5,7 @@ "van-icon": "@vant/weapp/icon/index", "van-loading": "@vant/weapp/loading/index", "referralFrom": "/components/referralFrom/index", - "navbar": "/components/navbar/index" + "navbar": "/components/navbar/index", + "popup": "/components/popup/index" } } diff --git a/src/patient/pages/interactivePatient/index.scss b/src/patient/pages/interactivePatient/index.scss index d5560a6..9cb4392 100644 --- a/src/patient/pages/interactivePatient/index.scss +++ b/src/patient/pages/interactivePatient/index.scss @@ -393,12 +393,22 @@ page { } .message { margin-bottom: 32rpx; - padding: 26rpx 32rpx; - background: rgba(185, 130, 255, 1); - border-radius: 32rpx; - font-size: 32rpx; - color: #fff; - white-space: pre-line; + display: flex; + align-items: center; + gap: 16rpx; + .error { + flex-shrink: 0; + width: 36rpx; + height: 36rpx; + } + .content { + padding: 26rpx 32rpx; + background: rgba(185, 130, 255, 1); + border-radius: 32rpx; + font-size: 32rpx; + color: #fff; + white-space: pre-line; + } } .referral-replay { margin-bottom: 32rpx; @@ -442,6 +452,12 @@ page { } } } + .status { + margin-bottom: 32rpx; + text-align: center; + font-size: 28rpx; + color: #adacb2; + } .place { height: 10vh; } @@ -469,9 +485,12 @@ page { } &.expend { height: 45vh; + &.min-expend { + height: 32vh; + } } .line { - margin: 0 auto; + margin: 10rpx auto; width: 52rpx; height: 6rpx; background: #f2f4f5; @@ -479,14 +498,42 @@ page { } .title { margin-top: 26rpx; - font-size: 32rpx; - color: rgba(40, 48, 49, 1); display: flex; + gap: 20rpx; align-items: center; - justify-content: center; - .icon { - width: 36rpx; - height: 36rpx; + justify-content: space-between; + .custom-input { + text-indent: 40rpx; + flex: 1; + height: 72rpx; + background: #f6f8f9; + line-height: 72rpx; + border-radius: 98rpx; + font-size: 32rpx; + color: #adacb2; + &.active { + color: #211d2e; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + .shortcut { + width: 244rpx; + height: 72rpx; + background: #ffffff; + box-shadow: 0rpx 4rpx 24rpx 0rpx rgba(0, 0, 0, 0.07); + border-radius: 98rpx 98rpx 98rpx 98rpx; + border: 2rpx solid #f6f8f9; + font-size: 32rpx; + color: rgba(40, 48, 49, 1); + display: flex; + align-items: center; + justify-content: center; + .icon { + width: 36rpx; + height: 36rpx; + } } } .tabs { @@ -571,5 +618,75 @@ page { } } } + .custom-input { + transition: all 0.3s; + .icon { + position: relative; + width: 36rpx; + height: 36rpx; + overflow: visible; + &::after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 60rpx; + height: 60rpx; + background-color: transparent; + } + } + .wrap { + margin-top: 14rpx; + position: relative; + padding: 32rpx 32rpx 24rpx; + border-radius: 24rpx; + background-color: #f6f8f9; + .textarea { + width: 100%; + display: block; + height: 300rpx; + box-sizing: border-box; + padding-bottom: 80rpx; + .ka-container { + padding: 30rpx 62rpx; + display: flex; + align-items: center; + justify-content: space-between; + .stat { + font-size: 28rpx; + color: #adacb2; + } + .send-btn { + width: 128rpx; + height: 64rpx; + text-align: center; + line-height: 64rpx; + font-size: 32rpx; + color: #ffffff; + background: #b982ff linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 111rpx 111rpx 111rpx 111rpx; + } + } + } + } + } + &.custom-input-max { + .custom-input { + position: absolute; + top: -45vh; + left: 0; + width: 100%; + box-sizing: border-box; + padding: 30rpx; + border-radius: 32rpx 32rpx 0 0; + background-color: #fff; + .wrap { + .textarea { + height: 45vh; + } + } + } + } } } diff --git a/src/patient/pages/interactivePatient/index.ts b/src/patient/pages/interactivePatient/index.ts index 2840a2f..b44b39a 100644 --- a/src/patient/pages/interactivePatient/index.ts +++ b/src/patient/pages/interactivePatient/index.ts @@ -25,7 +25,14 @@ interface Item { Page({ data: { + popupShow: true, + popupType: 'popup9', + popupParams: {} as any, + expend: false, + expendType: 'shortcut', + maxTextArea: false, + focus: false, scrollTop: 0, scrollIntoView: '', doctorDetail: {} as any, @@ -115,7 +122,8 @@ Page({ }) }, getMessageList() { - if (this.data.isLoad || this.data.isFinish) return + if (this.data.isLoad || this.data.isFinish) + return this.setData({ isLoad: true, }) @@ -234,11 +242,14 @@ Page({ let msgCreateTimeName = '' if (dayjs().format('YYYY-MM-DD') === dayjs(date).format('YYYY-MM-DD')) { msgCreateTimeName = dayjs(date).format('HH:mm') - } else if (dayjs().format('YYYY-MM-DD') === dayjs(date).add(1, 'day').format('YYYY-MM-DD')) { + } + else if (dayjs().format('YYYY-MM-DD') === dayjs(date).add(1, 'day').format('YYYY-MM-DD')) { msgCreateTimeName = `昨天 ${dayjs(date).format('HH:mm')}` - } else if (dayjs().diff(date, 'day') < 7) { + } + else if (dayjs().diff(date, 'day') < 7) { msgCreateTimeName = dayjs(date).format(`dddd HH:mm`) - } else { + } + else { msgCreateTimeName = dayjs(date).format('YYYY-MM-DD HH:mm') } return msgCreateTimeName @@ -253,7 +264,8 @@ Page({ item.showTime = true preTime = dayjs(item.msgCreateTime).valueOf() item.msgCreateTimeName = this.formatTime(item.msgCreateTime) - } else { + } + else { const curTime = dayjs(item.msgCreateTime).valueOf() if (curTime - preTime > gapTime) { item.showTime = true @@ -281,7 +293,7 @@ Page({ }, handleRead() { const { firstNotReadMsgId, messageList } = this.data - const index = messageList.findIndex((item) => `${item.msgId}` === `${firstNotReadMsgId}`) + const index = messageList.findIndex(item => `${item.msgId}` === `${firstNotReadMsgId}`) this.handleView(index) this.setData({ unReadCount: 0, @@ -291,6 +303,7 @@ Page({ app.mpBehavior({ PageName: 'BTN_PatientImAsk' }) this.setData({ expend: !this.data.expend, + maxTextArea: false, }) if (this.data.expend) { setTimeout(() => { @@ -298,6 +311,33 @@ Page({ }, 300) } }, + handleFooterInput() { + this.setData({ + expendType: 'custom-input', + focus: true, + }) + this.handleFooter() + }, + handleFooterShortcut() { + this.setData({ + expendType: 'shortcut', + }) + this.handleFooter() + }, + catchFooterInput() { + return false + }, + toggleMaxTextarea() { + this.setData({ + maxTextArea: !this.data.maxTextArea, + }) + }, + + bindblur() { + this.setData({ + focus: false, + }) + }, handleAdl() { wx.navigateTo({ url: '/patient/pages/adl/index', @@ -367,6 +407,16 @@ Page({ url: '/patient/pages/qol/index', }) }, + handlePopupOk() { + this.setData({ + popupShow: false, + }) + }, + handlePopupCancel() { + this.setData({ + popupShow: false, + }) + }, handleBack() { wx.navigateBack({ fail() { diff --git a/src/patient/pages/interactivePatient/index.wxml b/src/patient/pages/interactivePatient/index.wxml index 0b466d7..340bd5e 100644 --- a/src/patient/pages/interactivePatient/index.wxml +++ b/src/patient/pages/interactivePatient/index.wxml @@ -113,7 +113,12 @@ - {{message.msgContent}} + + + + {{message.msgContent}} + + 我最近一次复诊时间是{{message.ReVisitInfo.visitDateName}} 我的方案是 @@ -140,47 +145,103 @@ + 医生回复您之前,24小时内最多只能发1条文字消息 - + 您有{{unReadCount}}条新消息 - - 请选择您要咨询的问题 - - - - {{item.typeName}} + 输入您的问题 + + + 快捷提问 - - - {{index+1}} - {{item.question}} - - + + + + + {{item.typeName}} + - - + + + {{index+1}} + {{item.question}} + + + + + + + + + + + + + + + + + + +