diff --git a/src/app.json b/src/app.json index 949d616..0f4e5e0 100644 --- a/src/app.json +++ b/src/app.json @@ -48,7 +48,8 @@ "pages/infusionCenter/index", "pages/interactivePatient/index", "pages/referral/index", - "pages/qaForm/index" + "pages/qaForm/index", + "pages/qaFormDetail/index" ], "subpackages": [ { diff --git a/src/app.ts b/src/app.ts index ad5b942..2079d78 100644 --- a/src/app.ts +++ b/src/app.ts @@ -47,7 +47,7 @@ App({ WorkerId: '', loginType: '', // 1:患者 2:医生 - first: true, + first: false, anyWhere: false, doctorUnReadCount: 0, @@ -134,7 +134,11 @@ App({ this.globalData.anyWhere = false this.globalData.scene = parseScene(options.query.scene) as { workerId: string } } - this.startLogin() + this.startLogin().then(() => { + if (this.globalData.loginType === 1) { + this.mpBehavior({ PageName: 'MINI_PROGRAM_VISIT' }) + } + }) }, startLogin(): Promise { const that = this @@ -153,7 +157,7 @@ App({ that.globalData.isLogin = res.isLogin that.globalData.loginType = res.loginType if (!Object.keys(that.globalData.scene)?.length) { - that.globalData.anyWhere = res.anyWhere + // that.globalData.anyWhere = res.anyWhere } that.getUserInfo(null, true, () => { resolve() @@ -413,20 +417,20 @@ App({ }) }, mpBehavior(data: { PageName: string; doctor?: boolean }) { - // let url = '?r=igg4/mp-behavior/add' - // if (data.doctor) { - // url = '?r=igg4/doctor/mp-behavior/add' - // } - // delete data.doctor - // wx.ajax({ - // method: 'POST', - // url, - // data: data, - // loading: false, - // showMsg: false, - // }).then((res) => { - // console.log('res: ', res) - // }) + let url = '?r=igg4/mp-behavior/add' + if (data.doctor) { + url = '?r=igg4/doctor/mp-behavior/add' + } + delete data.doctor + wx.ajax({ + method: 'POST', + url, + data: data, + loading: false, + showMsg: false, + }).then((res) => { + console.log('res: ', res) + }) }, // 更新用户信息 diff --git a/src/components/freeAudio/index.js b/src/components/freeAudio/index.js index 042cfd5..d5af7db 100644 --- a/src/components/freeAudio/index.js +++ b/src/components/freeAudio/index.js @@ -1,25 +1,29 @@ -const app = getApp(); -import dayjs from "dayjs"; +const app = getApp() +import dayjs from 'dayjs' Component({ behaviors: [], properties: { audio: { type: Object, observer(val) { + if (val && this._currentAudioUrl && val.url === this._currentAudioUrl) { + return + } + this._currentAudioUrl = val ? val.url : '' if (this.audioContext) { - const { play } = this.data; + const { play } = this.data if (play) { - this.audioContext.pause(); + this.audioContext.pause() this.setData({ play: false, progress: 0, - time: "00", - }); + time: '00', + }) } - this.audioContext.destroy(); + this.audioContext.destroy() } if (val) { - this.audioAddEventListener(val); + this.audioAddEventListener(val) } }, }, @@ -27,8 +31,8 @@ Component({ data: { Timestamp: app.globalData.Timestamp, progress: 0, - time: "00", - duration: "00", + time: '00', + duration: '00', play: false, loading: true, @@ -36,141 +40,147 @@ Component({ progressimg: true, }, lifetimes: { - created() {}, + created() { + app.getTheme().then((res) => { + this.setData({ + theme: res, + }) + }) + }, async attached() {}, moved() {}, detached() { if (this.audioContext) { - const { play } = this.data; + const { play } = this.data if (play) { - this.audioContext.pause(); + this.audioContext.pause() } - this.audioContext.destroy(); + this.audioContext.destroy() } - this.audioAddEventListener = null; + this.audioAddEventListener = null this.setData({ play: false, progress: 0, - time: "00", - }); + time: '00', + }) }, }, pageLifetimes: { // 组件所在页面的生命周期函数 show: function () {}, hide: function () { - const { play } = this.data; + const { play } = this.data if (play) { - this.audioContext.pause(); + this.audioContext.pause() } }, resize: function () {}, }, methods: { togglePlay() { - const { play, loading } = this.data; + const { play, loading } = this.data if (loading) { wx.showToast({ - title: "音频加载中", - icon: "none", - }); - return; + title: '音频加载中', + icon: 'none', + }) + return } if (play) { - this.audioContext.pause(); + this.audioContext.pause() } else { - this.audioContext.play(); + this.audioContext.play() } }, formatTime(time) { - let m = parseInt(time / 60); - let s = parseInt(time % 60); - return this.towNum(m) + ":" + this.towNum(s); + let m = parseInt(time / 60) + let s = parseInt(time % 60) + return this.towNum(m) + ':' + this.towNum(s) }, towNum(num) { if (num >= 10) { - return num; + return num } else { - return "0" + num; + return '0' + num } }, audioAddEventListener(val) { - const that = this; + const that = this this.setData({ duration: this.formatTime(val.size), - }); - that.audioContext = wx.createInnerAudioContext(); - that.audioContext.src = val.url; + }) + that.audioContext = wx.createInnerAudioContext() + that.audioContext.src = val.url that.setData({ loading: false, - }); + }) that.audioContext.onError(({ errCode, ...reset }) => { - console.log("reset: ", reset); - console.log("errCode: ", errCode); + console.log('reset: ', reset) + console.log('errCode: ', errCode) if (errCode === 10004 || errCode == 10001 || errCode == -1) { - that.audioContext.destroy(); + that.audioContext.destroy() that.setData({ loading: true, - }); + }) setTimeout(() => { - that.audioAddEventListener(val); - }, 300); + that.audioAddEventListener(val) + }, 300) } - }); + }) that.audioContext.onPlay(() => { that.setData({ play: true, - }); - }); + }) + }) that.audioContext.onPause(() => { - console.log(1111111); + console.log(1111111) that.setData({ play: false, - }); - }); + }) + }) that.audioContext.onEnded(() => { - that.audioContext.seek(0); + that.audioContext.seek(0) that.setData({ play: false, progress: 0, - time: "00", - }); - }); + time: '00', + }) + }) that.audioContext.onTimeUpdate(() => { - const duration = that.audioContext.duration || 0; - const currentTime = that.audioContext.currentTime || 0; - const progress = (currentTime / duration) * 100; + const duration = that.audioContext.duration || 0 + const currentTime = that.audioContext.currentTime || 0 + const progress = (currentTime / duration) * 100 if (duration == Infinity) { - return; + return } that.setData({ play: true, duration: that.formatTime(duration), time: that.formatTime(currentTime), - }); + }) if (that.data.progressimg) { this.setData({ progress: progress, - }); + }) } - }); + }) }, handleAuthChangeimg() { - console.log(11111); + console.log(11111) this.setData({ progressimg: false, - }); + }) }, handleAuthChange(e) { - console.log(22222222222); - let { duration } = this.data; - const secods = this.audioContext.duration || duration.split(":")[0] * 60 + duration.split(":")[1] * 1; - const progress = e.detail.value; - let seek = ((secods / 100) * progress).toFixed(3) * 1; - this.audioContext.seek(seek); + console.log(22222222222) + let { duration } = this.data + const secods = this.audioContext.duration || duration.split(':')[0] * 60 + duration.split(':')[1] * 1 + const progress = e.detail.value + let seek = ((secods / 100) * progress).toFixed(3) * 1 + this.audioContext.seek(seek) this.setData({ progressimg: true, - }); + }) }, }, -}); +}) diff --git a/src/components/freeAudio/index.scss b/src/components/freeAudio/index.scss index 584eaa5..e2e04a6 100644 --- a/src/components/freeAudio/index.scss +++ b/src/components/freeAudio/index.scss @@ -12,14 +12,15 @@ left: 0; top: 0; width: 100%; - padding: 14rpx 26rpx 12rpx; + padding: 18rpx 32rpx; display: flex; align-items: center; justify-content: space-between; box-sizing: border-box; - background: rgba(174, 182, 205, 0.1); - border-radius: 50rpx 50rpx 50rpx 50rpx; - border: 1rpx solid rgba(181, 205, 255, 0.1); + background: rgba(255, 255, 255, 1); + border-radius: 24rpx; + border: 1px solid rgba(244, 243, 243, 1); + box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.08); .icon { width: 60rpx; height: 60rpx; @@ -48,7 +49,7 @@ .time { flex-shrink: 0; font-size: 24rpx; - color: #e04775; + color: #222; } } } diff --git a/src/components/freeAudio/index.wxml b/src/components/freeAudio/index.wxml index cdc5e3e..cc6f59c 100644 --- a/src/components/freeAudio/index.wxml +++ b/src/components/freeAudio/index.wxml @@ -8,14 +8,14 @@ - + - 以下内容涉及患者个人信息，仅用于{{params.HospitalName}}{{params.Name}}医生进行患者随访管理，请在安全环境下查看，不截图，不转发 + 以下内容涉及患者个人信息，仅用于{{params.HospitalName}}{{params.Name}}医生进行患者随访管理，请在安全环境下查看，不截图，不转发。 确定 @@ -735,7 +736,7 @@ 您已选择 - {{params.ProvinceName}}{{params.CityName ? '—' + params.CityName : ''}} + {{tools.formatArea(params.ProvinceName, params.CityName)}} 取消 diff --git a/src/custom-tab-bar/index.scss b/src/custom-tab-bar/index.scss index bee809f..f876b13 100644 --- a/src/custom-tab-bar/index.scss +++ b/src/custom-tab-bar/index.scss @@ -22,8 +22,8 @@ .tab-item { .icon { - width: 50rpx; - height: 50rpx; + width: 60rpx; + height: 60rpx; } .name { margin-top: 4rpx; diff --git a/src/custom-tab-bar/index.ts b/src/custom-tab-bar/index.ts index 98825e5..32a0c0e 100644 --- a/src/custom-tab-bar/index.ts +++ b/src/custom-tab-bar/index.ts @@ -66,6 +66,11 @@ Component({ this.setData({ anyWhere: app.globalData.anyWhere, }) + app.getTheme().then((res) => { + this.setData({ + theme: res, + }) + }) wx.ajax({ method: 'GET', url: '?r=igg4/common/get-config', diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index de23629..f5d7bb4 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/doctor/components/tabbar/index.scss b/src/doctor/components/tabbar/index.scss index ea75e06..86bd5cf 100644 --- a/src/doctor/components/tabbar/index.scss +++ b/src/doctor/components/tabbar/index.scss @@ -3,6 +3,7 @@ bottom: 0; left: 0; width: 100%; + z-index: 10000; padding: 0 0 calc(env(safe-area-inset-bottom) + 12rpx); display: flex; justify-content: space-between; @@ -64,7 +65,7 @@ } } .name { - color: rgba(98, 190, 208, 1); + color: rgba(22, 121, 203, 1); } } } diff --git a/src/doctor/pages/d_createTask/index.ts b/src/doctor/pages/d_createTask/index.ts index 9c1d5ef..c446b33 100644 --- a/src/doctor/pages/d_createTask/index.ts +++ b/src/doctor/pages/d_createTask/index.ts @@ -105,7 +105,6 @@ Page({ btn = e?.currentTarget?.dataset?.btn } if (btn == 1) { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE1_REFRESH' }) } return wx @@ -143,7 +142,6 @@ Page({ }) }, handleReset() { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE1_CLEAR' }) wx.showModal({ title: '确认清空选项吗', confirmColor: 'rgba(22, 121, 203, 1)', @@ -233,11 +231,9 @@ Page({ }) }, handleCancel() { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE1_CANCEL' }) wx.navigateBack() }, async handleNext() { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE1_NEXT' }) const anyValueKeys = [ 'Search', 'HasAdl', @@ -291,12 +287,10 @@ Page({ }) }, handlePrevStep() { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE2_PREV' }) this.setData({ step: 1 }) this.handleViewMp() }, handleSubmit() { - app.mpBehavior({ doctor: true, PageName: 'BTN_NEWMESSAGEPAGE2_SUBMIT' }) const { Search, HasAdl, @@ -408,10 +402,5 @@ Page({ wx.navigateBack() }, handleViewMp() { - if (this.data.step === 2) { - app.mpBehavior({ doctor: true, PageName: 'PG_NEWMESSAGEPAGE1' }) - } else if (this.data.step === 2) { - app.mpBehavior({ doctor: true, PageName: 'PG_NEWMESSAGEPAGE2' }) - } }, }) diff --git a/src/doctor/pages/d_customExport/index.ts b/src/doctor/pages/d_customExport/index.ts index 359cb8c..c13ec5b 100644 --- a/src/doctor/pages/d_customExport/index.ts +++ b/src/doctor/pages/d_customExport/index.ts @@ -16,7 +16,6 @@ Page({ id: options.id, }) app.waitLogin().then(() => { - app.mpBehavior({ doctor: true, PageName: 'PAGE_DOCTORADLREPORT' }) this.getList() }) }, diff --git a/src/doctor/pages/d_exportList/index.ts b/src/doctor/pages/d_exportList/index.ts index 3ab79f7..f907b22 100644 --- a/src/doctor/pages/d_exportList/index.ts +++ b/src/doctor/pages/d_exportList/index.ts @@ -22,7 +22,6 @@ Page({ download: null as null | WechatMiniprogram.DownloadTask, onLoad() { app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PAGE_DOCTORADLREPORTLIST' }) this.getList() }) }, @@ -57,7 +56,6 @@ Page({ }, handleCustomExport(e) { const { id } = e.currentTarget.dataset - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORADLREPORTLIST' }) wx.navigateTo({ url: `/doctor/pages/d_customExport/index?id=${id}`, }) diff --git a/src/doctor/pages/d_home/index.json b/src/doctor/pages/d_home/index.json index faff49e..e9c3ada 100644 --- a/src/doctor/pages/d_home/index.json +++ b/src/doctor/pages/d_home/index.json @@ -4,6 +4,7 @@ "usingComponents": { "pageNavbar": "/components/pageNavbar/index", "ec-canvas": "/components/ec-canvas/ec-canvas", + "pagination": "/components/pagination/index", "van-icon": "@vant/weapp/icon/index", "van-dialog": "@vant/weapp/dialog/index", "tabbar": "../../components/tabbar/index" diff --git a/src/doctor/pages/d_home/index.scss b/src/doctor/pages/d_home/index.scss index cc700b9..45a8689 100644 --- a/src/doctor/pages/d_home/index.scss +++ b/src/doctor/pages/d_home/index.scss @@ -20,12 +20,16 @@ page { font-weight: bold; } .site { - font-size: 32rpx; - color: rgba(33, 33, 32, 0.4); + .site-content { + margin-right: 10rpx; + display: inline-block; + font-size: 32rpx; + color: rgba(33, 33, 32, 0.4); + } .tag { vertical-align: 2rpx; display: inline-block; - padding: 0 12rpx; + padding: 4rpx 12rpx; font-size: 22rpx; color: #fff; border-radius: 8rpx; @@ -37,7 +41,7 @@ page { } } .new-banner { - margin: 40rpx 40rpx 0; + margin: 60rpx 40rpx 0; display: grid; grid-template-columns: repeat(2, 1fr); gap: 24rpx 26rpx; @@ -80,11 +84,36 @@ page { .page-container { margin: 0 30rpx; .card { - margin: 24rpx 0 0; + margin: 44rpx 0 0; padding-top: 15px; border-radius: 24rpx 24rpx 24rpx 24rpx; + .card-title { + display: flex; + align-items: center; + justify-content: space-between; + .title { + margin-bottom: 42rpx; + font-size: 40rpx; + color: #222222; + font-weight: bold; + display: flex; + align-items: center; + gap: 14rpx; + &::before { + content: ''; + width: 10rpx; + height: 40rpx; + background: rgba(39, 66, 164, 1); + border-radius: 8rpx 8rpx 8rpx 8rpx; + } + } + .more { + font-weight: normal; + font-size: 32rpx; + color: rgba(34, 34, 34, 0.7); + } + } .chart { - margin-top: 48rpx; padding: 32rpx 0; border: 2rpx solid #f2f4f5; border-radius: 12rpx; @@ -110,9 +139,9 @@ page { } } .chart-container { - padding: 15rpx 30rpx 0; + padding: 15rpx 30rpx 20rpx; width: 100%; - height: 546rpx; + height: 586rpx; box-sizing: border-box; } } diff --git a/src/doctor/pages/d_home/index.ts b/src/doctor/pages/d_home/index.ts index a571abb..cdf98d6 100644 --- a/src/doctor/pages/d_home/index.ts +++ b/src/doctor/pages/d_home/index.ts @@ -20,6 +20,8 @@ Page({ detail: {}, year1: dayjs().format('YYYY'), + chartEmpty: false, + chartPagination: { count: 0, page: 1, pages: 1 }, }, ecDataTrendComponent1_1: null as any, async onLoad() { @@ -33,7 +35,6 @@ Page({ } echarts = await require.async('../../../resource/components/echart/echarts.js') app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORHOME' }) this.getDoctorInfo() this.getDetail() this.getList1_1() @@ -74,7 +75,13 @@ Page({ statYear: this.data.year1, }, }).then(async (res) => { - this.initChart1_1(res.list) + const list = res.list || [] + if (!list.length) { + this.setData({ chartEmpty: true }) + return + } + this.setData({ chartEmpty: false }) + this.initChart1_1(list) }) }, initChart1_1(list: any[]) { @@ -113,7 +120,7 @@ Page({ top: '10%', left: '3%', right: '4%', - bottom: '30', + bottom: '0', containLabel: true, }, xAxis: [ @@ -183,8 +190,8 @@ Page({ title: '累计邀约', }, 2: { - content: `当月新增患者数`, - title: '当月新增', + content: `当月活跃患者数`, + title: '当月活跃', }, }[id] Dialog.alert({ diff --git a/src/doctor/pages/d_home/index.wxml b/src/doctor/pages/d_home/index.wxml index 4e8a192..576ed65 100644 --- a/src/doctor/pages/d_home/index.wxml +++ b/src/doctor/pages/d_home/index.wxml @@ -5,8 +5,8 @@ {{doctor.Name}} - {{hospital.Name}} - {{hospital.HospitalClassificationName}}{{hospital.HospitalLevelName}} +
{{hospital.Name}}
+ {{hospital.HospitalClassificationName}}{{hospital.HospitalLevelName}} @@ -41,6 +41,9 @@ + + 月度邀约患者数 + 统计数据截止昨天 - + + diff --git a/src/doctor/pages/d_interactive/index.scss b/src/doctor/pages/d_interactive/index.scss index 2e3e494..16ef107 100644 --- a/src/doctor/pages/d_interactive/index.scss +++ b/src/doctor/pages/d_interactive/index.scss @@ -9,13 +9,13 @@ page { top: 0; padding: 32rpx 40rpx; z-index: 10; - background-color: rgba(246, 248, 249, 1); + background-color: #fff; .wrap { display: flex; align-items: center; .search { flex: 1; - padding: 12rpx 32rpx; + padding: 16rpx 32rpx; display: flex; align-items: center; gap: 16rpx; diff --git a/src/doctor/pages/d_interactive/index.ts b/src/doctor/pages/d_interactive/index.ts index a0983b9..02f2e0c 100644 --- a/src/doctor/pages/d_interactive/index.ts +++ b/src/doctor/pages/d_interactive/index.ts @@ -14,13 +14,11 @@ Page({ }, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DoctorIMList' }) this.getList() app.setTabbarNoticeMessage() }) }, handleTapSearch() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorIMListSearch' }) }, handleSearch() { this.setData({ @@ -69,7 +67,6 @@ Page({ } }, handleDetail(e) { - app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorIMList' }) const { index } = e.currentTarget.dataset const { list } = this.data const listItem: any = list[index] diff --git a/src/doctor/pages/d_interactiveDoctor/index.scss b/src/doctor/pages/d_interactiveDoctor/index.scss index c0f36b8..3a681fb 100644 --- a/src/doctor/pages/d_interactiveDoctor/index.scss +++ b/src/doctor/pages/d_interactiveDoctor/index.scss @@ -251,7 +251,7 @@ page { background-color: #fff; .send { flex: 1; - padding: 8rpx 8rpx 8rpx 32rpx; + padding: 8rpx 12rpx 8rpx 32rpx; box-sizing: border-box; display: flex; align-items: center; diff --git a/src/doctor/pages/d_interactiveDoctor/index.ts b/src/doctor/pages/d_interactiveDoctor/index.ts index 0cd2290..239e911 100644 --- a/src/doctor/pages/d_interactiveDoctor/index.ts +++ b/src/doctor/pages/d_interactiveDoctor/index.ts @@ -66,7 +66,6 @@ Page({ }, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DoctorIMDetail' }) this.getDoctorDetail() this.getPatientDetail() this.getMessageList() @@ -170,7 +169,6 @@ Page({ }) }, handleSendDate() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorIMDetailClinicHours' }) const { messageList, doctor: { Clinic }, @@ -225,7 +223,6 @@ Page({ }) }, handleSendShow() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorIMDetailSendMessage' }) this.setData({ messageListShow: true, }) @@ -322,7 +319,6 @@ Page({ }) }, handlePatientDetail() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorIMDetailPatient' }) wx.navigateTo({ url: `/doctor/pages/d_patientDetail/index?id=${this.data.patientId}`, }) diff --git a/src/doctor/pages/d_interactiveDoctor/index.wxml b/src/doctor/pages/d_interactiveDoctor/index.wxml index 29b5426..06546fd 100644 --- a/src/doctor/pages/d_interactiveDoctor/index.wxml +++ b/src/doctor/pages/d_interactiveDoctor/index.wxml @@ -64,7 +64,7 @@ - + diff --git a/src/doctor/pages/d_invite/index.scss b/src/doctor/pages/d_invite/index.scss index f5ab83c..dad9e36 100644 --- a/src/doctor/pages/d_invite/index.scss +++ b/src/doctor/pages/d_invite/index.scss @@ -1,5 +1,5 @@ page{ - background-color: #3059C2; + background-color: #315BC3; } .page { position: relative; diff --git a/src/doctor/pages/d_invite/index.ts b/src/doctor/pages/d_invite/index.ts index a656b23..d77599a 100644 --- a/src/doctor/pages/d_invite/index.ts +++ b/src/doctor/pages/d_invite/index.ts @@ -21,7 +21,6 @@ Page({ wx.showLoading({ title: '加载中', }) - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' }) this.getDetail() }) }, diff --git a/src/doctor/pages/d_invite/index.wxml b/src/doctor/pages/d_invite/index.wxml index 1fd0ca2..be0fe48 100644 --- a/src/doctor/pages/d_invite/index.wxml +++ b/src/doctor/pages/d_invite/index.wxml @@ -1,4 +1,4 @@ - + 长按图片保存 diff --git a/src/doctor/pages/d_login/index.scss b/src/doctor/pages/d_login/index.scss index a58d5dc..a758620 100644 --- a/src/doctor/pages/d_login/index.scss +++ b/src/doctor/pages/d_login/index.scss @@ -57,8 +57,8 @@ } } .form { - margin-top: 58rpx; - padding: 0 60rpx; + margin-top: 48rpx; + padding: 0 48rpx; .row { margin-bottom: 32rpx; display: flex; diff --git a/src/doctor/pages/d_login/index.ts b/src/doctor/pages/d_login/index.ts index ae806b7..e1e650f 100644 --- a/src/doctor/pages/d_login/index.ts +++ b/src/doctor/pages/d_login/index.ts @@ -23,7 +23,6 @@ Page({ back: true, }) } - app.mpBehavior({ PageName: 'PG_DOCTORLOGIN' }) }, getCode() { if (timer) return @@ -88,7 +87,6 @@ Page({ }) }, handleSubmit() { - app.mpBehavior({ PageName: 'BTN_DOCTORLOGIN' }) if (!this.data.mobile) { wx.showToast({ icon: 'none', @@ -119,7 +117,6 @@ Page({ }) }, handleWxSubmit(e: WechatMiniprogram.CustomEvent) { - app.mpBehavior({ PageName: 'BTN_DOCTORQUICKPATIENTLOGIN' }) this.handlePopupCancel() const { iv, encryptedData } = e.detail if (iv && encryptedData) { @@ -136,7 +133,6 @@ Page({ } }, handleNoDoc() { - app.mpBehavior({ PageName: 'BTN_DOCTORQUICKPATIENTLOGIN' }) this.handleDocRule() }, submitCallback() { diff --git a/src/doctor/pages/d_login/index.wxml b/src/doctor/pages/d_login/index.wxml index 46be374..14917a7 100644 --- a/src/doctor/pages/d_login/index.wxml +++ b/src/doctor/pages/d_login/index.wxml @@ -2,7 +2,9 @@ 尊敬的医生您好 - “愈见昕生”是北京白求恩公益基金会发起的 IgG4-RD 患者健康管理平台。 + “愈见昕生”是北京白求恩公益基金会发起的 + + IgG4相关性疾病 患者健康管理平台。 加入平台前，请您仔细阅读 《隐私保护协议》 diff --git a/src/doctor/pages/d_my/index.ts b/src/doctor/pages/d_my/index.ts index 1c829bf..6c1a59f 100644 --- a/src/doctor/pages/d_my/index.ts +++ b/src/doctor/pages/d_my/index.ts @@ -20,7 +20,6 @@ Page({ }, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORMY' }) this.getDetail() }) }, @@ -53,12 +52,6 @@ Page({ }, handleRouter(e) { const { url } = e.currentTarget.dataset - if (url === '/doctor/pages/d_invite/index') { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORMYPAGEINVITEDPATIENTS' }) - } - if (url === '/doctor/pages/d_userInfo/index') { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORMYPAGEPERSONALINFO' }) - } wx.navigateTo({ url, }) diff --git a/src/doctor/pages/d_patient/index.ts b/src/doctor/pages/d_patient/index.ts index a1996e3..bfb149f 100644 --- a/src/doctor/pages/d_patient/index.ts +++ b/src/doctor/pages/d_patient/index.ts @@ -57,7 +57,6 @@ Page({ IsThisWeekAdl: Number(options.IsThisWeekAdl || ''), }) app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTLIST' }) this.getList() }) }, @@ -97,7 +96,6 @@ Page({ this.getList() }, handleTapSearch() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTLISTSEARCH' }) }, handleNav(e) { const { active } = e.currentTarget.dataset @@ -118,7 +116,7 @@ Page({ } if (active === 0) { } else if (active === 1) { - params.IsPreviousConvulsion = 1 + params.IsDiagnose = 1 } wx.ajax({ method: 'GET', @@ -182,7 +180,6 @@ Page({ }) }, handleDetail(e: any) { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTLISTVIEW' }) const { index } = e.currentTarget.dataset const item = this.data.list[index] @@ -197,7 +194,6 @@ Page({ }) }, handleSendGroup() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTLISTMASSMESSAGE' }) wx.navigateTo({ url: '/doctor/pages/d_taskList/index', }) diff --git a/src/doctor/pages/d_patient/index.wxml b/src/doctor/pages/d_patient/index.wxml index a1f6269..77285c6 100644 --- a/src/doctor/pages/d_patient/index.wxml +++ b/src/doctor/pages/d_patient/index.wxml @@ -1,4 +1,4 @@ - + @@ -15,8 +15,8 @@ /> - 疾病基础 - 复发/活动期 + 全部 + 确诊IgG4-RD @@ -29,7 +29,7 @@ {{item.Name}} 病程{{item.DiagnosisTimeRange == 1 ? '<1年' : item.DiagnosisTimeRange == 2 ? '1-3年' : '>3年'}} - 邀约时间：{{item.InviteTime}} + 邀约时间：{{tools.formatDate(item.InviteTime)}} 备注：{{item.DoctorRemark || '无'}} diff --git a/src/doctor/pages/d_patientDetail/index.json b/src/doctor/pages/d_patientDetail/index.json index d00b5e8..1d9f7fc 100644 --- a/src/doctor/pages/d_patientDetail/index.json +++ b/src/doctor/pages/d_patientDetail/index.json @@ -3,7 +3,6 @@ "usingComponents": { "van-icon": "@vant/weapp/icon/index", "van-popup": "@vant/weapp/popup/index", - "ec-canvas": "/components/ec-canvas/ec-canvas", "toast": "/components/toast/index" } } diff --git a/src/doctor/pages/d_patientDetail/index.scss b/src/doctor/pages/d_patientDetail/index.scss index 8e861f1..cc7d1b3 100644 --- a/src/doctor/pages/d_patientDetail/index.scss +++ b/src/doctor/pages/d_patientDetail/index.scss @@ -12,6 +12,7 @@ page { background: #ffffff; border-radius: 12rpx 12rpx 12rpx 12rpx; border: 1px solid #f4f3f3; + box-shadow: 0 4rpx 32rpx 0 rgba(0, 0, 0, 0.08); .avatar { flex-shrink: 0; .avatar-img { @@ -114,7 +115,7 @@ page { .title { display: flex; justify-content: center; - font-size: 36rpx; + font-size: 40rpx; color: rgba(40, 48, 49, 1); font-weight: bold; } @@ -127,7 +128,7 @@ page { background: #f7f8f9; border-radius: 24rpx 24rpx 24rpx 24rpx; border: 2rpx solid #f8f9f9; - font-size: 32rx; + font-size: 36rx; } .submit { margin-top: 32rpx; @@ -135,7 +136,7 @@ page { display: flex; justify-content: center; align-items: center; - background: linear-gradient( 90deg, #293B9F 0%, #1679CB 100%); + background: linear-gradient(90deg, #293b9f 0%, #1679cb 100%); font-size: 36rpx; color: #fff; border-radius: 12rpx; diff --git a/src/doctor/pages/d_patientDetail/index.ts b/src/doctor/pages/d_patientDetail/index.ts index 51d23bd..668988d 100644 --- a/src/doctor/pages/d_patientDetail/index.ts +++ b/src/doctor/pages/d_patientDetail/index.ts @@ -16,7 +16,6 @@ Page({ id: '', remark: '', detail: {} as any, - userInfo: {}, popupRemarkShow: false, remarkFocus: false, @@ -107,21 +106,12 @@ Page({ 2: '6个月-3年', 3: '3年以上', }, - - adlList: [] as any, - - pagination: { - page: 1, - pages: 1, - count: 1, - }, }, onLoad(option) { this.setData({ id: option.id, }) app.waitLogin().then(async (_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORPATIENTDETAIL' }) this.getDoctorDetail() await this.getDetail() }) @@ -180,620 +170,13 @@ Page({ this.setData({ detail: { ...res, - hideName: res.Name.replace(/^(.)(.*)$/, (_, first, rest) => first + '*'.repeat(rest.length)), + hideName: res.Name.length <= 2 ? res.Name.charAt(0) + '*' : res.Name.charAt(0) + '*' + res.Name.charAt(res.Name.length - 1), + hideTelephone: res.Telephone ? res.Telephone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') : '', }, }) }) }, handleRemark() { - // 合并两个数组中相同Date字段的对象 - const mergedArray: any[] = [] - const mergedMap = new Map() - - array1.concat(array2).forEach((obj) => { - const date = obj.Date - if (mergedMap.has(date)) { - mergedMap.get(date).push(obj) - } else { - mergedMap.set(date, [obj]) - } - }) - - mergedMap.forEach((objs: any) => { - if (objs.length === 1) { - mergedArray.push(objs[0]) - } else { - const mergedObj = objs.reduce((acc, cur) => ({ ...acc, ...cur })) - mergedArray.push(mergedObj) - } - }) - - // 按照Date字段对合并后的数组进行排序 - mergedArray.sort((a, b) => { - return a.Date.localeCompare(b.Date) - }) - return mergedArray - }, - initChart1(adlSummary = {}) { - this.ecDataTrendComponent1.init((canvas, width, height, dpr) => { - const chart = echarts.init(canvas, null, { - width, - height, - devicePixelRatio: dpr, // new - }) - canvas.setChart(chart) - - const option = { - tooltip: { - trigger: 'item', - formatter: '{b} \n {c}次,{d}%', - }, - legend: { - show: false, - }, - color: ['rgba(226, 219, 65, 1)', 'rgba(215, 108, 108, 1)', 'rgba(98, 190, 208, 1)'], - series: [ - { - name: '全部患者', - type: 'pie', - radius: ['40%', '60%'], - center: ['50%', '50%'], - label: { - show: true, - width: 80, - alignTo: 'edge', - minMargin: 5, - edgeDistance: 10, - lineHeight: 15, - formatter: '{b} \n{time|{d}%}', - rich: { - time: { - fontSize: 10, - color: '#999', - }, - }, - }, - labelLine: { - length: 15, - length2: 0, - maxSurfaceAngle: 80, - }, - labelLayout(params) { - const isLeft = params.labelRect.x < chart.getWidth() / 2 - const points = params.labelLinePoints - // Update the end point. - points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width - return { - labelLinePoints: points, - } - }, - data: [ - { value: adlSummary.adlNearNum, name: 'ADL接近达标' }, - { value: adlSummary.adlUnStandardNum, name: 'ADL未达标' }, - { value: adlSummary.adlStandardNum, name: 'ADL达标' }, - ], - emphasis: { - itemStyle: { - shadowBlur: 10, - shadowOffsetX: 0, - shadowColor: 'rgba(0, 0, 0, 0.5)', - }, - }, - }, - ], - } - - chart.setOption(option) - return chart - }) - }, - initChart2(adlSummary = {}) { - this.ecDataTrendComponent2.init((canvas, width, height, dpr) => { - const chart = echarts.init(canvas, null, { - width, - height, - devicePixelRatio: dpr, // new - }) - canvas.setChart(chart) - - const option = { - tooltip: { - trigger: 'item', - formatter: '{b} \n {c}次,{d}%', - }, - legend: { - show: false, - }, - color: ['rgba(215, 108, 108, 1)', 'rgba(98, 190, 208, 1)'], - series: [ - { - name: '全部患者', - type: 'pie', - radius: ['40%', '60%'], - center: ['50%', '50%'], - label: { - show: true, - width: 80, - alignTo: 'edge', - minMargin: 5, - edgeDistance: 10, - lineHeight: 15, - formatter: '{b} \n{time|{d}%}', - rich: { - time: { - fontSize: 10, - color: '#999', - }, - }, - }, - labelLine: { - length: 15, - length2: 0, - maxSurfaceAngle: 80, - }, - labelLayout(params) { - const isLeft = params.labelRect.x < chart.getWidth() / 2 - const points = params.labelLinePoints - // Update the end point. - points[2][0] = isLeft ? params.labelRect.x : params.labelRect.x + params.labelRect.width - return { - labelLinePoints: points, - } - }, - data: [ - { value: adlSummary.SteroidDailyDoseUnStandardNum, name: '激素未达标' }, - { value: adlSummary.SteroidDailyDoseStandardNum, name: '激素达标' }, - ], - emphasis: { - itemStyle: { - shadowBlur: 10, - shadowOffsetX: 0, - shadowColor: 'rgba(0, 0, 0, 0.5)', - }, - }, - }, - ], - } - - chart.setOption(option) - return chart - }) - }, - - initChart3(defaultList = []) { - const { userInfo } = this.data - const list: any = defaultList - return new Promise((reslove) => { - this.ecDataTrendComponent3.init((canvas, width, height, dpr) => { - const chart = echarts.init(canvas, null, { - width, - height, - devicePixelRatio: dpr, // new - }) - canvas.setChart(chart) - - const option: any = { - tooltip: { - show: false, - trigger: 'axis', - axisPointer: { - type: 'shadow', - }, - confine: true, - backgroundColor: 'rgba(0, 0, 0, 0.5)', - textStyle: { - color: '#fff', - fontSize: 10, - }, - order: 'seriesDesc', - }, - grid: { - top: '30', - left: '0', - right: '0', - bottom: '10', - containLabel: true, - }, - xAxis: [ - { - type: 'category', - axisTick: { - show: true, - inside: true, - length: 1, - alignWithLabel: true, - lineStyle: { - type: 'dotted', - color: '#D8D8D8', - width: 4, - cap: 'round', - }, - }, - axisLine: { - lineStyle: { - color: '#8C8C8C', - type: 'dashed', - }, - }, - data: list.map((item) => dayjs(item.Date).format('MM-DD')), - axisLabel: { - formatter() { - return '' - }, - }, - }, - ], - yAxis: [ - { - type: 'value', - minInterval: 1, - }, - ], - series: [ - { - name: '总分', - data: list.length ? list.map((item) => item.TotalScore) : [25], - barWidth: '16', - label: { - show: true, - position: 'top', - color: '#CF5375', - }, - type: 'line', - symbol: 'circle', - symbolSize: 8, - showSymbol: list.length >= 1, - connectNulls: true, - z: 10, - itemStyle: { - color: '#CF5375', - }, - markLine: { - symbol: ['none', 'none'], - data: [ - { - name: '达标区(1分)', - yAxis: 1, - label: { - formatter: '{b}', - position: 'insideMiddle', - color: '#24D8C8', - fontSize: '10', - }, - lineStyle: { - cap: '', - color: '#34D7C7', - type: 'dashed', - }, - }, - ], - }, - markArea: { - itemStyle: { - color: 'rgba(37,217,200,0.19)', - }, - data: [ - [ - { - yAxis: 0, - }, - { - yAxis: 1, - }, - ], - ], - }, - }, - ], - dataZoom: { - type: 'inside', // 有type这个属性，滚动条在最下面，也可以不行，写y：36，这表示距离顶端36px，一般就是在图上面。 - startValue: list.length - 5, - endValue: list.length - 1, - filterMode: 'none', - }, - } - - if (this.data.detail.UserType === 4) { - const markLineData = list - .filter((item) => item.InjectionBottles) - .map((item) => { - return { - name: '', - xAxis: dayjs(item.Date).format('MM-DD'), - lineStyle: { - color: 'rgba(37, 217, 200,0.5)', - cap: '', - type: 'solid', - }, - - label: { - formatter: '', - position: 'insideEndBottom', - rotate: 0, - color: '#25D9C8', - offset: [60, 0], - }, - } - }) - option.series.push({ - name: '用药', - data: list.map((item) => (item.InjectionBottles ? 0 : null)), - type: 'line', - symbol: - 'image://data:image/png;base64,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', - symbolSize: [11, 16], - symbolOffset: [0, 0], - itemStyle: { - color: '#25D9C8', - }, - lineStyle: { - width: 0, - }, - tooltip: { - show: false, - }, - z: 11, - markLine: { - symbol: ['none', 'none'], - data: markLineData, - }, - }) - // option.series.push({ - // name: "用药时间", - // data: list.map((item: any) => (item.InjectionBottles ? item.TotalScore : 0)), - // type: "line", - // symbol: - // "image://data:image/png;base64,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", - // symbolSize: [11, 16], - // symbolOffset: [0, "100%"], - // itemStyle: { - // color: "#25D9C8", - // }, - // tooltip: { - // show: false, - // }, - // lineStyle: { - // width: 0, - // }, - // z: 1, - // }); - } - - chart.setOption(option) - reslove(chart) - return chart - }) - }) - }, - initChart4(defaultList = []) { - const { userInfo } = this.data - const list: any = defaultList - return new Promise((reslove) => { - this.ecDataTrendComponent4.init((canvas, width, height, dpr) => { - const chart = echarts.init(canvas, null, { - width, - height, - devicePixelRatio: dpr, // new - }) - canvas.setChart(chart) - - const option: any = { - tooltip: { - show: false, - trigger: 'axis', - axisPointer: { - type: 'shadow', - }, - confine: true, - backgroundColor: 'rgba(0, 0, 0, 0.5)', - textStyle: { - color: '#fff', - fontSize: 10, - }, - order: 'seriesDesc', - }, - grid: { - top: '30', - left: '0', - right: '0', - bottom: '10', - containLabel: true, - }, - xAxis: [ - { - type: 'category', - axisTick: { - show: true, - inside: true, - length: 1, - alignWithLabel: true, - lineStyle: { - type: 'dotted', - color: '#D8D8D8', - width: 4, - cap: 'round', - }, - }, - axisLine: { - lineStyle: { - color: '#8C8C8C', - type: 'dashed', - }, - }, - data: list.map((item) => dayjs(item.Date).format('MM-DD')), - }, - ], - yAxis: [ - { - type: 'value', - minInterval: 1, - max(value) { - return value.max + 20 > 999 ? 999 : value.max + 20 - }, - axisLabel: { - // width: 20, - formatter(value: number) { - return value - }, - }, - }, - ], - series: [ - { - name: '激素用量', - data: list.length ? list.map((item) => item.SteroidDailyDose) : [20], - barWidth: '16', - type: 'line', - symbol: 'circle', - symbolSize: 8, - connectNulls: true, - showSymbol: list.length >= 1, - z: 10, - label: { - show: true, - position: 'top', - color: '#18474e', - z: 11, - formatter({ value }) { - return `${value}mg` - }, - }, - itemStyle: { - color: '#3192A1', - }, - markLine: { - symbol: ['none', 'none'], - data: [ - { - name: '达标区(5mg)', - yAxis: 5, - label: { - formatter: '{b}', - position: 'insideMiddle', - color: '#24D8C8', - fontSize: '10', - }, - lineStyle: { - cap: '', - color: '#34D7C7', - type: 'dashed', - }, - }, - { - name: '20', - yAxis: 20, - label: { - formatter: '{b}', - position: 'start', - color: '#D76C6C', - distance: 8, - }, - lineStyle: { - cap: '', - color: '#D76C6C', - type: 'dashed', - }, - }, - ], - }, - markArea: { - itemStyle: { - color: 'rgba(37,217,200,0.19)', - }, - data: [ - [ - { - yAxis: 0, - }, - { - yAxis: 5, - }, - ], - ], - }, - }, - ], - dataZoom: { - type: 'inside', // 有type这个属性，滚动条在最下面，也可以不行，写y：36，这表示距离顶端36px，一般就是在图上面。 - startValue: list.length - 5, - endValue: list.length - 1, - filterMode: 'none', - }, - } - if (this.data.detail.UserType === 4) { - const markLineData = list - .filter((item) => item.InjectionBottles) - .map((item) => { - return { - name: '', - xAxis: dayjs(item.Date).format('MM-DD'), - lineStyle: { - color: 'rgba(37, 217, 200,0.5)', - cap: '', - type: 'solid', - }, - label: { - formatter: '', - position: 'insideEndBottom', - rotate: 0, - color: '#25D9C8', - offset: [60, 0], - }, - } - }) - const maxValue = Math.max(...list.map((item) => item.SteroidDailyDose)) - option.series.push({ - name: '用药', - data: list.map((item) => (item.InjectionBottles ? 0 : null)), - type: 'line', - symbol: - 'image://data:image/png;base64,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', - symbolSize: [11, 16], - symbolOffset: [0, 0], - itemStyle: { - color: '#25D9C8', - }, - lineStyle: { - width: 0, - }, - tooltip: { - show: false, - }, - z: 11, - markLine: { - symbol: ['none', 'none'], - data: markLineData, - }, - }) - // option.series.push({ - // name: "用药时间", - // data: list.map((item: any) => (item.InjectionBottles ? item.TotalScore : 0)), - // type: "line", - // symbol: - // "image://data:image/png;base64,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", - // symbolSize: [11, 16], - // symbolOffset: [0, "100%"], - // itemStyle: { - // color: "#25D9C8", - // }, - // tooltip: { - // show: false, - // }, - // lineStyle: { - // width: 0, - // }, - // z: 1, - // }); - } - - chart.setOption(option) - reslove(chart) - return chart - }) - }) - }, - handleRemark() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTDETAILREMARK' }) this.setData({ popupRemarkShow: true, remark: this.data.detail.DoctorRemark, @@ -833,7 +216,6 @@ Page({ }, handleEditUser() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTDETAILEDIT' }) this.setData({ popupEditShow: true, }) @@ -859,12 +241,12 @@ Page({ method: 'POST', url: '?r=igg4/doctor/patient/update', data: { - PatientId: detail.PatientId, //患者Id - AntibodyType: detail.AntibodyType, //抗体类型 1：AChR 2：Musk 3：LRP4 4：RYR - ThyroidAbnormal: detail.ThyroidAbnormal, //胸腺异常 1：是 2：否 - PreviousConvulsion: detail.PreviousConvulsion, //既往发生危象 1：是 2：否 - TraditionalImmunosuppressant: detail.TraditionalImmunosuppressant, //传统免疫抑制剂 1：特克莫苏 2：硫唑嘌呤 3：马替麦考酚酯 4：其他 - MedicalInsuranceType: detail.MedicalInsuranceType, //医保类型 1：城市职工 2：城市居民 3：新农合 + PatientId: detail.PatientId, + AntibodyType: detail.AntibodyType, + ThyroidAbnormal: detail.ThyroidAbnormal, + PreviousConvulsion: detail.PreviousConvulsion, + TraditionalImmunosuppressant: detail.TraditionalImmunosuppressant, + MedicalInsuranceType: detail.MedicalInsuranceType, }, }).then(() => { wx.showToast({ @@ -874,81 +256,17 @@ Page({ this.getDetail() }) }, - handleBack() { - wx.navigateBack() - }, handleSend() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTDETAILMESSAGE' }) wx.navigateTo({ url: `/doctor/pages/d_interactiveDoctor/index?patientId=${this.data.detail.PatientId}`, }) }, - handleNav(e, mp = true) { - const { index } = e.currentTarget.dataset - if (index == 0 && mp) { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTDETAILREPORTGUIDE' }) - } - if (index == 1 && mp) { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPATIENTDETAILNOTEGUIDE' }) - } - this.setData({ - nav: index, - }) - this.handleTypeChange({ detail: { value: '2' } }) - }, - getAdlList(newPage = 1) { - const { detail, EndDate, StartDate, type } = this.data - wx.ajax({ - method: 'GET', - url: '?r=igg4/doctor/patient/adl-list', - data: { - DateType: type, - PatientId: detail.PatientId, - StartDate, - EndDate, - page: newPage, - }, - }).then((res) => { - res.list.map((item) => { - let grade = 1 - if (item.TotalScore < 5) { - grade = 1 - } else if (item.TotalScore >= 5 && item.TotalScore < 15) { - grade = 2 - } else { - grade = 3 - } - item.grade = grade - item.fold = false - return item - }) - - const adlList = res.page === 1 ? res.list : [...this.data.adlList, ...res.list] - this.setData({ - adlList, - pagination: { - page: res.page, - pages: res.pages, - count: res.count, - }, - }) - }) - }, - onReachBottom() { - const { page, pages } = this.data.pagination - const nav = this.data.nav - if (pages > page && nav === '1') { - this.getAdlList(page + 1) - } - }, - handleFold(e) { - const { index } = e.currentTarget.dataset + handleToggleTel() { this.setData({ - [`adlList[${index}].fold`]: !this.data.adlList[index].fold, + showTel: !this.data.showTel, }) }, - handleAdlDetail() {}, handleToastOk() { this.setData({ toastShow: false, @@ -957,10 +275,4 @@ Page({ handleToastCancel() { wx.navigateBack() }, - handleToggleTel() { - console.log(11111) - this.setData({ - showTel: !this.data.showTel, - }) - }, }) diff --git a/src/doctor/pages/d_patientDetail/index.wxml b/src/doctor/pages/d_patientDetail/index.wxml index b27fdcd..aef6b86 100644 --- a/src/doctor/pages/d_patientDetail/index.wxml +++ b/src/doctor/pages/d_patientDetail/index.wxml @@ -1,3 +1,4 @@ + diff --git a/src/doctor/pages/d_patientList/index.wxml b/src/doctor/pages/d_patientList/index.wxml index 78344f5..f87f4a9 100644 --- a/src/doctor/pages/d_patientList/index.wxml +++ b/src/doctor/pages/d_patientList/index.wxml @@ -1,3 +1,4 @@ + @@ -19,7 +20,7 @@ {{item.Name}} 病程{{item.DiagnosisTimeRange == 1 ? '<1年' : item.DiagnosisTimeRange == 2 ? '1-3年' : '>3年'}} - 邀约时间：{{item.InviteTime}} + 邀约时间：{{tools.formatDate(item.InviteTime)}} 备注：{{item.DoctorRemark || '无'}} diff --git a/src/doctor/pages/d_taskList/index.ts b/src/doctor/pages/d_taskList/index.ts index 8b79288..1bd844d 100644 --- a/src/doctor/pages/d_taskList/index.ts +++ b/src/doctor/pages/d_taskList/index.ts @@ -32,7 +32,6 @@ Page({ }, onShow() { app.waitLogin().then(() => { - app.mpBehavior({ doctor: true, PageName: 'PG_MASSMESSAGETASKLIST' }) this.getList() }) }, @@ -105,13 +104,11 @@ Page({ }) }, handleCreate() { - app.mpBehavior({ doctor: true, PageName: 'BTN_MASSMESSAGETASKLISTADD' }) wx.navigateTo({ url: '/doctor/pages/d_createTask/index', }) }, handleDetail(e) { - app.mpBehavior({ doctor: true, PageName: 'BTN_MASSMESSAGETASKLISTTASK' }) const { id } = e.currentTarget.dataset wx.navigateTo({ url: `/doctor/pages/d_taskDetail/index?id=${id}`, diff --git a/src/doctor/pages/d_trans/index.wxml b/src/doctor/pages/d_trans/index.wxml index 732d10f..ab739ba 100644 --- a/src/doctor/pages/d_trans/index.wxml +++ b/src/doctor/pages/d_trans/index.wxml @@ -1,7 +1,7 @@ - + 随便看看 回到医生端 diff --git a/src/doctor/pages/d_transfer/index.ts b/src/doctor/pages/d_transfer/index.ts index 331e1fc..8bebbe0 100644 --- a/src/doctor/pages/d_transfer/index.ts +++ b/src/doctor/pages/d_transfer/index.ts @@ -23,7 +23,6 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORRECOMMENDEDREFERRAL' }) this.getList() }) }, @@ -71,7 +70,6 @@ Page({ }) }, handlePopup() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORRECOMMENDEDREFERRALPAGEFASTFINDDR' }) this.setData({ show: true, }) @@ -81,7 +79,6 @@ Page({ const { index } = e.currentTarget.dataset const item: any = list[index] const url = `${app.globalData.url}?r=igg4/doctor/doctor-recommend/get-rec-code&loginState=${app.globalData.loginState}&recommendDoctorId=${item.doctorId}` - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORRECOMMENDEDREFERRALPAGERECOMMENDCODE' }) this.setData({ toastShow: true, toastType: 'transferCode', @@ -101,7 +98,6 @@ Page({ wx.navigateBack() }, handleLog() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORRECOMMENDEDREFERRALPAGEMYRECORD' }) wx.navigateTo({ url: '/doctor/pages/d_transferLog/index', }) diff --git a/src/doctor/pages/d_transfer/index.wxml b/src/doctor/pages/d_transfer/index.wxml index a899dbf..c68407a 100644 --- a/src/doctor/pages/d_transfer/index.wxml +++ b/src/doctor/pages/d_transfer/index.wxml @@ -1,3 +1,4 @@ + @@ -17,7 +18,7 @@ {{item.hospitalName}} - {{item.hospitalProvinceName}}{{item.hospitalCityName}}{{item.hospitalCountyName}}{{item.hospitalAreaName}} + {{tools.formatArea(item.hospitalProvinceName, item.hospitalCityName)}}{{item.hospitalCountyName}}{{item.hospitalAreaName}} @@ -37,7 +38,7 @@ {{ProvinceName}} - {{ProvinceName == CityName ? '' : CityName}} + {{CityName}} 点击一键找医生 diff --git a/src/doctor/pages/d_transferLog/index.ts b/src/doctor/pages/d_transferLog/index.ts index 151c53f..af1bc13 100644 --- a/src/doctor/pages/d_transferLog/index.ts +++ b/src/doctor/pages/d_transferLog/index.ts @@ -41,15 +41,6 @@ Page({ 0: '?r=igg4/doctor/doctor-recommend/get-rec-stat-list', 1: '?r=igg4/doctor/doctor-recommend/get-be-rec-stat-list', }[active] - if (newPage == 1) { - app.mpBehavior({ - doctor: true, - PageName: { - 0: 'PG_DOCTORRECOMMENDEDRECORDPAGE_MYRECOMMENDLIST', - 1: 'PG_DOCTORRECOMMENDEDRECORDPAGE_RECOMMENDEDTOMElist', - }[active] as string, - }) - } if (!url) return wx.ajax({ method: 'GET', @@ -77,8 +68,7 @@ Page({ } }, handleDetail(e) { - const { type, id, code } = e.currentTarget.dataset - app.mpBehavior({ doctor: true, PageName: code }) + const { type, id} = e.currentTarget.dataset wx.navigateTo({ url: `/doctor/pages/d_transferDetail/index?type=${type}&id=${id}`, }) diff --git a/src/doctor/pages/d_transferLog/index.wxml b/src/doctor/pages/d_transferLog/index.wxml index 60da62b..c865eaf 100644 --- a/src/doctor/pages/d_transferLog/index.wxml +++ b/src/doctor/pages/d_transferLog/index.wxml @@ -1,11 +1,5 @@ - + diff --git a/src/doctor/pages/d_userInfo/index.ts b/src/doctor/pages/d_userInfo/index.ts index 3d170d7..dcc2208 100644 --- a/src/doctor/pages/d_userInfo/index.ts +++ b/src/doctor/pages/d_userInfo/index.ts @@ -57,7 +57,6 @@ Page({ onLoad() {}, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORPERSONALINFO' }) this.getDetail() }) }, @@ -136,7 +135,6 @@ Page({ }) }, handleChangePhone() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPERSONALINFOCHANGEPHONE' }) wx.navigateTo({ url: '/doctor/pages/d_changePhone/index', }) @@ -217,7 +215,6 @@ Page({ this.getDetail() }, handleSwitch() { - app.mpBehavior({ doctor: true, PageName: 'BTN_DOCTORPERSONALINFOSWITCHACCOUNT' }) wx.navigateTo({ url: '/doctor/pages/d_changeDoctor/index', }) diff --git a/src/gift/pages/myHealthRecord/index.ts b/src/gift/pages/myHealthRecord/index.ts index d9ccf32..97c797b 100644 --- a/src/gift/pages/myHealthRecord/index.ts +++ b/src/gift/pages/myHealthRecord/index.ts @@ -116,7 +116,6 @@ Page({ app.waitLogin().then(() => { // 强制疾病患者以上身份 app.permissionVerification(3, 0, `/gift/pages/myHealthRecord/index`).then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTHEALTHRECORD' }) app.getUserInfo(this, true, (res) => { if (res.UserType != 4) { this.setData({ @@ -214,25 +213,14 @@ Page({ let EndMonth = '' let BeginMonth = '' if (type == '1') { - if (e) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDDAILYCURVE' }) - } EndMonth = dayjs().format('YYYY-MM-DD') BeginMonth = dayjs().subtract(6, 'd').format('YYYY-MM-DD') } else if (type == '2') { - if (e) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDMONTHLYCURVE' }) - } EndMonth = dayjs().format('YYYY-MM') BeginMonth = dayjs().subtract(1, 'M').format('YYYY-MM') } else if (type == '3') { - if (e) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDYEARLYCURVE' }) - } EndMonth = dayjs().format('YYYY') BeginMonth = dayjs().subtract(1, 'y').format('YYYY') - } else if (type == '4' && e) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDTIMECURVE' }) } this.setData({ page: 0, @@ -253,15 +241,6 @@ Page({ this.setData({ tab: index, }) - if (index == 1) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDCOMPREHENSIVEREPORT' }) - } - if (index == 2) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDDUALCOMPLIANCENOTES' }) - } - if (index == 3) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDMEDICATIONRECORD' }) - } this.handleTabCallBack() }, handleTabCallBack() { @@ -965,12 +944,6 @@ Page({ if (isi == 1) { return } - if (tab == 1) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDREPORTLIST' }) - } - if (tab == 2) { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDNOTESLIST' }) - } wx.navigateTo({ url: `/pages/adlResult/index?id=${id}`, @@ -1001,13 +974,11 @@ Page({ }) }, handleAdd() { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDASSESSMENT' }) wx.navigateTo({ url: '/pages/adl/index', }) }, handleAddDrug() { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDMEDICATION' }) wx.navigateTo({ url: '/pages/drugRecord/index', }) @@ -1026,7 +997,6 @@ Page({ }, handleDetailDrug(e) { const { id, isi } = e.currentTarget.dataset - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDMEDICATIONLIST' }) if (isi == 1) { return } @@ -1063,7 +1033,6 @@ Page({ }) }, handleShare() { - app.mpBehavior({ PageName: 'BTN_PATIENTHEALTHRECORDSHAREDUALCOMPLIANCEPOSTER' }) wx.navigateTo({ url: '/pages/adlShare/index', }) diff --git a/src/images/1/audio-pause.png b/src/images/1/audio-pause.png index b7920c0..e4a47d0 100644 Binary files a/src/images/1/audio-pause.png and b/src/images/1/audio-pause.png differ diff --git a/src/images/1/audio-play.png b/src/images/1/audio-play.png index 3958eca..a63abeb 100644 Binary files a/src/images/1/audio-play.png and b/src/images/1/audio-play.png differ diff --git a/src/images/1/drug-save-active.png b/src/images/1/drug-save-active.png new file mode 100644 index 0000000..71f8e0a Binary files /dev/null and b/src/images/1/drug-save-active.png differ diff --git a/src/images/1/drug-share-active.png b/src/images/1/drug-share-active.png new file mode 100644 index 0000000..f13c72d Binary files /dev/null and b/src/images/1/drug-share-active.png differ diff --git a/src/images/1/drug-star-active.png b/src/images/1/drug-star-active.png new file mode 100644 index 0000000..a3a0ac4 Binary files /dev/null and b/src/images/1/drug-star-active.png differ diff --git a/src/images/1/drug-view-active.png b/src/images/1/drug-view-active.png new file mode 100644 index 0000000..5224f9f Binary files /dev/null and b/src/images/1/drug-view-active.png differ diff --git a/src/images/1/firee-audio-bg.png b/src/images/1/firee-audio-bg.png index 3d22647..cf23c63 100644 Binary files a/src/images/1/firee-audio-bg.png and b/src/images/1/firee-audio-bg.png differ diff --git a/src/images/1/save-active-plan.png b/src/images/1/save-active-plan.png index 6303337..0be841f 100644 Binary files a/src/images/1/save-active-plan.png and b/src/images/1/save-active-plan.png differ diff --git a/src/images/1/save.png b/src/images/1/save.png index 6173274..8081952 100644 Binary files a/src/images/1/save.png and b/src/images/1/save.png differ diff --git a/src/images/1/share-active.png b/src/images/1/share-active.png index 6dc02c3..88daada 100644 Binary files a/src/images/1/share-active.png and b/src/images/1/share-active.png differ diff --git a/src/images/1/share.png b/src/images/1/share.png index 6dc02c3..b14c4ff 100644 Binary files a/src/images/1/share.png and b/src/images/1/share.png differ diff --git a/src/images/1/star-active.png b/src/images/1/star-active.png index 46008cf..19100ae 100644 Binary files a/src/images/1/star-active.png and b/src/images/1/star-active.png differ diff --git a/src/images/1/star.png b/src/images/1/star.png index 983075c..52f135a 100644 Binary files a/src/images/1/star.png and b/src/images/1/star.png differ diff --git a/src/images/1/view-active.png b/src/images/1/view-active.png index ffd0638..aabb8f6 100644 Binary files a/src/images/1/view-active.png and b/src/images/1/view-active.png differ diff --git a/src/images/1/view.png b/src/images/1/view.png index cbdef01..8a33aab 100644 Binary files a/src/images/1/view.png and b/src/images/1/view.png differ diff --git a/src/images/bg35.png b/src/images/bg35.png new file mode 100644 index 0000000..e82100e Binary files /dev/null and b/src/images/bg35.png differ diff --git a/src/pages/changePhone/index.scss b/src/pages/changePhone/index.scss index 4d4747c..10862b1 100644 --- a/src/pages/changePhone/index.scss +++ b/src/pages/changePhone/index.scss @@ -37,7 +37,7 @@ #drug-page { .btn { - color: rgba(22, 121, 203, 1); + color: #5956e9; } .submit { background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%); diff --git a/src/pages/doctor/index.ts b/src/pages/doctor/index.ts index 84fb289..ae246ad 100644 --- a/src/pages/doctor/index.ts +++ b/src/pages/doctor/index.ts @@ -41,9 +41,7 @@ Page({ app.waitLogin().then((_res) => { if (options.es === '201504') { app.globalData.IsAliQiWei = 1 - app.mpBehavior({ PageName: 'PG_PATIENTVISITMAP_PAGE' }) } - app.mpBehavior({ PageName: 'PG_PATIENTVISITMAPLIST' }) app.getUserInfo(this, true) if (options.pid) { @@ -127,7 +125,6 @@ Page({ }) }, handleTapSite() { - app.mpBehavior({ PageName: 'BTN_PATIENTVISITMAPCHANGEAREA' }) }, handleChangeSite(e: WechatMiniprogram.CustomEvent) { const detail = e.detail @@ -140,7 +137,6 @@ Page({ this.getList() }, handleTapSearch() { - app.mpBehavior({ PageName: 'BTN_PATIENTVISITMAPSEARCHBOX' }) }, handleBlur() { this.getList() @@ -192,7 +188,6 @@ Page({ }, handleDetail(e: WechatMiniprogram.CustomEvent) { const { url } = e.currentTarget.dataset - app.mpBehavior({ PageName: 'BTN_PATIENTVISITMAPLIST' }) wx.navigateTo({ url, }) diff --git a/src/pages/doctor/index.wxml b/src/pages/doctor/index.wxml index 635b246..1c83b53 100644 --- a/src/pages/doctor/index.wxml +++ b/src/pages/doctor/index.wxml @@ -1,3 +1,4 @@ + @@ -16,7 +17,7 @@ - {{ProvinceName}}{{ProvinceName == CityName ? '' : CityName}} + {{tools.formatArea(ProvinceName, CityName)}} 请选择省市 @@ -61,7 +62,7 @@ - {{item.ProvinceName}}{{item.CityName}}{{item.CountyName}}{{item.Address}} + {{tools.formatArea(item.ProvinceName, item.CityName)}}{{item.CountyName}}{{item.Address}} {{item.DoctorNum}}名医生 @@ -70,7 +71,7 @@ catch:tap="handleOpenMap" data-lat="{{item.LAT}}" data-lng="{{item.LNG}}" - data-address="{{item.ProvinceName}}{{item.CityName}}{{item.CountyName}}{{item.Address}}" + data-address="{{tools.formatArea(item.ProvinceName, item.CityName)}}{{item.CountyName}}{{item.Address}}" data-name="{{item.Name}}" > {{item.dist}} diff --git a/src/pages/doctor/siteShare/index.ts b/src/pages/doctor/siteShare/index.ts index 0af76bf..3e2c22c 100644 --- a/src/pages/doctor/siteShare/index.ts +++ b/src/pages/doctor/siteShare/index.ts @@ -215,7 +215,6 @@ Component({ }, methods: { handleShow() { - app.mpBehavior({ PageName: 'BTN_PATIENTVISITMAPDIRECTSHARE' }) this.setData({ show: true, ProvinceName: this.data.pname || '', diff --git a/src/pages/doctorDetail/index.scss b/src/pages/doctorDetail/index.scss index 82319cd..3673df2 100644 --- a/src/pages/doctorDetail/index.scss +++ b/src/pages/doctorDetail/index.scss @@ -47,10 +47,10 @@ page { margin-top: 12rpx; display: inline-block; flex-shrink: 0; - padding: 0 12rpx; - font-size: 22rpx; - line-height: 40rpx; + padding: 6rpx 12rpx; + font-size: 28rpx; color: #fff; + line-height: 1; background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%); border-radius: 8rpx 8rpx 8rpx 8rpx; } diff --git a/src/pages/doctorDetail/index.ts b/src/pages/doctorDetail/index.ts index fe1d77f..9b18c47 100644 --- a/src/pages/doctorDetail/index.ts +++ b/src/pages/doctorDetail/index.ts @@ -1,3 +1,4 @@ +import { formatArea } from '@/utils/util' const app = getApp() Page({ @@ -143,7 +144,7 @@ Page({ latitude: hospital.LAT, longitude: hospital.LNG, name: hospital.Name, - address: `${hospital.ProvinceName}${hospital.CityName}${hospital.AreaName}${hospital.Address}`, + address: `${formatArea(hospital.ProvinceName, hospital.CityName)}${hospital.AreaName}${hospital.Address}`, }) }, handleBack() { diff --git a/src/pages/doctorDetailBak/index.ts b/src/pages/doctorDetailBak/index.ts index 105f359..649565e 100644 --- a/src/pages/doctorDetailBak/index.ts +++ b/src/pages/doctorDetailBak/index.ts @@ -1,3 +1,4 @@ +import { formatArea } from '@/utils/util' const app = getApp(); Page({ @@ -134,7 +135,7 @@ Page({ latitude: hospital.LAT, longitude: hospital.LNG, name: hospital.Name, - address:`${hospital.ProvinceName}${hospital.CityName}${hospital.AreaName}${hospital.Address}` + address:`${formatArea(hospital.ProvinceName, hospital.CityName)}${hospital.AreaName}${hospital.Address}` }); }, handleBack() { diff --git a/src/pages/doctorDetailBak/index.wxml b/src/pages/doctorDetailBak/index.wxml index e6e5121..61f0ccc 100644 --- a/src/pages/doctorDetailBak/index.wxml +++ b/src/pages/doctorDetailBak/index.wxml @@ -1,3 +1,4 @@ + - {{detail.hospital.ProvinceName}}{{detail.hospital.CityName}}{{detail.hospital.CountyName}}{{detail.hospital.Address}} + {{tools.formatArea(detail.hospital.ProvinceName, detail.hospital.CityName)}}{{detail.hospital.CountyName}}{{detail.hospital.Address}} {{detail.hospital.dist}} diff --git a/src/pages/enterInfo/index.scss b/src/pages/enterInfo/index.scss index c950291..b7cc5dc 100644 --- a/src/pages/enterInfo/index.scss +++ b/src/pages/enterInfo/index.scss @@ -19,7 +19,7 @@ box-sizing: border-box; border-radius: 24rpx; .switch { - margin-bottom: 50rpx; + margin-bottom: 68rpx; display: flex; justify-content: center; align-items: center; @@ -28,9 +28,9 @@ flex: 1; display: flex; align-items: center; - background-color: #f6f8f9; + background-color: rgba(246, 246, 246, 1); border-radius: 16rpx; - border: 1px solid #f6f8f9; + border: 1px solid rgba(246, 246, 246, 1); .icon { flex-shrink: 0; width: 148rpx; @@ -43,7 +43,7 @@ } &.active { border-color: #0eb66d; - background: #fff; + background-color: #ecfff7; .name { color: #0eb66d; } @@ -61,7 +61,7 @@ font-weight: bold; } .row { - margin-bottom: 56rpx; + margin-bottom: 68rpx; &.row2 { display: grid; grid-template-columns: repeat(2, 1fr); @@ -102,23 +102,23 @@ .input { flex: 1; padding: 24rpx 32rpx; - height: 40rpx; + height: 100rpx; font-size: 36rpx; color: #222222; background: #f6f6f6; border-radius: 24rpx; } .item { - padding: 12rpx 24rpx; + padding: 24rpx 24rpx; opacity: 1; - border: 2rpx solid #cccccc; + border: 1px solid rgba(246, 246, 246, 1); font-size: 36rpx; color: #999999; display: flex; align-items: center; justify-content: center; border-radius: 12rpx; - background: linear-gradient(90deg, #fff 0%, #f9f9f9 100%); + background: rgba(246, 246, 246, 1); .icon { width: 64rpx; height: 64rpx; @@ -143,7 +143,7 @@ } } .age-item { - height: 96rpx; + height: 114rpx; white-space: nowrap; font-size: 36rpx; color: rgba(34, 34, 34, 0.7); diff --git a/src/pages/enterInfo/index.ts b/src/pages/enterInfo/index.ts index f74cb8f..0498dc6 100644 --- a/src/pages/enterInfo/index.ts +++ b/src/pages/enterInfo/index.ts @@ -36,7 +36,6 @@ Page({ ageRange: userInfo.AgeRange, }) }) - app.mpBehavior({ PageName: 'PG_PATIENTINFOENTRY' }) }) }, handleRelationType(e: WechatMiniprogram.CustomEvent) { @@ -87,7 +86,6 @@ Page({ }, handleSubmit() { if (this.data.submiting) return - app.mpBehavior({ PageName: 'BTN_PATIENTINFONEXT' }) const { name, gender, ageRange, relationType } = this.data const { registrationSource, registChannel, regBusinessId, WorkerId } = app.globalData const { doctorId, inviteChan, recDoctorId: recommendDoctorId } = app.globalData.scene diff --git a/src/pages/enterInfo/index.wxml b/src/pages/enterInfo/index.wxml index 4437f69..b380abd 100644 --- a/src/pages/enterInfo/index.wxml +++ b/src/pages/enterInfo/index.wxml @@ -29,11 +29,11 @@ 患者年龄 {{"<40岁"}} - {{"40 - 49 岁"}} - {{"50 - 59 岁"}} - {{"60 - 69 岁"}} - {{"70 - 79 岁"}} - {{"≥80 岁"}} + {{"40-49岁"}} + {{"50-59岁"}} + {{"60-69岁"}} + {{"70-79岁"}} + {{"≥80岁"}} 输入真实姓名，便于医生识别随访 diff --git a/src/pages/family/index.ts b/src/pages/family/index.ts index 6d5c241..62c0e9e 100644 --- a/src/pages/family/index.ts +++ b/src/pages/family/index.ts @@ -19,7 +19,6 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTMYRELATIVES' }) this.getMpInfo() }) }, @@ -46,9 +45,6 @@ Page({ }, routerTo(e) { const { url } = e.currentTarget.dataset - if (url === '/pages/familyList/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTFAMILYMEMBERSVIEW' }) - } wx.navigateTo({ url, }) diff --git a/src/pages/familyList/index.ts b/src/pages/familyList/index.ts index 3ed3914..7a76214 100644 --- a/src/pages/familyList/index.ts +++ b/src/pages/familyList/index.ts @@ -12,7 +12,6 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTMYRELATIVESLIST' }) this.getFamilyList(); app.getUserInfo(this); }); diff --git a/src/pages/hospital/index.ts b/src/pages/hospital/index.ts index 3fd6b72..eb77d63 100644 --- a/src/pages/hospital/index.ts +++ b/src/pages/hospital/index.ts @@ -1,3 +1,4 @@ +import { formatArea } from '@/utils/util' const app = getApp() Page({ @@ -157,7 +158,7 @@ Page({ latitude: detail.LAT, longitude: detail.LNG, name: detail.Name, - address: `${detail.ProvinceName}${detail.CityName}${detail.CountyName}${detail.Address}`, + address: `${formatArea(detail.ProvinceName, detail.CityName)}${detail.CountyName}${detail.Address}`, }) }, handleTimeOut(Id) { diff --git a/src/pages/hospital/index.wxml b/src/pages/hospital/index.wxml index da1a365..776b5c2 100644 --- a/src/pages/hospital/index.wxml +++ b/src/pages/hospital/index.wxml @@ -1,3 +1,4 @@ + - diff --git a/src/pages/my/index.scss b/src/pages/my/index.scss index 12de61d..a311234 100644 --- a/src/pages/my/index.scss +++ b/src/pages/my/index.scss @@ -194,7 +194,7 @@ page { #drug-page { .day { - color: rgba(34, 34, 34, 0.5); + color: rgba(89, 86, 233, 1); } .common-operations { .item:first-of-type { diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 5b9900a..a8a1418 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -29,7 +29,6 @@ Page({ }, onShow() { app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTMY' }) app.getUserInfo(this, true, () => {}) this.getScore() }) @@ -46,7 +45,6 @@ Page({ }) }, handleMyHealthRecord(e) { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGEHEALTHRECORD' }) const { url } = e.currentTarget.dataset app.permissionVerification(3, 0, url).then(() => { wx.navigateTo({ @@ -55,7 +53,6 @@ Page({ }) }, handleFamily(e) { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGEFAMILYMEMBERS' }) const { url } = e.currentTarget.dataset app.permissionVerification(3, 0, url).then(() => { wx.navigateTo({ @@ -64,9 +61,6 @@ Page({ }) }, handleAdlChaneg(e) { - if (!e.detail) { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGECLOSEADLREMINDER' }) - } wx.ajax({ method: 'POST', url: '?r=igg4/account/update-adl-notify-switch', @@ -85,22 +79,29 @@ Page({ title: '工程师正在努力建设中，敬请期待!', }) } - if (url === '/pages/mySave/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGEFAVORITES' }) - } - if (url === '/pages/myLive/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGESIGNEDUPMEETINGS' }) - } - if (url === '/pages/personalInformation/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGEPERSONALINFO' }) - } - if (url === '/pages/storyList/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTMYPAGEMYSTORIES' }) - } wx.navigateTo({ url, }) }, + handleQaForm() { + wx.ajax({ + method: 'GET', + url: '?r=igg4/health-question/get-patient-questionnaire', + data: {}, + showMsg: false, + }).then((res: any) => { + const answers = res.questions || [] + if (answers.length) { + wx.navigateTo({ + url: '/pages/qaFormDetail/index', + }) + } else { + wx.navigateTo({ + url: '/pages/qaForm/index', + }) + } + }) + }, routerVipTo() { const { UseDrugsAuditStatus, UserType } = this.data.userInfo if (!UserType) { diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index e365848..29b18b0 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -23,7 +23,7 @@ - + 健康档案 @@ -42,7 +42,7 @@ - + diff --git a/src/pages/myLive/index.ts b/src/pages/myLive/index.ts index aeaeb61..df5b90f 100644 --- a/src/pages/myLive/index.ts +++ b/src/pages/myLive/index.ts @@ -52,15 +52,6 @@ Page({ }, getList(newPage = 1) { const { active } = this.data - if (newPage == 1 && active == 0) { - app.mpBehavior({ PageName: 'PG_PATIENTMYEVENTS_ALL' }) - } - if (newPage == 1 && active == 1) { - app.mpBehavior({ PageName: 'PG_PATIENTMYEVENTS_ONLINE' }) - } - if (newPage == 1 && active == 2) { - app.mpBehavior({ PageName: 'PG_PATIENTMYEVENTS_OFFLINE' }) - } wx.ajax({ method: 'GET', url: '?r=igg4/activity/sign-up-list', @@ -101,16 +92,6 @@ Page({ }, handleDetail(e) { const { id } = e.currentTarget.dataset - const { active } = this.data - if (active == 0) { - app.mpBehavior({ PageName: 'BTN_PATIENTSIGNEDUPACTIVITIESALLLIST' }) - } - if (active == 1) { - app.mpBehavior({ PageName: 'BTN_PATIENTSIGNEDUPACTIVITIESONLINELIST' }) - } - if (active == 2) { - app.mpBehavior({ PageName: 'BTN_PATIENTSIGNEDUPACTIVITIESOFFLINELIST' }) - } wx.navigateTo({ url: `/pages/liveDetail/index?id=${id}`, }) diff --git a/src/pages/mySave/index.scss b/src/pages/mySave/index.scss index 5e6f1c6..6f62ee9 100644 --- a/src/pages/mySave/index.scss +++ b/src/pages/mySave/index.scss @@ -60,7 +60,7 @@ height: 32rpx; } &.active { - color: rgba(249, 163, 14, 1); + color: #0eb66d; } } } @@ -74,4 +74,7 @@ color: #fff; background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%); } + .info-list .footer .f-item.active { + color: #5956e9; + } } diff --git a/src/pages/mySave/index.ts b/src/pages/mySave/index.ts index 9fea1a0..b7bcc0c 100644 --- a/src/pages/mySave/index.ts +++ b/src/pages/mySave/index.ts @@ -26,7 +26,6 @@ Page({ }, getList() { this.getInfoList() - app.mpBehavior({ PageName: 'PG_PATIENTMYFAVORITES_KNOWLEDGEBASE' }) }, getInfoList(newPage = 1) { wx.ajax({ diff --git a/src/pages/mySave/index.wxml b/src/pages/mySave/index.wxml index 989e9e0..a49481e 100644 --- a/src/pages/mySave/index.wxml +++ b/src/pages/mySave/index.wxml @@ -29,7 +29,7 @@ {{item.CollectionPeopleNum}} diff --git a/src/pages/personalInformation/index.ts b/src/pages/personalInformation/index.ts index 2796b66..5c049b7 100644 --- a/src/pages/personalInformation/index.ts +++ b/src/pages/personalInformation/index.ts @@ -31,7 +31,6 @@ Page({ }) app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTPERSONALINFO' }) const that = this app.getUserInfo(that, true, that.formatUserInfo.bind(that)) }) @@ -122,7 +121,6 @@ Page({ }, handleChangeTel() { - app.mpBehavior({ PageName: 'PG_PATIENTPERSONALINFO_CHANGEPHONECLICK' }) wx.navigateTo({ url: '/pages/changePhone/index', }) @@ -133,7 +131,6 @@ Page({ }) }, handleLogout() { - app.mpBehavior({ PageName: 'BTN_PATIENTPERSONALINFOLOGOUT' }) wx.navigateTo({ url: '/pages/cancellation/index', }) @@ -143,9 +140,6 @@ Page({ }, routerTo(e) { const { url } = e.currentTarget.dataset - if (url.includes('/doctor/pages/d_login/index')) { - app.mpBehavior({ PageName: 'BTN_PATIENTPERSONALINFOSWITCHDOCTORPORTAL' }) - } wx.navigateTo({ url, }) diff --git a/src/pages/personalInformation/index.wxml b/src/pages/personalInformation/index.wxml index e65af20..7ff75a9 100644 --- a/src/pages/personalInformation/index.wxml +++ b/src/pages/personalInformation/index.wxml @@ -55,7 +55,7 @@ data-id="2" bind:tap="handleRadio" > - 40 - 49 岁 + 40-49岁 - 50 - 59 岁 + 50-59岁 - 60 - 69 岁 + 60-69岁 - 70 - 79 岁 + 70-79岁 - ≥80 岁 + ≥80岁 从首次确诊IgG4相关性疾病，到现在多久了 @@ -130,11 +130,11 @@ bindblur="updateUserInfo" /> - 手机号 - - - 修改 - + + + + + diff --git a/src/pages/publishStoryDetail/index.ts b/src/pages/publishStoryDetail/index.ts index dd82d38..7d4a399 100644 --- a/src/pages/publishStoryDetail/index.ts +++ b/src/pages/publishStoryDetail/index.ts @@ -36,7 +36,6 @@ Page({ this.handleTimeOut() }, onShow() { - app.mpBehavior({ PageName: 'PG_PATIENTSTORYDETAILS' }) if (this.data.sendShare) { this.setData({ sendShare: false, @@ -99,7 +98,6 @@ Page({ }) }, handleStar() { - app.mpBehavior({ PageName: 'BTN_PATIENTSTORYDETAILSLIKE' }) this.setData({ starShow: true, }) @@ -174,7 +172,6 @@ Page({ }) }, handleTapShare() { - app.mpBehavior({ PageName: 'BTN_PATIENTSTORYDETAILSSHARE' }) }, onShareAppMessage() { const { Title, ListPicLink } = this.data.detail diff --git a/src/pages/qaForm/index.scss b/src/pages/qaForm/index.scss index 303c7c0..5902bcd 100644 --- a/src/pages/qaForm/index.scss +++ b/src/pages/qaForm/index.scss @@ -41,7 +41,7 @@ page { } .content { font-size: 36rpx; - color: rgba(34, 34, 34, 0.7); + color: rgba(34, 34, 34, 0.70); } &.active { .radio { @@ -98,7 +98,7 @@ page { } .content { font-size: 36rpx; - color: rgba(34, 34, 34, 1); + color: rgba(34, 34, 34, 0.70); } &.active { .check { diff --git a/src/pages/qaFormDetail/index.json b/src/pages/qaFormDetail/index.json new file mode 100644 index 0000000..f04fac5 --- /dev/null +++ b/src/pages/qaFormDetail/index.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "健康档案", + "navigationBarBackgroundColor": "#F6F6F6", + "usingComponents": { + "van-icon": "@vant/weapp/icon/index" + } +} diff --git a/src/pages/qaFormDetail/index.scss b/src/pages/qaFormDetail/index.scss new file mode 100644 index 0000000..410594e --- /dev/null +++ b/src/pages/qaFormDetail/index.scss @@ -0,0 +1,95 @@ +page { + background-color: #f6f6f6; +} +.page { + padding: 32rpx 32rpx 80rpx; + .page-container { + padding: 32rpx; + background: #ffffff; + box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.08); + border-radius: 12rpx 12rpx 12rpx 12rpx; + border: 2rpx solid #f4f3f3; + .card { + margin-bottom: 32rpx; + padding-bottom: 32rpx; + border-bottom: 1px solid rgba(244, 243, 243, 1); + .c-title { + font-size: 36rpx; + color: rgba(33, 33, 32, 1); + font-weight: bold; + } + .answer-text { + margin-top: 24rpx; + display: flex; + flex-wrap: wrap; + gap: 16rpx; + .answer-tag { + font-size: 36rpx; + color: rgba(33, 33, 32, 1); + } + .answer-content { + font-size: 36rpx; + color: rgba(33, 33, 32, 1); + } + } + .other-text { + margin-top: 16rpx; + font-size: 28rpx; + color: rgba(34, 34, 34, 0.7); + } + .image-group { + margin-top: 24rpx; + display: flex; + flex-wrap: wrap; + gap: 20rpx; + .image-item { + width: 200rpx; + height: 200rpx; + .img { + width: 100%; + height: 100%; + border-radius: 16rpx; + } + } + } + } + .empty { + display: flex; + flex-direction: column; + align-items: center; + padding: 120rpx 0; + .empty-text { + font-size: 32rpx; + color: rgba(34, 34, 34, 0.4); + margin-bottom: 40rpx; + } + .empty-btn { + padding: 20rpx 64rpx; + background: linear-gradient(94deg, #0eb66d 0%, #00d277 100%); + border-radius: 16rpx; + font-size: 32rpx; + color: rgba(255, 255, 255, 1); + } + } + } + .edit-btn { + margin-top: 60rpx; + height: 96rpx; + display: flex; + align-items: center; + justify-content: center; + background: linear-gradient(94deg, #0eb66d 0%, #00d277 100%); + border-radius: 16rpx; + font-size: 40rpx; + color: rgba(255, 255, 255, 1); + } +} + +#drug-page { + .empty-btn { + background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%) !important; + } + .edit-btn { + background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%) !important; + } +} diff --git a/src/pages/qaFormDetail/index.ts b/src/pages/qaFormDetail/index.ts new file mode 100644 index 0000000..74a626f --- /dev/null +++ b/src/pages/qaFormDetail/index.ts @@ -0,0 +1,201 @@ +const app = getApp() + +interface IOption { + key: string + value: string +} + +interface ICondition { + questionNo: number + values: number[] +} + +interface IQuestion { + QuestionNo: number + QuestionContent: string + QuestionType: number + HasOther: number + Description: string + Options: Record + optionList: IOption[] + Answer: any + OtherText: string + DateValue: string + TextValue: string + Images: any[] + Condition: ICondition | null + visible: boolean + displayNo: number + answerText: string +} + +Page({ + data: { + questions: [] as IQuestion[], + hasData: false, + }, + + onLoad() { + app.waitLogin({}).then(() => { + this.loadData() + }) + }, + onShow() { + if (this.data.questions.length) { + this.loadData() + } + }, + + loadData() { + wx.ajax({ + method: 'GET', + url: '?r=igg4/health-question/questionnaire-list', + data: {}, + }).then((questionRes: any) => { + const questionList = questionRes.questions || questionRes.list || [] + const questions: IQuestion[] = (Array.isArray(questionList) ? questionList : []).map((q: any) => { + const optionList: IOption[] = Object.entries(q.Options || {}).map(([key, value]) => ({ + key, + value: value as string, + })) + let condition: ICondition | null = null + if (q.Condition && q.Condition.questionNo) { + condition = { + questionNo: q.Condition.questionNo, + values: q.Condition.values || [], + } + } + return { + QuestionNo: q.QuestionNo, + QuestionContent: q.QuestionContent, + QuestionType: q.QuestionType, + HasOther: q.HasOther || 0, + Description: q.Description || '', + Options: q.Options || {}, + optionList, + Answer: q.QuestionType === 2 ? [] : '', + OtherText: '', + DateValue: '', + TextValue: '', + Images: [], + Condition: condition, + visible: !condition, + displayNo: 0, + answerText: '', + } + }) + this.setData({ questions }) + this.loadAnswers() + }) + }, + + loadAnswers() { + wx.ajax({ + method: 'GET', + url: '?r=igg4/health-question/get-patient-questionnaire', + data: {}, + }).then((res: any) => { + const answers = res.questions || [] + if (!answers.length) { + this.setData({ hasData: false }) + return + } + this.setData({ hasData: true }) + const questions = this.data.questions + const updates: Record = {} + questions.forEach((q, i) => { + const found = answers.find((a: any) => a.QuestionNo === q.QuestionNo) + if (!found) return + const answer = found.Answer + if (answer === null || answer === undefined) return + if (q.QuestionType === 1) { + updates[`questions[${i}].Answer`] = Number(answer) + updates[`questions[${i}].answerText`] = this.getAnswerText(q, Number(answer)) + } else if (q.QuestionType === 2) { + const arr = Array.isArray(answer) ? answer : String(answer).split(',').map(Number) + updates[`questions[${i}].Answer`] = arr + updates[`questions[${i}].answerText`] = this.getMultiAnswerText(q, arr) + } else if (q.QuestionType === 3) { + updates[`questions[${i}].DateValue`] = answer + updates[`questions[${i}].Answer`] = answer + updates[`questions[${i}].answerText`] = answer + } else if (q.QuestionType === 4) { + updates[`questions[${i}].TextValue`] = answer + updates[`questions[${i}].Answer`] = answer + updates[`questions[${i}].answerText`] = answer + } else if (q.QuestionType === 5) { + const imgs = Array.isArray(answer) ? answer : [] + updates[`questions[${i}].Images`] = imgs + updates[`questions[${i}].Answer`] = imgs + updates[`questions[${i}].answerText`] = imgs.length ? `${imgs.length}张图片` : '' + } + if (found.OtherText) { + updates[`questions[${i}].OtherText`] = found.OtherText + } + }) + if (Object.keys(updates).length) { + this.setData(updates) + } + this.updateVisibility() + }) + }, + + getAnswerText(q: IQuestion, value: number): string { + return q.Options[String(value)] || '' + }, + + getMultiAnswerText(q: IQuestion, values: number[]): string { + return values + .map((v) => q.Options[String(v)] || '') + .filter(Boolean) + .join('、') + }, + + updateVisibility() { + const { questions } = this.data + const updates: Record = {} + let no = 0 + questions.forEach((q, i) => { + let visible = true + if (q.Condition) { + const parentQ = questions.find((p) => p.QuestionNo === q.Condition!.questionNo) + if (parentQ) { + if (parentQ.QuestionType === 2 && Array.isArray(parentQ.Answer)) { + visible = q.Condition.values.some((v) => parentQ.Answer.includes(v)) + } else { + visible = q.Condition.values.includes(Number(parentQ.Answer)) + } + } else { + visible = false + } + } + if (q.visible !== visible) { + updates[`questions[${i}].visible`] = visible + } + if (visible) no++ + if (q.displayNo !== no) { + updates[`questions[${i}].displayNo`] = no + } + }) + if (Object.keys(updates).length) { + this.setData(updates) + } + }, + + handlePreviewImage(e: any) { + const { index } = e.currentTarget.dataset + const images = this.data.questions[index].Images + const urls = images.map((img: any) => img.url) + const current = e.currentTarget.dataset.url + wx.previewImage({ + current, + urls, + }) + }, + + handleEdit() { + wx.navigateTo({ + url: '/pages/qaForm/index', + }) + }, +}) diff --git a/src/pages/qaFormDetail/index.wxml b/src/pages/qaFormDetail/index.wxml new file mode 100644 index 0000000..bb70da2 --- /dev/null +++ b/src/pages/qaFormDetail/index.wxml @@ -0,0 +1,57 @@ + + + + + + {{item.displayNo}}. {{item.QuestionContent}} + + + {{item.answerText}} + + + + + {{item.Options[val] || ''}} + + + 其他：{{item.OtherText}} + + + {{item.DateValue}} + + + + {{item.TextValue}} + + + + + + + + + + 其他：{{item.OtherText}} + + + + + 暂未填写健康档案 + 去填写 + + + + 更新健康档案 + diff --git a/src/pages/referral/index.ts b/src/pages/referral/index.ts index f3738bd..0497c5a 100644 --- a/src/pages/referral/index.ts +++ b/src/pages/referral/index.ts @@ -17,7 +17,6 @@ Page({ }, onLoad(options) { app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PAGE_PATIENTREVISITLIST' }) // 强制疾病患者以上身份 app.permissionVerification(3, 0, `/pages/referral/index`).then(() => { this.getList() @@ -101,14 +100,12 @@ Page({ }) }, handleRecord() { - app.mpBehavior({ PageName: 'BTN_PATIENTREVISITADDBTN' }) this.setData({ referralFromShow: true, referralFromParams: null, }) }, handleRefrech() { - app.mpBehavior({ PageName: 'BTN_PATIENTREVISITSUBMITBTN' }) this.getList() }, handleAdl() { diff --git a/src/pages/repository/index.scss b/src/pages/repository/index.scss index 805e88d..7a55040 100644 --- a/src/pages/repository/index.scss +++ b/src/pages/repository/index.scss @@ -25,7 +25,7 @@ .input { flex: 1; margin: 0 20rpx; - font-size: 28rpx; + font-size: 32rpx; } .placeholder-input { color: rgba(34, 34, 34, 0.3); @@ -139,7 +139,7 @@ height: 32rpx; } &.active { - color: rgba(249, 163, 14, 1); + color: #0eb66d; } } .share { @@ -206,7 +206,7 @@ height: 36rpx; } &.active { - color: rgba(249, 163, 14, 1); + color: #0eb66d; } } } @@ -220,4 +220,8 @@ color: #fff; background: linear-gradient(270deg, #5956e9 0%, #b384f4 100%); } + .info-list .footer .f-item.active, + .video-list .footer .f-item.active { + color: #5956e9; + } } diff --git a/src/pages/repository/index.ts b/src/pages/repository/index.ts index c66f909..8048d28 100644 --- a/src/pages/repository/index.ts +++ b/src/pages/repository/index.ts @@ -25,7 +25,6 @@ Page({ }, onShow() { if (app.globalData.loginState) { - app.mpBehavior({ PageName: 'PG_PATIENTMGINFO' }) if (this.data.list.length) { this.getList() } @@ -158,7 +157,6 @@ Page({ this.getList() }, handleDetail(e: WechatMiniprogram.CustomEvent) { - app.mpBehavior({ PageName: 'BTN_PATIENTMGARTICLELIST' }) const { id } = e.currentTarget.dataset wx.navigateTo({ url: `/pages/repositoryDetail/index?id=${id}`, diff --git a/src/pages/repository/index.wxml b/src/pages/repository/index.wxml index f182d84..9e910a3 100644 --- a/src/pages/repository/index.wxml +++ b/src/pages/repository/index.wxml @@ -82,7 +82,7 @@ {{item.CollectionPeopleNum}} @@ -114,7 +114,7 @@ {{item.CollectionPeopleNum}} diff --git a/src/pages/repositoryDetail/index.scss b/src/pages/repositoryDetail/index.scss index 9280f25..4fda723 100644 --- a/src/pages/repositoryDetail/index.scss +++ b/src/pages/repositoryDetail/index.scss @@ -1,7 +1,7 @@ .page { .page-container { box-sizing: border-box; - padding: 0 30rpx 200rpx; + padding: 24rpx 30rpx 200rpx; .banner { .title { @@ -58,8 +58,8 @@ display: flex; margin-bottom: 22rpx; .photo { - width: 232rpx; - height: 184rpx; + width: 190rpx; + height: 190rpx; flex-shrink: 0; border-radius: 16rpx; border: 1rpx solid #ebecee; @@ -170,9 +170,11 @@ } } .f-item { + flex:1; display: flex; - flex-direction: column; align-items: center; + justify-content: center; + gap: 6rpx; font-size: 30rpx; color: rgba(34, 34, 34, 0.7); margin: 0; @@ -196,7 +198,7 @@ display: none; } &.active { - color: rgba(249, 163, 14, 1); + color: #0eb66d; .icon { display: none; } @@ -212,3 +214,12 @@ } } } + +#drug-page { + .footer .f-item.active { + color: #5956e9; + } + .other .f-item.active { + color: #5956e9; + } +} diff --git a/src/pages/repositoryDetail/index.ts b/src/pages/repositoryDetail/index.ts index 2dfa378..6220312 100644 --- a/src/pages/repositoryDetail/index.ts +++ b/src/pages/repositoryDetail/index.ts @@ -37,7 +37,6 @@ Page({ }) }, onShow() { - app.mpBehavior({ PageName: 'PG_PATIENTKNOWLEDGEDETAILS' }) if (this.data.sendShare) { this.setData({ sendShare: false, @@ -167,7 +166,6 @@ Page({ }) }, handleStar() { - app.mpBehavior({ PageName: 'BTN_PATIENTKNOWLEDGEDETAILSLIKE' }) this.setData({ starShow: true, }) @@ -199,7 +197,6 @@ Page({ }) }, handleToggleSave() { - app.mpBehavior({ PageName: 'BTN_PATIENTKNOWLEDGEDETAILSFAVORITE' }) const { id, detail: { IsCollect }, @@ -324,6 +321,5 @@ Page({ } }, handleTapShare() { - app.mpBehavior({ PageName: 'BTN_PATIENTKNOWLEDGEDETAILSSHARE' }) }, }) diff --git a/src/pages/repositoryDetail/index.wxml b/src/pages/repositoryDetail/index.wxml index 26371dc..fd05fc1 100644 --- a/src/pages/repositoryDetail/index.wxml +++ b/src/pages/repositoryDetail/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/src/pages/signIn/index.wxml b/src/pages/signIn/index.wxml index 675dae8..f7699cd 100644 --- a/src/pages/signIn/index.wxml +++ b/src/pages/signIn/index.wxml @@ -1,7 +1,7 @@ diff --git a/src/pages/story/index.ts b/src/pages/story/index.ts index 8d0c91c..f099b90 100644 --- a/src/pages/story/index.ts +++ b/src/pages/story/index.ts @@ -22,7 +22,6 @@ Page({ }, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ PageName: 'PG_PATIENTDESIREDLIFE' }) this.getList() app.getUserInfo(this, true) }) @@ -73,19 +72,6 @@ Page({ }, routerTo(e) { const { url } = e.currentTarget.dataset - // let PageName = { - // '/pages/storyGuide/index': 'BTN_STORY_SUBMIT', - // }[url] - // if (PageName) { - // app.mpBehavior({ PageName }) - // } - - if (url.includes('/pages/publishStoryDetail/index')) { - app.mpBehavior({ PageName: 'BTN_PATIENTDESIRELIFESTORYLIST' }) - } - if (url === '/pages/storyGuide/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTDESIRELIFESHARE' }) - } wx.navigateTo({ url, }) diff --git a/src/pages/storyEnter/index.ts b/src/pages/storyEnter/index.ts index 3ff7a9a..1e5925b 100644 --- a/src/pages/storyEnter/index.ts +++ b/src/pages/storyEnter/index.ts @@ -38,7 +38,6 @@ Page({ } app.waitLogin().then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTSUBMITTEDSTORIES' }) app.getUserInfo(that, true) }) @@ -220,7 +219,6 @@ Page({ }) }, submit() { - app.mpBehavior({ PageName: 'BTN_PATIENTSUBMISSIONSTORYSUBMIT' }) const { form, fileList, VoiceContent } = this.data let toast = '' if (!form.TreatmentExperience) { diff --git a/src/pages/storyGuide/index.ts b/src/pages/storyGuide/index.ts index fdba87d..4f2f035 100644 --- a/src/pages/storyGuide/index.ts +++ b/src/pages/storyGuide/index.ts @@ -21,7 +21,6 @@ Page({ }) } app.waitLogin().then((_res) => { - app.mpBehavior({ PageName: 'PG_PATIENTREWARDESSAY' }) // this.getSettingInfo(); if (options.storyleadin) { this.setToSee() @@ -61,9 +60,6 @@ Page({ }, routerTo(e) { const { url } = e.currentTarget.dataset - if (url.includes('/pages/storyEnter/index')) { - app.mpBehavior({ PageName: 'BTN_PATIENTREWARDEDWRITINGSUBMIT' }) - } wx.navigateTo({ url, }) diff --git a/src/pages/storyList/index.ts b/src/pages/storyList/index.ts index b7c38bb..702badf 100644 --- a/src/pages/storyList/index.ts +++ b/src/pages/storyList/index.ts @@ -21,7 +21,6 @@ Page({ }, onShow() { app.waitLogin().then((_res) => { - app.mpBehavior({ PageName: 'PG_PATIENTMYSTORIES' }) this.getList() app.getUserInfo(this, true) }) @@ -58,7 +57,6 @@ Page({ } }, handleDetail(e) { - app.mpBehavior({ PageName: 'BTN_PATIENTMYSTORIESLIST' }) const { id } = e.currentTarget.dataset wx.navigateTo({ url: `/pages/storyDetail/index?id=${id}`, @@ -66,9 +64,6 @@ Page({ }, routerTo(e) { const { url } = e.currentTarget.dataset - if (url === '/pages/storyGuide/index') { - app.mpBehavior({ PageName: 'BTN_PATIENTMYSTORIESCONTINUESUBMIT' }) - } wx.navigateTo({ url, }) diff --git a/src/pages/taskAgreement/index.ts b/src/pages/taskAgreement/index.ts index b9645c2..1bf3c4f 100644 --- a/src/pages/taskAgreement/index.ts +++ b/src/pages/taskAgreement/index.ts @@ -11,7 +11,6 @@ Page({ pagePath: options.page, }) app.waitLogin({ isReg: false, loginPage: true }).then(() => { - app.mpBehavior({ PageName: 'PG_PATIENTFOLLOWUPCONSENT' }) }) }, handleBack() { @@ -19,11 +18,6 @@ Page({ }, handleSure(e) { const { replace, pcfu } = e.currentTarget.dataset - if (pcfu == 1) { - app.mpBehavior({ PageName: 'BTN_PATIENTFOLLOWUPAGREE' }) - } else if (pcfu == 2) { - app.mpBehavior({ PageName: 'BTN_PATIENTFOLLOWUPDISAGREE' }) - } const { pagePath } = this.data if (replace) { wx.redirectTo({ diff --git a/src/pages/webview/index.ts b/src/pages/webview/index.ts index e4313e5..a14a0cb 100644 --- a/src/pages/webview/index.ts +++ b/src/pages/webview/index.ts @@ -22,11 +22,9 @@ Page({ if (options.es === '201503') { app.globalData.IsAliQiWei = 1 - app.mpBehavior({ PageName: 'WEIYI_WEBVIEW_PAGE' }) } if (options.es === '201505') { app.globalData.IsAliQiWei = 1 - app.mpBehavior({ PageName: 'WEIYI_WEBVIEW_PAGE_TWO' }) } const { UserType } = app.globalData.userInfo diff --git a/src/utils/tools.wxs b/src/utils/tools.wxs index 121849c..32ee3d7 100644 --- a/src/utils/tools.wxs +++ b/src/utils/tools.wxs @@ -12,7 +12,27 @@ function eq(a, b) { return parseInt(a) === parseInt(b) } +function isEmpty(value) { + return value === undefined || value === null || value === '' || (typeof value === 'object' && value.constructor === Array && value.length === 0) +} + +function formatArea(province, city) { + if (!province) return city || '' + if (!city) return province + if (province === city) return province + return province + city +} + +function formatDate(dateTime) { + if (!dateTime) return '' + var date = dateTime.split(' ')[0] + return date +} + module.exports = { include: include, eq: eq, + isEmpty: isEmpty, + formatArea: formatArea, + formatDate: formatDate, } diff --git a/src/utils/util.ts b/src/utils/util.ts index edc27dd..4f6bc47 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -1,3 +1,10 @@ +export const formatArea = (province: string, city: string) => { + if (!province) return city || '' + if (!city) return province + if (province === city) return province + return province + city +} + export const formatTime = (date: Date) => { const year = date.getFullYear(); const month = date.getMonth() + 1;