diff --git a/src/components/customAudioText/index.ts b/src/components/customAudioText/index.ts index e8d20f0..66bd247 100644 --- a/src/components/customAudioText/index.ts +++ b/src/components/customAudioText/index.ts @@ -1,3 +1,5 @@ +const app = getApp(); + Component({ // 组件选项 options: { @@ -30,6 +32,7 @@ Component({ methods: { init() {}, handleAudioText() { + console.log(this.data.map1) if (this.data.map1) { app.mpBehavior({ PageName: this.data.map1 }); } @@ -82,3 +85,5 @@ Component({ }, definitionFilter() {}, }); + +export {} diff --git a/src/components/customRecord/index.ts b/src/components/customRecord/index.ts index a26dc57..56d8b2f 100644 --- a/src/components/customRecord/index.ts +++ b/src/components/customRecord/index.ts @@ -244,6 +244,10 @@ Component({ return arr2[arr2.length - 1]; //将后缀名返回出来 }, noneEnoughPeople() {}, + + handleCatchTap() { + return false; + }, }, }); diff --git a/src/components/customRecord/index.wxml b/src/components/customRecord/index.wxml index 0940b45..b97563f 100644 --- a/src/components/customRecord/index.wxml +++ b/src/components/customRecord/index.wxml @@ -5,6 +5,7 @@ bind:touchend="handleHide" bind:touchcancel="handleHide" catchtouchmove="noneEnoughPeople" + catch:tap="handleCatchTap" > diff --git a/src/components/popupDoctorDetail/index.ts b/src/components/popupDoctorDetail/index.ts index db92c0b..707e947 100644 --- a/src/components/popupDoctorDetail/index.ts +++ b/src/components/popupDoctorDetail/index.ts @@ -1,4 +1,4 @@ -const _app = getApp(); +const app = getApp(); // pages/story/a.ts Component({ diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts index b1fbc0f..b8366d3 100644 --- a/src/custom-tab-bar/index.ts +++ b/src/custom-tab-bar/index.ts @@ -1,4 +1,4 @@ -const _app = getApp(); +const app = getApp(); // pages/story/a.ts Component({ @@ -81,6 +81,7 @@ Component({ const { index } = e.currentTarget.dataset; const tab = this.data.tabbar[index]; if (tab.custom) { + app.mpBehavior({ PageName: "BTN_FIXEDSUBMITCASE" }); this.handleClsoeCaseTip(); wx.navigateTo({ url: tab.path, diff --git a/src/echart/components/homeLevel4/index.ts b/src/echart/components/homeLevel4/index.ts index 33878b3..c16466f 100644 --- a/src/echart/components/homeLevel4/index.ts +++ b/src/echart/components/homeLevel4/index.ts @@ -90,8 +90,10 @@ Component({ } }, 30); }, - handleYear1(e) { + handleTapYear1() { app.mpBehavior({ PageName: "BTN_DEPTSTATUSYEARFILTER" }); + }, + handleYear1(e) { this.setData({ year1: e.detail.value, }); @@ -273,8 +275,10 @@ Component({ }); }); }, - handleYear2(e) { + handleTapYear2() { app.mpBehavior({ PageName: "BTN_CASESTATSYEARFILTER" }); + }, + handleYear2(e) { this.setData({ year2: e.detail.value, }); @@ -436,8 +440,10 @@ Component({ }); }); }, - handleYear3(e) { + handleTapYear3() { app.mpBehavior({ PageName: "BTN_DEPTNEWCASEYEARFILTER" }); + }, + handleYear3(e) { this.setData({ year3: e.detail.value, }); diff --git a/src/echart/components/homeLevel4/index.wxml b/src/echart/components/homeLevel4/index.wxml index 51d48bc..966029e 100644 --- a/src/echart/components/homeLevel4/index.wxml +++ b/src/echart/components/homeLevel4/index.wxml @@ -182,7 +182,7 @@ 科室医生入驻情况 - + {{year1}}年 @@ -208,7 +208,7 @@ 累计病历统计 - + {{year2}}年 @@ -231,7 +231,7 @@ 科室新增病历统计 - + {{year3}}年 diff --git a/src/images/guide1-3.png b/src/images/guide1-3.png index fea013a..bed918e 100644 Binary files a/src/images/guide1-3.png and b/src/images/guide1-3.png differ diff --git a/src/images/guide3-3.png b/src/images/guide3-3.png index c4accab..abb66b1 100644 Binary files a/src/images/guide3-3.png and b/src/images/guide3-3.png differ diff --git a/src/module1/pages/auditDoctorDetail/index.ts b/src/module1/pages/auditDoctorDetail/index.ts index a3510b6..ddbd088 100644 --- a/src/module1/pages/auditDoctorDetail/index.ts +++ b/src/module1/pages/auditDoctorDetail/index.ts @@ -11,6 +11,8 @@ Page({ detail: {} as any, RejectReason: "", + + DoctorTitleType: {}, }, onLoad(options) { this.setData({ @@ -32,10 +34,22 @@ Page({ }); app.waitLogin().then(() => { + this.getDoctorDict(); this.getDetail(); app.getUserInfo(this); }); }, + getDoctorDict() { + wx.ajax({ + method: "GET", + url: "?r=takeda/reg/doctor-dict", + data: {}, + }).then((res) => { + this.setData({ + DoctorTitleType: res.DoctorTitleType, + }); + }); + }, getDetail() { wx.ajax({ method: "GET", diff --git a/src/module1/pages/auditDoctorDetail/index.wxml b/src/module1/pages/auditDoctorDetail/index.wxml index 8aba0c2..aca5a15 100644 --- a/src/module1/pages/auditDoctorDetail/index.wxml +++ b/src/module1/pages/auditDoctorDetail/index.wxml @@ -27,7 +27,8 @@ 头衔 - 主任医师 + {{detail.OtherTitle}} + {{DoctorTitleType[detail.TitleType]}} 证件 diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml index 5f67a69..ef86e95 100644 --- a/src/module1/pages/casesDetail/index.wxml +++ b/src/module1/pages/casesDetail/index.wxml @@ -75,7 +75,7 @@ - + 转文字 @@ -171,7 +171,7 @@ - + 转文字 diff --git a/src/module1/pages/casesFeedback/index.wxml b/src/module1/pages/casesFeedback/index.wxml index 4c312e6..c330209 100644 --- a/src/module1/pages/casesFeedback/index.wxml +++ b/src/module1/pages/casesFeedback/index.wxml @@ -26,8 +26,8 @@ 转文字 diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts index 5fd030e..d5a46cc 100644 --- a/src/module1/pages/chatRoom/index.ts +++ b/src/module1/pages/chatRoom/index.ts @@ -258,8 +258,10 @@ Page({ }; this.WebIMSendMessage(message); }, - handleSendPhoto(e) { + handleSendMapPhoto() { app.mpBehavior({ PageName: "BTN_CHATROOMSELECTIMAGE" }); + }, + handleSendPhoto(e) { const { userInfo } = this.data; const contentStr = JSON.stringify({ url: e.detail.fileUrl, @@ -278,8 +280,10 @@ Page({ }; this.WebIMSendMessage(message); }, - handleSendVideo(e) { + handleSendMapVideo() { app.mpBehavior({ PageName: "BTN_CHATROOMSELECTVIDEO" }); + }, + handleSendVideo(e) { const { userInfo } = this.data; const contentStr = JSON.stringify({ url: e.detail.fileUrl, @@ -485,7 +489,6 @@ Page({ } }, handleAudio(e) { - app.mpBehavior({ PageName: "BTN_CHATROOMVOICE" }); const { index } = e.currentTarget.dataset; const { messageList } = this.data; const messageItem = messageList[index]; @@ -573,6 +576,9 @@ Page({ }); }, handleToggleRecord() { + if (!this.data.record) { + app.mpBehavior({ PageName: "BTN_CHATROOMVOICE" }); + } 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 f22d9ac..a2e08f5 100644 --- a/src/module1/pages/chatRoom/index.wxml +++ b/src/module1/pages/chatRoom/index.wxml @@ -165,7 +165,14 @@ /> {{sendMessage}} - + 按住说话 - + 照片 - + 视频 diff --git a/src/module1/pages/entryCases/index.wxml b/src/module1/pages/entryCases/index.wxml index 29a3637..662c1e0 100644 --- a/src/module1/pages/entryCases/index.wxml +++ b/src/module1/pages/entryCases/index.wxml @@ -52,8 +52,8 @@ 转文字 diff --git a/src/module1/pages/login/index.scss b/src/module1/pages/login/index.scss index 5165440..7ddad63 100644 --- a/src/module1/pages/login/index.scss +++ b/src/module1/pages/login/index.scss @@ -30,11 +30,12 @@ padding-top: 66rpx; .tel { .input { - padding: 24rpx 32rpx; + padding: 0 32rpx; display: block; font-size: 32rpx; color: #000; - line-height: 44rpx; + height: 92rpx; + line-height: 92rpx; background: #f6f6f6; border-radius: 96rpx 96rpx 96rpx 96rpx; } @@ -49,10 +50,11 @@ gap: 30rpx; .input { display: block; - padding: 24rpx 32rpx; + padding: 0 32rpx; font-size: 32rpx; color: #000; - line-height: 44rpx; + height: 92rpx; + line-height: 92rpx; background: #f6f6f6; border-radius: 96rpx 96rpx 96rpx 96rpx; } diff --git a/src/module1/pages/login/index.ts b/src/module1/pages/login/index.ts index 32c8e4d..c6c5dee 100644 --- a/src/module1/pages/login/index.ts +++ b/src/module1/pages/login/index.ts @@ -11,12 +11,12 @@ Page({ }, onLoad() { app.waitLogin(true).then(() => { - app.mpBehavior({ PageName: "PG_LOGIN" }); + // app.mpBehavior({ PageName: "PG_LOGIN" }); }); }, getCode() { if (timer) return; - app.mpBehavior({ PageName: "BTN_SENDVERIFICATION" }); + // app.mpBehavior({ PageName: "BTN_SENDVERIFICATION" }); const mobile = this.data.mobile; if (!mobile) { wx.showToast({ @@ -62,9 +62,9 @@ Page({ }, handleSubmit() { const { mobile, code, protool } = this.data; - app.mpBehavior({ PageName: "BTN_LOGIN" }); + // app.mpBehavior({ PageName: "BTN_LOGIN" }); if (!protool) { - this.handleNavProtool(); + this.handleNavProtool({}); return; } if (!mobile) { @@ -93,7 +93,7 @@ Page({ }); }, handleWxSubmit(e: any) { - app.mpBehavior({ PageName: "BTN_PHONEQUICKACCESS" }); + // app.mpBehavior({ PageName: "BTN_PHONEQUICKACCESS" }); const { protool } = this.data; const { iv, encryptedData } = e.detail; if (!protool) { @@ -136,7 +136,7 @@ Page({ handleNavProtool(e) { const phone = e?.currentTarget?.dataset?.phone; if (phone === "1") { - app.mpBehavior({ PageName: "BTN_PHONEQUICKACCESS" }); + // app.mpBehavior({ PageName: "BTN_PHONEQUICKACCESS" }); } wx.navigateTo({ url: `/module1/pages/loginProtool/index?phone=${phone}` }); }, diff --git a/src/module1/pages/login/index.wxml b/src/module1/pages/login/index.wxml index 5bab42b..db79994 100644 --- a/src/module1/pages/login/index.wxml +++ b/src/module1/pages/login/index.wxml @@ -10,6 +10,7 @@ diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 75b763c..6a05cc8 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -58,6 +58,7 @@ Page({ }); }, handleInvite() { + app.mpBehavior({ PageName: "BTN_MYQRCODEPOSTER" }); wx.navigateTo({ url: "/module1/pages/invite/index", });