diff --git a/pages/diagnosticResults/index.js b/pages/diagnosticResults/index.js index 73e499a..97bc681 100644 --- a/pages/diagnosticResults/index.js +++ b/pages/diagnosticResults/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - msg: '' + msg: '', }, handleBack(){ wx.navigateBack() diff --git a/pages/diagnosticResults/index.less b/pages/diagnosticResults/index.less index ccd0440..78773be 100644 --- a/pages/diagnosticResults/index.less +++ b/pages/diagnosticResults/index.less @@ -42,6 +42,9 @@ margin-top: -40rpx; margin-bottom: 24rpx; } + .success{ + color: var(--td-brand-color); + } .msg-text{ font-size: 30rpx; color: #606266; diff --git a/pages/diagnosticResults/index.wxml b/pages/diagnosticResults/index.wxml index 1afed14..b52b57b 100644 --- a/pages/diagnosticResults/index.wxml +++ b/pages/diagnosticResults/index.wxml @@ -2,33 +2,29 @@ - - - - + - - - - - 高危预警 - - - 您的症状组合提示可能存在胆管炎风险 - - - - + \ No newline at end of file diff --git a/pages/followUp/index.js b/pages/followUp/index.js index 61d7951..452eb16 100644 --- a/pages/followUp/index.js +++ b/pages/followUp/index.js @@ -385,7 +385,7 @@ Page({ async getDetail(){ const res = await request('patient/questionnaire_info', 'post',{patient_id : 0, questionnaire_id: Number(this.planId)}) - const data = res.data + const data = res data.liver_function_image = data.liver_function_image ? data.liver_function_image.split(',') : [] data.b_mode_image = data.b_mode_image ? data.b_mode_image.split(',') : [] data.blood_routine_image = data.blood_routine_image ? data.blood_routine_image.split(',') : [] diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 0fa7850..d70778d 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -26,7 +26,7 @@ - + diff --git a/pages/message/index.js b/pages/message/index.js index a395730..da8a44a 100644 --- a/pages/message/index.js +++ b/pages/message/index.js @@ -106,6 +106,12 @@ Page({ url: `/pages/followUp/index?planId=${id}&name=${name}&time=${time}` , }) }, + goQuestionnaire(e) { + const data = this.data.dataList[0] + wx.navigateTo({ + url: `/pages/followUp/index?planId=${data.id}&name=${data.plan_name}&time=${data.plan_date}` , + }) + }, toRegister() { wx.navigateTo({ url: '/pages/register/index', diff --git a/pages/message/index.wxml b/pages/message/index.wxml index 8986144..9236981 100644 --- a/pages/message/index.wxml +++ b/pages/message/index.wxml @@ -21,7 +21,7 @@ - + 添加随访 diff --git a/pages/my/index.js b/pages/my/index.js index 55a1833..a37d572 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -42,6 +42,7 @@ Page({ { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' }, ], + risk_type: '' }, onLoad() { @@ -56,6 +57,16 @@ Page({ const Token = wx.getStorageSync('access_token'); if (Token) { const personalInfo = await this.getPersonalInfo(); + let style = '' + if(personalInfo.risk_type == '1' || !personalInfo.risk_type){ + style = 'success' + } + if(personalInfo.risk_type == '2'){ + style = 'waring' + } + if(personalInfo.risk_type == '3'){ + style = 'danger' + } this.setData({ isLoad: false, personalInfo: personalInfo, @@ -64,6 +75,7 @@ Page({ { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' }, ], + risk_type: style }); } else { this.setData({ diff --git a/pages/my/index.less b/pages/my/index.less index 789d92b..c1091b0 100644 --- a/pages/my/index.less +++ b/pages/my/index.less @@ -220,7 +220,7 @@ } .group_1 { width: 270rpx; - background-color: rgba(208,15,22,0.100000); + // background-color: rgba(208,15,22,0.100000); border-radius: 28rpx; border: 1px solid rgba(255,255,255,1); padding-left: 20rpx; @@ -229,6 +229,43 @@ justify-content: space-between; margin: 22rpx 82rpx 0 0; } +.success{ + background-color: rgba(43, 164, 113, 0.1); + .text-wrapper_2{ + background-color: rgba(43, 164, 113, 1);; + } + .text-group_5{ + color: rgba(43, 164, 113); + } + .thumbnail_1{ + color: rgba(43, 164, 113); + } +} +.waring{ + background-color: rgba(227, 115, 24, 0.1); + .text-wrapper_2{ + background-color: rgba(227, 115, 24, 1); + } + .text-group_5{ + color: rgba(227, 115, 24, 1); + } + .thumbnail_1{ + color: rgba(227, 115, 24, 1); + } +} +.danger{ + background-color: rgba(208, 15, 22, 0.1); + .text-wrapper_2{ + background-color: rgba(208, 15, 22, 1); + } + .text-group_5{ + color: rgba(208, 15, 22, 1); + } + .thumbnail_1{ + color: rgba(208, 15, 22, 1); + } + +} .image-text_4 { width: 188rpx; flex-direction: row; @@ -257,16 +294,7 @@ flex-direction: column; padding: 12rpx 22rpx 12rpx 22rpx; } -.scuess{ - background-color: #2ba471; -} -.waring{ - background-color: #e37318; -} -.danger{ - background-color: rgba(208,15,22,1.000000); -} .text_6 { overflow-wrap: break-word; color: rgba(255,255,255,1); diff --git a/pages/my/index.wxml b/pages/my/index.wxml index 6661821..7aeb655 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -27,20 +27,21 @@ 胆道闭锁手术时间：{{personalInfo.operative_date}} - + - PELD评分：{{personalInfo.risk_value}} + PELD评分：{{personalInfo.risk_value || '--'}} - + 低危 - + 中危 - + 高危 + diff --git a/pages/register/index.wxml b/pages/register/index.wxml index 7071f16..13b1fa6 100644 --- a/pages/register/index.wxml +++ b/pages/register/index.wxml @@ -3,7 +3,7 @@ t-class-placeholder="t-navbar-placeholder" t-class-content="t-navbar-content" class="block" - title="紧急通道" + title="预约挂号" left-arrow bind:go-back="handleBack" /> diff --git a/pages/therapeuticRegimen/index.js b/pages/therapeuticRegimen/index.js index d4f8f84..de51307 100644 --- a/pages/therapeuticRegimen/index.js +++ b/pages/therapeuticRegimen/index.js @@ -56,14 +56,14 @@ Page({ * 生命周期函数--监听页面初次渲染完成 */ onReady() { - this.getList() + }, /** * 生命周期函数--监听页面显示 */ onShow() { - + this.getList() }, /** diff --git a/pages/therapeuticRegimen/index.less b/pages/therapeuticRegimen/index.less index 4acb97f..49ca8be 100644 --- a/pages/therapeuticRegimen/index.less +++ b/pages/therapeuticRegimen/index.less @@ -4,7 +4,7 @@ box-sizing: border-box; padding: 24rpx; position: relative; - height: calc(100vh - 130rpx); + height: calc(100vh - 110rpx); .therapeuticRegimen-item{ padding: 28rpx; background-color: #fff; diff --git a/pages/therapeuticRegimen/index.wxml b/pages/therapeuticRegimen/index.wxml index 6b0e256..349d32b 100644 --- a/pages/therapeuticRegimen/index.wxml +++ b/pages/therapeuticRegimen/index.wxml @@ -1,5 +1,5 @@ - +