diff --git a/README.md b/README.md index c318e3a..45d1af7 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,17 @@ svn://39.106.86.127:28386/projects/xd/proj_src/branches/dev_v2.0/shop/frontend/w ## vscode -(/images/)(\S\*(?=["|'])) +``` +(/images/)(\S*(?=["|'])) {{imageUrl}}$2?t={{Timestamp}} +``` ## neovim -(/images/)([^\"|']\*) +``` +(/images/)([^\"|']*) {{imageUrl}}$2?t={{Timestamp}} +``` ui问题 diff --git a/src/app.json b/src/app.json index 49a5b8d..7179316 100644 --- a/src/app.json +++ b/src/app.json @@ -66,6 +66,7 @@ "pages/qolAdd/index", "pages/qolResult/index", "pages/qolReport/index", + "pages/hormonesStart/index", "pages/hormones/index", "pages/hormonesResult/index" ] diff --git a/src/pages/d_patientDetail/index.ts b/src/pages/d_patientDetail/index.ts index f5c7726..f278cb8 100644 --- a/src/pages/d_patientDetail/index.ts +++ b/src/pages/d_patientDetail/index.ts @@ -232,6 +232,7 @@ Page({ }, handleChange() { this.getGraph() + this.getHormoneData() }, handleTypeChange(e = '') { let index = 0 diff --git a/src/pages/d_patientHormones/index.scss b/src/pages/d_patientHormones/index.scss index 24f28b9..96a4565 100644 --- a/src/pages/d_patientHormones/index.scss +++ b/src/pages/d_patientHormones/index.scss @@ -87,6 +87,7 @@ page { border-top: 1px solid rgba(33, 29, 46, 0.05); padding-top: 22rpx; display: flex; + align-items: center; gap: 48rpx; .name { width: 8em; diff --git a/src/pages/d_patientHormones/index.wxml b/src/pages/d_patientHormones/index.wxml index 896359c..32da269 100644 --- a/src/pages/d_patientHormones/index.wxml +++ b/src/pages/d_patientHormones/index.wxml @@ -26,13 +26,13 @@ - 每日用药量 + 周用药量 {{item.dosage}}mg - 已持续口服 + 已持续口服 {{item.oralMonthName}} @@ -40,7 +40,7 @@ {{item.injectionWeek}}周 -
已注射次数
+
已注射次数
{{item.injectionTimes}}次 diff --git a/src/patient/pages/hormones/index.ts b/src/patient/pages/hormones/index.ts index fdc1913..733c464 100644 --- a/src/patient/pages/hormones/index.ts +++ b/src/patient/pages/hormones/index.ts @@ -87,10 +87,6 @@ Page({ this.getBaseInfo() if (Number(options.id) > 0) { this.getDetail(options.id) - wx.showToast({ - icon: 'none', - title: '每日仅录入1次，您可修改已录信息', - }) } }) }, @@ -162,11 +158,10 @@ Page({ }) }, handleBlur(e) { - console.log('DEBUGPRINT[133]: index.ts:160: e=', e) const { nav } = this.data const { key } = e.currentTarget.dataset this.setData({ - [`form.${key}`]: e.detail.value, + [`form.${key}`]: Number(e.detail.value), }) setTimeout(() => { this.setData({ diff --git a/src/patient/pages/hormonesResult/index.ts b/src/patient/pages/hormonesResult/index.ts index b55247c..4ffadf1 100644 --- a/src/patient/pages/hormonesResult/index.ts +++ b/src/patient/pages/hormonesResult/index.ts @@ -33,7 +33,7 @@ Page({ }, handleReport() { wx.redirectTo({ - url: '/patient/pages/qolReport/index', + url: '/patient/pages/qolReport/index?scrollId=proit-hormone', }) }, handlePic() { diff --git a/src/patient/pages/hormonesResult/index.wxml b/src/patient/pages/hormonesResult/index.wxml index 77b08b5..a69af35 100644 --- a/src/patient/pages/hormonesResult/index.wxml +++ b/src/patient/pages/hormonesResult/index.wxml @@ -25,6 +25,7 @@ 温馨提醒 全身应用糖皮质激素可引起不良反应，程度与用药剂量和用药时间相关。 + 长期糖皮质激素口服治疗的不良反应发生率大于静脉冲击治疗。 {{picText.picTextTitle}} @@ -98,6 +99,7 @@ 眶内注射可改善眼外肌增粗、复视等症状。眼睑注射可改善眼睑肿胀、上睑退缩等症状。 + 局部注射可能出现局部皮下组织萎缩、局部药物沉积等不良反应。其中，眶内注射还可能出现眼球破裂、动脉阻塞、视网膜毒性作用、眼压增高等不良反应，应慎重使用。 diff --git a/src/patient/pages/hormonesStart/index.json b/src/patient/pages/hormonesStart/index.json new file mode 100644 index 0000000..520a2b9 --- /dev/null +++ b/src/patient/pages/hormonesStart/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "navbar": "/components/navbar/index", + "van-popup": "@vant/weapp/popup/index" + } +} diff --git a/src/patient/pages/hormonesStart/index.scss b/src/patient/pages/hormonesStart/index.scss new file mode 100644 index 0000000..d8ccba8 --- /dev/null +++ b/src/patient/pages/hormonesStart/index.scss @@ -0,0 +1,122 @@ +page { + background-color: #f7f1ff; +} + +.nav-back { + color: #333333; + font-size: 36rpx; +} +.nav-title { + color: #fff; +} +.page { + .body { + margin: 44rpx 40rpx; + padding-top: 174rpx; + .contaienr { + background: linear-gradient(180deg, #e7d5ff 0%, #ffffff 14.78%, #ffffff 100%); + padding: 32rpx 40rpx; + border-radius: 32rpx; + .title { + font-size: 36rpx; + color: #211d2e; + line-height: 56rpx; + } + .progress { + margin-top: 32rpx; + padding: 46rpx 32rpx; + background: #f6f8f9; + border-radius: 16rpx 16rpx 16rpx 16rpx; + border: 2rpx solid #ffffff; + .p-header { + margin-bottom: 20rpx; + font-size: 36rpx; + color: #211d2e; + font-weight: bold; + display: flex; + align-items: center; + gap: 16rpx; + &::before { + flex-shrink: 0; + content: ''; + width: 6rpx; + height: 36rpx; + border-radius: 44rpx; + background: #b982ff; + } + } + .row { + display: flex; + gap: 18rpx; + .aside { + display: flex; + flex-direction: column; + align-items: center; + .order { + position: relative; + flex-shrink: 0; + width: 32rpx; + height: 32rpx; + font-size: 24rpx; + color: #ffffff; + text-align: center; + line-height: 32rpx; + border-radius: 50%; + background: rgba(185, 130, 255, 0.29); + &::after { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + content: ''; + width: 16rpx; + height: 16rpx; + border-radius: 50%; + background-color: #b982ff; + } + } + .line { + flex: 1; + border-right: 1px dashed #b982ff; + } + .line-top { + height: 16rpx; + border-right: 1px dashed #b982ff; + } + .op0 { + opacity: 0; + } + } + .r-content { + font-size: 36rpx; + color: #211d2e; + line-height: 64rpx; + } + } + } + .tip { + margin-top: 28rpx; + font-size: 28rpx; + color: #adacb2; + } + .btn1 { + margin-top: 48rpx; + height: 88rpx; + display: flex; + align-items: center; + font-size: 36rpx; + color: #ffffff; + justify-content: center; + background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 100rpx 100rpx 100rpx 100rpx; + } + .btn2 { + margin-top: 20rpx; + padding: 20rpx; + font-size: 36rpx; + color: #B982FF; + text-align: center; + } + } + } +} diff --git a/src/patient/pages/hormonesStart/index.ts b/src/patient/pages/hormonesStart/index.ts new file mode 100644 index 0000000..cdb3ee3 --- /dev/null +++ b/src/patient/pages/hormonesStart/index.ts @@ -0,0 +1,41 @@ +const app = getApp() + +Page({ + data: { + id: '', + }, + onLoad(options) { + app.waitLogin({ type: [1] }).then(() => { + if (options.id) { + wx.showToast({ + icon: 'none', + title: '每日仅录入1次，您可修改已录信息', + }) + this.setData({ + id: options.id, + }) + } + }) + }, + handleAdd() { + wx.navigateTo({ + url: `/patient/pages/hormones/index?id=${this.data.id}`, + }) + }, + handleReport() { + wx.navigateTo({ + url: `/patient/pages/qolReport/index?scrollId=proit-hormone`, + }) + }, + handleBack() { + wx.navigateBack({ + fail() { + wx.reLaunch({ + url: '/patient/pages/index/index', + }) + }, + }) + }, +}) + +export {} diff --git a/src/patient/pages/hormonesStart/index.wxml b/src/patient/pages/hormonesStart/index.wxml new file mode 100644 index 0000000..2734cdc --- /dev/null +++ b/src/patient/pages/hormonesStart/index.wxml @@ -0,0 +1,50 @@ + + + + + + + + + 糖皮质激素具有强大的抗炎和免疫抑制作用，能够减轻眼睑、泪腺等眼眶周围组织炎性反应，改善眼外肌水肿等症状。 + + + 日常记录用量的必要性 + + + + + + + 自我管理健康的关键动作 + + + + + + + + 补充钙剂和维生素D + + + + + + + + 平衡“治疗效果”与 “用药安全”的核心 + + + + 参考文献 + + 中国甲状腺相关眼病诊断和治疗指南(2022年) + + 开始记录 + 查看我的记录 + + + diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 7dc709c..8c46bc9 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -84,16 +84,18 @@ wx:if="{{card.code == 'hormone' && card.showStatus == 1}}" style="background: url('{{imageUrl}}bg36.png?t={{Timestamp}}') no-repeat top center/100%" bind:tap="routerTo" - data-url="/patient/pages/qolReport/index" + data-url="/patient/pages/qolReport/index?scrollId=proit-hormone" > 最近一次录入时间 {{hormoneDetail.createTime}} + diff --git a/src/patient/pages/qolReport/index.ts b/src/patient/pages/qolReport/index.ts index 9c1fd1e..b3bf65a 100644 --- a/src/patient/pages/qolReport/index.ts +++ b/src/patient/pages/qolReport/index.ts @@ -28,7 +28,7 @@ Page({ chartComponent4: null as any, chartComponent5: null as any, chartComponent6: null as any, - async onLoad() { + async onLoad(options) { echarts = await require.async('../../../gift/compontnts/echart/echarts.js') this.chartComponent1 = this.selectComponent('#chart1') this.chartComponent2 = this.selectComponent('#chart2') @@ -40,8 +40,28 @@ Page({ app.waitLogin({ type: [1] }).then(() => { this.handleChangeType() this.getList() + if (options.scrollId) { + this.scrollPoint(`#${options.scrollId}`) + } }) }, + scrollPoint(id) { + wx.createSelectorQuery() + .select(id) + .boundingClientRect((res) => { + // 2.使用wx.getSysTemInfo()获取设备及页面高度windowHeight（px） + wx.getSystemInfo({ + success(ress) { + wx.pageScrollTo({ + // 3. 滚动的距离根据设备的页面高度进行微调（px） + scrollTop: res.top - ress.windowHeight / 2 + 50, + duration: 200, + }) + }, + }) + }) + .exec() + }, handleChangeType(e?: WechatMiniprogram.CustomEvent) { let type = '' if (e) { @@ -76,6 +96,7 @@ Page({ }, handleChange() { this.getChatData() + this.getHormoneData() }, getChatData() { const { type, BeginMonth, EndMonth } = this.data diff --git a/src/patient/pages/qolReport/index.wxml b/src/patient/pages/qolReport/index.wxml index e12e058..918159e 100644 --- a/src/patient/pages/qolReport/index.wxml +++ b/src/patient/pages/qolReport/index.wxml @@ -61,7 +61,7 @@ - + 我的激素周用量记录曲线 @@ -142,7 +142,7 @@ {{item.dosage}} mg/周 - *周用量=日用量*7天 + *周用量=日用量*7天 您已持续口服