diff --git a/src/components/pickerArea/index.json b/src/components/pickerArea/index.json index 9a0f641..cf286db 100644 --- a/src/components/pickerArea/index.json +++ b/src/components/pickerArea/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "van-popup": "@vant/weapp/popup/index", - "van-cascader": "@vant/weapp/cascader/index" + "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/components/pickerArea/index.scss b/src/components/pickerArea/index.scss index e69de29..de262c0 100644 --- a/src/components/pickerArea/index.scss +++ b/src/components/pickerArea/index.scss @@ -0,0 +1,128 @@ +.aside-share { + position: fixed; + right: 22rpx; + bottom: 120rpx; + width: 136rpx; + height: 136rpx; +} + +.popup { + position: relative; + background-color: #fff; + .close { + position: absolute; + top: 52rpx; + right: 32rpx; + color: rgba(72, 72, 72, 1); + font-size: 34rpx; + } + .p-header { + padding: 46rpx 30rpx 0; + .title { + text-align: center; + font-size: 36rpx; + color: rgba(72, 72, 72, 1); + font-weight: bold; + } + .tip { + text-align: center; + margin-top: 16rpx; + font-size: 32rpx; + color: rgba(72, 72, 72, 1); + } + .area { + margin-top: 48rpx; + display: flex; + align-items: center; + justify-content: space-between; + gap: 14rpx; + .item { + flex: 1; + 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; + display: flex; + align-items: center; + justify-content: space-between; + .content { + font-size: 32rpx; + color: rgba(72, 72, 72, 1); + max-width: 5em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .icon { + width: 32rpx; + height: 32rpx; + } + } + .picker { + flex: 1; + } + .btn { + width: 126rpx; + height: 76rpx; + font-size: 32rpx; + color: rgba(255, 255, 255, 1); + display: flex; + align-items: center; + justify-content: center; + background: #e04775; + border-radius: 12rpx 12rpx 12rpx 12rpx; + } + } + } + .select { + margin-top: 44rpx; + padding: 0 30rpx 0; + display: grid; + grid-template-columns: repeat(auto-fit, 68rpx); + gap: 26rpx 20rpx; + .s-item { + width: 68rpx; + height: 68rpx; + text-align: center; + line-height: 68rpx; + font-size: 28rpx; + color: rgba(158, 158, 158, 1); + border-radius: 50%; + background: #f7f8f9; + &.active { + color: #fff; + background-color: rgba(224, 71, 117, 1); + } + } + } + .scroll { + padding: 0 30rpx; + height: 45vh; + box-sizing: border-box; + .item { + padding: 32rpx 0; + font-size: 28rpx; + color: rgba(72, 72, 72, 1); + border-bottom: 2px solid #fbfbfb; + display: flex; + align-items: center; + justify-content: space-between; + .word { + margin-right: 24rpx; + display: inline-block; + width: 1em; + color: rgba(158, 158, 158, 1); + } + .icon { + width: 36rpx; + height: 36rpx; + } + &.active { + color: rgba(224, 71, 117, 1); + .word { + color: rgba(224, 71, 117, 1); + } + } + } + } +} diff --git a/src/components/pickerArea/index.ts b/src/components/pickerArea/index.ts index 9aa5bbc..eeccd32 100644 --- a/src/components/pickerArea/index.ts +++ b/src/components/pickerArea/index.ts @@ -2,75 +2,315 @@ const app = getApp() Component({ properties: { - level: { - type: Number, - value: 3, + // 省份名称 + pname: { + type: String, + value: '', + }, + // 省份ID + pid: { + type: String, + value: '', }, - value: { + // 城市名称 + cname: { + type: String, + value: '', + }, + // 城市ID + cid: { type: String, value: '', }, }, - + observers: { + show(newVal: boolean) { + this.triggerEvent('show', newVal) + }, + }, data: { + show: false, + word: '', imageUrl: app.globalData.imageUrl, Timestamp: app.globalData.Timestamp, - show: false, - options: [], - fieldNames: { - text: 'label', - value: 'value', - children: 'children', - }, - }, - lifetimes: { - attached() { - this.getArea() + active: 0, + ProvinceName: '', + ProvinceId: '', + CityName: '', + CityId: '', + proList: { + A: [ + { + name: '安徽省', + code: '340000', + }, + { + name: '澳门特别行政区', + code: '820000', + }, + ], + B: [ + { + name: '北京市', + code: '110000', + }, + ], + C: [ + { + name: '重庆市', + code: '500000', + }, + ], + F: [ + { + name: '福建省', + code: '350000', + }, + ], + G: [ + { + name: '甘肃省', + code: '620000', + }, + { + name: '广东省', + code: '440000', + }, + { + name: '广西壮族自治区', + code: '450000', + }, + { + name: '贵州省', + code: '520000', + }, + ], + H: [ + { + name: '海南省', + code: '460000', + }, + { + name: '河北省', + code: '130000', + }, + { + name: '河南省', + code: '410000', + }, + { + name: '黑龙江省', + code: '230000', + }, + { + name: '湖北省', + code: '420000', + }, + { + name: '湖南省', + code: '430000', + }, + ], + J: [ + { + name: '吉林省', + code: '220000', + }, + { + name: '江苏省', + code: '320000', + }, + { + name: '江西省', + code: '360000', + }, + ], + L: [ + { + name: '辽宁省', + code: '210000', + }, + ], + N: [ + { + name: '宁夏回族自治区', + code: '640000', + }, + { + name: '内蒙古自治区', + code: '150000', + }, + ], + Q: [ + { + name: '青海省', + code: '630000', + }, + ], + S: [ + { + name: '山东省', + code: '370000', + }, + { + name: '山西省', + code: '140000', + }, + { + name: '陕西省', + code: '610000', + }, + { + name: '上海市', + code: '310000', + }, + { + name: '四川省', + code: '510000', + }, + ], + T: [ + { + name: '天津市', + code: '120000', + }, + { + name: '台湾省', + code: '710000', + }, + ], + X: [ + { + name: '西藏自治区', + code: '540000', + }, + { + name: '新疆维吾尔自治区', + code: '650000', + }, + { + name: '香港特别行政区', + code: '810000', + }, + ], + Y: [ + { + name: '云南省', + code: '530000', + }, + ], + Z: [ + { + name: '浙江省', + code: '330000', + }, + ], }, + area: [] as any, + range: [], + + scrollIntoView0: '', + scrollIntoView1: '', }, methods: { handleShow() { this.setData({ show: true, + ProvinceName: this.data.pname || '', + ProvinceId: this.data.pid || '', + CityName: this.data.cname || '', + CityId: this.data.cid || '', + + scrollIntoView0: this.data.pid || '', + scrollIntoView1: this.data.cid || '', }) + this.getArea() }, getArea() { - const { level } = this.data wx.ajax({ method: 'GET', url: '/js/area.json', - data: {}, isJSON: true, }).then((res) => { - if (level === 1) { - res.forEach((item: any) => { - delete item.children - }) - } - if (level === 2) { - res.forEach((item: any) => { - item.children.forEach((child: any) => { - delete child.children - }) - }) - } this.setData({ - options: res, + area: res, }) + this.getRangeList() }) }, - onFinish(e: any) { - this.triggerEvent('change', e.detail.selectedOptions) + handleItem(e: any) { + const { code, name } = e.currentTarget.dataset + this.setData({ + ProvinceId: code, + ProvinceName: name, + CityId: '', + CityName: '', + }) + this.getRangeList() + }, + handleChangeCity(e: any) { + const { code, name } = e.currentTarget.dataset + this.setData({ + CityId: code, + CityName: name, + }) + }, + handleShare() { this.setData({ show: false, }) + this.triggerEvent('change', [ + { + label: this.data.ProvinceName, + value: this.data.ProvinceId, + }, + { + label: this.data.CityName, + value: this.data.CityId, + }, + ]) + }, + handleSelect(e) { + const { id } = e.currentTarget.dataset + this.setData({ + word: id, + scrollIntoView0: id, + }) + }, + getRangeList() { + const { area, ProvinceId } = this.data + if (!ProvinceId) return + const range = area.filter((item: any) => item.value == ProvinceId)[0].children + this.setData({ + range, + active: 1, + scrollIntoView0: '', + scrollIntoView1: `id${this.data.CityId}`, + }) + }, + handleProvince() { + this.setData({ + active: 0, + scrollIntoView0: this.data.word || `id${this.data.ProvinceId}`, + scrollIntoView1: '', + }) + }, + handleCity() { + const { ProvinceId } = this.data + if (!ProvinceId) { + wx.showToast({ + title: '请先选择省份', + icon: 'none', + }) + return + } + this.getRangeList() }, - onClose() { + handleClose() { this.setData({ show: false, }) - this.triggerEvent('cancel') }, }, }) diff --git a/src/components/pickerArea/index.wxml b/src/components/pickerArea/index.wxml index 1f92857..f4b30a8 100644 --- a/src/components/pickerArea/index.wxml +++ b/src/components/pickerArea/index.wxml @@ -1,13 +1,81 @@ - - - - + + + + + + 选择省份和地区 + + + + {{ProvinceName || '请选择省份'}} + + + + {{CityName || '请选择城市'}} + + + 确定 + + + + + + {{item.label}} + + + + + + + {{index}} + + + + + + + + + {{index===0 ? key : ''}} + {{item.name}} + + + + + + + + diff --git a/src/components/pickerAreaBak/index.json b/src/components/pickerAreaBak/index.json new file mode 100644 index 0000000..9a0f641 --- /dev/null +++ b/src/components/pickerAreaBak/index.json @@ -0,0 +1,7 @@ +{ + "component": true, + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-cascader": "@vant/weapp/cascader/index" + } +} diff --git a/src/components/pickerAreaBak/index.scss b/src/components/pickerAreaBak/index.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/components/pickerAreaBak/index.ts b/src/components/pickerAreaBak/index.ts new file mode 100644 index 0000000..9aa5bbc --- /dev/null +++ b/src/components/pickerAreaBak/index.ts @@ -0,0 +1,76 @@ +const app = getApp() + +Component({ + properties: { + level: { + type: Number, + value: 3, + }, + value: { + type: String, + value: '', + }, + }, + + data: { + imageUrl: app.globalData.imageUrl, + Timestamp: app.globalData.Timestamp, + + show: false, + options: [], + fieldNames: { + text: 'label', + value: 'value', + children: 'children', + }, + }, + lifetimes: { + attached() { + this.getArea() + }, + }, + methods: { + handleShow() { + this.setData({ + show: true, + }) + }, + getArea() { + const { level } = this.data + wx.ajax({ + method: 'GET', + url: '/js/area.json', + data: {}, + isJSON: true, + }).then((res) => { + if (level === 1) { + res.forEach((item: any) => { + delete item.children + }) + } + if (level === 2) { + res.forEach((item: any) => { + item.children.forEach((child: any) => { + delete child.children + }) + }) + } + this.setData({ + options: res, + }) + }) + }, + onFinish(e: any) { + this.triggerEvent('change', e.detail.selectedOptions) + this.setData({ + show: false, + }) + }, + onClose() { + this.setData({ + show: false, + }) + this.triggerEvent('cancel') + }, + }, +}) diff --git a/src/components/pickerAreaBak/index.wxml b/src/components/pickerAreaBak/index.wxml new file mode 100644 index 0000000..1f92857 --- /dev/null +++ b/src/components/pickerAreaBak/index.wxml @@ -0,0 +1,13 @@ + + + + + diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 4eb52b4..caf8149 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -9,6 +9,7 @@ margin: 0 auto; width: 164rpx; height: 164rpx; + border-radius: 32rpx; } .title { margin-top: 32rpx; @@ -261,19 +262,19 @@ .popup6 { .container { - padding: 330rpx 0 0; - width: 510rpx; - height: 490rpx; + padding: 420rpx 0 0; + width: 610rpx; + height: 600rpx; box-sizing: border-box; text-align: center; .title { - font-size: 36rpx; + font-size: 40rpx; color: rgba(1, 1, 5, 1); font-weight: bold; } .content { margin-top: 20rpx; - font-size: 32rpx; + font-size: 36rpx; color: rgba(1, 1, 5, 1); } } @@ -518,7 +519,7 @@ margin-top: -72rpx; padding: 106rpx 0 0; width: 604rpx; - height: 194rpx; + height: 244rpx; background: linear-gradient(7deg, #ffffff 19%, #ffe8e4 100%); border-radius: 24rpx 24rpx 24rpx 24rpx; box-sizing: border-box; @@ -1160,6 +1161,62 @@ } } +.popup19 { + .badge { + position: relative; + z-index: 1; + margin: 0 auto; + display: block; + width: 194rpx; + height: 167rpx; + } + .container { + margin-top: -87rpx; + padding: 116rpx 36rpx 34rpx; + width: 610rpx; + height: 370rpx; + box-sizing: border-box; + background: linear-gradient(7deg, #ffffff 19%, #ffe8e4 100%); + border-radius: 24rpx 24rpx 24rpx 24rpx; + border: 2rpx solid #ffffff; + .title { + font-size: 32rpx; + color: rgba(1, 1, 5, 1); + line-height: 48rpx; + font-weight: bold; + text-align: center; + } + .footer { + margin-top: 32rpx; + display: flex; + gap: 26rpx; + .cancel { + flex: 1; + padding: 22rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 32rpx; + color: rgba(246, 74, 58, 1); + border-radius: 84rpx; + border: 1px solid #f64a3a; + } + .submit { + flex: 1; + padding: 22rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 32rpx; + color: #fff; + background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%); + border-radius: 84rpx; + border: 1px solid #f64a3a; + } + } + } +} + .close { margin: 32rpx auto 0; display: block; diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 943d337..ba8338a 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -100,6 +100,18 @@ 您的病史信息已填写完成! + + + 你真棒! + 您的信息已填写完成! + + + + + 你真棒! + 信息录入完成！ + + 记录下您此次的检查情况吧 @@ -354,6 +366,20 @@ + + + + + 凝血因子数据 + + 通过您的复诊随访档案生成 + + + 好的 + 去看档案 + + + --> - + 选择视频或图片 diff --git a/src/doctor/pages/askDoctor/index.scss b/src/doctor/pages/askDoctor/index.scss index d2cde3c..2241285 100644 --- a/src/doctor/pages/askDoctor/index.scss +++ b/src/doctor/pages/askDoctor/index.scss @@ -212,7 +212,10 @@ page { width: 502rpx; height: 340rpx; box-sizing: border-box; - padding: 114rpx 56rpx 0; + padding: 94rpx 56rpx 30rpx; + display: flex; + flex-direction: column; + justify-content: center; .content { text-align: center; font-size: 32rpx; @@ -376,6 +379,7 @@ page { color: rgba(40, 48, 49, 1); border-radius: 24rpx; background-color: #fff; + white-space: pre-line; &.active { color: #fff; background: linear-gradient(356deg, #1d6bff 0%, #4f8dff 100%); diff --git a/src/doctor/pages/coltStat/index.scss b/src/doctor/pages/coltStat/index.scss index b06865c..2ac8762 100644 --- a/src/doctor/pages/coltStat/index.scss +++ b/src/doctor/pages/coltStat/index.scss @@ -145,6 +145,18 @@ page { color: rgba(1, 1, 5, 1); font-weight: bold; } + .chart-none { + padding: 86rpx 0; + text-align: center; + .none { + width: 365rpx; + height: 217rpx; + } + .none-title { + font-size: 28rpx; + color: rgba(161, 164, 172, 0.5); + } + } .container { margin-top: 32rpx; height: 600rpx; diff --git a/src/doctor/pages/coltStat/index.ts b/src/doctor/pages/coltStat/index.ts index 3390518..42d84ac 100644 --- a/src/doctor/pages/coltStat/index.ts +++ b/src/doctor/pages/coltStat/index.ts @@ -39,12 +39,14 @@ Page({ }, }, - beginDate: dayjs().subtract(1, 'M').startOf('month').format('YYYY-MM-DD'), + beginDate: dayjs().subtract(1, 'y').startOf('month').format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD'), tabActve: 3, iDays: '', + chartNone: false, + list2: [] as any[], total2: 0, pagination2: { @@ -106,6 +108,7 @@ Page({ astList, altList, cfRecordList, + chartNone: false, } this.initChart(initParams) }) @@ -287,6 +290,11 @@ Page({ }, initChart({ altList = {}, astList = {}, cfRecordList = {} }) { const arr = this.generateDateArray(altList, astList, cfRecordList) + if (!arr.length) { + this.setData({ + chartNone: true, + }) + } const astArr: Number[] = [] const altArr: Number[] = [] const cfRecordArr: Number[] = [] @@ -336,8 +344,8 @@ Page({ }, grid: { top: '30', - left: '5', - right: '0', + left: '10', + right: '10', bottom: '45', containLabel: true, }, diff --git a/src/doctor/pages/coltStat/index.wxml b/src/doctor/pages/coltStat/index.wxml index cc4181e..e87a5e4 100644 --- a/src/doctor/pages/coltStat/index.wxml +++ b/src/doctor/pages/coltStat/index.wxml @@ -74,13 +74,31 @@ 他的健康变化 - + + + 暂无数据 + + - 凝血因子 - 生化检查 + + 凝血因子 + + + 生化检查 + diff --git a/src/doctor/pages/course/index.ts b/src/doctor/pages/course/index.ts index b6be33a..5576ecf 100644 --- a/src/doctor/pages/course/index.ts +++ b/src/doctor/pages/course/index.ts @@ -192,9 +192,7 @@ Page({ this.setData({ popupShow: true, popupType: 'TCenterEnd', - popupParams: { - close: true, - }, + popupParams: {}, }) }) } diff --git a/src/doctor/pages/courseHostipal/index.json b/src/doctor/pages/courseHostipal/index.json index cfc5a11..b8ae2b3 100644 --- a/src/doctor/pages/courseHostipal/index.json +++ b/src/doctor/pages/courseHostipal/index.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "诊前检查医院", + "navigationBarTitleText": "医院详情", "usingComponents": {} } diff --git a/src/doctor/pages/courseHostipal/index.ts b/src/doctor/pages/courseHostipal/index.ts index c453991..c1c685d 100644 --- a/src/doctor/pages/courseHostipal/index.ts +++ b/src/doctor/pages/courseHostipal/index.ts @@ -5,11 +5,6 @@ Page({ detail: {} as any, }, onLoad(options: any) { - if (options.period === '2') { - wx.setNavigationBarTitle({ - title: '治疗中心', - }) - } app.waitLogin({ type: 2 }).then(() => { const name = { 1: 'PG_DESIGNATEDHOSPITAL_VISIT', diff --git a/src/doctor/pages/file/index.json b/src/doctor/pages/file/index.json index c3e5ce4..bf510c9 100644 --- a/src/doctor/pages/file/index.json +++ b/src/doctor/pages/file/index.json @@ -2,6 +2,8 @@ "navigationStyle": "custom", "usingComponents": { "navbar": "/components/navbar/index", - "calendar": "/components/calendar/index" + "calendar": "/components/calendar/index", + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index" } } diff --git a/src/doctor/pages/file/index.scss b/src/doctor/pages/file/index.scss index 51a0516..0581fcf 100644 --- a/src/doctor/pages/file/index.scss +++ b/src/doctor/pages/file/index.scss @@ -101,6 +101,9 @@ page { } } + .swiper { + height: 100vh; + } .container0 { padding: 8rpx 0 0; .none { @@ -425,6 +428,9 @@ page { .row { padding: 32rpx 0; border-bottom: 1px solid rgba(247, 247, 250, 1); + &:last-of-type { + border: none; + } .wrap { display: flex; gap: 32rpx; @@ -454,6 +460,9 @@ page { .row1 { padding: 32rpx 0; border-bottom: 1px solid rgba(247, 247, 250, 1); + &:last-of-type { + border: none; + } .wrap { display: flex; align-items: center; @@ -600,7 +609,7 @@ page { line-height: 48rpx; color: #fff; text-align: center; - background: linear-gradient( 356deg, #1D6BFF 0%, #4F8DFF 100%); + background: linear-gradient(356deg, #1d6bff 0%, #4f8dff 100%); border-radius: 96rpx; } } diff --git a/src/doctor/pages/file/index.ts b/src/doctor/pages/file/index.ts index ea9f9ac..4b396c8 100644 --- a/src/doctor/pages/file/index.ts +++ b/src/doctor/pages/file/index.ts @@ -10,6 +10,8 @@ Page({ userInfo: {}, + swiperHeight: 800, + fold1: false, fold2: false, fold3: false, @@ -74,15 +76,30 @@ Page({ }) }, handleNav(e) { - const { nav, name } = e.currentTarget.dataset - if (name) { - app.mpBehavior({ PageName: name }) - } + const { nav } = e.currentTarget.dataset this.setData({ nav, }) this.getInfo() }, + handleSwiperChange(e) { + const name = { + 0: 'BTN_TREATMENT_RECORD_TAB_CLICK', + 1: 'BTN_MEDICAL_HISTORY_TAB_CLICK', + 2: 'BTN_FOLLOWUP_CALENDAR_TAB_CLICK', + }[e.detail.current] + if (name) { + app.mpBehavior({ PageName: name }) + } + const query = wx.createSelectorQuery() + query.select(`#container${e.detail.current}`).boundingClientRect() + query.exec((res) => { + this.setData({ + swiperHeight: res[0].height + 42, + nav: e.detail.current, + }) + }) + }, getInfo() { const { nav } = this.data if (nav == 0) { @@ -104,6 +121,7 @@ Page({ !res.periodThree.injectionDrugs && !res.periodThree.injectionNum, }) + this.handleSwiperChange({ detail: { current: 0 } }) }) } if (nav == 1) { @@ -117,6 +135,7 @@ Page({ this.setData({ medical: res, }) + this.handleSwiperChange({ detail: { current: 1 } }) }) } if (nav == 2) { @@ -134,6 +153,7 @@ Page({ }, }) this.getFollowList() + this.handleSwiperChange({ detail: { current: 2 } }) }) } }, diff --git a/src/doctor/pages/file/index.wxml b/src/doctor/pages/file/index.wxml index b258c39..f932593 100644 --- a/src/doctor/pages/file/index.wxml +++ b/src/doctor/pages/file/index.wxml @@ -27,355 +27,359 @@ - - 健康档案 - - - 病史档案 - - - 随访日历 - + 健康档案 + 病史档案 + 随访日历 - - - - - 随访计划 - + + + + + + + + 随访计划 + + + + + + + + + + 日期 + + {{item.beginDate}}~ + {{item.endDate}} + + + {{item.beginDate || item.endDate}} + + -- + + + 诊疗医院 + {{item.hospitalName || '未填写'}} + + + 检查项目 + {{item.totalNum}}/{{item.allNum}} + + + + 查看全部 + + + - - - - - - - 日期 - - {{item.beginDate}}~ - {{item.endDate}} + + + 注射日 + - {{item.beginDate || item.endDate}} - -- - - - 诊疗医院 - {{item.hospitalName || '未填写'}} - - 检查项目 - {{item.totalNum}}/{{item.allNum}} + + + + 注射日期 + {{periodThree.injectionDate}} + + + BBM-H901 + + 体重 {{periodThree.injectionWeight}}kg + 体重 未填写 + 用药 {{periodThree.injectionDrugs}}ml + 用药 未填写 + 预期用药 {{periodThree.injectionNum}} 瓶 + 预期用药 未填写 + + + + + 诊疗阶段详情 + + + + 查看详情 + + + + - - 查看全部 - + + + + 基因治疗中心检查 + + + + + + + 日期 + + {{item.beginDate}}~ + {{item.endDate}} + + + {{item.beginDate || item.endDate}} + + 未填写 + + + 诊疗医院 + {{item.hospitalName || '未填写'}} + + + 检查项目 + {{item.totalNum}}/{{item.allNum}} + + + + 诊疗阶段详情 + + + + 查看详情 + + + + + - - - - - - 注射日 - + + + + 诊前筛查 + + + + + + + 日期 + + {{item.beginDate}}~ + {{item.endDate}} + + + {{item.beginDate || item.endDate}} + + 未填写 + + + 定点医院 + {{item.hospitalName || '未填写'}} + + + 检查项目 + {{item.totalNum}}/{{item.allNum}} + + + + 诊疗阶段详情 + + + + 查看详情 + + + + + + - - + + + + - 注射日期 - {{periodThree.injectionDate}} + 出生年月 + {{medical.birthMonth}}（{{medical.ageYear}}岁） - BBM-H901 + 确诊时间 - 体重 {{periodThree.injectionWeight}}kg - 体重 未填写 - 用药 {{periodThree.injectionDrugs}}ml - 用药 未填写 - 预期用药 {{periodThree.injectionNum}} 瓶 - 预期用药 未填写 + {{medical.diagnosisTime || '未填写'}} + （{{medical.diagnosisAge}}） - - - 诊疗阶段详情 - - - - 查看详情 - - + + 您的体重 + {{medical.weight}} kg +
未填写
 - - - - - - 基因治疗中心检查 - - - - - + - 日期 - - {{item.beginDate}}~ - {{item.endDate}} - - {{item.beginDate || item.endDate}} + 凝血因子 + {{medical.clottingFactor}}% 未填写 - 诊疗医院 - {{item.hospitalName || '未填写'}} + 治疗方案 + {{medical.treatmentPlanName || '未填写'}} - 检查项目 - {{item.totalNum}}/{{item.allNum}} - - - - 诊疗阶段详情 - - - - 查看详情 - - + FIX暴露日 + {{medical.fixExposureDay}}个 + 未填写 - - - - - - 诊前筛查 - - - - - + - 日期 - - {{item.beginDate}}~ - {{item.endDate}} + + 既往FIX抑制物病史 + {{medical.beforeFixHistoryName || '未填写'}} - {{item.beginDate || item.endDate}} - 未填写 - 定点医院 - {{item.hospitalName || '未填写'}} + + 既往肝脏疾病病史 + {{medical.beforeLiverHistoryName || '未填写'}} + + {{medical.liverRecord}} - 检查项目 - {{item.totalNum}}/{{item.allNum}} + + 您是否有饮酒史 + {{medical.drinkingHistoryName || '未填写'}} + - - - 诊疗阶段详情 - + + + 您是否有过敏史 + {{medical.allergyHistoryName || '未填写'}} - - 查看详情 - + {{medical.allergyRecord}} + + + + + 您是否可能存在不适合 + 使用糖皮质激素的情况？ + + + {{medical.isNotGlucocorticoidName || '未填写'}} + {{medical.medicalHistoryInfo}} - - - - - - - - 出生年月 - {{medical.birthMonth}}（{{medical.ageYear}}岁） - - - 确诊时间 - - {{medical.diagnosisTime || '未填写'}} - （{{medical.diagnosisAge}}） - - - - 您的体重 - {{medical.weight}} kg -
未填写
- - - - - 凝血因子 - {{medical.clottingFactor}}% - 未填写 - - - 治疗方案 - {{medical.treatmentPlanName || '未填写'}} - - - FIX暴露日 - {{medical.fixExposureDay}}个 - 未填写 - - - - - - 既往FIX抑制物病史 - {{medical.beforeFixHistoryName || '未填写'}} - - - - - 既往肝脏疾病病史 - {{medical.beforeLiverHistoryName || '未填写'}} - - {{medical.liverRecord}} - - - - 您是否有饮酒史 - {{medical.drinkingHistoryName || '未填写'}} - - - - - 您是否有过敏史 - {{medical.allergyHistoryName || '未填写'}} - - {{medical.allergyRecord}} - - - - - 您是否可能存在不适合 - 使用糖皮质激素的情况？ + + + + 靶关节 + + + {{item.bleedingPartName}} + + + - - {{medical.isNotGlucocorticoidName || '未填写'}} - - {{medical.medicalHistoryInfo}} - - - - - - 靶关节 - - - {{item.bleedingPartName}} + + + 最近6个月出血 + {{medical.lastBleedingInfo.remark}} - - - 最近6个月出血 + + + + + + 注射日：{{followExam.injectionDateName || '未填写'}} - {{medical.lastBleedingInfo.remark}} - - - - - - - 注射日：{{followExam.injectionDateName || '未填写'}} - - - {{followExam.tipsInfo}} - {{followExam.lastNoticeWeekInfo}} - {{followExam.lastNoticeExamInfo}} - - - - - - - - - - - - 注射日 - - - - 已复诊 - - - - 建议复诊 + + {{followExam.tipsInfo}} + {{followExam.lastNoticeWeekInfo}} + {{followExam.lastNoticeExamInfo}} + + + + + + + + + + + + 注射日 + + + + 已复诊 + + + + 建议复诊 + + + + 查看健康档案 - - - 查看健康档案 - + + diff --git a/src/doctor/pages/followPlan/index.ts b/src/doctor/pages/followPlan/index.ts index 8c07cdf..ac9c70b 100644 --- a/src/doctor/pages/followPlan/index.ts +++ b/src/doctor/pages/followPlan/index.ts @@ -18,6 +18,11 @@ Page({ this.getDetail() }) }, + handleInject() { + wx.navigateTo({ + url: '/patient/pages/injectDate/index', + }) + }, getDetail() { wx.ajax({ method: 'GET', diff --git a/src/doctor/pages/followPlan/index.wxml b/src/doctor/pages/followPlan/index.wxml index 6a31ecc..62b82f0 100644 --- a/src/doctor/pages/followPlan/index.wxml +++ b/src/doctor/pages/followPlan/index.wxml @@ -1,10 +1,10 @@ - + 注射日：{{injectionDate || '未录入'}} - 基因治疗后时间 监测频率 + 基因治疗后 监测频率 diff --git a/src/doctor/pages/index/index.scss b/src/doctor/pages/index/index.scss index a6d864d..6f45181 100644 --- a/src/doctor/pages/index/index.scss +++ b/src/doctor/pages/index/index.scss @@ -2,7 +2,7 @@ page { background-color: rgba(246, 246, 246, 1); } .page-title { - width: 399rpx; + width: 148rpx; height: 30rpx; } @@ -58,8 +58,15 @@ page { align-items: center; justify-content: space-between; .title { - width: 175rpx; - height: 34rpx; + margin-right: 4rpx; + font-size: 36rpx; + line-height: 40rpx; + font-weight: bold; + color: transparent; + background: linear-gradient(-10deg, rgba(28, 107, 255, 1), rgba(75, 219, 255, 1)); + -webkit-background-clip: text; + background-clip: text; + transform: skew(-6deg); } .more { font-size: 28rpx; @@ -82,10 +89,11 @@ page { .photo { display: block; width: 424rpx; - height: 246rpx; - border-radius: 24rpx 24rpx 0 0; + height: 320rpx; + border-radius: 24rpx 24rpx 32rpx 32rpx; } .content { + margin-top: -72rpx; max-width: 424rpx; box-sizing: border-box; padding: 20rpx; @@ -104,15 +112,15 @@ page { .patient { margin-top: 50rpx; .p-header { - display: flex; - align-items: center; - .title { - margin-right: 4rpx; - width: 141rpx; - height: 34rpx; - } + margin-right: 4rpx; font-size: 36rpx; - color: rgba(28, 107, 255, 1); + line-height: 40rpx; + font-weight: bold; + color: transparent; + background: linear-gradient(-1deg, rgba(28, 107, 255, 1), rgba(75, 219, 255, 1)); + -webkit-background-clip: text; + background-clip: text; + transform: skew(-6deg); } .patient-list { .card { @@ -125,11 +133,23 @@ page { align-items: center; justify-content: space-between; gap: 20rpx; - .photo { - flex-shrink: 0; - width: 112rpx; - height: 112rpx; - border-radius: 50%; + .photo-wrap { + position: relative; + .photo { + flex-shrink: 0; + width: 112rpx; + height: 112rpx; + border-radius: 50%; + } + .dot { + position: absolute; + top: 6rpx; + right: 6rpx; + width: 16rpx; + height: 16rpx; + border-radius: 50%; + background-color: rgba(246, 74, 58, 1); + } } .wrap { flex: 1; @@ -175,5 +195,24 @@ page { } } } + .patient-none { + padding: 66rpx 0; + text-align: center; + .none-img { + width: 344rpx; + height: 214rpx; + } + .none-title { + margin-top: -30rpx; + font-size: 32rpx; + color: rgba(161, 164, 172, 1); + } + .none-btn { + margin-top: 32rpx; + color: rgba(28, 107, 255, 1); + font-size: 32rpx; + font-weight: bold; + } + } } } diff --git a/src/doctor/pages/index/index.ts b/src/doctor/pages/index/index.ts index f4ae839..41e063b 100644 --- a/src/doctor/pages/index/index.ts +++ b/src/doctor/pages/index/index.ts @@ -6,7 +6,7 @@ Page({ knowledgeList: [] as any, patientList: [] as any, }, - onLoad() { + onShow() { app.waitLogin({ type: 2 }).then(() => { app.mpBehavior({ PageName: 'PG_DOCTORHOME_VISIT' }) this.getPatientList() diff --git a/src/doctor/pages/index/index.wxml b/src/doctor/pages/index/index.wxml index ea5c9bb..b6447d7 100644 --- a/src/doctor/pages/index/index.wxml +++ b/src/doctor/pages/index/index.wxml @@ -1,5 +1,5 @@ - + - + - + 医生小助手 查看更多 @@ -28,19 +28,13 @@ - + {{item.Title}} - - - （{{patientList.length}}） - + 我的患者（{{patientList.length}}） - + + + + {{item.patientName}} @@ -63,6 +60,11 @@ + + + 出示您的专属邀约码，邀约患者绑定 + 立即邀约 + diff --git a/src/doctor/pages/lastDiagnosisReport/index.scss b/src/doctor/pages/lastDiagnosisReport/index.scss index 2c16106..008df8a 100644 --- a/src/doctor/pages/lastDiagnosisReport/index.scss +++ b/src/doctor/pages/lastDiagnosisReport/index.scss @@ -97,6 +97,36 @@ page { } .form { margin-top: 48rpx; + .form-header { + margin-bottom: 24rpx; + display: flex; + align-items: center; + gap: 12rpx; + .title { + font-size: 36rpx; + color: rgba(1, 1, 5, 1); + font-weight: bold; + } + .fold-all { + padding: 2rpx 16rpx 0; + display: flex; + align-items: center; + gap: 6rpx; + font-size: 28rpx; + line-height: 44rpx; + color: rgba(161, 164, 172, 1); + background-color: #fff; + border-radius: 12rpx; + .icon { + transition: all 0.3s; + } + &.trans { + .icon { + transform: rotate(180deg); + } + } + } + } .form-card { display: flex; gap: 24rpx; diff --git a/src/doctor/pages/lastDiagnosisReport/index.ts b/src/doctor/pages/lastDiagnosisReport/index.ts index 6804fb5..699eb69 100644 --- a/src/doctor/pages/lastDiagnosisReport/index.ts +++ b/src/doctor/pages/lastDiagnosisReport/index.ts @@ -8,9 +8,11 @@ Page({ edit: false, - fold1: true, - fold2: true, - fold3: true, + foldAll: false, + + fold1: false, + fold2: false, + fold3: false, hospitalName: '', @@ -116,6 +118,15 @@ Page({ url: `/doctor/pages/courseHostipal/index?id=${this.data.hospitalId}`, }) }, + handleToggleFoldAll() { + const foldAll = !this.data.foldAll + this.setData({ + foldAll, + fold1: foldAll, + fold2: foldAll, + fold3: foldAll, + }) + }, handleToggleFold(e: any) { const { fold } = e.currentTarget.dataset this.setData({ diff --git a/src/doctor/pages/lastDiagnosisReport/index.wxml b/src/doctor/pages/lastDiagnosisReport/index.wxml index a3cddb2..a1fe469 100644 --- a/src/doctor/pages/lastDiagnosisReport/index.wxml +++ b/src/doctor/pages/lastDiagnosisReport/index.wxml @@ -10,13 +10,20 @@ 检查医院 -
+ {{hospitalName}} -
+ + + 您的检查项目 + + {{foldAll ? '展开' : '收起'}} + + + @@ -30,7 +37,7 @@ 生化检查 - {{isBiochemical==1?'已检查':'未检查'}} + 已检查 @@ -114,7 +121,7 @@ 凝血因子 IX 活性 - {{isCFIxActivity==1?'已检查':'未检查'}} + 已检查 @@ -161,7 +168,7 @@ 其他检查 - {{isOther==1?'已检查':'未检查'}} + 已检查 您的其他项检查 diff --git a/src/doctor/pages/login/index.scss b/src/doctor/pages/login/index.scss index 85afdfa..29b61f1 100644 --- a/src/doctor/pages/login/index.scss +++ b/src/doctor/pages/login/index.scss @@ -70,23 +70,15 @@ page { } } .phone { - margin-top: 38rpx; - height: 48rpx; - width: 280rpx; - font-size: 24rpx; - color: rgba(161, 164, 172, 1); + margin-top: 100rpx; + height: 88rpx; + font-size: 32rpx; + color: rgba(255, 255, 255, 1); display: flex; align-items: center; justify-content: center; + background: linear-gradient(356deg, #1d6bff 0%, #4f8dff 100%); border-radius: 84rpx 84rpx 84rpx 84rpx; - background-color: #fff; - &::after { - border: none; - } - .icon { - width: 48rpx; - height: 48rpx; - } } .tel-btn { margin: 0 auto; @@ -96,7 +88,7 @@ page { align-items: center; justify-content: center; gap: 12rpx; - background: #f7f7fa; + background: #fff; border-radius: 24rpx; font-size: 24rpx; color: rgba(161, 164, 172, 1); diff --git a/src/doctor/pages/login/index.wxml b/src/doctor/pages/login/index.wxml index 1d68095..bb20899 100644 --- a/src/doctor/pages/login/index.wxml +++ b/src/doctor/pages/login/index.wxml @@ -7,7 +7,18 @@ > 欢迎加入愈见守护 - + + + + 或者 + + + + 手机号验证码 + + 登录 - - 或者 - - - - + 我已阅读并同意 - 《个人信息及隐私协议政策》 + 《个人信息及隐私保护政策》 - + 我已阅读并同意 - 《个人信息及隐私协议政策》 + 《个人信息及隐私保护政策》 规定收集我的相关敏感个人信息 diff --git a/src/doctor/pages/my/index.scss b/src/doctor/pages/my/index.scss index d1ed190..e02ef80 100644 --- a/src/doctor/pages/my/index.scss +++ b/src/doctor/pages/my/index.scss @@ -16,7 +16,7 @@ page { background-color: transparent; border-radius: 50%; border: 2rpx solid #ffffff; - box-shadow: 0 4rpx 8rpx rgba(1, 1, 5, 0.1); + box-shadow: 0 8rpx 16rpx rgba(0, 0, 0, 0.07); &::after { border: none; } diff --git a/src/doctor/pages/patientDetail/index.scss b/src/doctor/pages/patientDetail/index.scss index 248c60d..6778d6d 100644 --- a/src/doctor/pages/patientDetail/index.scss +++ b/src/doctor/pages/patientDetail/index.scss @@ -36,7 +36,7 @@ page { } .age { margin-right: 16rpx; - padding: 0 14rpx; + padding: 2rpx 14rpx 0; border-radius: 20rpx; display: inline-flex; align-items: center; @@ -130,6 +130,7 @@ page { height: 92rpx; border-radius: 50%; border: 1px solid #fff; + background-color: #fff; &:nth-of-type(2) { z-index: 1; margin-left: -46rpx; diff --git a/src/doctor/pages/patientDetail/index.wxml b/src/doctor/pages/patientDetail/index.wxml index 29ea33e..0fbe229 100644 --- a/src/doctor/pages/patientDetail/index.wxml +++ b/src/doctor/pages/patientDetail/index.wxml @@ -40,7 +40,7 @@ - 共同照护团队 + 给{{patientInfo.patientName||'患者'}}留言 最新消息{{messageCount}}条 diff --git a/src/doctor/pages/preDiagnosisReport/index.scss b/src/doctor/pages/preDiagnosisReport/index.scss index 0280323..c224079 100644 --- a/src/doctor/pages/preDiagnosisReport/index.scss +++ b/src/doctor/pages/preDiagnosisReport/index.scss @@ -44,10 +44,34 @@ page { display: flex; align-items: center; justify-content: space-between; - .form-title { - font-size: 36rpx; - color: rgba(1, 1, 5, 1); - font-weight: bold; + .wrap { + display: flex; + align-items: center; + gap: 12rpx; + .form-title { + font-size: 36rpx; + color: rgba(1, 1, 5, 1); + font-weight: bold; + } + .fold-all { + padding: 2rpx 16rpx 0; + display: flex; + align-items: center; + gap: 6rpx; + font-size: 28rpx; + line-height: 44rpx; + color: rgba(161, 164, 172, 1); + background-color: #fff; + border-radius: 12rpx; + .icon { + transition: all 0.3s; + } + &.trans { + .icon { + transform: rotate(180deg); + } + } + } } .order { display: flex; diff --git a/src/doctor/pages/preDiagnosisReport/index.ts b/src/doctor/pages/preDiagnosisReport/index.ts index d82f58c..84c88f0 100644 --- a/src/doctor/pages/preDiagnosisReport/index.ts +++ b/src/doctor/pages/preDiagnosisReport/index.ts @@ -6,16 +6,18 @@ Page({ popupType: 'preDiagnosisReportDate', // 确认绑定曾经扫码医生 popupParams: {}, - fold1: true, - fold2: true, - fold3: true, - fold4: true, - fold5: true, - fold6: true, - fold7: true, - fold8: true, - fold9: true, - fold10: true, + foldAll: false, + + fold1: false, + fold2: false, + fold3: false, + fold4: false, + fold5: false, + fold6: false, + fold7: false, + fold8: false, + fold9: false, + fold10: false, // form examId: '', @@ -194,6 +196,22 @@ Page({ this.getCheckNum() }) }, + handleToggleFoldAll() { + const foldAll = !this.data.foldAll + this.setData({ + foldAll, + fold1: foldAll, + fold2: foldAll, + fold3: foldAll, + fold4: foldAll, + fold5: foldAll, + fold6: foldAll, + fold7: foldAll, + fold8: foldAll, + fold9: foldAll, + fold10: foldAll, + }) + }, handleToggleFold(e: any) { const { fold } = e.currentTarget.dataset this.setData({ diff --git a/src/doctor/pages/preDiagnosisReport/index.wxml b/src/doctor/pages/preDiagnosisReport/index.wxml index 196d578..9f9af23 100644 --- a/src/doctor/pages/preDiagnosisReport/index.wxml +++ b/src/doctor/pages/preDiagnosisReport/index.wxml @@ -11,8 +11,14 @@ - 检查项目 - 诊前检查项目 + + 检查项目 + 诊前检查项目 + + {{foldAll ? '展开' : '收起'}} + + + {{checkNum}} / @@ -33,7 +39,7 @@ - {{isBloodRoutine==1?'已检查':'未检查'}} + 已检查 重点检查项目:白细胞计数）WBC）血红蛋白（HGB）血小板计数（PLT） @@ -69,7 +75,7 @@ - {{isBiochemical==1?'已检查':'未检查'}} + 已检查 @@ -159,7 +165,7 @@ 凝血因子 IX 活性 - {{isCFIxActivity==1?'已检查':'未检查'}} + 已检查 @@ -208,7 +214,7 @@ 凝血因子 IX 抑制物检测 - {{isCFIxInhibitor==1?'已检查':'未检查'}} + 已检查 @@ -244,7 +250,7 @@ 乙型肝炎相关检查 - {{isHepatitisB==1?'已检查':'未检查'}} + 已检查 @@ -285,7 +291,7 @@ 丙型肝炎相关检查 - {{isHepatitisC==1?'已检查':'未检查'}} + 已检查 @@ -328,7 +334,7 @@ HIV抗体 - {{isHivAntibody==1?'已检查':'未检查'}} + 已检查 类免疫缺陷病毒抗体（HIV - Ab） @@ -366,7 +372,7 @@ 甲胎蛋白（AFP）检测 - {{isAfp==1?'已检查':'未检查'}} + 已检查 @@ -415,7 +421,7 @@ AAV 抗体检查 - {{isAav==1?'已检查':'未检查'}} + 已检查 提交您的AAV抗体检查报告 @@ -453,7 +459,7 @@ 其他检查 - {{isOther==1?'已检查':'未检查'}} + 已检查 您的其他项检查 diff --git a/src/doctor/pages/userInfo/index.scss b/src/doctor/pages/userInfo/index.scss index 0516575..b365481 100644 --- a/src/doctor/pages/userInfo/index.scss +++ b/src/doctor/pages/userInfo/index.scss @@ -12,7 +12,7 @@ page { display: flex; align-items: center; justify-content: space-between; - padding: 32rpx; + padding: 32rpx 0; border-bottom: 1px solid rgba(247, 247, 250, 1); &:last-of-type { border: none; diff --git a/src/images/bg4.png b/src/images/bg4.png index 41e65e8..676413f 100644 Binary files a/src/images/bg4.png and b/src/images/bg4.png differ diff --git a/src/images/gif2.gif b/src/images/gif2.gif index eef27d9..0ade6c3 100644 Binary files a/src/images/gif2.gif and b/src/images/gif2.gif differ diff --git a/src/images/icon119.png b/src/images/icon119.png new file mode 100644 index 0000000..42717ce Binary files /dev/null and b/src/images/icon119.png differ diff --git a/src/images/icon12.png b/src/images/icon12.png index 449592f..a6cc351 100644 Binary files a/src/images/icon12.png and b/src/images/icon12.png differ diff --git a/src/images/icon120.png b/src/images/icon120.png new file mode 100644 index 0000000..a903ac1 Binary files /dev/null and b/src/images/icon120.png differ diff --git a/src/images/none3.png b/src/images/none3.png new file mode 100644 index 0000000..7083981 Binary files /dev/null and b/src/images/none3.png differ diff --git a/src/images/none4.png b/src/images/none4.png new file mode 100644 index 0000000..103e201 Binary files /dev/null and b/src/images/none4.png differ diff --git a/src/images/none5.png b/src/images/none5.png new file mode 100644 index 0000000..983cea1 Binary files /dev/null and b/src/images/none5.png differ diff --git a/src/images/share.png b/src/images/share.png new file mode 100644 index 0000000..74e037e Binary files /dev/null and b/src/images/share.png differ diff --git a/src/images/title17.png b/src/images/title17.png new file mode 100644 index 0000000..292e2fe Binary files /dev/null and b/src/images/title17.png differ diff --git a/src/images/title18.png b/src/images/title18.png new file mode 100644 index 0000000..bf273ec Binary files /dev/null and b/src/images/title18.png differ diff --git a/src/pages/applyFrom/index.ts b/src/pages/applyFrom/index.ts index 335cffa..65dca72 100644 --- a/src/pages/applyFrom/index.ts +++ b/src/pages/applyFrom/index.ts @@ -142,7 +142,13 @@ Page({ }) }, handleBack() { - wx.navigateBack() + wx.navigateBack({ + fail: () => { + wx.switchTab({ + url: '/pages/index/index', + }) + }, + }) }, }) diff --git a/src/pages/applyFrom/index.wxml b/src/pages/applyFrom/index.wxml index 326c3a0..f2c3f51 100644 --- a/src/pages/applyFrom/index.wxml +++ b/src/pages/applyFrom/index.wxml @@ -1,4 +1,4 @@ - + @@ -34,9 +34,8 @@ - - {{BirthMonth}} - + + {{BirthMonth}} @@ -46,7 +45,13 @@ 所在地区 - + diff --git a/src/pages/ask/index.scss b/src/pages/ask/index.scss index e2ce618..b98d201 100644 --- a/src/pages/ask/index.scss +++ b/src/pages/ask/index.scss @@ -63,7 +63,7 @@ page { line-height: 48rxp; padding: 20rpx 32rpx; background-color: #fff; - border-radius: 84rpx; + border-radius: 32rpx; } } } diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index 2f5d943..43330f2 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -1,6 +1,6 @@ .page-title { - width: 319rpx; - height: 92rpx; + width: 168rpx; + height: 32rpx; } .page { min-height: 100vh; diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index 9090f48..dbe3089 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index 55d2279..032b107 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -2,14 +2,14 @@ page { background-color: rgba(247, 247, 250, 1); } .page-title { - width: 319rpx; - height: 92rpx; + width: 168rpx; + height: 32rpx; } .page { padding: 0 40rpx 180rpx; .user { - margin-top: 42rpx; + margin-top: 62rpx; display: flex; align-items: center; .avatar { @@ -213,6 +213,7 @@ page { align-items: center; justify-content: center; border-radius: 50%; + background-color: #fff; &.active { background-color: rgba(242, 58, 47, 1); color: #fff; @@ -382,7 +383,7 @@ page { } } .info { - margin-top: 50rpx; + margin-top: 20rpx; .i-header { display: flex; align-items: center; @@ -413,10 +414,11 @@ page { .photo { display: block; width: 424rpx; - height: 246rpx; - border-radius: 24rpx 24rpx 0 0; + height: 320rpx; + border-radius: 24rpx 24rpx 32rpx 32rpx; } .content { + margin-top: -72rpx; max-width: 424rpx; box-sizing: border-box; padding: 20rpx; diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index faf034f..bc18660 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -15,7 +15,7 @@ Page({ doctorList: [], - progress: 1, + progress: 0, swiperHeight: 220, treatment: { followUpWeekInfo: {}, @@ -212,7 +212,7 @@ Page({ query.select(`#process${e.detail.current}`).boundingClientRect() query.exec((res) => { this.setData({ - swiperHeight: res[0].height + 22, + swiperHeight: res[0].height + 42, }) }) }, @@ -308,9 +308,7 @@ Page({ this.setData({ popupShow: true, popupType: 'publicCard', - popupParams: { - close: true, - }, + popupParams: {}, }) this.handleClosePublicCard() }, diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 72133fc..58ec7e0 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -1,9 +1,9 @@ - +