diff --git a/app.json b/app.json index 455a4e1..3de3ac8 100644 --- a/app.json +++ b/app.json @@ -79,19 +79,27 @@ "navigationBarBackgroundColor": "#fff", "navigationBarTitleText": "Weixin", "navigationBarTextStyle": "black" + }, "tabBar": { - "custom": true, + "color": "#888888", + "selectedColor": "#005BA2", "list": [ { + "iconPath": "assets/images/home/home.png", + "selectedIconPath": "assets/images/home/homeAct.png", "pagePath": "pages/home/index", "text": "首页" }, { + "iconPath": "assets/images/home/sf.png", + "selectedIconPath": "assets/images/home/sfAct.png", "pagePath": "pages/message/index", "text": "随访" }, { + "iconPath": "assets/images/home/my.png", + "selectedIconPath": "assets/images/home/myAct.png", "pagePath": "pages/my/index", "text": "我的" } diff --git a/assets/images/home/home.png b/assets/images/home/home.png new file mode 100644 index 0000000..b015c53 Binary files /dev/null and b/assets/images/home/home.png differ diff --git a/assets/images/home/homeAct.png b/assets/images/home/homeAct.png new file mode 100644 index 0000000..4653fea Binary files /dev/null and b/assets/images/home/homeAct.png differ diff --git a/assets/images/home/my.png b/assets/images/home/my.png new file mode 100644 index 0000000..cac9c17 Binary files /dev/null and b/assets/images/home/my.png differ diff --git a/assets/images/home/myAct.png b/assets/images/home/myAct.png new file mode 100644 index 0000000..d6602be Binary files /dev/null and b/assets/images/home/myAct.png differ diff --git a/assets/images/home/sf.png b/assets/images/home/sf.png new file mode 100644 index 0000000..54784f8 Binary files /dev/null and b/assets/images/home/sf.png differ diff --git a/assets/images/home/sfAct.png b/assets/images/home/sfAct.png new file mode 100644 index 0000000..6a081c5 Binary files /dev/null and b/assets/images/home/sfAct.png differ diff --git a/assets/images/my/baby.png b/assets/images/my/baby.png new file mode 100644 index 0000000..a8a0a30 Binary files /dev/null and b/assets/images/my/baby.png differ diff --git a/assets/images/my/jkjy.svg b/assets/images/my/jkjy.svg new file mode 100644 index 0000000..79f22fe --- /dev/null +++ b/assets/images/my/jkjy.svg @@ -0,0 +1,24 @@ + + + 健康教育 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/my/my-top-bg.png b/assets/images/my/my-top-bg.png new file mode 100644 index 0000000..411d85c Binary files /dev/null and b/assets/images/my/my-top-bg.png differ diff --git a/assets/images/my/yyfa.svg b/assets/images/my/yyfa.svg new file mode 100644 index 0000000..329baf8 --- /dev/null +++ b/assets/images/my/yyfa.svg @@ -0,0 +1,22 @@ + + + 用药方案 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iconfont.less b/iconfont.less index 33b1f51..85b3a6c 100644 --- a/iconfont.less +++ b/iconfont.less @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4945922 */ - src: url('//at.alicdn.com/t/c/font_4945922_1cebnuqykww.woff2?t=1749652718973') format('woff2'), - url('//at.alicdn.com/t/c/font_4945922_1cebnuqykww.woff?t=1749652718973') format('woff'), - url('//at.alicdn.com/t/c/font_4945922_1cebnuqykww.ttf?t=1749652718973') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4945922_h7s60vu3p4o.woff2?t=1749983302860') format('woff2'), + url('//at.alicdn.com/t/c/font_4945922_h7s60vu3p4o.woff?t=1749983302860') format('woff'), + url('//at.alicdn.com/t/c/font_4945922_h7s60vu3p4o.ttf?t=1749983302860') format('truetype'); } .iconfont { @@ -13,6 +13,26 @@ -moz-osx-font-smoothing: grayscale; } +.icon-jiahao2:before { + content: "\e660"; +} + +.icon-zengjiatianjiajiahao:before { + content: "\e62a"; +} + +.icon-gantanhao_icon:before { + content: "\e65b"; +} + +.icon-touxiang:before { + content: "\e62c"; +} + +.icon-youjiantou:before { + content: "\e612"; +} + .icon-shouji:before { content: "\e6f7"; } @@ -44,4 +64,3 @@ .icon-xiangji:before { content: "\e609"; } - diff --git a/pages/clockIn/index copy.less b/pages/clockIn/index copy.less new file mode 100644 index 0000000..6bc07e3 --- /dev/null +++ b/pages/clockIn/index copy.less @@ -0,0 +1,44 @@ +/* pages/clockIn/index.wxss */ +.clockin{ + padding: 36rpx; + padding-bottom: 120rpx; + .new-time{ + font-size: 28rpx; + } + .clockin-item{ + margin-top: 36rpx; + background-color: #fff; + border-radius: 20rpx; + padding: 28rpx; + .t-button{ + } + .item-top{ + display: flex; + justify-content: space-between; + margin-bottom: 20rpx; + font-size: 28rpx; + .active{ + color: var(--td-brand-color); + } + } + .medicine-name{ + font-weight: bold; + margin-bottom: 12rpx; + } + .dose{ + font-size: 28rpx; + margin-bottom: 16rpx; + } + } + .footer-example{ + position: fixed; + bottom: 42rpx; + width: 100%; + left: 0; + text-align: center; + color: var(--td-brand-color); + font-size: 28rpx; + line-height: 60rpx; + line-height: 60rpx; + } +} \ No newline at end of file diff --git a/pages/clockIn/index copy.wxml b/pages/clockIn/index copy.wxml new file mode 100644 index 0000000..9f3298f --- /dev/null +++ b/pages/clockIn/index copy.wxml @@ -0,0 +1,20 @@ + + + {{newTime}} + + + + {{item.medicine_time}} + 已完成 + + + + {{detail.name}} + {{detail.dose}} {{detail.time}} + 打卡 + + + + + 历史服药记录 > + \ No newline at end of file diff --git a/pages/clockIn/index.js b/pages/clockIn/index.js index a518998..286ac58 100644 --- a/pages/clockIn/index.js +++ b/pages/clockIn/index.js @@ -16,11 +16,16 @@ Page({ const res = await request('patient/medicine_records', 'get', { page: 1, page_size: 10, - time_type: 1 + time_type: 1, + status: 0 + }) + const arr = res.list.map(item => { + item.detail = JSON.parse(item.detail) + return item + }) + this.setData({ + list: arr }) - // this.setData({ - // list: res.list - // }) }, /** * 生命周期函数--监听页面加载 diff --git a/pages/clockIn/index.less b/pages/clockIn/index.less index 6bc07e3..d0eb142 100644 --- a/pages/clockIn/index.less +++ b/pages/clockIn/index.less @@ -1,44 +1,495 @@ -/* pages/clockIn/index.wxss */ -.clockin{ - padding: 36rpx; - padding-bottom: 120rpx; - .new-time{ - font-size: 28rpx; - } - .clockin-item{ - margin-top: 36rpx; - background-color: #fff; - border-radius: 20rpx; - padding: 28rpx; - .t-button{ - } - .item-top{ - display: flex; - justify-content: space-between; - margin-bottom: 20rpx; - font-size: 28rpx; - .active{ - color: var(--td-brand-color); - } - } - .medicine-name{ - font-weight: bold; - margin-bottom: 12rpx; - } - .dose{ - font-size: 28rpx; - margin-bottom: 16rpx; - } - } - .footer-example{ - position: fixed; - bottom: 42rpx; - width: 100%; - left: 0; - text-align: center; - color: var(--td-brand-color); - font-size: 28rpx; - line-height: 60rpx; - line-height: 60rpx; - } +.page { + background-color: rgba(248,248,248,1.000000); + position: relative; + overflow: hidden; + display: flex; + flex-direction: column; + padding: 0 24rpx; +} +.group_1 { + background-color: rgba(255,255,255,1.000000); + padding-bottom: 12rpx; + display: flex; + flex-direction: column; +} +.image_1 { + width: 750rpx; + height: 88rpx; +} +.section_1 { + flex-direction: row; + display: flex; + margin: 12rpx 12rpx 0 32rpx; +} +.image_2 { + width: 24rpx; + height: 48rpx; + margin: 8rpx 0 8rpx 0; +} +.text_1 { + overflow-wrap: break-word; + color: rgba(0,0,0,1); + font-size: 34rpx; + font-family: PingFangSC-Medium; + font-weight: 500; + text-align: right; + white-space: nowrap; + line-height: 40rpx; + margin: 8rpx 0 0 252rpx; +} +.image_3 { + width: 174rpx; + height: 64rpx; + margin-left: 120rpx; +} +.group_2 { + display: flex; + flex-direction: column; + padding: 24rpx 0 26rpx 0; +} +.text-wrapper_1 { + flex-direction: row; + display: flex; + justify-content: space-between; +} +.text_2 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; +} +.text_3 { + overflow-wrap: break-word; + color: rgba(96,98,102,1); + font-size: 26rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: center; + white-space: nowrap; + line-height: 28rpx; +} +.group_3 { + border: 1px solid rgba(255,255,255,1); + margin-top: -2rpx; + position: relative; + display: flex; + flex-direction: column; + padding: 24rpx 24rpx 0rpx 22rpx; + box-sizing: border-box; + border-radius: 24rpx; + background: linear-gradient( 180deg, #EDF3F8 0%, #F7FAFC 100%); +} +.group-item{ + padding-bottom: 30rpx; +} +.section_2 { + width: 112rpx; + margin-right: 544rpx; + flex-direction: row; + display: flex; + justify-content: space-between; +} +.group_4 { + border-radius: 100%; + width: 20rpx; + height: 20rpx; + border: 2.5px solid rgba(142,181,213,1); + display: flex; + flex-direction: column; + margin: 6rpx 0 2rpx 0; + box-sizing: border-box; +} +.text_4 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; +} +.section_3 { + display: flex; + flex-direction: row; + margin: 16rpx 0 0 34rpx; +} +.block_1 { + background-color: rgba(255,255,255,1.000000); + border-radius: 16rpx; + flex-direction: row; + display: flex; + padding: 24rpx 50rpx 24rpx 24rpx; +} +.image-text_1 { + width: 298rpx; + flex-direction: row; + display: flex; + justify-content: space-between; +} +.section_4 { + border-radius: 16rpx; + background-image: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/4438d491898944508b7d13f8ad91d0ef_mergeImage.png); + width: 100rpx; + height: 100rpx; + border: 1px solid rgba(0,91,162,0.1); + display: flex; + flex-direction: column; +} +.text-group_1 { + display: flex; + flex-direction: column; + margin: 10rpx 0 8rpx 0; +} +.text_5 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 32rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; + margin-right: 86rpx; +} +.text_6 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 22rpx; +} +.box_1 { + background-color: rgba(237,243,248,1.000000); + width: 2rpx; + height: 62rpx; + display: flex; + flex-direction: column; + margin: 20rpx 0 18rpx 114rpx; +} +.text_7 { + overflow-wrap: break-word; + color: rgba(0,91,162,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; + margin: 34rpx 0 0 50rpx; +} +.section_5 { + width: 112rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 24rpx 544rpx 0 0; +} +.box_2 { + border-radius: 100%; + width: 20rpx; + height: 20rpx; + border: 2.5px solid rgba(0,91,162,1); + display: flex; + flex-direction: column; + margin: 6rpx 0 2rpx 0; +} +.text_8 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; +} +.section_6 { + display: flex; + flex-direction: row; + margin: 16rpx 0 0 34rpx; +} +.box_3 { + background-color: rgba(255,255,255,1.000000); + border-radius: 16rpx; + width: 622rpx; + flex-direction: row; + display: flex; + justify-content: flex-center; + padding: 24rpx 24rpx 24rpx 24rpx; +} +.image-text_2 { + width: 298rpx; + flex-direction: row; + display: flex; + justify-content: space-between; +} +.image_4 { + width: 100rpx; + height: 100rpx; +} +.text-group_2 { + display: flex; + flex-direction: column; + margin: 12rpx 0 12rpx 0; +} +.text_9 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 32rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; + margin-right: 86rpx; +} +.text_10 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 16rpx; +} +.section_7 { + background-color: rgba(237,243,248,1.000000); + width: 2rpx; + height: 62rpx; + display: flex; + flex-direction: column; + margin: 20rpx 0 18rpx 114rpx; +} +.text-wrapper_2 { + background-color: rgba(0,91,162,1.000000); + border-radius: 32rpx; + display: flex; + flex-direction: column; + margin: 22rpx 0 22rpx 24rpx; + padding: 12rpx 40rpx 12rpx 40rpx; +} +.text_11 { + overflow-wrap: break-word; + color: rgba(255,255,255,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; +} +.section_8 { + display: flex; + flex-direction: row; + margin: 16rpx 0 0 34rpx; +} +.box_4 { + background-color: rgba(255,255,255,1.000000); + border-radius: 16rpx; + width: 622rpx; + flex-direction: row; + display: flex; + justify-content: flex-center; + padding: 24rpx 24rpx 24rpx 24rpx; +} +.image-text_3 { + width: 298rpx; + flex-direction: row; + display: flex; + justify-content: space-between; +} +.image_5 { + width: 100rpx; + height: 100rpx; +} +.text-group_3 { + display: flex; + flex-direction: column; + margin: 12rpx 0 12rpx 0; +} +.text_12 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 32rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; + margin-right: 86rpx; +} +.text_13 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 16rpx; +} +.section_9 { + background-color: rgba(237,243,248,1.000000); + width: 2rpx; + height: 62rpx; + display: flex; + flex-direction: column; + margin: 20rpx 0 18rpx 114rpx; +} +.text-wrapper_3 { + background-color: rgba(0,91,162,1.000000); + border-radius: 32rpx; + display: flex; + flex-direction: column; + margin: 22rpx 0 22rpx 24rpx; + padding: 12rpx 40rpx 12rpx 40rpx; +} +.text_14 { + overflow-wrap: break-word; + color: rgba(255,255,255,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; +} +.section_10 { + width: 112rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 24rpx 544rpx 0 0; +} +.group_5 { + border-radius: 100%; + width: 20rpx; + height: 20rpx; + border: 2.5px solid rgba(0,91,162,1); + display: flex; + flex-direction: column; + margin: 6rpx 0 2rpx 0; +} +.text_15 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; +} +.section_11 { + display: flex; + flex-direction: row; + margin: 16rpx 0 0 34rpx; +} +.group_6 { + background-color: rgba(255,255,255,1.000000); + border-radius: 16rpx; + width: 622rpx; + flex-direction: row; + display: flex; + justify-content: flex-center; + padding: 24rpx 24rpx 24rpx 24rpx; +} +.image-text_4 { + width: 298rpx; + flex-direction: row; + display: flex; + justify-content: space-between; +} +.box_5 { + border-radius: 16rpx; + background-image: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/1d20527d73294b4688010486fcc35ccc_mergeImage.png); + width: 100rpx; + height: 100rpx; + border: 1px solid rgba(0,91,162,0.1); + display: flex; + flex-direction: column; +} +.text-group_4 { + display: flex; + flex-direction: column; + margin: 12rpx 0 12rpx 0; +} +.text_16 { + overflow-wrap: break-word; + color: rgba(34,34,34,1); + font-size: 32rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; + margin-right: 86rpx; +} +.text_17 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 16rpx; +} +.box_6 { + background-color: rgba(237,243,248,1.000000); + width: 2rpx; + height: 62rpx; + display: flex; + flex-direction: column; + margin: 20rpx 0 18rpx 114rpx; +} +.text-wrapper_4 { + background-color: rgba(0,91,162,1.000000); + border-radius: 32rpx; + display: flex; + flex-direction: column; + margin: 22rpx 0 22rpx 24rpx; + padding: 12rpx 40rpx 12rpx 40rpx; +} +.text_18 { + overflow-wrap: break-word; + color: rgba(255,255,255,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: right; + white-space: nowrap; + line-height: 32rpx; +} +.image_6 { + position: absolute; + left: 32rpx; + top: 48rpx; + width: 2rpx; + height: 196rpx; +} +.image_7 { + position: absolute; + left: 32rpx; + top: 260rpx; + width: 2rpx; + height: 368rpx; +} +.image_8 { + width: 750rpx; + height: 68rpx; + margin-top: 460rpx; } \ No newline at end of file diff --git a/pages/clockIn/index.wxml b/pages/clockIn/index.wxml index 0e24631..048f7ca 100644 --- a/pages/clockIn/index.wxml +++ b/pages/clockIn/index.wxml @@ -1,17 +1,36 @@ - - - {{newTime}} - - - - 早上 - 已完成 + + + + + 2025年3月1日 + 历史服药记录 + - 优思弗 - 1片 饭后服用 - 打卡 - - - 历史服药记录 > + + + + + {{item.medicine_time}} + + + + + + + {{detail.name}} + {{detail.dose}} {{detail.time}} + + + + 未打卡 + + 打卡 + + + + + + + \ No newline at end of file diff --git a/pages/followUp/index.js b/pages/followUp/index.js index 388c7e4..b528769 100644 --- a/pages/followUp/index.js +++ b/pages/followUp/index.js @@ -1,11 +1,23 @@ -// pages/followUp/index.js +import request from '~/api/request'; Page({ /** * 页面的初始数据 */ + + // 凝血酶原时间(s)/国际标准化比/活化的部分凝血酶时间（s） data: { style: 'border: 2rpx solid #efefef;border-radius: 12rpx;', + + dataItem:[ + { + title: '随访信息', + child: [] + } + ], + + + personInfo: { name: '', gender: 0, @@ -98,6 +110,12 @@ Page({ }, + }, + onInput(e) { + const { key } = e.currentTarget.dataset; + this.setData({ + [key]: e.detail.value, + }); }, showPicker(e) { const { mode } = e.currentTarget.dataset; @@ -128,7 +146,11 @@ Page({ handleClick(e) { console.log(e.detail.file); }, + toQuestionnaire(){ + request('/patient/follow_questionnaire', 'post', { + }) + }, /** diff --git a/pages/followUp/index.wxml b/pages/followUp/index.wxml index f8f5eec..e2e7364 100644 --- a/pages/followUp/index.wxml +++ b/pages/followUp/index.wxml @@ -4,7 +4,7 @@ 随访信息 随访名称 - + 随访日期 @@ -13,7 +13,7 @@ 随访医院 - + @@ -25,7 +25,7 @@ 身高（cm） - + @@ -34,7 +34,7 @@ 体重（kg） - + @@ -42,7 +42,7 @@ 头围（cm） - + @@ -51,7 +51,7 @@ 上臀围（cm） - + @@ -72,7 +72,7 @@ 总胆红素（µmol/L) - + @@ -80,8 +80,8 @@ - 总胆红素（µmol/L) - + 直接胆红素(µmol/L) + @@ -89,7 +89,7 @@ 总胆汁酸（g/L） - + @@ -98,7 +98,7 @@ 白蛋白（g/L） - + @@ -106,7 +106,7 @@ 谷草（U/L） - + @@ -115,7 +115,7 @@ 谷丙（U/L） - + @@ -123,7 +123,7 @@ GGT（U/L） - + @@ -132,7 +132,7 @@ ALP（U/L） - + @@ -154,7 +154,7 @@ 凝血酶原时间（s） - + @@ -163,7 +163,7 @@ 国际标准化比 - + @@ -171,7 +171,7 @@ 活化的部分凝血酶时间（s） - + @@ -195,7 +195,7 @@ 血小板（10^9/L） - + @@ -204,7 +204,7 @@ 血红蛋白（g/L） - + @@ -212,7 +212,7 @@ 白细胞（10^9/L） - + @@ -236,7 +236,7 @@ 25（OH）D3 (ng/ml) - + @@ -245,7 +245,7 @@ 维生素A (ng/ml) - + @@ -253,7 +253,7 @@ 维生素K (ng/ml) - + @@ -262,7 +262,7 @@ 维生素E (ng/ml) - + @@ -284,8 +284,8 @@ - 肝肋下(mm)肝肋下(mm) - + 肝肋下(mm) + @@ -294,7 +294,7 @@ 肝剑突下(mm) - + @@ -302,7 +302,7 @@ 脾肋下(mm) - + @@ -311,7 +311,7 @@ 门静脉主干(mm) - + @@ -320,7 +320,7 @@ 门静脉流速 - + @@ -329,7 +329,7 @@ 肝弹性值 - + diff --git a/pages/medicationRecord/index.js b/pages/medicationRecord/index.js index d204cb7..a9cc4ff 100644 --- a/pages/medicationRecord/index.js +++ b/pages/medicationRecord/index.js @@ -1,4 +1,4 @@ -// pages/clockIn/index.js +import request from '~/api/request'; Page({ /** @@ -29,6 +29,16 @@ Page({ }) }, + getList(){ + request('patient/medicine_records', getComputedStyle, { + time_type: 3, + status: 0, + page:1, + page_size: 10 + }) + }, + + /** * 生命周期函数--监听页面初次渲染完成 */ @@ -40,7 +50,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.getList() }, /** diff --git a/pages/message/index.json b/pages/message/index.json index 2fbe3e1..26e43f4 100644 --- a/pages/message/index.json +++ b/pages/message/index.json @@ -1,8 +1,7 @@ { + "navigationStyle": "custom", "usingComponents": { "t-button": "tdesign-miniprogram/button/button", "t-tag": "tdesign-miniprogram/tag/tag" - }, - "navigationStyle": "default", - "navigationBarTitleText": "随访计划" + } } \ No newline at end of file diff --git a/pages/message/index.less b/pages/message/index.less index e0de6e5..f475cdf 100644 --- a/pages/message/index.less +++ b/pages/message/index.less @@ -2,6 +2,16 @@ .clockin{ padding: 28rpx; padding-bottom: 200rpx; + padding-top: 200rpx; + position: relative; + .clockin-img{ + + position: absolute; + width: 100%; + z-index: 0; + top: 0; + left: 0; + } .new-time{ font-size: 28rpx; } @@ -10,14 +20,35 @@ background-color: #fff; border-radius: 20rpx; padding: 28rpx; - .t-button{ + position: relative; + z-index: 1; + .margin-16{ + position: absolute; + top: 0; + right: 0; + height: 60rpx; + line-height: 60rpx; + background: rgba(34, 34, 34, 0.1); + border-radius: 0rpx 24rpx 0rpx 24rpx; + color: #909399; + padding: 0 24rpx; + font-size: 26rpx; + } + .success{ + color: #00B095; + background: rgba(0, 176, 149, 0.1); + } + .primary{ + color: var(--td-brand-color); + background: rgba(237, 243, 248, 1); } .item-top{ display: flex; justify-content: space-between; margin-bottom: 10rpx; - font-size: 30rpx; + font-size: 32rpx; font-weight: bold; + .active{ color: var(--td-brand-color); } @@ -29,21 +60,34 @@ .dose{ font-size: 28rpx; // margin-bottom: 30rpx; + color: #909399; } .t-button{ margin-top: 30rpx; } } .footer-example{ - // position: fixed; - // bottom: 202rpx; - // width: 100%; - // left: 0; - // text-align: center; - // color: var(--td-brand-color); - // font-size: 28rpx; - // line-height: 60rpx; - // line-height: 60rpx; - margin-top: 28rpx; + position: fixed; + bottom: 202rpx; + display: flex; + justify-content: center; + width: 100%; + left: 0; + view{ + width: 246rpx; + height: 82rpx; + background: #FFFFFF; + box-shadow: 0rpx 2rpx 14rpx 0rpx rgba(0,91,162,0.08); + border-radius: 40rpx; + line-height: 82rpx; + text-align: center; + font-size: 30rpx; + color: #222222; + text{ + font-size: 40rpx; + color: var(--td-brand-color); + vertical-align: middle; + } + } } } \ No newline at end of file diff --git a/pages/message/index.wxml b/pages/message/index.wxml index c433c07..ea45ad8 100644 --- a/pages/message/index.wxml +++ b/pages/message/index.wxml @@ -1,13 +1,15 @@ + + 已完成 + 未开始 + 待开始 - {{item.plan_name}} - 已完成 - 未开始 - 待开始 + {{item.plan_date}} + - 随访时间：{{item.plan_date}} + {{item.plan_name}} 填写随访问卷 预约挂号 @@ -41,6 +43,11 @@ 随访时间：2025年5月20日 --> - 添加随访 + + + 添加随访 + + + \ No newline at end of file diff --git a/pages/my/index copy.js b/pages/my/index copy.js new file mode 100644 index 0000000..24e7bf0 --- /dev/null +++ b/pages/my/index copy.js @@ -0,0 +1,107 @@ +import request from '~/api/request'; +import useToastBehavior from '~/behaviors/useToast'; + +Page({ + behaviors: [useToastBehavior], + + data: { + isLoad: true, + service: [], + personalInfo: { + name: '邹方成' + }, + gridList: [ + { + name: '全部发布', + icon: 'root-list', + type: 'all', + url: '', + }, + { + name: '审核中', + icon: 'search', + type: 'progress', + url: '', + }, + { + name: '已发布', + icon: 'upload', + type: 'published', + url: '', + }, + { + name: '草稿箱', + icon: 'file-copy', + type: 'draft', + url: '', + }, + ], + + settingList: [ + { label: '用药方案', path: '/pages/therapeuticRegimen/index', icon: 'service', type: 'text' }, + { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' }, + + ], + }, + + onLoad() { + // this.getServiceList(); + }, + + handelClick(e) { + console.log(e) + }, + + async onShow() { + const Token = wx.getStorageSync('access_token'); + if (Token) { + const personalInfo = await this.getPersonalInfo(); + this.setData({ + isLoad: false, + personalInfo: personalInfo, + settingList: [ + { label: '用药方案', path: '/pages/therapeuticRegimen/index', icon: 'service', type: 'text' }, + { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' }, + + ], + }); + } else { + this.setData({ + isLoad: true, + settingList: [ + { label: '用药方案', path: '', icon: 'service', type: 'text' }, + { label: '健康教育', path: '', icon: 'setting', type: 'text' }, + + ], + }); + } + }, + + getServiceList() { + request('/api/getServiceList').then((res) => { + const { service } = res.data.data; + this.setData({ service }); + }); + }, + + async getPersonalInfo() { + const info = await request('patient/basic/0').then((res) => res); + return info; + }, + + onLogin(e) { + wx.navigateTo({ + url: '/pages/login/login', + }); + }, + + onNavigateTo() { + wx.navigateTo({ url: `/pages/my/info-edit/index` }); + }, + + onEleClick(e) { + const { name, url } = e.currentTarget.dataset.data; + if (url) return; + this.onShowToast('#t-toast', name); + }, +}); diff --git a/pages/my/index copy.less b/pages/my/index copy.less new file mode 100644 index 0000000..8fa1435 --- /dev/null +++ b/pages/my/index copy.less @@ -0,0 +1,128 @@ +.my { + height: calc(100vh - 56px); + overflow-y: auto; + + --td-navbar-bg-color: transparent; + .nav-bg { + width: 750rpx; + height: 200rpx; + position: fixed; + top: 0; + } + + &-info, + &-service, + &-setting { + background-color: #fff; + } + + &-info { + border-radius: 24rpx; + margin: 8rpx 32rpx 0rpx 32rpx; + // padding-bottom: 32rpx; + overflow: hidden; + + .cell-class-title { + font-weight: 600 !important; + } + + .cell-class-center { + display: flex; + align-items: center !important; + } + + .divider-class { + margin-top: 0 !important; + margin-bottom: 0 !important; + } + + .grid-class { + margin-top: 40rpx; + } + + .grid-item .t-grid-item__content { + padding: 0px !important; + } + + .split-line { + border-right: 1px solid #e7e7e7; + } + + // 头像margin-right + --td-spacer-1: 32rpx; + + &__person { + .name { + line-height: 48rpx; + font-size: 32rpx; + color: #000000e6; + font-weight: 600; + } + + .tags { + display: flex; + margin-top: 16rpx; + + --td-text-color-primary: #000000e6; + --td-tag-medium-font-size: 20rpx; + --td-tag-medium-icon-size: 24rpx; + } + + .tag:not(:last-child) { + margin-right: 16rpx; + } + } + } + + &-service { + border-radius: 24rpx; + margin: 32rpx; + padding-bottom: 8rpx; + overflow: hidden; + + &__list-item { + .t-grid-item__content { + padding-bottom: 16rpx !important; + } + .t-grid-item__text { + height: 40rpx !important; + } + } + + &--tips { + height: 44rpx; + line-height: 44rpx; + padding-left: 40rpx; + margin-top: 32rpx; + color: #000000e6; + font-size: 28rpx; + font-weight: 600; + } + } + .my-cell{ + margin-top: 30rpx; + } + .my-info__person{ + position: relative; + text{ + font-size: 24rpx; + margin-left: 20rpx; + color: #666; + } + .edit{ + position: absolute; + right: -20rpx; + top: 0; + } + } + .time{ + font-size: 26rpx; + } + .peld{ + font-size: 26rpx; + color: red; + .tag{ + margin-left: 20rpx; + } + } +} diff --git a/pages/my/index copy.wxml b/pages/my/index copy.wxml new file mode 100644 index 0000000..e9b00f9 --- /dev/null +++ b/pages/my/index copy.wxml @@ -0,0 +1,44 @@ + + + +