diff --git a/README.md b/README.md index 9daf6e2..bf0e492 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ svn://39.106.86.127:28386/projects/wutian_xueyoubing_b/proj_src/shop/frontend/we ### vscode (/images/)(\S*(?=["|'])) {{imageUrl}}$2?t={{Timestamp}} + ### neovim (/images/)([^\"|']*) {{imageUrl}}${2}?t={{Timestamp}} diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index c59ec4b..6ce0f08 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -4,7 +4,7 @@ round z-index="{{100000}}" show="{{ true }}" - custom-style="background:transparent;" + custom-style="background:transparent;top:40%" position="{{params.position || 'center'}}" safe-area-inset-bottom="{{false}}" root-portal diff --git a/src/components/uploadFile/index.wxml b/src/components/uploadFile/index.wxml index 5357e89..e174128 100644 --- a/src/components/uploadFile/index.wxml +++ b/src/components/uploadFile/index.wxml @@ -2,8 +2,8 @@ - - + + () Page({ @@ -6,7 +8,8 @@ Page({ popupType: 'casesAddComplete', popupParams: {} as any, - currentFinish: true, + end: dayjs().format('YYYY-MM-DD'), + current: 0, // form @@ -250,31 +253,29 @@ Page({ this.setData({ popupShow: true, popupType: 'casesAddComplete', - popupParams: {}, + popupParams: { close: true }, }) } }) }, - handleFinish() { - this.setData({ - currentFinish: true, - }) - }, handleBack() { wx.navigateBack() }, - handlePrev() { - if (!this.data.currentFinish) return + handleSwiperChange(e) { + this.setData({ + current: e.detail.current, + }) + }, + handlePrev(e) { + const { value } = e.currentTarget.dataset this.setData({ - currentFinish: false, - current: this.data.current - 1, + current: value, }) }, - handleNext() { - if (!this.data.currentFinish) return + handleNext(e) { + const { value } = e.currentTarget.dataset this.setData({ - currentFinish: false, - current: this.data.current + 1, + current: value, }) }, handlePopupCancel() { diff --git a/src/patient/pages/casesAdd/index.wxml b/src/patient/pages/casesAdd/index.wxml index 057aada..02fc52e 100644 --- a/src/patient/pages/casesAdd/index.wxml +++ b/src/patient/pages/casesAdd/index.wxml @@ -32,14 +32,14 @@ 最后 1 步啦！感谢您的耐心填写～ 对健康负责，就是对自己和家人最好的关爱 - + 确诊时间 - + {{diagnosisTime}} @@ -115,7 +115,7 @@ 取消 - 下一步 + 下一步 @@ -244,8 +244,8 @@ - 上一步 - 下一步 + 上一步 + 下一步 @@ -272,7 +272,7 @@ {{item.name}} - 已选择关节 + 已选择关节 @@ -295,7 +295,7 @@ - 上一步 + 上一步 完成 @@ -305,6 +305,7 @@ - 1.您的诊前检查医院 + 1.我的定点检查医院 {{periodInfo1.hospitalName}} diff --git a/src/patient/pages/file/index.wxml b/src/patient/pages/file/index.wxml index 546d0c9..c136ae2 100644 --- a/src/patient/pages/file/index.wxml +++ b/src/patient/pages/file/index.wxml @@ -13,11 +13,11 @@ 刘能 - + 32岁 - + 北京 @@ -254,13 +254,13 @@ 注射日：2025 年5月28日 星期三 - + 最近1个月没有您的复诊信息哦！ 本周是注射后第12周 建议每周复诊1次～ - - - + + + diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index a28dfee..5f47c53 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -205,6 +205,7 @@ page { .c-header { display: flex; .num { + margin-top: 8rpx; flex-shrink: 0; width: 40rpx; height: 40rpx; diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 4f9136c..1cffa17 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -159,7 +159,7 @@ - + 建议每2周复查一次 diff --git a/src/patient/pages/preDiagnosisReport/index.ts b/src/patient/pages/preDiagnosisReport/index.ts index fe39101..74b5869 100644 --- a/src/patient/pages/preDiagnosisReport/index.ts +++ b/src/patient/pages/preDiagnosisReport/index.ts @@ -86,6 +86,20 @@ Page({ 'otherInfo', ], + checkNum: 0, + checkList: [ + 'isBloodRoutine', + 'isBiochemical', + 'isCFIxActivity', + 'isCFIxInhibitor', + 'isHepatitisB', + 'isHepatitisC', + 'isHivAntibody', + 'isAfp', + 'isAav', + 'isOther', + ], + dict: { result: {}, number: {}, @@ -110,6 +124,7 @@ Page({ this.setData({ ...reset, }) + this.getCheckNum() } else { this.getDetail() } @@ -158,6 +173,7 @@ Page({ attachmentList9: res.attachmentList[9] || [], attachmentList10: res.attachmentList[10] || [], }) + this.getCheckNum() }) }, handleToggleFold(e: any) { @@ -169,7 +185,7 @@ Page({ handleToggleCheck(e: any) { const { check, fold } = e.currentTarget.dataset let foldValue = this.data[fold] - if (!this.data[check]) { + if (this.data[check] == 2) { foldValue = false } this.setData({ @@ -177,6 +193,19 @@ Page({ [fold]: foldValue, }) this.updateSave() + this.getCheckNum() + }, + getCheckNum() { + const { checkList } = this.data + let num = 0 + checkList.forEach((item) => { + if (this.data[item] == 1) { + num += 1 + } + }) + this.setData({ + checkNum: num, + }) }, handleSelect(e: any) { const { key, value } = e.currentTarget.dataset diff --git a/src/patient/pages/preDiagnosisReport/index.wxml b/src/patient/pages/preDiagnosisReport/index.wxml index 9d5fb2b..dfa4b53 100644 --- a/src/patient/pages/preDiagnosisReport/index.wxml +++ b/src/patient/pages/preDiagnosisReport/index.wxml @@ -24,9 +24,9 @@ 您的诊前检查项目 - 1 + {{checkNum}} / - 8 + 10 diff --git a/src/patient/pages/selectDoctorList/index.ts b/src/patient/pages/selectDoctorList/index.ts index 851af97..96880f2 100644 --- a/src/patient/pages/selectDoctorList/index.ts +++ b/src/patient/pages/selectDoctorList/index.ts @@ -10,6 +10,11 @@ Page({ selectId: '', doctorList: [] as any, + pagination: { + page: 1, + pages: 1, + count: 1, + }, }, onLoad() { app.waitLogin({ type: 1 }).then(() => { @@ -24,6 +29,7 @@ Page({ }).then((res) => { this.setData({ doctorList: res, + ['pagination.count']: res.length, }) }) }, diff --git a/src/patient/pages/selectDoctorList/index.wxml b/src/patient/pages/selectDoctorList/index.wxml index 242929f..2ba2489 100644 --- a/src/patient/pages/selectDoctorList/index.wxml +++ b/src/patient/pages/selectDoctorList/index.wxml @@ -19,6 +19,7 @@ {{item.introduce}} + + @@ -13,7 +13,7 @@ type="text" model:value="{{search}}" placeholder-class="place-input" - placeholder="请输入搜索您的诊前检查医院" + placeholder="请输入搜索您的定点检查医院" class="input" bindconfirm="handleSearch" /> @@ -22,9 +22,14 @@ {{provinceName || '省份'}} {{cityName || '城市'}} + + + 重选 + + 定点检查医院为接受过相关培训的定点合作医院 @@ -41,6 +46,7 @@ +