From 1fb4055e4669f6add368ff4ef8248d93532ca308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=93=A5?= <17630302050@163.com> Date: Tue, 24 Jun 2025 23:47:16 +0800 Subject: [PATCH] dsfs --- api/request.js | 8 ++-- iconfont.less | 17 ++++--- pages/home/index.json | 13 ++---- pages/home/index.less | 94 +++++++++++++++++++++++++++++++++++++++ pages/home/index.wxml | 28 ++++++++++++ pages/login/login.js | 35 ++++++++------- pages/login/login.less | 14 +++--- pages/login/login.wxml | 8 ++-- pages/my/index.json | 12 +---- pages/my/index.less | 6 ++- pages/my/index.wxml | 4 +- pages/patients/index.js | 13 +++++- pages/patients/index.less | 19 +++++--- pages/patients/index.wxml | 6 +-- 14 files changed, 206 insertions(+), 71 deletions(-) diff --git a/api/request.js b/api/request.js index f86535e..2dc05ea 100644 --- a/api/request.js +++ b/api/request.js @@ -24,10 +24,10 @@ function request(url, method = 'GET', data = {}) { setTimeout(() => { if(res.data.code && res.data.code == 10103){ - // wx.removeStorageSync('access_token'); - // wx.switchTab({ - // url: '/pages/my/index', - // }) + wx.removeStorageSync('access_token'); + wx.switchTab({ + url: '/pages/my/index', + }) reject(res.data); } else { console.log(res.data) diff --git a/iconfont.less b/iconfont.less index dcc646c..593fdac 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_o43abax97g.woff2?t=1750755738154') format('woff2'), - url('//at.alicdn.com/t/c/font_4945922_o43abax97g.woff?t=1750755738154') format('woff'), - url('//at.alicdn.com/t/c/font_4945922_o43abax97g.ttf?t=1750755738154') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4945922_182jbfyzero.woff2?t=1750774471454') format('woff2'), + url('//at.alicdn.com/t/c/font_4945922_182jbfyzero.woff?t=1750774471454') format('woff'), + url('//at.alicdn.com/t/c/font_4945922_182jbfyzero.ttf?t=1750774471454') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yanjing_yincang:before { + content: "\e6cc"; +} + +.icon-yanjing-xianshi:before { + content: "\e668"; +} + .icon-gouxuan:before { content: "\e608"; } @@ -100,6 +108,3 @@ .icon-xiangji:before { content: "\e609"; } - - - diff --git a/pages/home/index.json b/pages/home/index.json index efb5c0b..fef3d0b 100644 --- a/pages/home/index.json +++ b/pages/home/index.json @@ -2,16 +2,9 @@ "navigationStyle": "custom", "navigationBarTitleText": "首页", "usingComponents": { - "t-tabs": "tdesign-miniprogram/tabs/tabs", - "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel", - "t-swiper": "tdesign-miniprogram/swiper/swiper", - "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav", - "t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh", - "t-message": "tdesign-miniprogram/message/message", "t-button": "tdesign-miniprogram/button/button", - "t-icon": "tdesign-miniprogram/icon/icon", - "nav": "/components/nav", - "card": "/components/card", - "ec-canvas": "../../ec-canvas/ec-canvas" + "ec-canvas": "../../ec-canvas/ec-canvas", + "t-col": "tdesign-miniprogram/col/col", + "t-row": "tdesign-miniprogram/row/row" } } diff --git a/pages/home/index.less b/pages/home/index.less index 7abc1ff..35ba1d4 100644 --- a/pages/home/index.less +++ b/pages/home/index.less @@ -16,6 +16,79 @@ } + + .group_2 { + overflow-wrap: break-word; + color: rgba(144,147,153,1); + font-size: 24rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 34rpx; + margin: 24rpx 0 0 0; + position: relative; + z-index: 1; + display: flex; + padding: 28rpx; + .box_1 { + border-radius: 100%; + background-image: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/e2d2f77550f64a02bebd425d1db7d2e3_mergeImage.png); + width: 120rpx; + height: 120rpx; + border: 1px solid rgba(248,248,248,1); + display: flex; + flex-direction: column; + } + .text-group_1 { + display: flex; + flex-direction: column; + margin: 16rpx 0 16rpx 24rpx; + } + .text_2 { + overflow-wrap: break-word; + color: rgba(17,17,17,1); + font-size: 36rpx; + font-family: Alibaba-PuHuiTi-M; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 36rpx; + margin-right: 24rpx; + } + .text_3 { + overflow-wrap: break-word; + color: rgba(96,98,102,1); + font-size: 28rpx; + font-family: Alibaba-PuHuiTi-R; + font-weight: normal; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 24rpx; + } + .text_4 { + color: rgba(96,98,102,1); + font-size: 24rpx; + text-align: left; + line-height: 24rpx; + margin: 28rpx 0 0 0rpx; + margin-left: 24rpx; + } + .box_2 { + background-color: rgba(255,93,93,0.000000); + border-radius: 100%; + width: 16rpx; + height: 16rpx; + display: flex; + flex-direction: column; + margin: 16rpx 0 88rpx 250rpx; + } + } + + + + .group_1 { position: relative; z-index: 1; @@ -44,10 +117,31 @@ .home-content { // height: calc(100% - @nav-bar-height); + background-color: #F8F8F8; padding: 28rpx; padding-bottom: 0; position: relative; z-index: 1; + border-radius: 40rpx 40rpx 0rpx 0rpx; + .text_1{ + font-size: 36rpx; + color: var(--td-text-color); + } + .core-indicators{ + .box_2{ + margin-top: 24rpx; + background-color: #fff; + border-radius: 24rpx; + box-shadow: 0 0 30rpx 0 rgba(0,0,0,0.1); + padding: 24rpx; + .box_2_item{ + text-align: center; + height: 200rpx; + } + } + } + + .item-title-img{ height: 36rpx; // width: auto; diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 65a3112..5ba90a2 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -5,7 +5,35 @@ 患者详情页 + + + + 张知梦女 · 2岁5个月 + 下次随访时间:2025-12-12 + + + + + + + 核心指标 + + + + + 术后时长3个月 + + + + 高危/PELD 12 + + + col-8 + + + + 宝宝成长曲线 diff --git a/pages/login/login.js b/pages/login/login.js index e5a2d76..65989fc 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -10,21 +10,21 @@ Page({ getCodeText: '获取验证码', mobile: '13888888888', password: 'doctor2025', - + showPassword: false, }, onLoad(options) { - + }, - bindKeyInput(e){ + bindKeyInput(e) { const { mode } = e.currentTarget.dataset; this.setData({ [mode]: e.detail.value }) }, - async login() { + async login() { // 验证手机号 if (!this.data.mobile) { wx.showToast({ @@ -49,8 +49,8 @@ Page({ }); return; } - - + + const res = await request('doctor/login', 'post', { password: aesCryptoJS(this.data.password), mobile: this.data.mobile @@ -59,16 +59,17 @@ Page({ wx.switchTab({ url: `/pages/my/index`, }); - // if (res.is_personal_information_complete) { - // wx.switchTab({ - // url: `/pages/my/index`, - // }); - // } else { - // wx.navigateTo({ - // url: `/pages/my/info-edit/index`, - // }); - // } -}, + + }, + toBack() { + wx.navigateBack({ + delta: 1, + }); + }, - + togglePassword() { + this.setData({ + showPassword: !this.data.showPassword + }); + }, }); diff --git a/pages/login/login.less b/pages/login/login.less index 67e9e82..cbd02ca 100644 --- a/pages/login/login.less +++ b/pages/login/login.less @@ -98,14 +98,19 @@ border-radius: 24rpx; margin-top: 32rpx; flex-direction: row; - display: flex; - justify-content: flex-center; + padding: 32rpx 40rpx 34rpx 40rpx; } .image-text_2 { - flex-direction: row; display: flex; - justify-content: space-between; + position: relative; + .yanjing{ + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + opacity: 0.7; + } } .thumbnail_2 { font-size: 40rpx; @@ -114,7 +119,6 @@ transform: translateY(4rpx); } .text-group_3 { - overflow-wrap: break-word; // color: rgba(170,170,170,1); font-size: 32rpx; letter-spacing: 0rpx; diff --git a/pages/login/login.wxml b/pages/login/login.wxml index e58415e..e371a4a 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -2,7 +2,7 @@ - + @@ -18,8 +18,10 @@ - - + + + + diff --git a/pages/my/index.json b/pages/my/index.json index ffb2079..e4a2164 100644 --- a/pages/my/index.json +++ b/pages/my/index.json @@ -1,16 +1,6 @@ { "navigationStyle": "custom", "usingComponents": { - "t-cell": "tdesign-miniprogram/cell/cell", - "t-cell-group": "tdesign-miniprogram/cell-group/cell-group", - "t-avatar": "tdesign-miniprogram/avatar/avatar", - "t-divider": "tdesign-miniprogram/divider/divider", - "t-icon": "tdesign-miniprogram/icon/icon", - "t-image": "tdesign-miniprogram/image/image", - "t-navbar": "tdesign-miniprogram/navbar/navbar", - "t-grid": "tdesign-miniprogram/grid/grid", - "t-grid-item": "tdesign-miniprogram/grid-item/grid-item", - "t-tag": "tdesign-miniprogram/tag/tag", - "nav": "/components/nav" + "t-button": "tdesign-miniprogram/button/button" } } diff --git a/pages/my/index.less b/pages/my/index.less index 8c1cad3..16d3c95 100644 --- a/pages/my/index.less +++ b/pages/my/index.less @@ -175,12 +175,14 @@ image{ width: 100%; height: 100%; + border-radius: 120rpx; } } .block_4 { + height: 120rpx; display: flex; - flex-direction: column; - margin: 4rpx 0 0 24rpx; + align-items: center; + padding-left: 20rpx; } .text-group_4 { display: flex; diff --git a/pages/my/index.wxml b/pages/my/index.wxml index d2ee892..7c96ab8 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -12,7 +12,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/pages/patients/index.js b/pages/patients/index.js index 5bf336f..ecc7f4b 100644 --- a/pages/patients/index.js +++ b/pages/patients/index.js @@ -5,8 +5,10 @@ Page({ * 页面的初始数据 */ data: { + username: '', list: [] }, + page: 1, handleClick(e){ wx.navigateTo({ @@ -14,12 +16,19 @@ Page({ }) }, async getList() { - const res = await request('doctor/patients') + const res = await request('doctor/patients', { + username: this.data.username, + page: this.page, + page_size: 20 + }) this.setData({ list: res.list }) }, - + changeUsername(){ + this.page = 1 + this.getList() + }, /** * 生命周期函数--监听页面加载 diff --git a/pages/patients/index.less b/pages/patients/index.less index f645ff0..42017f0 100644 --- a/pages/patients/index.less +++ b/pages/patients/index.less @@ -45,20 +45,27 @@ .box_3 { background-color: rgba(255,255,255,1.000000); border-radius: 40rpx; - display: flex; - flex-direction: row; margin: 36rpx 12rpx 0 0; - padding: 24rpx 432rpx 24rpx 24rpx; + padding: 0 24rpx; + height: 78rpx; } .image-text_1 { - width: 246rpx; - flex-direction: row; + width: 100%; display: flex; - justify-content: space-between; + // justify-content: space-between; + line-height: 78rpx; + input{ + flex: auto; + height: 78rpx; + border: none; + margin-top: 0; + } } .thumbnail_1 { width: 32rpx; height: 32rpx; + margin-right: 20rpx; + // flex: auto; } .text-group_1 { overflow-wrap: break-word; diff --git a/pages/patients/index.wxml b/pages/patients/index.wxml index 2f96709..bc258d4 100644 --- a/pages/patients/index.wxml +++ b/pages/patients/index.wxml @@ -9,7 +9,7 @@ - 请输入患者姓名 + @@ -43,7 +43,7 @@ - +