From ad0340f3aa8b2cca4e0a0e5814a4c813c2f87103 Mon Sep 17 00:00:00 2001 From: kola-web Date: Fri, 15 Nov 2024 18:40:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist.ps1 | 8 + src/app.json | 1 + src/components/doctorAvatar/index.json | 4 +- src/components/doctorAvatar/index.ts | 66 +++++++- src/components/doctorAvatar/index.wxml | 9 +- src/components/popupDoctorDetail/index.json | 1 - src/components/popupDoctorDetail/index.scss | 16 ++ src/components/popupDoctorDetail/index.wxml | 26 ++- src/echart/components/homeLevel1/index.wxml | 4 +- src/echart/components/homeLevel2/index.scss | 41 +++++ src/echart/components/homeLevel2/index.ts | 16 +- src/echart/components/homeLevel2/index.wxml | 27 +++- src/echart/components/homeLevel3/index.wxml | 2 +- src/echart/components/homeLevel4/index.scss | 41 +++++ src/echart/components/homeLevel4/index.ts | 23 ++- src/echart/components/homeLevel4/index.wxml | 14 +- src/images/icon-keyboard.png | Bin 0 -> 1657 bytes src/module1/pages/casesDetail/index.scss | 1 + src/module1/pages/casesDetail/index.ts | 83 +++++++--- src/module1/pages/casesDetail/index.wxml | 41 +++++ src/module1/pages/chatRoom/index.json | 3 +- src/module1/pages/chatRoom/index.scss | 20 ++- src/module1/pages/chatRoom/index.ts | 8 + src/module1/pages/chatRoom/index.wxml | 62 +++++--- src/module1/pages/chatRoomInfo/index.wxml | 2 +- src/module1/pages/login/index.ts | 32 ++-- src/module1/pages/login/index.wxml | 6 +- src/module1/pages/loginProtool/index.ts | 2 - src/module1/pages/org3/index.wxml | 8 + src/module1/pages/org4/index.wxml | 8 + src/module1/pages/setCaseDoctor/index.wxml | 7 +- src/module1/pages/setChatDoctor/index.wxml | 2 +- src/module1/pages/setDoctor/index.wxml | 7 +- src/module1/pages/setInfo/index.scss | 27 +++- src/module1/pages/setInfo/index.ts | 32 ++++ src/module1/pages/setInfo/index.wxml | 5 +- src/module1/pages/setInfoDoctor/index.json | 10 ++ src/module1/pages/setInfoDoctor/index.scss | 236 ++++++++++++++++++++++++++++ src/module1/pages/setInfoDoctor/index.ts | 77 +++++++++ src/module1/pages/setInfoDoctor/index.wxml | 72 +++++++++ src/module1/pages/setInfoResult/index.scss | 6 + src/module1/pages/setInfoResult/index.ts | 21 ++- src/module1/pages/setInfoResult/index.wxml | 3 +- src/module1/pages/userInfo/index.scss | 1 + src/pages/cases/index.ts | 7 +- src/pages/cases/index.wxml | 1 + src/pages/my/index.wxml | 7 +- 47 files changed, 976 insertions(+), 120 deletions(-) create mode 100644 dist.ps1 create mode 100644 src/images/icon-keyboard.png create mode 100644 src/module1/pages/setInfoDoctor/index.json create mode 100644 src/module1/pages/setInfoDoctor/index.scss create mode 100644 src/module1/pages/setInfoDoctor/index.ts create mode 100644 src/module1/pages/setInfoDoctor/index.wxml diff --git a/dist.ps1 b/dist.ps1 new file mode 100644 index 0000000..d75626b --- /dev/null +++ b/dist.ps1 @@ -0,0 +1,8 @@ +# Change to the src/images directory, or exit if the directory doesn't exist +Set-Location -Path ./src/images/ -ErrorAction Stop + +# Add all files to svn, including ignored files and forced additions +svn add . --no-ignore --force + +# Commit the changes with a message +svn ci -m "版本更新" diff --git a/src/app.json b/src/app.json index e164e1b..9c38a47 100644 --- a/src/app.json +++ b/src/app.json @@ -13,6 +13,7 @@ "pages/loginProtool/index", "pages/invite/index", "pages/setInfo/index", + "pages/setInfoDoctor/index", "pages/setInfoResult/index", "pages/sHostipal/index", "pages/cHostipal/index", diff --git a/src/components/doctorAvatar/index.json b/src/components/doctorAvatar/index.json index a89ef4d..1ed9b10 100644 --- a/src/components/doctorAvatar/index.json +++ b/src/components/doctorAvatar/index.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "popupDoctorDetail": "/components/popupDoctorDetail/index" + } } diff --git a/src/components/doctorAvatar/index.ts b/src/components/doctorAvatar/index.ts index 33ffd47..ae306b8 100644 --- a/src/components/doctorAvatar/index.ts +++ b/src/components/doctorAvatar/index.ts @@ -1,4 +1,4 @@ -const _app = getApp() +const _app = getApp(); // pages/story/a.ts Component({ @@ -9,21 +9,77 @@ Component({ properties: { src: { type: String, - value: '', + optionalTypes: [String, Number], + value: "", }, level: { type: Number, + optionalTypes: [String, Number], value: 1, }, + did: { + type: String, + optionalTypes: [String, Number], + value: "", + }, }, /** * 组件的初始数据 */ - data: {}, + data: { + showDetail: false, + popupDoctorDetail: {}, + DoctorTitleType: {}, + hospitalClassification: {}, + hospitalLevel: {}, + }, /** * 组件的方法列表 */ - methods: {}, -}) + methods: { + async getDoctorDict(): Promise { + return wx.ajax({ + method: "GET", + url: "?r=takeda/reg/doctor-dict", + data: {}, + }); + }, + async handleDetail() { + const did = this.data.did; + if (!did) return; + const { DoctorTitleType } = await this.getDoctorDict(); + wx.ajax({ + method: "GET", + url: "?r=takeda/doctor/detail", + data: { + DoctorId: did, + }, + }).then((res) => { + this.setData({ + showDetail: true, + popupDoctorDetail: { + DoctorLevel: res.DoctorLevel, + DoctorImg: res.Img, + DoctorName: res.Name, + DoctorTitleName: res.TitleType === "99" ? res.OtherTitle : DoctorTitleType[res.TitleType], + HospitalName: res.HospitalName, + HospitalClassificationName: res.HospitalClassificationName, + HospitalLevelName: res.HospitalLevelName, + CityName: res.CityName, + CountyName: res.CountyName, + Introduce: res.Introduce, + department: res.Department, + specialty: res.Specialty, + }, + }); + }); + }, + handlePopupClose() { + this.setData({ + showDetail: false, + }); + }, + }, +}); diff --git a/src/components/doctorAvatar/index.wxml b/src/components/doctorAvatar/index.wxml index 7ad1cdb..3899f12 100644 --- a/src/components/doctorAvatar/index.wxml +++ b/src/components/doctorAvatar/index.wxml @@ -1,4 +1,4 @@ - + + + diff --git a/src/components/popupDoctorDetail/index.json b/src/components/popupDoctorDetail/index.json index fa8fca7..cf286db 100644 --- a/src/components/popupDoctorDetail/index.json +++ b/src/components/popupDoctorDetail/index.json @@ -2,7 +2,6 @@ "component": true, "usingComponents": { "van-popup": "@vant/weapp/popup/index", - "doctorAvatar": "/components/doctorAvatar/index", "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/components/popupDoctorDetail/index.scss b/src/components/popupDoctorDetail/index.scss index 2df308d..82eb300 100644 --- a/src/components/popupDoctorDetail/index.scss +++ b/src/components/popupDoctorDetail/index.scss @@ -24,6 +24,19 @@ flex-shrink: 0; width: 112rpx; height: 112rpx; + position: relative; + .a-img { + width: 100%; + height: 100%; + border-radius: 50%; + } + .mask { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } } .wrap { .name { @@ -105,6 +118,9 @@ } .brief-introduction { flex: 1; + max-height: 20vh; + overflow-y: auto; + overflow-x: hidden; font-size: 28rpx; color: rgba(20, 21, 21, 1); line-height: 44rpx; diff --git a/src/components/popupDoctorDetail/index.wxml b/src/components/popupDoctorDetail/index.wxml index e21b41b..3f2ff88 100644 --- a/src/components/popupDoctorDetail/index.wxml +++ b/src/components/popupDoctorDetail/index.wxml @@ -3,7 +3,27 @@ 医生详情 - + + + + + + {{params.DoctorName}} @@ -20,7 +40,9 @@ {{params.HospitalName}} {{params.HospitalClassificationName}}{{params.HospitalLevelName}} - {{params.CityName}}{{params.CountyName?'/':''}}{{params.CountyName}} + + {{params.CityName}}{{params.CountyName?'/':''}}{{params.CountyName}} + diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml index 24d6d2b..47a176e 100644 --- a/src/echart/components/homeLevel1/index.wxml +++ b/src/echart/components/homeLevel1/index.wxml @@ -1,6 +1,6 @@ - + {{userInfo.Name}} @@ -102,7 +102,7 @@ - + {{item.DoctorName}} diff --git a/src/echart/components/homeLevel2/index.scss b/src/echart/components/homeLevel2/index.scss index c6f9e57..7238219 100644 --- a/src/echart/components/homeLevel2/index.scss +++ b/src/echart/components/homeLevel2/index.scss @@ -185,6 +185,7 @@ .s-container { display: flex; .item { + position: relative; flex: 1; text-align: center; .name { @@ -198,6 +199,46 @@ color: rgba(20, 21, 21, 1); line-height: 56rpx; } + .item-toast { + position: absolute; + left: -80rpx; + top: -20rpx; + transform: translate(0, -100%); + padding: 28rpx 0; + border-radius: 16rpx; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + display: flex; + align-items: center; + white-space: nowrap; + font-size: 28rpx; + color: #fff; + .i-row { + padding: 0 56rpx; + } + .i-line { + width: 2rpx; + height: 32rpx; + background-color: rgba(255, 255, 255, 0.29); + } + .i-clsoe { + position: absolute; + top: -10rpx; + right: -10rpx; + width: 32rpx; + height: 32rpx; + } + &::after { + position: absolute; + left: 134rpx; + bottom: -10rpx; + content: ""; + width: 0; + height: 0; + border-style: solid; + border-width: 18rpx 18rpx 0 18rpx; + border-color: #4abfc0 transparent transparent transparent; + } + } } .line { flex-shrink: 0; diff --git a/src/echart/components/homeLevel2/index.ts b/src/echart/components/homeLevel2/index.ts index f596f3e..a3e4b33 100644 --- a/src/echart/components/homeLevel2/index.ts +++ b/src/echart/components/homeLevel2/index.ts @@ -24,6 +24,7 @@ Component({ case: {} as any, cooperateList: [], inviteList: [], + newCaseShow: false, }, lifetimes: { @@ -147,14 +148,15 @@ Component({ const { index } = e.currentTarget.dataset; this.triggerEvent("question", index); }, + handleNewCase() { - const { case: cases } = this.data; - wx.showModal({ - confirmColor: "#00B4C5", - cancelColor: "#141515", - showCancel: false, - confirmText: "关闭", - content: `本人提交:${cases.newOneCaseCount}\r\n他人提交:${cases.newTwoCaseCount}`, + this.setData({ + newCaseShow: true, + }); + }, + handleNewCaseClose() { + this.setData({ + newCaseShow: false, }); }, }, diff --git a/src/echart/components/homeLevel2/index.wxml b/src/echart/components/homeLevel2/index.wxml index 5d58eda..69c7a8e 100644 --- a/src/echart/components/homeLevel2/index.wxml +++ b/src/echart/components/homeLevel2/index.wxml @@ -1,6 +1,11 @@ - + @@ -81,6 +86,12 @@ {{case.newCaseCount}} + + + 本人提交:{{case.newOneCaseCount}} + + 他人提交:{{case.newTwoCaseCount}} + @@ -128,7 +139,12 @@ - + {{item.DoctorName}} @@ -184,7 +200,12 @@ - + {{item.DoctorName}} diff --git a/src/echart/components/homeLevel3/index.wxml b/src/echart/components/homeLevel3/index.wxml index 54f0202..ab4fdb2 100644 --- a/src/echart/components/homeLevel3/index.wxml +++ b/src/echart/components/homeLevel3/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/src/echart/components/homeLevel4/index.scss b/src/echart/components/homeLevel4/index.scss index e621757..599ddf1 100644 --- a/src/echart/components/homeLevel4/index.scss +++ b/src/echart/components/homeLevel4/index.scss @@ -200,6 +200,7 @@ .s-container { display: flex; .item { + position: relative; flex: 1; text-align: center; .name { @@ -213,6 +214,46 @@ color: rgba(20, 21, 21, 1); line-height: 56rpx; } + .item-toast { + position: absolute; + left: -80rpx; + top: -20rpx; + transform: translate(0, -100%); + padding: 28rpx 0; + border-radius: 16rpx; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + display: flex; + align-items: center; + white-space: nowrap; + font-size: 28rpx; + color: #fff; + .i-row { + padding: 0 56rpx; + } + .i-line { + width: 2rpx; + height: 32rpx; + background-color: rgba(255, 255, 255, 0.29); + } + .i-clsoe { + position: absolute; + top: -10rpx; + right: -10rpx; + width: 32rpx; + height: 32rpx; + } + &::after { + position: absolute; + left: 134rpx; + bottom: -10rpx; + content: ""; + width: 0; + height: 0; + border-style: solid; + border-width: 18rpx 18rpx 0 18rpx; + border-color: #4abfc0 transparent transparent transparent; + } + } } .line { flex-shrink: 0; diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts index 1f21f5d..d0f2618 100644 --- a/src/echart/components/homeLevel4/index.ts +++ b/src/echart/components/homeLevel4/index.ts @@ -38,6 +38,8 @@ Component({ empty3: false, rankList: [], + + newCaseShow: false, }, lifetimes: { @@ -180,6 +182,7 @@ Component({ { name: "质控医生", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -197,6 +200,7 @@ Component({ { name: "核心医生", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -214,6 +218,7 @@ Component({ { name: "一级医生", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -357,6 +362,7 @@ Component({ { name: "核心医生提交", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -374,6 +380,7 @@ Component({ { name: "一级医生提交", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -517,6 +524,7 @@ Component({ { name: "核心医生提交", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -534,6 +542,7 @@ Component({ { name: "一级医生提交", type: "bar", + barMaxWidth: 40, stack: "a", label: { show: true, @@ -681,13 +690,13 @@ Component({ this.triggerEvent("question", index); }, handleNewCase() { - const { case: cases } = this.data; - wx.showModal({ - confirmColor: "#00B4C5", - cancelColor: "#141515", - showCancel: false, - confirmText: "关闭", - content: `本科室:${cases.newOneCaseCount}\r\n无科室:${cases.newTwoCaseCount}`, + this.setData({ + newCaseShow: true, + }); + }, + handleNewCaseClose() { + this.setData({ + newCaseShow: false, }); }, }, diff --git a/src/echart/components/homeLevel4/index.wxml b/src/echart/components/homeLevel4/index.wxml index 38edb93..3fb30da 100644 --- a/src/echart/components/homeLevel4/index.wxml +++ b/src/echart/components/homeLevel4/index.wxml @@ -1,6 +1,6 @@ - + @@ -78,8 +78,18 @@ {{case.newCaseCount}} + + + 本科室:{{case.newOneCaseCount}} + + 无科室:{{case.newTwoCaseCount}} + - + 讨论中 diff --git a/src/images/icon-keyboard.png b/src/images/icon-keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..32db6432d203f92cbdc2e69a78c6150c652dce9c GIT binary patch literal 1657 zcmV-<28Q{GP)Px*Gf6~2RA@upT3?7%RT%%iGc&LcK8$m}BR&`!_@H34fx$+F28M^Wzg2Ool&xnFbc-h21XoqK2Q z+?^@(zU|!aeCPXp=R4n@-(7@z{K0$Nei$f#a=E;sP$)c%h$~%yr3kRdI*0-83V_?L z>)vo(_qSTDc4JVETPT1c5j_q7I~iaTA}-5f7&G4j=I;Su!Wi>ImNjWIc>xq1$Jv2G z>~9&dav=sV^E4wKsVen30Q}RhuD$^*CfZy;{4~vQX09RPH3qm10C%lH$UFi7%K&i| z08o;V9uU_ZuU4z)`vK7pfDuQ^!w9geV*}>PF5(2b?s;R(bTXN@o#ZP1}adlg#{~G3M8PycWnxDMy+4JwV(NTYt4tuWzZ< zYJd0A+Y^9q`~?J95h`Q0Uf!d%zR+ufEbobE9UvZyh9v{sXx8iNdx7W*AjS9zt@UeJ zk2nheUuJ})JPrUa1Z%Q@=mx+lya)iJ5zimcTEE|iQGJUNkqxN>5fImmQjexNEERww zczg@xqt;k^c5iP3{*6kpS`2? zxwy(C03#036`af2_L}Td8%%#zf;?@j8#?MY+reoLLWsLc?02^Dk%5d1bM8LO{S zsf>w2!Dhq6h=>C?jzV~?LaV#{#VGYyJT&6RYTvs6&s3EPFa4log1w385+JViL;9Fs zhrB=A0TA5`TVm$DTI)}eZki+IK45+a5gRVR!KzZ9#pMPi&3&!CV6#|lqz5}+-7rowOaL3{{2(PEE*!Z*&41r zcFhGCPihhJdT=4@Vm0cPPHH8507n6Fw;x8AwbphP{ofx)%8LPqB@7T_ z-8i3$l&@k?9dp8DfT^ldU!*NBm&>EYQt3+Yo?Z88V~pihy(d1A6-i3lG zK$Di6bJ}m)_SB+jbvi_6aGv;@_6M49yN;34ah#V?h!dei!blms>tHT&py&pmOth|u z7><+(Fs@>)d(u$fb_&2et+jq6X{aA^2w7h0j|f|5z29L+BCXPzfHt=#ptE7zF;5t+ zU&`U&+)JXB*UO5Co2s+39nAIpNo@IUvvm5UHb(kCVCUkj8~|L^bF+Ek$B$m*?utUG z^ka;fwzGoG!+n2E=@CzsP&qN8BI8dwA+PI^vKrH8jLhOs=`MD+l;99d@e=f_{ z%$_F@F(&mBljV?*`7|@1>&0YPhJl6HD42JKTu)?^p?qSBdbF}+iQU|CrvdpJceu8- z0|0I@VsK9uA@kDKptL4n77|Wr2AIcN{Z|JA-R(sCIf1C25h>;CtuK*whE4;LHIil+ z;Gj|JWSn`_UjO zLWt!_|7yU@e>R)Vt645*20wTr0|k(E(?QDJ^8o$@omZ1y%x42P00000NkvXXu0mjf D9?%-g literal 0 HcmV?d00001 diff --git a/src/module1/pages/casesDetail/index.scss b/src/module1/pages/casesDetail/index.scss index 15af82f..8b274c1 100644 --- a/src/module1/pages/casesDetail/index.scss +++ b/src/module1/pages/casesDetail/index.scss @@ -967,6 +967,7 @@ page { .select-wrap { margin-top: 32rpx; display: flex; + flex-wrap: wrap; gap: 16rpx; .select { padding: 4rpx 24rpx; diff --git a/src/module1/pages/casesDetail/index.ts b/src/module1/pages/casesDetail/index.ts index 2e89ad7..11527e7 100644 --- a/src/module1/pages/casesDetail/index.ts +++ b/src/module1/pages/casesDetail/index.ts @@ -9,6 +9,8 @@ Page({ show5: false, // 取消归档 show6: false, // 创建学习窗 show7: false, // 更改标签 + show8: false, // 公开 + show9: false, // 取消公开 showRejectReason: false, more: false, @@ -78,6 +80,18 @@ Page({ } return true; }, + beforeClose8: (e: any) => { + if (e === "confirm") { + this.handleOpenSubmit(); + } + return true; + }, + beforeClose9: (e: any) => { + if (e === "confirm") { + this.handleUnOpenSubmit(); + } + return true; + }, }); }, onShow() { @@ -174,9 +188,11 @@ Page({ }, handleImagePreview(e) { - const { url } = e.currentTarget.dataset; + const { url, parent } = e.currentTarget.dataset; + const urls = parent.map((item) => item.url); wx.previewImage({ - urls: [url], + urls, + current: url, }); }, @@ -393,25 +409,40 @@ Page({ }, handleOpen() { - const { detail, id } = this.data; + const { detail } = this.data; const isOpen = detail.isOpen === "1"; - wx.showModal({ - confirmColor: "#00B4C5", - cancelColor: "#141515", - title: `确认${isOpen ? "取消公开" : "公开"}?`, - success: (res) => { - if (res.confirm) { - wx.ajax({ - method: "POST", - url: "?r=takeda/case/set-open", - data: { - caseId: id, - }, - }).then(() => { - this.handleResoure(); - }); - } + if (isOpen) { + this.setData({ + show9: true, + }); + } else { + this.setData({ + show8: true, + }); + } + }, + handleOpenSubmit() { + const { id } = this.data; + wx.ajax({ + method: "POST", + url: "?r=takeda/case/set-open", + data: { + caseId: id, + }, + }).then(() => { + this.handleResoure(); + }); + }, + handleUnOpenSubmit() { + const { id } = this.data; + wx.ajax({ + method: "POST", + url: "?r=takeda/case/set-open", + data: { + caseId: id, }, + }).then(() => { + this.handleResoure(); }); }, @@ -516,8 +547,18 @@ Page({ remark, }, }).then(() => { - wx.reLaunch({ - url: "/pages/cases/index", + wx.showToast({ + icon: "none", + title: "驳回成功", + duration: 2000, + success() { + const time = setTimeout(() => { + clearInterval(time); + wx.reLaunch({ + url: "/pages/cases/index", + }); + }, 2000); + }, }); }); }, diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml index f96933a..6c57cf5 100644 --- a/src/module1/pages/casesDetail/index.wxml +++ b/src/module1/pages/casesDetail/index.wxml @@ -24,6 +24,7 @@ class="avatar" src="{{detail.createDoctorInfo.doctorImg}}" level="{{detail.createDoctorInfo.doctorLevel}}" + did="{{detail.createDoctorInfo.doctorId}}" > @@ -61,6 +62,7 @@ mode="aspectFill" bind:tap="handleImagePreview" data-url="{{item.url}}" + data-parent="{{detail.caseImages}}" wx:for="{{detail.caseImages}}" wx:key="url" > @@ -129,6 +131,7 @@ class="avatar" src="{{item.createDoctorInfo.doctorImg}}" level="{{item.createDoctorInfo.doctorLevel}}" + did="{{item.createDoctorInfo.doctorId}}" > @@ -177,6 +180,7 @@ mode="aspectFill" bind:tap="handleImagePreview" data-url="{{cItem.url}}" + data-parent="{{item.feedbackImages}}" wx:for="{{item.feedbackImages}}" wx:for-item="cItem" wx:key="url" @@ -214,6 +218,7 @@ class="avatar" src="{{dealDoctorInfo.doctorImg}}" level="{{dealDoctorInfo.doctorLevel}}" + did="{{dealDoctorInfo.doctorId}}" > @@ -362,6 +367,7 @@ use-slot title="" show="{{ show1 }}" + width="678rpx" show-cancel-button confirm-button-color="rgba(0, 180, 197, 1)" beforeClose="{{beforeClose1}}" @@ -507,3 +513,38 @@ 提交 + + + + + + 确认公开病历吗? + 您的病历配置为公开后，科室内医生均可查看 + + + + + + + + 确认取消公开病历吗？ + + + + diff --git a/src/module1/pages/chatRoom/index.json b/src/module1/pages/chatRoom/index.json index 2425f1a..2427e50 100644 --- a/src/module1/pages/chatRoom/index.json +++ b/src/module1/pages/chatRoom/index.json @@ -5,6 +5,7 @@ "van-icon": "@vant/weapp/icon/index", "van-popup": "@vant/weapp/popup/index", "customRecord": "/components/customRecord/index", - "uploadFile": "/components/uploadFile/index" + "uploadFile": "/components/uploadFile/index", + "doctorAvatar":"/components/doctorAvatar/index" } } diff --git a/src/module1/pages/chatRoom/index.scss b/src/module1/pages/chatRoom/index.scss index ac1c5f5..e46ef13 100644 --- a/src/module1/pages/chatRoom/index.scss +++ b/src/module1/pages/chatRoom/index.scss @@ -121,6 +121,8 @@ page { .avatar { padding-right: 16rpx; flex-shrink: 0; + width: 84rpx; + height: 84rpx; .a-img { width: 84rpx; height: 84rpx; @@ -216,6 +218,8 @@ page { .avatar { padding-left: 16rpx; flex-shrink: 0; + width: 84rpx; + height: 84rpx; .a-img { width: 84rpx; height: 84rpx; @@ -306,10 +310,6 @@ page { gap: 12rpx; align-items: center; justify-content: space-between; - .custom-record{ - width: 48rpx; - height: 48rpx; - } .icon { width: 48rpx; height: 48rpx; @@ -333,10 +333,22 @@ page { border-radius: 212rpx 212rpx 212rpx 212rpx; font-size: 28rpx; color: #000; + line-height: 40rpx; } .place-input { color: rgba(205, 205, 205, 1); } + .custom-record { + padding: 16rpx 32rpx; + flex: 1; + background: #f6f6f6; + text-align: center; + border-radius: 212rpx 212rpx 212rpx 212rpx; + font-size: 28rpx; + line-height: 40rpx; + color: #141515; + } + .icon-add { width: 48rpx; height: 48rpx; diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts index 73cf44b..473d4c0 100644 --- a/src/module1/pages/chatRoom/index.ts +++ b/src/module1/pages/chatRoom/index.ts @@ -49,6 +49,8 @@ Page({ videoUrl: "", protocol: `

罕心守护平台向用户提供了“学习窗”功能，基于此服务，我们在此特别声明：

罕心守护平台非常重视您的个人信息保护及平台信息的隐私性，您同意在学习窗功能使用时遵守以下规则：

1.严禁在学习窗内讨论或分享任何患者的个人身份信息，包括但不限于姓名、性别等。群内发送的任何素材内容，必须去除所有可能识别患者身份的敏感信息；

2.不以截图、录音或以任何形式将内容传播；

3.讨论内容仅限于专业交流，不得用于任何商业目的;

4.保持讨论的专业性和尊重性，避免使用侮辱性或攻击性语言。


`, + + record: true, }, innerAudioContext: null as WechatMiniprogram.InnerAudioContext | null, videoContext: null as WechatMiniprogram.VideoContext | null, @@ -484,4 +486,10 @@ Page({ focus: false, }); }, + handleToggleRecord() { + this.setData({ + record: !this.data.record, + focus: !this.data.record, + }); + }, }); diff --git a/src/module1/pages/chatRoom/index.wxml b/src/module1/pages/chatRoom/index.wxml index 18f9423..db5ca7a 100644 --- a/src/module1/pages/chatRoom/index.wxml +++ b/src/module1/pages/chatRoom/index.wxml @@ -44,9 +44,7 @@ {{message.createTimeName}} {{message.content}} - - - + {{message.doctorName}} {{message.hospitalName}} {{message.content}} @@ -64,6 +62,7 @@ > {{message.content.duration}}'' + {{message.doctorName}} {{message.hospitalName}} {{message.content}} + {{message.content.duration}}'' - - - + @@ -130,26 +128,38 @@ - - - - - {{sendMessage}} + + + + + {{sendMessage}} + + 按住说话 - + {{item.doctorName}} diff --git a/src/module1/pages/login/index.ts b/src/module1/pages/login/index.ts index 237e4d3..986508b 100644 --- a/src/module1/pages/login/index.ts +++ b/src/module1/pages/login/index.ts @@ -8,13 +8,8 @@ Page({ code: "", protool: false, codeText: "发送验证码", - isProtocol: false, - }, - onLoad() { - if(!this.data.isProtocol){ - this.handleNavProtool() - } }, + onLoad() {}, getCode() { if (timer) return; const mobile = this.data.mobile; @@ -63,10 +58,7 @@ Page({ handleSubmit() { const { mobile, code, protool } = this.data; if (!protool) { - wx.showToast({ - title: "请先勾选协议", - icon: "none", - }); + this.handleNavProtool(); return; } if (!mobile) { @@ -98,10 +90,6 @@ Page({ const { protool } = this.data; const { iv, encryptedData } = e.detail; if (!protool) { - wx.showToast({ - title: "请先勾选协议", - icon: "none", - }); return; } if (iv && encryptedData) { @@ -127,11 +115,21 @@ Page({ }); }, handleProtool() { - this.setData({ - protool: !this.data.protool, - }); + if (this.data.protool) { + this.setData({ + protool: false, + }); + } else { + this.setData({ + protool: false, + }); + wx.navigateTo({ url: "/module1/pages/loginProtool/index" }); + } }, handleNavProtool() { + if (this.data.protool) { + return; + } wx.navigateTo({ url: "/module1/pages/loginProtool/index" }); }, }); diff --git a/src/module1/pages/login/index.wxml b/src/module1/pages/login/index.wxml index d1aba7f..5bc4460 100644 --- a/src/module1/pages/login/index.wxml +++ b/src/module1/pages/login/index.wxml @@ -32,7 +32,11 @@ 或者 - + diff --git a/src/module1/pages/loginProtool/index.ts b/src/module1/pages/loginProtool/index.ts index d39ed71..bd2fdd6 100644 --- a/src/module1/pages/loginProtool/index.ts +++ b/src/module1/pages/loginProtool/index.ts @@ -22,7 +22,6 @@ Page({ const prevPage = pages[pages.length - 2]; prevPage.setData({ protool: false, - isProtocol: true, }); wx.navigateBack(); }, @@ -31,7 +30,6 @@ Page({ const prevPage = pages[pages.length - 2]; prevPage.setData({ protool: true, - isProtocol: true, }); wx.navigateBack(); }, diff --git a/src/module1/pages/org3/index.wxml b/src/module1/pages/org3/index.wxml index a196c34..5592967 100644 --- a/src/module1/pages/org3/index.wxml +++ b/src/module1/pages/org3/index.wxml @@ -40,6 +40,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.DoctorId}}" > {{item.ChildCount}}人 @@ -91,6 +92,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > {{item.ChildCount}}人 @@ -153,6 +155,7 @@ class="avatar" src="{{subItem.DoctorInfo.doctorImg}}" level="{{subItem.DoctorInfo.doctorLevel}}" + did="{{subItem.DoctorInfo.doctorId}}" > {{subItem.ChildCount}}人 @@ -222,6 +225,7 @@ class="avatar" src="{{subSubItem.DoctorInfo.doctorImg}}" level="{{subSubItem.DoctorInfo.doctorLevel}}" + did="{{subSubItem.DoctorInfo.doctorId}}" > @@ -276,6 +280,7 @@ class="avatar" src="{{subItem.DoctorInfo.doctorImg}}" level="{{subItem.DoctorInfo.doctorLevel}}" + did="{{subItem.DoctorInfo.doctorId}}" > @@ -330,6 +335,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > {{item.ChildCount}}人 @@ -390,6 +396,7 @@ class="avatar" src="{{subSubItem.DoctorInfo.doctorImg}}" level="{{subSubItem.DoctorInfo.doctorLevel}}" + did="{{subSubItem.DoctorInfo.doctorId}}" > @@ -444,6 +451,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > diff --git a/src/module1/pages/org4/index.wxml b/src/module1/pages/org4/index.wxml index 35987ea..541b1f0 100644 --- a/src/module1/pages/org4/index.wxml +++ b/src/module1/pages/org4/index.wxml @@ -53,6 +53,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > {{item.ChildCount}}人 @@ -104,6 +105,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > {{item.ChildCount}}人 @@ -166,6 +168,7 @@ class="avatar" src="{{subItem.DoctorInfo.doctorImg}}" level="{{subItem.DoctorInfo.doctorLevel}}" + did="{{subItem.DoctorInfo.doctorId}}" > {{subItem.ChildCount}}人 @@ -235,6 +238,7 @@ class="avatar" src="{{subSubItem.DoctorInfo.doctorImg}}" level="{{subSubItem.DoctorInfo.doctorLevel}}" + did="{{subSubItem.DoctorInfo.doctorId}}" > @@ -289,6 +293,7 @@ class="avatar" src="{{subItem.DoctorInfo.doctorImg}}" level="{{subItem.DoctorInfo.doctorLevel}}" + did="{{subItem.DoctorInfo.doctorId}}" > @@ -343,6 +348,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > {{item.ChildCount}}人 @@ -403,6 +409,7 @@ class="avatar" src="{{subSubItem.DoctorInfo.doctorImg}}" level="{{subSubItem.DoctorInfo.doctorLevel}}" + did="{{subSubItem.DoctorInfo.doctorId}}" > @@ -457,6 +464,7 @@ class="avatar" src="{{item.DoctorInfo.doctorImg}}" level="{{item.DoctorInfo.doctorLevel}}" + did="{{item.DoctorInfo.doctorId}}" > diff --git a/src/module1/pages/setCaseDoctor/index.wxml b/src/module1/pages/setCaseDoctor/index.wxml index 59a887d..98e9f2b 100644 --- a/src/module1/pages/setCaseDoctor/index.wxml +++ b/src/module1/pages/setCaseDoctor/index.wxml @@ -51,7 +51,12 @@ data-index="{{index}}" > - + {{item.doctorName}} diff --git a/src/module1/pages/setChatDoctor/index.wxml b/src/module1/pages/setChatDoctor/index.wxml index 7bf2ef4..a526294 100644 --- a/src/module1/pages/setChatDoctor/index.wxml +++ b/src/module1/pages/setChatDoctor/index.wxml @@ -51,7 +51,7 @@ color="#00B4C5" > - + {{item.doctorName}} diff --git a/src/module1/pages/setDoctor/index.wxml b/src/module1/pages/setDoctor/index.wxml index fd578cd..8d3d3c6 100644 --- a/src/module1/pages/setDoctor/index.wxml +++ b/src/module1/pages/setDoctor/index.wxml @@ -55,7 +55,12 @@ color="#00B4C5" > - + {{item.DoctorName}} diff --git a/src/module1/pages/setInfo/index.scss b/src/module1/pages/setInfo/index.scss index afbc01f..e80bc40 100644 --- a/src/module1/pages/setInfo/index.scss +++ b/src/module1/pages/setInfo/index.scss @@ -24,16 +24,22 @@ .invite { padding: 22rpx 28rpx; border-radius: 16rpx; - font-size: 32rpx; + font-size: 28rpx; color: #fff; background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); display: flex; align-items: center; justify-content: space-between; - .icon{ - flex-shrink: 0; - width: 40rpx; - height: 40rpx; + .bind { + width: 128rpx; + height: 50rpx; + font-size: 28rpx; + color: #00B4C5; + background: #ffffff; + display: flex; + align-items: center; + justify-content: center; + border-radius: 102rpx 102rpx 102rpx 102rpx; } } .card { @@ -208,6 +214,17 @@ justify-content: space-between; background-color: #fff; box-shadow: 0 -10rpx 20rpx rgba(0, 0, 0, 0.1); + gap: 24rpx; + .cancel { + flex: 1; + height: 84rpx; + border-radius: 96rpx 96rpx 96rpx 96rpx; + border: 1px solid #01b4c5; + font-size: 32rpx; + color: #01b4c5; + text-align: center; + line-height: 84rpx; + } .submit { flex: 1; height: 88rpx; diff --git a/src/module1/pages/setInfo/index.ts b/src/module1/pages/setInfo/index.ts index 8a946da..d0a6625 100644 --- a/src/module1/pages/setInfo/index.ts +++ b/src/module1/pages/setInfo/index.ts @@ -271,6 +271,38 @@ Page({ }, }); }, + handleBindDoctor() { + wx.navigateTo({ + url: "/module1/pages/setInfoDoctor/index", + events: { + acceptDataFromOpenedPage: (data) => { + this.setData({ + InviteDoctorId: data.DoctorId, + inviteName: data.DoctorName, + }); + }, + }, + }); + }, + handleLoginOut() { + wx.showModal({ + confirmColor: "#00B4C5", + cancelColor: "#141515", + title: "确认退出登录？", + success(res) { + if (res.confirm) { + wx.ajax({ + method: "POST", + url: "?r=takeda/account/reg-logout", + }).then(() => { + wx.reLaunch({ + url: "/module1/pages/login/index", + }); + }); + } + }, + }); + }, }); export {}; diff --git a/src/module1/pages/setInfo/index.wxml b/src/module1/pages/setInfo/index.wxml index 92b5bd0..aee550f 100644 --- a/src/module1/pages/setInfo/index.wxml +++ b/src/module1/pages/setInfo/index.wxml @@ -9,11 +9,11 @@ {{inviteName}}医生为您的邀约医生 - + 绑定 您没有邀约医生，可能会影响您的审核 - + 绑定 @@ -114,6 +114,7 @@ + 退出 提交 diff --git a/src/module1/pages/setInfoDoctor/index.json b/src/module1/pages/setInfoDoctor/index.json new file mode 100644 index 0000000..f434f65 --- /dev/null +++ b/src/module1/pages/setInfoDoctor/index.json @@ -0,0 +1,10 @@ +{ + "navigationBarTitleText": "指派医生", + "navigationStyle": "default", + "usingComponents": { + "popupDoctorDetail": "/components/popupDoctorDetail/index", + "doctorAvatar": "/components/doctorAvatar/index", + "van-popup": "@vant/weapp/popup/index", + "van-dialog": "@vant/weapp/dialog/index" + } +} diff --git a/src/module1/pages/setInfoDoctor/index.scss b/src/module1/pages/setInfoDoctor/index.scss new file mode 100644 index 0000000..ced0df8 --- /dev/null +++ b/src/module1/pages/setInfoDoctor/index.scss @@ -0,0 +1,236 @@ +page { + background-color: rgba(246, 246, 246, 1); +} +.page { + .header { + padding: 32rpx 32rpx 32rpx; + background-color: #fff; + .tip { + font-size: 28rpx; + color: rgba(20, 21, 21, 1); + .link { + color: rgba(0, 180, 197, 1); + } + } + .search-wrap { + margin-top: 32rpx; + display: flex; + align-items: center; + gap: 22rpx; + .search { + flex: 1; + padding: 20rpx 30rpx; + display: flex; + align-items: center; + gap: 20rpx; + border-radius: 122rpx; + background-color: rgba(246, 246, 246, 1); + .icon { + width: 32rpx; + height: 32rpx; + } + .input { + flex: 1; + text-align: center; + font-size: 28rpx; + color: #000; + } + .place-input { + color: rgba(205, 205, 205, 1); + } + } + .reset { + padding: 10rpx; + font-size: 28rpx; + color: #00b4c5; + } + } + .options { + display: flex; + align-items: center; + justify-content: space-between; + .picker { + flex: 1; + } + .option-wrap { + flex: 1; + .option { + padding: 30rpx 10rpx; + display: flex; + align-items: center; + justify-content: center; + .option-text { + max-width: 4em; + font-size: 32rpx; + color: rgba(20, 21, 21, 1); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .icon { + width: 24rpx; + height: 24rpx; + } + } + } + } + } + .list { + padding: 26rpx 32rpx 300rpx; + .list-item { + margin-bottom: 24rpx; + display: flex; + align-items: center; + .radio { + transform: scale(0.7); + } + .card { + flex: 1; + padding: 32rpx; + border-radius: 16rpx; + background-color: #fff; + display: flex; + gap: 24rpx; + .avatar { + flex-shrink: 0; + position: relative; + width: 112rpx; + height: 112rpx; + } + .wrap { + .w-header { + .name { + margin-right: 10rpx; + display: inline; + font-size: 36rpx; + color: rgba(20, 21, 21, 1); + font-weight: bold; + } + .label { + display: inline; + font-size: 28rpx; + color: rgba(20, 21, 21, 1); + } + .line { + margin: 0 10rpx; + display: inline-block; + width: 1px; + height: 24rpx; + background-color: rgba(205, 205, 205, 1); + } + } + .w-container { + margin-top: 24rpx; + .hostipal { + margin-right: 12rpx; + font-size: 28rpx; + color: rgba(20, 21, 21, 1); + } + .tag { + margin-right: 12rpx; + display: inline-block; + padding: 0 8rpx; + border-radius: 4rpx; + font-size: 24rpx; + color: rgba(255, 255, 255, 1); + line-height: 32rpx; + background-color: rgba(0, 180, 197, 1); + } + .site { + display: inline-block; + padding: 0 8rpx; + font-size: 24rpx; + color: rgba(148, 87, 30, 1); + line-height: 32rpx; + border-radius: 4rpx; + background-color: rgba(250, 229, 206, 1); + } + } + .w-footer { + margin-top: 14rpx; + display: flex; + gap: 12rpx; + flex-wrap: wrap; + .wf-label { + flex-shrink: 0; + width: 48rpx; + height: 32rpx; + } + .wf-tag { + flex-shrink: 0; + padding: 0 8rpx; + font-size: 22rpx; + color: rgba(0, 180, 197, 1); + line-height: 32rpx; + border: 1px solid rgba(191, 239, 244, 1); + } + } + } + } + } + } + .footer { + position: fixed; + bottom: 0; + left: 0; + padding: 32rpx 32rpx calc(env(safe-area-inset-bottom) + 32rpx); + width: 100%; + box-sizing: border-box; + display: flex; + gap: 26rpx; + align-items: center; + justify-content: space-between; + background-color: #fff; + box-shadow: 0 -10rpx 20rpx rgba(0, 0, 0, 0.1); + .cancel { + width: 230rpx; + height: 84rpx; + text-align: center; + line-height: 88rpx; + font-size: 32rpx; + color: rgba(1, 180, 197, 1); + border-radius: 96rpx 96rpx 96rpx 96rpx; + border: 1px solid #01b4c5; + } + .submit { + flex: 1; + height: 88rpx; + text-align: center; + line-height: 88rpx; + font-size: 32rpx; + color: #fff; + background: linear-gradient(90deg, #00b4c5 0%, #54e2b4 100%); + border-radius: 96rpx; + } + } +} + +.resolve { + background-color: transparent; + .r-badge { + position: relative; + z-index: 1; + display: block; + margin: 0 auto; + width: 152rpx; + height: 152rpx; + } + .r-container { + margin-top: -76rpx; + padding: 78rpx 32rpx 40rpx; + background-color: #fff; + border-radius: 32rpx 32rpx 0 0; + .title { + font-size: 32rpx; + color: rgba(20, 21, 21, 1); + font-weight: bold; + text-align: center; + } + .content { + margin-top: 32rpx; + font-size: 30rpx; + color: rgba(153, 153, 153, 1); + line-height: 44rpx; + } + } +} diff --git a/src/module1/pages/setInfoDoctor/index.ts b/src/module1/pages/setInfoDoctor/index.ts new file mode 100644 index 0000000..a31bb88 --- /dev/null +++ b/src/module1/pages/setInfoDoctor/index.ts @@ -0,0 +1,77 @@ +const app = getApp(); + +Page({ + data: { + showDetail: false, + popupDoctorDetail: {}, + + Search: "", + + list: [], + + DoctorId: "", + DoctorName: "", + }, + onLoad() { + app.waitLogin().then(() => { + this.getList(); + }); + }, + handleSearch() { + this.setData({ + list: [], + }); + this.getList(); + }, + handleReset() { + this.setData({ + Search: "", + }); + this.handleSearch(); + }, + getList() { + const { Search } = this.data; + wx.ajax({ + method: "GET", + url: "?r=takeda/reg/second-doctor-list", + data: { + Search, + }, + }).then((res) => { + this.setData({ + list: res.list, + }); + }); + }, + handlePopupClose() { + this.setData({ + showDetail: false, + }); + }, + handleRadio(e: any) { + const { index } = e.currentTarget.dataset; + const { list } = this.data; + this.setData({ + DoctorId: (list as any)[index].DoctorId, + DoctorName: (list as any)[index].DoctorName, + }); + }, + handleResolve() { + const { DoctorId, DoctorName } = this.data; + if (!DoctorId) { + wx.showToast({ + title: "请选择医生", + icon: "none", + }); + return; + } + const eventChannel = this.getOpenerEventChannel(); + eventChannel.emit("acceptDataFromOpenedPage", { DoctorId, DoctorName }); + this.handleBack() + }, + handleBack() { + wx.navigateBack(); + }, +}); + +export {}; diff --git a/src/module1/pages/setInfoDoctor/index.wxml b/src/module1/pages/setInfoDoctor/index.wxml new file mode 100644 index 0000000..979c422 --- /dev/null +++ b/src/module1/pages/setInfoDoctor/index.wxml @@ -0,0 +1,72 @@ + + + + + + + + 重置 + + + + + + + + + + + + {{item.DoctorName}} + {{item.DoctorOtherTitle}} + {{DoctorTitleType[item.DoctorTitleType]}} + + + {{depart.DepartmentName}} + + + + {{item.HospitalName}} + + {{hospitalClassification[item.HospitalClassification]}}{{hospitalLevel[item.HospitalLevel]}} + + + {{item.CityName}}{{item.CountyName?'/':''}}{{item.CountyName}} + + + + + + {{spec.SpecialtyName}} + + + + + + + + + + 返回 + 确认 + + diff --git a/src/module1/pages/setInfoResult/index.scss b/src/module1/pages/setInfoResult/index.scss index 40009cf..b1f644c 100644 --- a/src/module1/pages/setInfoResult/index.scss +++ b/src/module1/pages/setInfoResult/index.scss @@ -53,4 +53,10 @@ color: rgba(153, 153, 153, 1); } } +.login-out{ + margin-top: 42rpx; + font-size: 32rpx; + color: #fff; + text-align: center; + } } diff --git a/src/module1/pages/setInfoResult/index.ts b/src/module1/pages/setInfoResult/index.ts index f6b88f7..cf6e296 100644 --- a/src/module1/pages/setInfoResult/index.ts +++ b/src/module1/pages/setInfoResult/index.ts @@ -12,7 +12,7 @@ Page({ isFollow: Number(options.isf), InviteDoctorName: options.iname === "null" ? "" : options.iname, }); - this.getCodeUrl() + this.getCodeUrl(); if (!options.iname) { this.getApplyDoctor(); } @@ -38,6 +38,25 @@ Page({ }); }); }, + handleLoginOut() { + wx.showModal({ + confirmColor: "#00B4C5", + cancelColor: "#141515", + title: "确认退出登录？", + success(res) { + if (res.confirm) { + wx.ajax({ + method: "POST", + url: "?r=takeda/account/reg-logout", + }).then(() => { + wx.reLaunch({ + url: "/module1/pages/login/index", + }); + }); + } + }, + }); + }, }); export {}; diff --git a/src/module1/pages/setInfoResult/index.wxml b/src/module1/pages/setInfoResult/index.wxml index 7b564fc..bb1bc22 100644 --- a/src/module1/pages/setInfoResult/index.wxml +++ b/src/module1/pages/setInfoResult/index.wxml @@ -5,7 +5,7 @@ - 提交成功 + 提交成功待审核 已将信息提交给 @@ -19,4 +19,5 @@ 获取审核通知 + diff --git a/src/module1/pages/userInfo/index.scss b/src/module1/pages/userInfo/index.scss index 408fa1b..357b468 100644 --- a/src/module1/pages/userInfo/index.scss +++ b/src/module1/pages/userInfo/index.scss @@ -1,5 +1,6 @@ page { background-color: rgba(246, 246, 246, 1); + padding-bottom: 200rpx; } .page { margin-bottom: 32rpx; diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts index fddfe33..555f6c7 100644 --- a/src/pages/cases/index.ts +++ b/src/pages/cases/index.ts @@ -143,6 +143,7 @@ Page({ nav, isOpen: nav === "1" ? "1" : "", isHighQuality: nav === "2" ? "1" : "", + isReject: "", }); if (noSearch) return; this.handleSearch(); @@ -273,9 +274,11 @@ Page({ } }, handleImagePreview(e) { - const { url } = e.currentTarget.dataset; + const { url, parent } = e.currentTarget.dataset; + const urls = parent.map((item) => item.url); wx.previewImage({ - urls: [url], + urls, + current: url, }); }, handleDetail(e) { diff --git a/src/pages/cases/index.wxml b/src/pages/cases/index.wxml index af778d1..8a6e3ee 100644 --- a/src/pages/cases/index.wxml +++ b/src/pages/cases/index.wxml @@ -242,6 +242,7 @@ src="{{photoItem.url}}" catch:tap="handleImagePreview" data-url="{{photoItem.url}}" + data-parent="{{item.caseImages}}" wx:key="index" > diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 084a635..6c05feb 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -3,7 +3,12 @@ style="background: url({{imageUrl}}my-bg.png?r={{Timestamp}}) no-repeat top center/100% 642rpx;padding-top:{{menuButtonInfo.bottom+30}}px;" > - + {{userInfo.Name}}