From 3ef16dacb749c54604e68bfa74dd693a807b4936 Mon Sep 17 00:00:00 2001 From: kola-web Date: Wed, 16 Jul 2025 18:15:07 +0800 Subject: [PATCH] =?UTF-8?q?3.0bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/components/popup/index.wxml | 2 +- src/components/uploadFile/index.wxml | 6 ++--- src/images/icon98.png | Bin 0 -> 1009 bytes src/pages/ask/index.scss | 2 +- src/patient/pages/askPatient/index.scss | 2 +- src/patient/pages/casesAdd/index.ts | 31 ++++++++++++------------ src/patient/pages/casesAdd/index.wxml | 15 ++++++------ src/patient/pages/course/index.ts | 3 ++- src/patient/pages/course/index.wxml | 2 +- src/patient/pages/file/index.wxml | 12 ++++----- src/patient/pages/index/index.scss | 1 + src/patient/pages/index/index.wxml | 2 +- src/patient/pages/preDiagnosisReport/index.ts | 31 +++++++++++++++++++++++- src/patient/pages/preDiagnosisReport/index.wxml | 4 +-- src/patient/pages/selectDoctorList/index.ts | 6 +++++ src/patient/pages/selectDoctorList/index.wxml | 1 + src/patient/pages/selectHostipal/index.scss | 20 +++++++++++++++ src/patient/pages/selectHostipal/index.ts | 10 ++++++++ src/patient/pages/selectHostipal/index.wxml | 10 ++++++-- 20 files changed, 119 insertions(+), 42 deletions(-) create mode 100644 src/images/icon98.png 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 @@ - - + + Px&t4TybR9Hvtmr-bwR}{zp=O&sjUxQXAt`%hp%5+p13~du17NOWCA`^U2n8OYB z;2wq@ZqMu91}b(>_CeTW9Zc{+QJNHygzEDy5mZNT7!R z=UGyEa^|n=n=^&7pDbuA^d$an`%1$&4j~2zXx9nCz!ZUp=d9V&t1>qqJJ;CB*jvmv zEP#tfDto_X(*i2>_Z%f5hIBz1VHsQ`<^eO6zfiMTiRc3mZ36RznaXX|0;;CRm_17Z zpVkFoo&a!33LX=Z?}hDfkusUNQgUYpDuFHvi1&&4NHw72$IQc%_TOKqG+N0R*G%SU z_N6dQ6?)bmO_8Afmp+*b#5`z}jh_^NSK6K>V;>OnkQ0n0r++Pn_II1J&wT++?~Qc@ zg1GGnI#RNxK3kXht>gvbv_FV%GTscY{~mD+ZM$E~*4RePsGU_NE0a$mJN zpqIa9KojG3X#1-?M+?EZ0|AgyejG{X&wK5vmG-7U>IRhTr#t-iKuZB^4m9t1#2n3j zw3Hxz*6IL(r5tQa=aeFb+t@w~=&i%ni~Nh=FqiM|02e=SOz&6Tfp-wFffV z&qB;MW(?eE8_n+U4WwS`UFOUcLVc6ZQVz6@jbHXkgDMX@jq-Z?1<&NB=;RtLabVCE44%2dj8cO#h_#cF+m-9d(Un+a-CIpFMh)OunbHtf*n%_f$5 zAeZ`LC3YVI$svF`yp&nUt|nL^{D38@2et1l|ZKl|TX8>|>7UQD6KbSKy<2ryK( ztnb!jZcXWIMr)LII#Ov|XLj}yqYp$q0B@)%$G~GE+#}{Yk}+o5p{qIrrPIG}Ae~(< f<(vP3ywv*_A(^N&@r5*K00000NkvXXu0mjft})j+ literal 0 HcmV?d00001 diff --git a/src/pages/ask/index.scss b/src/pages/ask/index.scss index 06bd9ac..3d439b5 100644 --- a/src/pages/ask/index.scss +++ b/src/pages/ask/index.scss @@ -528,8 +528,8 @@ page { padding: 20rpx 0; display: flex; justify-content: space-between; - align-items: center; .order { + margin-top: 8rpx; width: 28rpx; height: 28rpx; font-size: 24rpx; diff --git a/src/patient/pages/askPatient/index.scss b/src/patient/pages/askPatient/index.scss index b7fe61f..7343cb4 100644 --- a/src/patient/pages/askPatient/index.scss +++ b/src/patient/pages/askPatient/index.scss @@ -394,8 +394,8 @@ page { padding: 20rpx 0; display: flex; justify-content: space-between; - align-items: center; .order { + margin-top: 8rpx; width: 28rpx; height: 28rpx; font-size: 24rpx; diff --git a/src/patient/pages/casesAdd/index.ts b/src/patient/pages/casesAdd/index.ts index df1ba59..447332e 100644 --- a/src/patient/pages/casesAdd/index.ts +++ b/src/patient/pages/casesAdd/index.ts @@ -1,3 +1,5 @@ +import dayjs from 'dayjs' + const app = getApp() 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 @@ +