From 469bdd058a575f5fc116a6bb2974e26eab2f45e4 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 24 Aug 2023 13:46:58 +0800 Subject: [PATCH] =?UTF-8?q?8.24=20=E5=8C=BB=E7=94=9F=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/case/index.js | 16 +++++ Pages/yishi/case/index.wxml | 16 ++--- Pages/yishi/case/index.wxss | 9 ++- Pages/yishi/linkPage/linkPage.js | 68 +++++++++++++++++++ Pages/yishi/linkPage/linkPage.json | 3 + Pages/yishi/linkPage/linkPage.wxml | 2 + Pages/yishi/linkPage/linkPage.wxss | 1 + Pages/yishi/my/index.js | 2 +- Pages/yishi/my/index.wxml | 46 +++++++------ Pages/yishi/my/index.wxss | 45 +++++++++--- .../MessageElements/CustomMessage/index.js | 25 ++++++- .../MessageElements/CustomMessage/index.wxml | 18 ++++- .../MessageElements/CustomMessage/index.wxss | 29 ++++++++ .../TUIChat/components/MessageList/index.js | 1 - TUIKit/components/TUIChat/index.js | 1 - TUIKit/components/TUIChat/index.wxss | 6 ++ app.json | 3 +- 17 files changed, 245 insertions(+), 46 deletions(-) create mode 100644 Pages/yishi/linkPage/linkPage.js create mode 100644 Pages/yishi/linkPage/linkPage.json create mode 100644 Pages/yishi/linkPage/linkPage.wxml create mode 100644 Pages/yishi/linkPage/linkPage.wxss diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js index 84ebf13..6414560 100644 --- a/Pages/yishi/case/index.js +++ b/Pages/yishi/case/index.js @@ -21,6 +21,22 @@ Page({ }, goReport(event){ const url=event.currentTarget.dataset.url; + const randfile = new Date().getTime() + '检测报告'; + const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`; + wx.downloadFile({ + // 示例 url，并非真实存在 + url:url, + filePath: newPath, + success: function (res) { + //const filePath = res.tempFilePath + wx.openDocument({ + filePath: newPath, + success: function (res) { + console.log('打开文档成功') + } + }) + } + }) }, formatImgList(){ let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[]; diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml index 56cf2e2..be3cbc5 100644 --- a/Pages/yishi/case/index.wxml +++ b/Pages/yishi/case/index.wxml @@ -15,13 +15,13 @@ 婚姻：{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}} - + 所患疾病： {{case_detail.disease_class_name}} - + 确诊日期： - {{dateSubstr.substring(case_detail.diagnosis_date,0,10)}} + {{dateSubstr.substring(case_detail.diagnosis_date,0,10)}} + \ No newline at end of file diff --git a/Pages/yishi/linkPage/linkPage.wxss b/Pages/yishi/linkPage/linkPage.wxss new file mode 100644 index 0000000..cdd32c4 --- /dev/null +++ b/Pages/yishi/linkPage/linkPage.wxss @@ -0,0 +1 @@ +/* pages/linkPage/linkPage.wxss */ \ No newline at end of file diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js index 7ffe33d..dc2a552 100644 --- a/Pages/yishi/my/index.js +++ b/Pages/yishi/my/index.js @@ -3,7 +3,7 @@ let api = new API() const app = getApp(); Page({ data: { - title: "个人中心", + title: "我的", navHeight: 0, stateHeight: 0, user_name: "医师姓名", diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml index f264281..e635942 100644 --- a/Pages/yishi/my/index.wxml +++ b/Pages/yishi/my/index.wxml @@ -1,58 +1,64 @@ {{ title }} - + - {{user_name}} + + + {{user_name}} + + 设置 + + + + {{iden_auth_status==1?'已医师认证':'未医师认证'}}> {{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}> - - - + - \ No newline at end of file diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss index 1d4d4ec..0fa6814 100644 --- a/Pages/yishi/my/index.wxss +++ b/Pages/yishi/my/index.wxss @@ -4,7 +4,7 @@ page{ .container{ background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%); - padding-bottom: 100rpx; + padding-bottom: 70rpx; min-height:100vh; width: 100vw; color: #fff; @@ -17,6 +17,7 @@ page{ position: absolute; } .title{ + color: #000000; position:relative; text-align: center; } @@ -34,7 +35,8 @@ page{ } .name{ height: 50rpx; - font-size: 36rpx; + font-size: 34rpx; + color: rgba(0,0,0,0.85); line-height: 50rpx; } .renzheng{ @@ -50,6 +52,12 @@ page{ padding: 0 20rpx; margin-right: 20rpx; } +.zhiye{ + background: #999999; +} +.yishi{ + background: #FAAD14; +} .photo{ flex: 3; text-align: center; @@ -62,11 +70,26 @@ page{ text-align: right; padding-right: 20rpx; } +.namebox{ + justify-content: space-between; + display: flex; +} +.iconbox{ + align-items: center; + font-size: 30rpx; + color: rgba(0,0,0,0.65); + margin-right: 24rpx; + display: flex; +} +.iconbox .arrow{ + margin-top: 4rpx; + margin-left: 4px; +} .account{ background-color: rgb(255, 255, 255); width: 92vw; margin: 0 auto; - height: 272rpx; + height: 280rpx; margin-top: 24rpx; position: relative; border-radius: 20rpx; @@ -85,12 +108,16 @@ page{ margin-left: 20rpx; } .account_title{ - flex: 9; + margin-top: 32rpx; display: flex; + font-size: 30rpx; +font-weight: 400; +color: rgba(0,0,0,0.65); align-items: center; } .account_num{ - flex: 10; + margin-top: 10rpx; + font-weight: bold; display: flex; align-items: center; } @@ -98,7 +125,8 @@ page{ flex: 2; display: flex; justify-content: center; - align-items: center; + align-items:flex-end; + margin-bottom: 20rpx; } .account_bottom{ flex: 1; @@ -112,14 +140,15 @@ page{ background-color: #fff; margin: 24rpx auto 0; position: static; + overflow: hidden; border-radius: 20rpx; - padding: 20rpx 0; + padding: 0rpx 0 20rpx; } .t-badge__content-text { line-height: 70rpx !important; } .van-cell { - padding: 32rpx !important; + padding: 30rpx !important; } diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js index 76f7bab..65bdd6e 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js @@ -198,7 +198,9 @@ Component({ let data = customMessage.data; const renderDom = [{ type: 'patient_info', - path:data.message_path + disease_desc:data.disease_desc, + path:data.message_path, + detection_link:data.detection_link }]; return renderDom; } @@ -251,12 +253,31 @@ Component({ } catch (error) { } }, - + goReport(event){ + const url=event.currentTarget.dataset.url; + const randfile = new Date().getTime() + '检测报告'; + const newPath = `${wx.env.USER_DATA_PATH}/${randfile}`; + wx.downloadFile({ + // 示例 url，并非真实存在 + url:url, + filePath: newPath, + success: function (res) { + //const filePath = res.tempFilePath + wx.openDocument({ + filePath: newPath, + success: function (res) { + console.log('打开文档成功') + } + }) + } + }) + }, goSick(event){ const url=event.currentTarget.dataset.url; console.log(url); app.go(url); }, + openLink(e) { if (e.currentTarget.dataset.value.key === '立即前往') { wx.navigateTo({ diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml index eaa7050..e8a283e 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml @@ -96,7 +96,7 @@ 所患疾病：{{renderDom[0].disease_class_names}} - + 查看报告 @@ -105,13 +105,25 @@ 患者信息 - - 就诊人：{{patient_family_data.patient_name}}（男女未知｜{{patient_family_data.patient_age}}岁） + + {{patient_family_data.patient_name}}（男女未知｜{{patient_family_data.patient_age}}岁） + + 病情描述：{{renderDom[0].disease_desc}} + + + 查看详情 + + + + + {{patient_family_data.patient_name}}（男女未知｜{{patient_family_data.patient_age}}岁） + 查看详情 + diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss index 225c55e..8f390db 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss @@ -333,4 +333,33 @@ justify-content:space-between; display: flex; color:rgba(0,0,0,0.45); align-items: center; +} +.sick_desc{ + font-size: 28rpx; + margin:20rpx 32rpx 0; + text-align: left; + + border-bottom: 1rpx solid rgba(0,0,0,0.12); + padding-bottom: 30rpx; + +} +.sickname{ + font-size: 28rpx; +font-weight: 400; +color: rgba(0,0,0,0.45); +} +.sicklook{ + justify-content: space-between; + margin:0 32rpx; + align-items: center; + height: 100rpx; +} +.sickinfo .name{ + margin: 20rpx 32rpx 0; + + text-align: left; +} +.sicklook .see{ + + font-size: 32rpx; } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index 0359fe1..da76b75 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -362,7 +362,6 @@ Component({ const title = customMessage.title if(title.indexOf("问诊已结束") > -1){ setTimeout(() => { - console.log('aaaaaaaaaaaaaaaaaaaaaa') //收到横条消息去触发父组件getbase方法,演示1秒 this.triggerEvent('getInquiryMessageBasic'); }, 1000); diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index 50aef6f..2ecaf8a 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -188,7 +188,6 @@ Component({ }, onChangeTime(e) { - console.log(e.detail) this.setData({ 'timeData': e.detail, }); diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss index 57ab792..8c01347 100644 --- a/TUIKit/components/TUIChat/index.wxss +++ b/TUIKit/components/TUIChat/index.wxss @@ -154,14 +154,20 @@ .time_desc{ color:#E34D59; display: flex; + align-items: center; } .time_desc .item{ color:#E34D59; + + display: flex; + align-items: center; font-size: 32rpx; } .count_time{ display: flex; + height:100rpx; + align-items: center; } .circle_top{ width: 10rpx; diff --git a/app.json b/app.json index ff1d525..12a4604 100644 --- a/app.json +++ b/app.json @@ -58,7 +58,8 @@ "Pages/yishi/wenzhenorderV2/index", "Pages/yishi/wenzhen_v3/wenzhen", "Pages/agreement_page/index", - "Pages/yishi/medince_list/index" + "Pages/yishi/medince_list/index", + "Pages/yishi/linkPage/linkPage" ], "window": { "navigationBarBackgroundColor": "#ffffff",