From e949a700089dd2879f6a45fbb05899be81ae45ec Mon Sep 17 00:00:00 2001 From: kola-web Date: Thu, 19 Mar 2026 15:10:17 +0800 Subject: [PATCH] 2.3.0 --- README.md | 10 ++ project.config.json | 2 +- src/app.ts | 12 +-- src/gift/pages/dtpDurg/index.ts | 1 - src/images/icon98.png | Bin 616 -> 952 bytes src/pages/d_patientDetail/index.ts | 2 + src/pages/d_patientDetail/index.wxml | 2 +- src/patient/pages/doctor/index.ts | 122 +++++++++++------------ src/patient/pages/enterInfo/index.scss | 51 ++++------ src/patient/pages/enterInfo/index.ts | 17 +++- src/patient/pages/enterInfo/index.wxml | 45 +++++---- src/patient/pages/hormones/index.wxml | 4 +- src/patient/pages/hospital/index.ts | 1 - src/patient/pages/infusionCenter/index.ts | 1 - src/patient/pages/interactivePatient/index.ts | 8 ++ src/patient/pages/interactivePatient/index.wxml | 1 + src/patient/pages/live/index.ts | 1 - src/patient/pages/login/index.scss | 1 + src/patient/pages/login/index.wxml | 6 +- src/patient/pages/medical/index.ts | 1 - src/patient/pages/personalInformation/index.wxml | 23 ++++- 21 files changed, 172 insertions(+), 139 deletions(-) diff --git a/README.md b/README.md index 45d1af7..a650a72 100644 --- a/README.md +++ b/README.md @@ -48,3 +48,13 @@ wx.showModal({ 正整数 2 正整数 3 + + + +已修改未上线内容 +1. 医生端首页 统计数据改为实时更新 +2. 就诊地图重新定位，在非北京地区重新定位会重新定位到北京，再次切换才会定位到当地 +3. 患者端注册页导航栏增加返回上一页按钮 +4. 量表安奈德修改为甲泼尼龙 +5. 患者端聊天页点击任意区域都可关闭底部操作浮层 +6. 患者顿啊登录页底部隐私政策区域展示异常修复 diff --git a/project.config.json b/project.config.json index 625d498..1d8faf4 100644 --- a/project.config.json +++ b/project.config.json @@ -71,5 +71,5 @@ } ] }, - "appid": "wxf9ce8010f1ad24aa" + "appid": "wx71ac9c27c3c3e3f4" } \ No newline at end of file diff --git a/src/app.ts b/src/app.ts index cbd248d..d095bd7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -18,15 +18,15 @@ App({ // 测试号 wx2b0bb13edf717c1d // dev // appid:wxf9ce8010f1ad24aa - url: 'https://m.xd.hbraas.com', - upFileUrl: 'https://m.xd.hbraas.com/', - imageUrl: 'https://m.xd.hbraas.com/xd/', + // url: 'https://m.xd.hbraas.com', + // upFileUrl: 'https://m.xd.hbraas.com/', + // imageUrl: 'https://m.xd.hbraas.com/xd/', // pro // appid:wx71ac9c27c3c3e3f4 - // url: 'https://m.xd.hbsaas.com', - // upFileUrl: 'https://m.xd.hbsaas.com/', - // imageUrl: 'https://m.xd.hbsaas.com/api/xd/', + url: 'https://m.xd.hbsaas.com', + upFileUrl: 'https://m.xd.hbsaas.com/', + imageUrl: 'https://m.xd.hbsaas.com/api/xd/', loginState: '', isLogin: 0, diff --git a/src/gift/pages/dtpDurg/index.ts b/src/gift/pages/dtpDurg/index.ts index 2cd744d..ba9c152 100644 --- a/src/gift/pages/dtpDurg/index.ts +++ b/src/gift/pages/dtpDurg/index.ts @@ -56,7 +56,6 @@ Page({ icon: 'success', duration: 1000, }) - // 再次授权，调用wx.getLocation的API this.getFuzzyLocation() } else { diff --git a/src/images/icon98.png b/src/images/icon98.png index c8c48efbbda02123d7b6d8f11e3cd4761f103c67..bf6e97dbb3a3837f445f9b66f208b2bda0be0b9a 100644 GIT binary patch delta 931 zcmV;U16=&*1h@x~BYy*JNklurnS1r$GGBM=^?y0&_UWDy10A{Uyj!bp zvC{iQYMGhliO5z&V|3QcoOxQ7v)tqobgN#o$*$OL{bWlMFGLxpm-Av?@(eM$ z`RD+GqS=+xTz}|hGYFZD7>E^i)&_)Qf}$u5;)uje&u+8MtcQ=U4d~cASrQi)0V83g z%PHi&lNT}zdH{s79!|~#u_7kCSaIE;dIKOS>o(E|>!FAKnMUoK*bsiW$zGk9B>Z3(L4FU!%II_Ngz}^iC)#N8| z(wu>>&~UU;RHhUy3^f24$su-7WjiT&j7cjLO8Xo;WBe(tH?(5jG^>;!fco)sm41~s zDM@Mf3R7z|wzXwhjv|%n*nH;`*C)&!<*(B{xqmz^ET-%m-1wT#$>6NyxJvM5fUa5= z77hfLG#o3JGn-<70HL_~6wk{TN~s9FLnbh$-=c-Ub9IN)L)MA0CvP0%9PR#A)jt zK!11(MK7PbGnAZ?obhtm8N@)W@aPHzC2ZwrF8927T784qEk|W^5kBD?F}jUNAYU1G z)aXe5CcqSNiW{BFQr7eEVP&)1zTc>4ERb&qFl%IFM$X>AiF|_;?QqNgsk6Bw{~+X| zvq#0IwXDUiXa5fX0RR8)V)>5%02}}YNkl9xdZ?J delta 592 zcmV-W0cRGtSG$jhDT_`fN&azJWdl! zP`zHSd75VbSBzlDYel1~)#@m^76V$XRuh6BqmIn2-EQZo0D7h&U&W9w21A13a=Cot z85%JlS%K2Get$rZwzR1NDugX{$Va|7g}MsdhP`7a!Qfj-1d@S(d97CKqvwV)!1P_$ z{UC4RxC$ii#bV*@_xl!awbnc!$4(_3TdmO<7vE@S)^w)j@xyj?qyj05cqQs5K~caF zfczxfTejBFLnl?StoM}*Tk0?ZDO!n?P>D4UNP~5k`+sEs*buvp_RTQLn+ZscDNr)c z0GmpQh{t-S&Ya^i11aDKs)g<$rlI|p3q}cZ0Vx2e4I5pjZ?1Wg@ag9Ak#CYcZ7nyD zlBp2ag6^r<#Rklbd+b3z^35wZ0iBBgrHy>K{(+eQlXT0ULyXTtK*|ol7?6O+>31n(<*`cySrVg0wcejVW0RRC1|1WbX*Z=?k e21!IgR09ClR5w_Y;}y^V0000 first + '*'.repeat(rest.length)), diff --git a/src/pages/d_patientDetail/index.wxml b/src/pages/d_patientDetail/index.wxml index ba2ffd6..14f0ca4 100644 --- a/src/pages/d_patientDetail/index.wxml +++ b/src/pages/d_patientDetail/index.wxml @@ -38,7 +38,7 @@ - + 甲状腺眼病分级 {{detail.DiseaseStageName}} diff --git a/src/patient/pages/doctor/index.ts b/src/patient/pages/doctor/index.ts index 520fab3..d19a214 100644 --- a/src/patient/pages/doctor/index.ts +++ b/src/patient/pages/doctor/index.ts @@ -93,72 +93,62 @@ Page({ }) }, handleToggleSite() { - if (!this.data.LNG) { - wx.getSetting({ - success: (res) => { - if ( - res.authSetting['scope.userFuzzyLocation'] != undefined - && res.authSetting['scope.userFuzzyLocation'] == true - ) { - // 获取当前位置 - this.getFuzzyLocation() - } - else if (res.authSetting['scope.userFuzzyLocation'] == undefined) { - // 获取当前位置 - this.getFuzzyLocation() - } - else { - wx.showModal({ - title: '请求授权当前位置', - content: '需要获取您的地理位置，请确认授权', - confirmColor: '#8c75d0', - success: (res) => { - if (res.cancel) { - // 取消授权 - wx.showToast({ - title: '拒绝授权', - icon: 'none', - duration: 1000, - }) - this.getList() - } - else if (res.confirm) { - // 确定授权，通过wx.openSetting发起授权请求 - wx.openSetting({ - success: (res) => { - if (res.authSetting['scope.userFuzzyLocation'] == true) { - wx.showToast({ - title: '授权成功', - icon: 'success', - duration: 1000, - }) - // 再次授权，调用wx.getLocation的API - this.getFuzzyLocation() - } - else { - wx.showToast({ - title: '授权失败', - icon: 'none', - duration: 1000, - }) - this.getList() - } - }, - }) - } - }, - }) - } - }, - }) - } - else { - this.setData({ - LNG: '', - LAT: '', - }) - this.getLocationInfo() - } + wx.getSetting({ + success: (res) => { + if ( + res.authSetting['scope.userFuzzyLocation'] != undefined + && res.authSetting['scope.userFuzzyLocation'] == true + ) { + // 获取当前位置 + this.getFuzzyLocation() + } + else if (res.authSetting['scope.userFuzzyLocation'] == undefined) { + // 获取当前位置 + this.getFuzzyLocation() + } + else { + wx.showModal({ + title: '请求授权当前位置', + content: '需要获取您的地理位置，请确认授权', + confirmColor: '#8c75d0', + success: (res) => { + if (res.cancel) { + // 取消授权 + wx.showToast({ + title: '拒绝授权', + icon: 'none', + duration: 1000, + }) + this.getList() + } + else if (res.confirm) { + // 确定授权，通过wx.openSetting发起授权请求 + wx.openSetting({ + success: (res) => { + if (res.authSetting['scope.userFuzzyLocation'] == true) { + wx.showToast({ + title: '授权成功', + icon: 'success', + duration: 1000, + }) + this.getFuzzyLocation() + } + else { + wx.showToast({ + title: '授权失败', + icon: 'none', + duration: 1000, + }) + this.getList() + } + }, + }) + } + }, + }) + } + }, + }) }, getFuzzyLocation() { wx.getFuzzyLocation({ diff --git a/src/patient/pages/enterInfo/index.scss b/src/patient/pages/enterInfo/index.scss index eae3a6f..28c999b 100644 --- a/src/patient/pages/enterInfo/index.scss +++ b/src/patient/pages/enterInfo/index.scss @@ -45,41 +45,38 @@ page { .switch { margin-bottom: 50rpx; display: flex; - gap: 22rpx; justify-content: center; - gap: 86rpx; + align-items: center; + gap: 26rpx; .item { - .icon-wrap { - background: #f6f8f9; - border-radius: 24rpx 24rpx 24rpx 24rpx; - border: 1px solid transparent; - text-align: center; - .icon { - display: block; - margin-bottom: -2px; - width: 186rpx; - height: 164rpx; - } + flex: 1; + display: flex; + align-items: center; + justify-content: center; + background-color: #f6f8f9; + border-radius: 16rpx; + border: 1px solid #f6f8f9; + .icon { + flex-shrink: 0; + width: 118rpx; + height: 118rpx; } .name { - margin-top: 24rpx; font-size: 32rpx; color: #211d2e; text-align: center; } &.active { - .icon-wrap { - border-color: rgba(185, 130, 255, 1); - background-color: transparent; - } + border-color: #b982ff; + background: #fff; .name { - color: rgba(185, 130, 255, 1); + color: #b982ff; } } } } .row-title { - margin-top: 48rpx; + margin-top: 60rpx; margin-bottom: 24rpx; font-size: 32rpx; font-weight: bold; @@ -152,20 +149,6 @@ page { .input-place { color: rgba(173, 172, 178, 1); } - .input-required { - display: flex; - justify-content: space-between; - align-items: center; - &::after { - flex-shrink: 0; - margin-right: 20rpx; - content: ''; - width: 12rpx; - height: 12rpx; - border-radius: 50%; - background: rgba(185, 130, 255, 1); - } - } .item { flex: 1; padding: 10rpx 62rpx; diff --git a/src/patient/pages/enterInfo/index.ts b/src/patient/pages/enterInfo/index.ts index 650741e..a9cd9c5 100644 --- a/src/patient/pages/enterInfo/index.ts +++ b/src/patient/pages/enterInfo/index.ts @@ -34,6 +34,10 @@ Page({ proces: '0', dict: {}, + bolList: { + 1: '是', + 2: '否', + }, show: false, @@ -59,6 +63,7 @@ Page({ gender: zdUserInfo.Gender, ageRange: zdUserInfo.AgeRange, IsGraves: zdUserInfo.IsGraves, + isKnowTituyo: zdUserInfo.IsKnowTituyo, diseaseStage: zdUserInfo.DiseaseStage, diseasePeriod: zdUserInfo.DiseaseStage, HasTedSurgery: zdUserInfo.HasTedSurgery, @@ -119,6 +124,12 @@ Page({ HasTedSurgery: id, }) }, + handleSelectIsKnowTituyo(e) { + const { id } = e.currentTarget.dataset + this.setData({ + isKnowTituyo: id, + }) + }, handleSelectKnowTituyo(e) { const { id } = e.currentTarget.dataset const { tituyo } = this.data @@ -142,8 +153,8 @@ Page({ }) }, handleNext() { - const { name, gender, ageRange, relationType } = this.data - if (!name || !gender || !ageRange || !relationType) { + const { name, gender, ageRange, relationType, diseaseStage } = this.data + if (!name || !gender || !ageRange || !relationType || !diseaseStage) { wx.showToast({ title: '完善个人信息，可获得【医生】更多关注', icon: 'none' }) return } @@ -186,6 +197,7 @@ Page({ diseasePeriod, IsGraves, HasTedSurgery, + isKnowTituyo, tituyo, prescriptionImg, @@ -224,6 +236,7 @@ Page({ diseaseStage, diseasePeriod, prescriptionImg, + isKnowTituyo, tituyo: Object.keys(tituyo), WorkerId, diff --git a/src/patient/pages/enterInfo/index.wxml b/src/patient/pages/enterInfo/index.wxml index 0c9eb32..f83f389 100644 --- a/src/patient/pages/enterInfo/index.wxml +++ b/src/patient/pages/enterInfo/index.wxml @@ -1,5 +1,7 @@ - + + + @@ -10,16 +12,12 @@ - - - - 我是本人 + + 本人 - - - - 我是亲友 + + 亲友 患者姓名 @@ -29,11 +27,10 @@ class="input input-required" placeholder-class="input-place" focus - maxlength="{{8}}" - placeholder="怎么称呼{{relationType==1?'您':'患者'}}？" + placeholder="输入真实姓名，便于医生识别随访" /> - 请您输入真实姓名，便于医生识别随访 + 患者性别 @@ -57,8 +54,6 @@ {{item}} - - 您的甲状腺眼病分级 - 您的甲状腺眼病分期 + + + 您的甲状腺眼病分期 - 是否有TED（甲状腺眼突) 及其相关眼部手术史 + 是否有甲状腺眼病相关眼部手术史 - 如何看待新药替妥尤单抗 + 是否了解生物制剂替妥尤单抗N01 + + + + {{item}} + + + + 如何看待新药替妥尤单抗N01 （多选） diff --git a/src/patient/pages/hormones/index.wxml b/src/patient/pages/hormones/index.wxml index 2a2c102..47ebec8 100644 --- a/src/patient/pages/hormones/index.wxml +++ b/src/patient/pages/hormones/index.wxml @@ -196,7 +196,7 @@ mg - 说明:此处按曲安奈德注射剂量计算 + 说明:此处按甲泼尼龙注射剂量计算 上一页 提交 @@ -287,7 +287,7 @@ mg - 说明:此处按曲安奈德注射剂量计算 + 说明:此处按甲泼尼龙注射剂量计算 上一页 提交 diff --git a/src/patient/pages/hospital/index.ts b/src/patient/pages/hospital/index.ts index 6023b34..d77ae88 100644 --- a/src/patient/pages/hospital/index.ts +++ b/src/patient/pages/hospital/index.ts @@ -67,7 +67,6 @@ Page({ icon: 'success', duration: 1000, }) - // 再次授权，调用wx.getLocation的API this.getFuzzyLocation() } else { diff --git a/src/patient/pages/infusionCenter/index.ts b/src/patient/pages/infusionCenter/index.ts index 8d2529b..3ad290c 100644 --- a/src/patient/pages/infusionCenter/index.ts +++ b/src/patient/pages/infusionCenter/index.ts @@ -55,7 +55,6 @@ Page({ icon: 'success', duration: 1000, }) - // 再次授权，调用wx.getLocation的API this.getFuzzyLocation() } else { diff --git a/src/patient/pages/interactivePatient/index.ts b/src/patient/pages/interactivePatient/index.ts index 7156547..0896ad2 100644 --- a/src/patient/pages/interactivePatient/index.ts +++ b/src/patient/pages/interactivePatient/index.ts @@ -303,6 +303,14 @@ Page({ unReadCount: 0, }) }, + hideFooter() { + const { expend } = this.data + if (expend) { + this.setData({ + expend: false, + }) + } + }, handleFooter() { app.mpBehavior({ PageName: 'BTN_PatientImAsk' }) this.setData({ diff --git a/src/patient/pages/interactivePatient/index.wxml b/src/patient/pages/interactivePatient/index.wxml index e802c26..9430096 100644 --- a/src/patient/pages/interactivePatient/index.wxml +++ b/src/patient/pages/interactivePatient/index.wxml @@ -5,6 +5,7 @@ diff --git a/src/patient/pages/live/index.ts b/src/patient/pages/live/index.ts index afbde4c..2cd6d43 100644 --- a/src/patient/pages/live/index.ts +++ b/src/patient/pages/live/index.ts @@ -146,7 +146,6 @@ Page({ // icon: 'success', // duration: 1000 // }) - // 再次授权，调用wx.getLocation的API that.getFuzzyLocation() } else { diff --git a/src/patient/pages/login/index.scss b/src/patient/pages/login/index.scss index e80279e..99d83b6 100644 --- a/src/patient/pages/login/index.scss +++ b/src/patient/pages/login/index.scss @@ -65,6 +65,7 @@ pgae { font-size: 28rpx; color: rgba(105, 104, 110, 1); .link { + display: inline; color: rgba(185, 130, 255, 1); } } diff --git a/src/patient/pages/login/index.wxml b/src/patient/pages/login/index.wxml index 7e233c4..d710754 100644 --- a/src/patient/pages/login/index.wxml +++ b/src/patient/pages/login/index.wxml @@ -52,10 +52,10 @@ > 我同意依照 - 《隐私政策》 - + 《隐私政策》 + 《个人信息共享知情同意书》 - + 规定收集和共享我的个人敏感信息 diff --git a/src/patient/pages/medical/index.ts b/src/patient/pages/medical/index.ts index 8992eaf..87fc1b2 100644 --- a/src/patient/pages/medical/index.ts +++ b/src/patient/pages/medical/index.ts @@ -68,7 +68,6 @@ Page({ icon: 'success', duration: 1000, }) - // 再次授权，调用wx.getLocation的API this.getFuzzyLocation() } else { diff --git a/src/patient/pages/personalInformation/index.wxml b/src/patient/pages/personalInformation/index.wxml index f4e0e2b..c18294b 100644 --- a/src/patient/pages/personalInformation/index.wxml +++ b/src/patient/pages/personalInformation/index.wxml @@ -144,7 +144,7 @@ - 是否有TED（甲状腺眼突）及其相关眼部手术史 + 是否有甲状腺眼病相关眼部手术史 @@ -163,7 +163,26 @@ - 如何看待新药替妥尤单抗 + 是否了解生物制剂替妥尤单抗N01 + + + + + {{item}} + + + + + + + 如何看待新药替妥尤单抗N01