diff --git a/README.md b/README.md index 06b11a1..7614da2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ svn://39.106.86.127:28386/projects/wutian_xueyoubing_b/proj_src/shop/frontend/we ### vscode -(/images/)(\S\*(?=["|'])) +(/images/)(\S*(?=["|'])) {{imageUrl}}$2?t={{Timestamp}} ### neovim diff --git a/src/app.ts b/src/app.ts index 8d6fac5..47abf3b 100644 --- a/src/app.ts +++ b/src/app.ts @@ -154,9 +154,14 @@ App({ return true }, mpBehavior(data: { PageName: string }) { + const { loginType } = this.globalData.initLoginInfo + const url = { + 1: '?r=wtx/mp-behavior/add', + 2: '?r=wtx/doctor/mp-behavior/add', + }[loginType as 1 | 2] wx.ajax({ method: 'POST', - url: '?r=wtx/mp-behavior/add', + url, data: data, loading: false, showMsg: false, diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 442f832..cd9a4f7 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -1121,6 +1121,36 @@ } } +.popup18 { + .container { + padding: 54rpx 32rpx 32rpx; + width: 590rpx; + height: 688rpx; + background: linear-gradient(5deg, #ffffff 0%, #ffe7e2 100%); + border-radius: 24rpx 24rpx 24rpx 24rpx; + box-sizing: border-box; + .title { + display: block; + margin: 0 auto; + width: 287rpx; + height: 98rpx; + } + .code-wrap { + margin: 40rpx auto 0; + padding-top: 60rpx; + width: 382rpx; + height: 430rpx; + .code { + margin: 0 auto; + display: block; + width: 296rpx; + height: 296rpx; + border-radius: 36rpx; + } + } + } +} + .close { margin: 32rpx auto 0; display: block; diff --git a/src/components/popup/index.ts b/src/components/popup/index.ts index 6a01334..1e69b34 100644 --- a/src/components/popup/index.ts +++ b/src/components/popup/index.ts @@ -27,13 +27,15 @@ Component({ }) } if (this.data.type === 'inhibitors') { - console.log(this.data.params) this.setData({ inhibitorsId: this.data.params.drugId || '', inhibitorsName: this.data.params.drugName || '', inhibitorsContent: this.data.params.content || '', }) } + if (this.data.type === 'publicCard') { + this.getCodeImg() + } } }, }, @@ -49,6 +51,8 @@ Component({ selectDoctorId: '', + codeImg: '', + imageUrl: app.globalData.imageUrl, Timestamp: app.globalData.Timestamp, }, @@ -144,5 +148,18 @@ Component({ inhibitorsName: name, }) }, + getCodeImg() { + wx.ajax({ + method: 'GET', + url: '?r=wtx/common/get-channel-wx-code', + data: { + ChannelType: 2, + }, + }).then((res) => { + this.setData({ + codeImg: res, + }) + }) + }, }, }) diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 0c04408..53eff34 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -300,9 +300,19 @@ - + - + @@ -332,6 +342,17 @@ + + + + + + + + { if (res.confirm) { wx.ajax({ diff --git a/src/components/uploadFile/index.scss b/src/components/uploadFile/index.scss index 569b4ba..bdbe3ee 100644 --- a/src/components/uploadFile/index.scss +++ b/src/components/uploadFile/index.scss @@ -64,3 +64,4 @@ } } } + diff --git a/src/doctor/components/doctor-tab-bar/index.ts b/src/doctor/components/doctor-tab-bar/index.ts index c27faa7..afeb28f 100644 --- a/src/doctor/components/doctor-tab-bar/index.ts +++ b/src/doctor/components/doctor-tab-bar/index.ts @@ -11,18 +11,21 @@ Component({ { pagePath: '/doctor/pages/index/index', text: '基因疗法', + pageName: 'BTN_HOME_NAV_CLICK', icon: 'tabbar3-1', iconActive: 'tabbar3-1-active', }, { pagePath: '/doctor/pages/knowledge/index', text: '小助手', + pageName: 'BTN_ASSISTANT_NAV_CLICK', icon: 'tabbar3-3', iconActive: 'tabbar3-3-active', }, { pagePath: '/doctor/pages/my/index', text: '我的', + pageName: 'BTN_MY_NAV_CLICK', icon: 'tabbar3-2', iconActive: 'tabbar3-2-active', }, @@ -44,7 +47,10 @@ Component({ handleNav(e) { const { index } = e.currentTarget.dataset const { list } = this.data - const pagePath = list[index].pagePath + const { pagePath, pageName } = list[index] + if (pageName) { + app.mpBehavior({ PageName: pageName }) + } wx.reLaunch({ url: pagePath, }) diff --git a/src/doctor/pages/askDoctor/index.ts b/src/doctor/pages/askDoctor/index.ts index 960cdf4..3b827c8 100644 --- a/src/doctor/pages/askDoctor/index.ts +++ b/src/doctor/pages/askDoctor/index.ts @@ -68,6 +68,7 @@ Page({ patientId: options.id || '', }) app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_CONSULTDOCTOR_VISIT' }) app.getUserInfo(2).then((userInfo) => { this.setData({ userInfo, @@ -221,6 +222,7 @@ Page({ }) }, handleSendShow() { + app.mpBehavior({ PageName: 'BTN_SEND_MESSAGE_CLICK' }) this.setData({ messageListShow: true, }) @@ -268,6 +270,7 @@ Page({ }) }, handleSendDate() { + app.mpBehavior({ PageName: 'BTN_DOCVISITTIME_CLICK' }) const { messageList, userInfo: { doctorName, doctorAvatar, clinic, clinicType }, @@ -282,7 +285,7 @@ Page({ wx.showModal({ title: '提示', content: '将您的出诊时间发送给患者?', - confirmColor: 'rgba(29, 107, 255, 1)', + confirmColor: '#1D6BFF', success: (res) => { if (res.confirm) { this.setData({ @@ -319,12 +322,13 @@ Page({ }) }, handleReferral() { + app.mpBehavior({ PageName: 'BTN_FOLLOWUP_REMINDER_CLICK' }) const { userInfo } = this.data wx.showModal({ title: '', content: '您将给患者发送复诊提醒卡片?', confirmText: '发送', - confirmColor: 'rgba(29, 107, 255, 1)', + confirmColor: '#1D6BFF', success: (res) => { if (res.confirm) { wx.ajax({ @@ -378,6 +382,7 @@ Page({ }) }, handleFile() { + app.mpBehavior({ PageName: 'BTN_DOC_VIEW_RECORD_CLICK' }) wx.navigateTo({ url: `/doctor/pages/file/index?id=${this.data.patientId}`, }) diff --git a/src/doctor/pages/bbmRemark/index.ts b/src/doctor/pages/bbmRemark/index.ts index f98bdff..1aecc27 100644 --- a/src/doctor/pages/bbmRemark/index.ts +++ b/src/doctor/pages/bbmRemark/index.ts @@ -12,6 +12,7 @@ Page({ patientId: options.id || '', }) app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_DOCINFUSIONFEELINGLOG_VISIT' }) this.getDetail() }) }, diff --git a/src/doctor/pages/bbmReport/index.ts b/src/doctor/pages/bbmReport/index.ts index 252ed38..a49df7f 100644 --- a/src/doctor/pages/bbmReport/index.ts +++ b/src/doctor/pages/bbmReport/index.ts @@ -16,6 +16,7 @@ Page({ patientId: options.id || '', }) app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_DOCBBMH901INFUSIONLOG_VISIT' }) this.getDetail() }) }, diff --git a/src/doctor/pages/blood/index.ts b/src/doctor/pages/blood/index.ts index 0e3ac77..46f8d21 100644 --- a/src/doctor/pages/blood/index.ts +++ b/src/doctor/pages/blood/index.ts @@ -22,6 +22,7 @@ Page({ }, onShow() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_DOCBLEEDINGMANAGEMENT_VISIT' }) this.getList() }) }, diff --git a/src/doctor/pages/casesDetail/index.ts b/src/doctor/pages/casesDetail/index.ts index 4f7a46a..4226c71 100644 --- a/src/doctor/pages/casesDetail/index.ts +++ b/src/doctor/pages/casesDetail/index.ts @@ -9,8 +9,9 @@ Page({ }, }, onLoad(options) { - console.log("DEBUGPRINT[122]: index.ts:11: options=", options) + console.log('DEBUGPRINT[122]: index.ts:11: options=', options) app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_MEDICALHISTORY_VISIT' }) this.getDetail(options.id) }) }, diff --git a/src/doctor/pages/changeTel/index.ts b/src/doctor/pages/changeTel/index.ts index 6b5b870..d5f3094 100644 --- a/src/doctor/pages/changeTel/index.ts +++ b/src/doctor/pages/changeTel/index.ts @@ -9,6 +9,12 @@ Page({ codeText: '发送验证码', }, onLoad() {}, + onUnload() { + if (timer) { + clearInterval(timer as number) + timer = null + } + }, getCode() { if (timer) return const mobile = this.data.mobile @@ -58,7 +64,7 @@ Page({ handleSubmit() { wx.showModal({ title: '确定修改此手机号?', - confirmColor: 'rgba(29, 107, 255, 1)', + confirmColor: '#1D6BFF', success: (res) => { if (!res.confirm) return const { mobile, code } = this.data diff --git a/src/doctor/pages/coltStat/index.ts b/src/doctor/pages/coltStat/index.ts index 9c89d24..54d6a94 100644 --- a/src/doctor/pages/coltStat/index.ts +++ b/src/doctor/pages/coltStat/index.ts @@ -42,7 +42,7 @@ Page({ beginDate: dayjs().subtract(1, 'M').startOf('month').format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD'), - tabActve: 2, + tabActve: 3, iDays: '', list2: [] as any[], @@ -66,7 +66,10 @@ Page({ this.setData({ patientId: options.id || '', }) - this.ecDataTrendComponent = this.selectComponent('#mychart-dom-bar') + app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_VIEWHEALTHCHANGE_VISIT' }) + this.ecDataTrendComponent = this.selectComponent('#mychart-dom-bar') + }) }, handleUpdate() { this.getDetail() @@ -506,13 +509,17 @@ Page({ }, handleTab(e: any) { - const { active } = e.currentTarget.dataset + const { active, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } this.setData({ tabActve: active, }) this.getList(1) }, handleFile() { + app.mpBehavior({ PageName: 'BTN_VIEW_RECORD_CLICK' }) wx.navigateTo({ url: `/doctor/pages/file/index?id=${this.data.patientId}`, }) diff --git a/src/doctor/pages/coltStat/index.wxml b/src/doctor/pages/coltStat/index.wxml index a21836d..cc4181e 100644 --- a/src/doctor/pages/coltStat/index.wxml +++ b/src/doctor/pages/coltStat/index.wxml @@ -79,11 +79,11 @@ - 凝血因子 - 生化检查 + 凝血因子 + 生化检查 - + 已记录 {{pagination2.count}} 条 @@ -93,7 +93,7 @@ - + @@ -102,7 +102,7 @@ 因子检查 - {{pagination2.count}} + {{pagination3.count}} @@ -121,7 +121,7 @@ - + @@ -138,9 +138,9 @@ - + - + diff --git a/src/doctor/pages/course/index.ts b/src/doctor/pages/course/index.ts index c8bd6f5..b6be33a 100644 --- a/src/doctor/pages/course/index.ts +++ b/src/doctor/pages/course/index.ts @@ -22,7 +22,7 @@ Page({ }, onLoad(options) { this.setData({ - current: Number(options.current), + current: Number(options.current) || 0, patientId: options.id, }) }, @@ -30,7 +30,20 @@ Page({ app.waitLogin({ type: 2 }).then(() => { this.handleUpdate() this.getDetail() - }) + this.handleViewBehavior() + }) + }, + handleViewBehavior() { + const { current } = this.data + const PageName = { + 0: 'PG_DOCTREATMENTPROCESS1_VISIT', + 1: 'PG_DOCTREATMENTPROCESS2_VISIT', + 2: 'PG_DOCTREATMENTPROCESS3_VISIT', + 3: 'PG_DOCTREATMENTPROCESS4_VISIT', + }[current] + if (PageName) { + app.mpBehavior({ PageName }) + } }, getDetail() { wx.ajax({ @@ -65,13 +78,20 @@ Page({ }) }, handleSwiperChange(e) { + const { current } = this.data this.setData({ current: e.detail.current, }) this.handleUpdate() + if (current != e.detail.current) { + this.handleViewBehavior() + } }, handleSelectHostipal(e) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } const id = this.data[`periodInfo${period}`].hospitalId if (!id) { wx.showToast({ @@ -85,6 +105,7 @@ Page({ }) }, handleCasesAdd() { + app.mpBehavior({ PageName: 'BTN_MEDICAL_HISTORY_CLICK' }) wx.navigateTo({ url: `/doctor/pages/casesDetail/index?id=${this.data.patientId}`, }) @@ -97,44 +118,56 @@ Page({ }) }, handlePreDiagnosisReport(e: any) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } const { examId } = this.data[`periodInfo${period}`] wx.navigateTo({ url: `/doctor/pages/preDiagnosisReport/index?examid=${examId}&period=${period}&id=${this.data.patientId}`, }) }, handleBbmReport() { + app.mpBehavior({ PageName: 'BTN_BBMH901_INFUSIONLOG_CLICK' }) wx.navigateTo({ url: `/doctor/pages/bbmReport/index?id=${this.data.patientId}`, }) }, handleBbmRemark() { + app.mpBehavior({ PageName: 'BTN_INFUSION_FEELINGLOG_CLICK' }) wx.navigateTo({ url: `/doctor/pages/bbmRemark/index?id=${this.data.patientId}`, }) }, handleInhibitorsManage(e: any) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/doctor/pages/inhibitorsManageList/index?period=${period}&id=${this.data.patientId}`, }) }, handleFollowPlan() { + app.mpBehavior({ PageName: 'BTN_VIEW_FOLLOWUPPLAN_CLICK' }) wx.navigateTo({ url: `/doctor/pages/followPlan/index?id=${this.data.patientId}`, }) }, handleLastDiagnosisReport() { + app.mpBehavior({ PageName: 'BTN_LATEST_FOLLOWUPRECORD_CLICK' }) wx.navigateTo({ url: `/doctor/pages/revisitRecord/index?period=4&id=${this.data.patientId}`, }) }, handleColtStat() { + app.mpBehavior({ PageName: 'BTN_VIEW_HEALTHCHANGE_CLICK' }) wx.navigateTo({ url: `/doctor/pages/coltStat/index?id=${this.data.patientId}`, }) }, handleBlood() { + app.mpBehavior({ PageName: 'BTN_BLEEDING_RECORD_CLICK' }) wx.navigateTo({ url: `/doctor/pages/blood/index?id=${this.data.patientId}`, }) diff --git a/src/doctor/pages/course/index.wxml b/src/doctor/pages/course/index.wxml index 000dad6..018893b 100644 --- a/src/doctor/pages/course/index.wxml +++ b/src/doctor/pages/course/index.wxml @@ -28,7 +28,7 @@ - + - + - + - + - + - + 第{{periodInfo4.followUpWeekInfo.iWeek}}周 @@ -415,7 +420,12 @@ - + - - - - - { + const name = { + 1: 'PG_DESIGNATEDHOSPITAL_VISIT', + 2: 'PG_TREATMENTCENTER_VISIT', + }[options.period] + app.mpBehavior({ PageName: name }) this.getDetail(options.id) }) }, @@ -29,4 +34,4 @@ Page({ }, }) -export {} +export { } diff --git a/src/doctor/pages/file/index.scss b/src/doctor/pages/file/index.scss index a5d8da8..9c71903 100644 --- a/src/doctor/pages/file/index.scss +++ b/src/doctor/pages/file/index.scss @@ -512,7 +512,7 @@ page { box-sizing: border-box; padding: 24rpx 32rpx; .title { - font-size: 32rpx; + font-size: 28rpx; color: rgba(255, 255, 255, 1); font-weight: bold; } diff --git a/src/doctor/pages/file/index.ts b/src/doctor/pages/file/index.ts index b0ae4cc..d753d87 100644 --- a/src/doctor/pages/file/index.ts +++ b/src/doctor/pages/file/index.ts @@ -38,7 +38,7 @@ Page({ autoChoosedWhenJump: true, firstDayOfWeek: 'Mon', theme: 'geneb_doctor', - takeoverTap: false, + takeoverTap: true, highlightToday: true, onlyShowCurrentMonth: true, disableMode: { @@ -54,6 +54,7 @@ Page({ }, onShow() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_MEDICALRECORD_VISIT' }) this.getPatientInfo() this.getInfo() }) @@ -76,7 +77,10 @@ Page({ }) }, handleNav(e) { - const { nav } = e.currentTarget.dataset + const { nav, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } this.setData({ nav, }) @@ -218,23 +222,31 @@ Page({ }) }, handleRevisitAll() { + app.mpBehavior({ PageName: 'BTN_VIEW_ALL_FOLLOWUP_CLICK' }) wx.navigateTo({ url: `/doctor/pages/revisitRecord/index?id=${this.data.id}`, }) }, handleCourse(e: any) { - const { progress } = e.currentTarget.dataset + const { progress, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/doctor/pages/course/index?current=${progress}&id=${this.data.id}`, }) }, handleBbmDetail() { + app.mpBehavior({ PageName: 'BTN_VIEW_INJECTION_DETAIL_CLICK' }) wx.navigateTo({ url: `/doctor/pages/bbmReport/index?id=${this.data.id}`, }) }, handlePreDiagnosisReport(e) { - const { id, period } = e.currentTarget.dataset + const { id, period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/doctor/pages/preDiagnosisReport/index?examid=${id}&period=${period}&id=${this.data.id}`, }) diff --git a/src/doctor/pages/file/index.wxml b/src/doctor/pages/file/index.wxml index b855dad..57e1980 100644 --- a/src/doctor/pages/file/index.wxml +++ b/src/doctor/pages/file/index.wxml @@ -27,9 +27,25 @@ - 治疗档案 - 病史档案 - 随访日历 + + 治疗档案 + + + 病史档案 + + + 随访日历 + @@ -103,7 +119,7 @@ - + 诊疗阶段详情 @@ -130,6 +146,7 @@ {{item.beginDate}}~ {{item.endDate}} + {{item.beginDate || item.endDate}} 未填写 @@ -141,7 +158,12 @@ {{item.totalNum}}/{{item.allNum}} - + 诊疗阶段详情 @@ -150,6 +172,7 @@ bind:tap="handlePreDiagnosisReport" data-id="{{item.examId}}" data-period="{{item.period}}" + data-name="BTN_VIEW_GENE_THERAPY_DETAIL_CLICK" > 查看详情 @@ -173,6 +196,7 @@ {{item.beginDate}}~ {{item.endDate}} + {{item.beginDate || item.endDate}} 未填写 @@ -184,7 +208,12 @@ {{item.totalNum}}/{{item.allNum}} - + 诊疗阶段详情 @@ -193,6 +222,7 @@ bind:tap="handlePreDiagnosisReport" data-id="{{item.examId}}" data-period="{{item.period}}" + data-name="BTN_VIEW_PRE_SCREENING_DETAIL_CLICK" > 查看详情 @@ -309,12 +339,14 @@ {{followExam.tipsInfo}} {{followExam.lastNoticeWeekInfo}} {{followExam.lastNoticeExamInfo}} + - + + { + app.mpBehavior({ PageName: 'PG_VIEWFOLLOWUPPLAN_VISIT' }) this.getDetail() }) }, diff --git a/src/doctor/pages/followPlan/index.wxml b/src/doctor/pages/followPlan/index.wxml index f59960b..6a31ecc 100644 --- a/src/doctor/pages/followPlan/index.wxml +++ b/src/doctor/pages/followPlan/index.wxml @@ -70,7 +70,7 @@ 输注后 第1年~第2年内 - 每周1次 + 每3个月1次 diff --git a/src/doctor/pages/index/index.ts b/src/doctor/pages/index/index.ts index 6fdc990..f4ae839 100644 --- a/src/doctor/pages/index/index.ts +++ b/src/doctor/pages/index/index.ts @@ -3,11 +3,12 @@ const app = getApp() Page({ data: { userInfo: {}, - knowledgeList: [], - patientList: [], + knowledgeList: [] as any, + patientList: [] as any, }, onLoad() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_DOCTORHOME_VISIT' }) this.getPatientList() this.getKnowledge() app.getUserInfo(2).then((userInfo) => { @@ -40,6 +41,7 @@ Page({ }) }, handleInfoDetail(e) { + app.mpBehavior({ PageName: 'BTN_HOMEASSISTANT_CARD_CLICK' }) const { index } = e.currentTarget.dataset const params = this.data.knowledgeList[index] if (params.Type == 1) { @@ -53,22 +55,26 @@ Page({ }) }, handleCalculator() { + app.mpBehavior({ PageName: 'BTN_MEDCALCULATOR_CARD_CLICK' }) wx.navigateTo({ url: '/doctor/pages/calculator/index', }) }, handlePatientDetail(e) { + app.mpBehavior({ PageName: 'BTN_PATIENT_CARD_CLICK' }) const { id } = e.currentTarget.dataset wx.navigateTo({ url: `/doctor/pages/patientDetail/index?id=${id}`, }) }, handlePoster() { + app.mpBehavior({ PageName: 'BTN_POSTER_BUTTON_CLICK' }) wx.navigateTo({ url: '/doctor/pages/poster/index', }) }, handleInfoMore() { + app.mpBehavior({ PageName: 'BTN_HOMEASSISTANT_ALL_CLICK' }) wx.navigateTo({ url: '/doctor/pages/knowledge/index', }) diff --git a/src/doctor/pages/inhibitorsManageList/index.ts b/src/doctor/pages/inhibitorsManageList/index.ts index c925dfd..cdc672a 100644 --- a/src/doctor/pages/inhibitorsManageList/index.ts +++ b/src/doctor/pages/inhibitorsManageList/index.ts @@ -21,6 +21,7 @@ Page({ }, onShow() { app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_DOCIMMUNOSUPPRESSANTLOG_VISIT' }) this.getList() }) }, diff --git a/src/doctor/pages/knowledge/index.ts b/src/doctor/pages/knowledge/index.ts index 50ea035..bceb240 100644 --- a/src/doctor/pages/knowledge/index.ts +++ b/src/doctor/pages/knowledge/index.ts @@ -13,6 +13,7 @@ Page({ }, onShow() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_ASSISTANT_LIST_VISIT' }) this.getList() }) }, diff --git a/src/doctor/pages/knowledgeDetail/index.scss b/src/doctor/pages/knowledgeDetail/index.scss index 390a59b..89673a8 100644 --- a/src/doctor/pages/knowledgeDetail/index.scss +++ b/src/doctor/pages/knowledgeDetail/index.scss @@ -50,7 +50,7 @@ padding-bottom: env(safe-area-inset-bottom); display: flex; align-items: center; - background-color: #fff; + background-color: rgba(255,255,255, 0.93); box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05); .btn { flex: 1; diff --git a/src/doctor/pages/lastDiagnosisReport/index.ts b/src/doctor/pages/lastDiagnosisReport/index.ts index 470f804..6804fb5 100644 --- a/src/doctor/pages/lastDiagnosisReport/index.ts +++ b/src/doctor/pages/lastDiagnosisReport/index.ts @@ -218,7 +218,7 @@ Page({ const { examId } = this.data wx.showModal({ title: '确认删除?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/doctor/pages/login/index.ts b/src/doctor/pages/login/index.ts index f5e0ae0..ffc2a4b 100644 --- a/src/doctor/pages/login/index.ts +++ b/src/doctor/pages/login/index.ts @@ -12,7 +12,17 @@ Page({ check1: false, check2: false, }, - onLoad() {}, + onLoad() { + app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_DOCLOG' }) + }) + }, + onUnload() { + if (timer) { + clearInterval(timer as number) + timer = null + } + }, getCode() { if (timer) return const mobile = this.data.mobile @@ -60,6 +70,7 @@ Page({ }, handleDocRule() { const { check1, check2 } = this.data + app.mpBehavior({ PageName: 'BTN_DOCMOBILEONECLICKLOGIN' }) return new Promise((resolve) => { if (check1 && check2) { return resolve(true) @@ -73,6 +84,7 @@ Page({ async handleSubmit() { await this.handleDocRule() const { mobile, code } = this.data + app.mpBehavior({ PageName: 'BTN_DOCLOGINCLICK' }) wx.ajax({ method: 'POST', url: '?r=wtx/doctor/login/reg-login', @@ -85,6 +97,7 @@ Page({ }) }, handleWxSubmit(e: WechatMiniprogram.CustomEvent) { + app.mpBehavior({ PageName: 'BTN_DOCMOBILEONECLICKLOGIN' }) const { iv, encryptedData } = e.detail if (iv && encryptedData) { wx.ajax({ @@ -117,6 +130,10 @@ Page({ url, }) }, + handleCheck(e) { + const { name } = e.currentTarget.dataset + app.mpBehavior({ PageName: name }) + }, handleBack() { wx.navigateBack() }, diff --git a/src/doctor/pages/login/index.wxml b/src/doctor/pages/login/index.wxml index fe8e733..1d68095 100644 --- a/src/doctor/pages/login/index.wxml +++ b/src/doctor/pages/login/index.wxml @@ -21,7 +21,7 @@ - + 我已阅读并同意 《个人信息及隐私协议政策》 - + 我已阅读并同意 《个人信息及隐私协议政策》 diff --git a/src/doctor/pages/my/index.ts b/src/doctor/pages/my/index.ts index 47854fc..6b1f46d 100644 --- a/src/doctor/pages/my/index.ts +++ b/src/doctor/pages/my/index.ts @@ -11,6 +11,7 @@ Page({ }, onLoad() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_MY_PAGE_VISIT' }) app.getUserInfo(2).then((userInfo) => { this.setData({ userInfo, @@ -70,16 +71,19 @@ Page({ }) }, handleUserInfo() { + app.mpBehavior({ PageName: 'BTN_ACCOUNT_MANAGEMENT_CLICK' }) wx.navigateTo({ url: '/doctor/pages/userInfo/index', }) }, handlePoster() { + app.mpBehavior({ PageName: 'BTN_MY_POSTER_BUTTON_CLICK' }) wx.navigateTo({ url: '/doctor/pages/poster/index', }) }, handleDoc() { + app.mpBehavior({ PageName: 'BTN_PRIVACY_POLICY_CLICK' }) wx.navigateTo({ url: '/doc/pages/doc5/index', }) diff --git a/src/doctor/pages/patientDetail/index.ts b/src/doctor/pages/patientDetail/index.ts index 13a17ab..5a3a5e6 100644 --- a/src/doctor/pages/patientDetail/index.ts +++ b/src/doctor/pages/patientDetail/index.ts @@ -20,6 +20,7 @@ Page({ }, onShow() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_PATIENTDETAIL_VISIT' }) this.getDetail() this.getMessageCount() }) @@ -62,29 +63,38 @@ Page({ }) }, handleAsk() { + app.mpBehavior({ PageName: 'BTN_CARETEAM_CLICK' }) wx.navigateTo({ url: `/doctor/pages/askDoctor/index?id=${this.data.id}`, }) }, - handleFile() { + handleFile(e) { + const { name } = e.currentTarget.dataset const { patientInfo } = this.data + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/doctor/pages/file/index?id=${patientInfo.patientId}`, }) }, handleCourse(e) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/doctor/pages/course/index?id=${this.data.id}¤t=${period}`, }) }, - handleCase(){ + handleCase() { const { patientInfo } = this.data wx.navigateTo({ url: `/doctor/pages/casesDetail/index?id=${patientInfo.patientId}`, }) }, handleStat() { + app.mpBehavior({ PageName: 'BTN_VIEW_HEALTH_CHANGES_CLICK' }) const { patientInfo } = this.data wx.navigateTo({ url: `/doctor/pages/coltStat/index?id=${patientInfo.patientId}`, diff --git a/src/doctor/pages/patientDetail/index.wxml b/src/doctor/pages/patientDetail/index.wxml index 5272422..cc5e401 100644 --- a/src/doctor/pages/patientDetail/index.wxml +++ b/src/doctor/pages/patientDetail/index.wxml @@ -29,7 +29,7 @@ 入组时间:{{patientInfo.createTimeName}} - + 查看档案 @@ -69,6 +69,7 @@ class="card {{patientArchiveInfo.periodOneStatus==2 && 'current'}} {{patientArchiveInfo.periodOneStatus==3 && 'finish'}}" bind:tap="handleCourse" data-period="0" + data-name="BTN_PRESCREENING_STAGE_CLICK" > 1 @@ -115,6 +116,7 @@ class="card {{patientArchiveInfo.periodTwoStatus==2 && 'current'}} {{patientArchiveInfo.periodTwoStatus==3 && 'finish'}}" bind:tap="handleCourse" data-period="1" + data-name="BTN_PREINJECTION_STAGE_CLICK" > 2 @@ -161,6 +163,7 @@ class="card {{patientArchiveInfo.periodThreeStatus==2 && 'current'}} {{patientArchiveInfo.periodThreeStatus==3 && 'finish'}}" bind:tap="handleCourse" data-period="2" + data-name="BTN_INJECTIONDAY_STAGE_CLICK" > 3 @@ -199,6 +202,7 @@ class="card {{patientArchiveInfo.periodFourStatus==2 && 'current'}} {{patientArchiveInfo.periodFourStatus==3 && 'finish'}}" bind:tap="handleCourse" data-period="3" + data-name="BTN_FOLLOWUP_STAGE_CLICK" > 4 @@ -232,7 +236,7 @@ - + 他的全部 diff --git a/src/doctor/pages/poster/index.scss b/src/doctor/pages/poster/index.scss index db9910a..6a1251e 100644 --- a/src/doctor/pages/poster/index.scss +++ b/src/doctor/pages/poster/index.scss @@ -10,8 +10,8 @@ page { height: 100vh; } .btn { - position: absolute; - bottom: 220rpx; + position: fixed; + bottom: 40rpx; left: 50%; transform: translateX(-50%); margin: 36rpx auto; @@ -22,9 +22,9 @@ page { display: flex; align-items: center; justify-content: center; - color: rgba(255, 255, 255, 1); - border-radius: 64rpx 64rpx 64rpx 64rpx; - border: 1px solid rgba(255, 255, 255, 1); + color: rgba(28, 107, 255, 1); + border-radius: 64rpx; + background-color: rgba(255, 255, 255, 1); box-sizing: border-box; } } diff --git a/src/doctor/pages/preDiagnosisReport/index.ts b/src/doctor/pages/preDiagnosisReport/index.ts index 639a84d..d82f58c 100644 --- a/src/doctor/pages/preDiagnosisReport/index.ts +++ b/src/doctor/pages/preDiagnosisReport/index.ts @@ -119,8 +119,8 @@ Page({ } }, onShow() { - const { formKeys, period } = this.data app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_PREEXAMREPORT_VISIT' }) this.getDict() this.getDetail() }) @@ -145,6 +145,11 @@ Page({ } else { num = num.slice(0, integerLimit) } + // 限制小数位位数 + const decimalIndex = num.indexOf('.') + if (decimalIndex !== -1) { + num = num.slice(0, decimalIndex + 3) + } return num }, getDict() { diff --git a/src/doctor/pages/preDiagnosisReport/index.wxml b/src/doctor/pages/preDiagnosisReport/index.wxml index 3e23d0b..a62ed09 100644 --- a/src/doctor/pages/preDiagnosisReport/index.wxml +++ b/src/doctor/pages/preDiagnosisReport/index.wxml @@ -5,6 +5,7 @@ 检查时间 {{beginDate}}至{{endDate}} + {{beginDate || endDate}} -- diff --git a/src/doctor/pages/revisitRecord/index.ts b/src/doctor/pages/revisitRecord/index.ts index 5806dcd..e57e9aa 100644 --- a/src/doctor/pages/revisitRecord/index.ts +++ b/src/doctor/pages/revisitRecord/index.ts @@ -22,6 +22,7 @@ Page({ }, onShow() { app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_LATESTFOLLOWUPRECORDLIST_VISIT' }) this.getList() }) }, diff --git a/src/doctor/pages/userInfo/index.ts b/src/doctor/pages/userInfo/index.ts index 674d0f4..342d7d9 100644 --- a/src/doctor/pages/userInfo/index.ts +++ b/src/doctor/pages/userInfo/index.ts @@ -2,16 +2,21 @@ const app = getApp() Page({ data: {}, - onLoad() {}, + onLoad() { + app.waitLogin({ type: 2 }).then(() => { + app.mpBehavior({ PageName: 'PG_ACCOUNT_MANAGEMENT_VISIT' }) + }) + }, handleChanegTel() { wx.navigateTo({ url: '/doctor/pages/changeTel/index', }) }, handleLoginOut() { + app.mpBehavior({ PageName: 'BTN_LOGOUT_CLICK' }) wx.showModal({ title: '确定退出登录吗?', - confirmColor: 'rgba(29, 107, 255, 1)', + confirmColor: '#1D6BFF', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/images/bg31.png b/src/images/bg31.png new file mode 100644 index 0000000..88c2f5b Binary files /dev/null and b/src/images/bg31.png differ diff --git a/src/images/icon114.png b/src/images/icon114.png new file mode 100644 index 0000000..f9279fa Binary files /dev/null and b/src/images/icon114.png differ diff --git a/src/images/icon115.png b/src/images/icon115.png new file mode 100644 index 0000000..27b7f49 Binary files /dev/null and b/src/images/icon115.png differ diff --git a/src/images/icon116.png b/src/images/icon116.png new file mode 100644 index 0000000..1ddaba3 Binary files /dev/null and b/src/images/icon116.png differ diff --git a/src/images/none2.png b/src/images/none2.png new file mode 100644 index 0000000..fc04f5b Binary files /dev/null and b/src/images/none2.png differ diff --git a/src/images/star.zip b/src/images/star.zip new file mode 100644 index 0000000..28b8d01 Binary files /dev/null and b/src/images/star.zip differ diff --git a/src/images/start.png b/src/images/start.png index 9bf6025..9d5ee13 100644 Binary files a/src/images/start.png and b/src/images/start.png differ diff --git a/src/images/title16.png b/src/images/title16.png new file mode 100644 index 0000000..7dfc485 Binary files /dev/null and b/src/images/title16.png differ diff --git a/src/pages/applyFromResult/index.ts b/src/pages/applyFromResult/index.ts index 6299f50..160ad4f 100644 --- a/src/pages/applyFromResult/index.ts +++ b/src/pages/applyFromResult/index.ts @@ -14,7 +14,9 @@ Page({ wx.ajax({ method: 'GET', url: '?r=wtx/common/get-channel-wx-code', - data: {}, + data: { + ChannelType: 1, + }, }).then((res) => { this.setData({ codeImg: res, diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts index 6fcfdf3..d6c2e28 100644 --- a/src/pages/index/index.ts +++ b/src/pages/index/index.ts @@ -240,4 +240,4 @@ Page({ }, }) -export {} +export { } diff --git a/src/pages/knowledgeDetail/index.scss b/src/pages/knowledgeDetail/index.scss index 390a59b..89673a8 100644 --- a/src/pages/knowledgeDetail/index.scss +++ b/src/pages/knowledgeDetail/index.scss @@ -50,7 +50,7 @@ padding-bottom: env(safe-area-inset-bottom); display: flex; align-items: center; - background-color: #fff; + background-color: rgba(255,255,255, 0.93); box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05); .btn { flex: 1; diff --git a/src/patient/components/patient-tab-bar/index.ts b/src/patient/components/patient-tab-bar/index.ts index 75d4611..3d73617 100644 --- a/src/patient/components/patient-tab-bar/index.ts +++ b/src/patient/components/patient-tab-bar/index.ts @@ -11,24 +11,28 @@ Component({ { pagePath: '/patient/pages/index/index', text: '首页', + pageName: 'BTN_PATHOMENAV', icon: 'tabbar2-1', iconActive: 'tabbar2-1-active', }, { pagePath: '/patient/pages/knowledge/index', text: '知识库', + pageName: 'BTN_KNOWLEDGEBASE_CLICK', icon: 'tabbar2-2', iconActive: 'tabbar2-2-active', }, { pagePath: '/patient/pages/file/index', text: '档案', + pageName: 'BTN_PROFILE_CLICK', icon: 'tabbar2-3', iconActive: 'tabbar2-3-active', }, { pagePath: '/patient/pages/my/index', text: '我的', + pageName: 'BTN_MY_CLICK', icon: 'tabbar2-4', iconActive: 'tabbar2-4-active', }, @@ -50,7 +54,10 @@ Component({ handleNav(e) { const { index } = e.currentTarget.dataset const { list } = this.data - const pagePath = list[index].pagePath + const { pagePath, pageName } = list[index] + if (pageName) { + app.mpBehavior({ PageName: pageName }) + } wx.reLaunch({ url: pagePath, }) diff --git a/src/patient/pages/askPatient/index.ts b/src/patient/pages/askPatient/index.ts index 8dd512c..2d2c9fa 100644 --- a/src/patient/pages/askPatient/index.ts +++ b/src/patient/pages/askPatient/index.ts @@ -28,7 +28,7 @@ Page({ scrollTop: 0, scrollIntoView: '', doctorDetail: {} as any, - doctorList: {}, + doctorList: [], questionActive: 0, questionList: [] as any, @@ -59,6 +59,7 @@ Page({ }, onLoad() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_ASKDOCTOR_VISIT' }) app.getUserInfo().then((userInfo) => { this.setData({ userInfo, @@ -160,7 +161,10 @@ Page({ }) }, handleQuestion(e: any) { - const { id, name } = e.currentTarget.dataset + const { id, name, pname } = e.currentTarget.dataset + if (pname) { + app.mpBehavior({ PageName: pname }) + } this.handleSendQuestion(name) wx.ajax({ method: 'POST', @@ -282,6 +286,7 @@ Page({ }) }, handleSendDate() { + app.mpBehavior({ PageName: 'BTN_VISITTIME_CLICK' }) const { doctorList } = this.data console.log('DEBUGPRINT[130]: index.ts:285: doctorList=', doctorList) if (doctorList.length == 1) { @@ -344,6 +349,7 @@ Page({ }) }, handleFooter() { + app.mpBehavior({ PageName: 'BTN_ASKQUESTION_CLICK' }) this.setData({ expend: !this.data.expend, }) @@ -354,13 +360,21 @@ Page({ } }, handleDoctorList() { + app.mpBehavior({ PageName: 'BTN_VIEWDOCTORINFO_CLICK' }) wx.navigateTo({ url: '/patient/pages/doctorList/index', }) }, + + handleCard() { + wx.navigateTo({ + url: '/patient/pages/file/index?nav=2', + }) + }, handlePopupOk(e) { const { popupType } = this.data if (popupType === 'selectDoctor') { + console.log(e.detail) this.handleSendDateMessage(e.detail.id) this.handlePopupCancel() } diff --git a/src/patient/pages/askPatient/index.wxml b/src/patient/pages/askPatient/index.wxml index 40cb270..5af006b 100644 --- a/src/patient/pages/askPatient/index.wxml +++ b/src/patient/pages/askPatient/index.wxml @@ -45,6 +45,7 @@ bind:tap="handleQuestion" data-id="{{item.questionId}}" data-name="{{item.question}}" + data-pname="BTN_TOPQUESTION_CLICK" > {{item.question}} @@ -73,6 +74,7 @@ class="card1" style="background: url('{{imageUrl}}bg15.png?t={{Timestamp}}') no-repeat top center/100%" wx:elif="{{message.msgContentType==='4'}}" + bind:tap="handleCard" > {{message.msgContent.weekInfo}} @@ -81,10 +83,12 @@ 点击查看 + {{message.msgContent.weekInfo}} diff --git a/src/patient/pages/bbmRemark/index.ts b/src/patient/pages/bbmRemark/index.ts index 51d4a80..dfa4bfe 100644 --- a/src/patient/pages/bbmRemark/index.ts +++ b/src/patient/pages/bbmRemark/index.ts @@ -7,6 +7,7 @@ Page({ }, onLoad() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_INFUSIONFEELINGLOG_VISIT' }) this.getDetail() }) }, @@ -28,10 +29,11 @@ Page({ }) }, handleSubmit() { + app.mpBehavior({ PageName: 'BTN_SENSATIONJOURNAL_SUBMITBUTTON_CLICK' }) const { injectionFeel, injectionRemark } = this.data if (!injectionFeel && !injectionRemark) { wx.showToast({ - title: '请选择注射感受或者填写备注', + title: '请选择治疗过程感受或者填写备注', icon: 'none', }) return @@ -44,10 +46,11 @@ Page({ injectionRemark, }, }).then((res) => { - this.handleBack() + wx.navigateBack() }) }, handleBack() { + app.mpBehavior({ PageName: 'BTN_SENSATIONJOURNAL_CANCELBUTTON_CLICK' }) wx.navigateBack() }, }) diff --git a/src/patient/pages/bbmReport/index.ts b/src/patient/pages/bbmReport/index.ts index c9b4299..b2fd81f 100644 --- a/src/patient/pages/bbmReport/index.ts +++ b/src/patient/pages/bbmReport/index.ts @@ -11,6 +11,7 @@ Page({ }, onLoad() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_BBMH901INFUSIONLOG_VISIT' }) this.getDetail() }) }, @@ -34,6 +35,11 @@ Page({ } else { num = num.slice(0, integerLimit) } + // 限制小数位位数 + const decimalIndex = num.indexOf('.') + if (decimalIndex !== -1) { + num = num.slice(0, decimalIndex + 3) + } return num }, handleWeight(e) { @@ -72,9 +78,11 @@ Page({ }) }, handleBack() { + app.mpBehavior({ PageName: 'BTN_BBMH901INFUSIONLOG_CANCELBUTTON_CLICK' }) wx.navigateBack() }, handleSubmit() { + app.mpBehavior({ PageName: 'BTN_SUBMITBUTTON_CLICK' }) const { injectionDate, injectionWeight } = this.data if (!injectionDate) { wx.showToast({ diff --git a/src/patient/pages/bindDoctor/index.scss b/src/patient/pages/bindDoctor/index.scss index f5c0da4..8a4c75e 100644 --- a/src/patient/pages/bindDoctor/index.scss +++ b/src/patient/pages/bindDoctor/index.scss @@ -8,9 +8,14 @@ } .title { margin: 54rpx auto 0; - display: block; - width: 342rpx; - height: 44rpx; + font-size: 40rpx; + font-weight: bold; + text-align: center; + color: transparent; + transform: skew(-10deg); + background-clip: text; + -webkit-background-clip: text; + background-image: linear-gradient(90deg, rgba(225, 36, 42, 1) 0%, rgba(255, 116, 64, 1) 100%); } .content { margin-top: 28rpx; diff --git a/src/patient/pages/bindDoctor/index.ts b/src/patient/pages/bindDoctor/index.ts index b2d9dea..b8d22b9 100644 --- a/src/patient/pages/bindDoctor/index.ts +++ b/src/patient/pages/bindDoctor/index.ts @@ -12,8 +12,13 @@ Page({ popupType: 'conformBindDoctorConform', // 注册后绑定医生码 popupParams: {}, }, - onLoad() {}, + onLoad() { + app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_PATIENTBINDING_VISIT' }) + }) + }, handleBindDoctor() { + app.mpBehavior({ PageName: 'BTN_CONTINUEBINDING_CLICK' }) wx.scanCode({ scanType: ['wxCode'], success: (res) => { diff --git a/src/patient/pages/bindDoctor/index.wxml b/src/patient/pages/bindDoctor/index.wxml index 80db7d2..cc31fb1 100644 --- a/src/patient/pages/bindDoctor/index.wxml +++ b/src/patient/pages/bindDoctor/index.wxml @@ -7,7 +7,8 @@ style="padding-top:{{pageTop+100}}px;background:url('{{imageUrl}}bg13.png?t={{Timestamp}}') no-repeat top center/100% 666rpx" > - + + 为什么要绑定医生? 绑定医生后 diff --git a/src/patient/pages/blood/index.ts b/src/patient/pages/blood/index.ts index b623b60..4b57621 100644 --- a/src/patient/pages/blood/index.ts +++ b/src/patient/pages/blood/index.ts @@ -15,6 +15,7 @@ Page({ }, onShow() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_BLEEDINGMANAGEMENT_VISIT' }) this.getList() this.addVisitRecord() }) @@ -77,6 +78,7 @@ Page({ }) }, handleAdd() { + app.mpBehavior({ PageName: 'BTN_HEMORRHAGE_PLUSBUTTON_CLICK' }) wx.navigateTo({ url: '/patient/pages/bloodAdd/index', }) diff --git a/src/patient/pages/bloodAdd/index.ts b/src/patient/pages/bloodAdd/index.ts index 126ce4f..9e22959 100644 --- a/src/patient/pages/bloodAdd/index.ts +++ b/src/patient/pages/bloodAdd/index.ts @@ -98,6 +98,7 @@ Page({ recordId: options.id, }) app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_BLEEDINGRECORD_VISIT' }) this.getDict() this.getDetail() }) @@ -115,7 +116,7 @@ Page({ const bleedingParts = res.bleedingPartList.map((item) => { parts[item.bleedingPart - 1].active = true return { - id: item.bleedingParts, + id: item.bleedingPart, name: item.bleedingPartName, } }) diff --git a/src/patient/pages/bloodDetail/index.ts b/src/patient/pages/bloodDetail/index.ts index a80d82f..a0d74e3 100644 --- a/src/patient/pages/bloodDetail/index.ts +++ b/src/patient/pages/bloodDetail/index.ts @@ -10,6 +10,8 @@ Page({ this.setData({ recordId: options.id, }) + }, + onShow() { app.waitLogin({ type: 1 }).then(() => { this.getDetail() }) @@ -37,7 +39,7 @@ Page({ const { recordId } = this.data wx.showModal({ title: '确认删除?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/casesAdd/index.ts b/src/patient/pages/casesAdd/index.ts index ebb0138..9ebfd19 100644 --- a/src/patient/pages/casesAdd/index.ts +++ b/src/patient/pages/casesAdd/index.ts @@ -143,6 +143,7 @@ Page({ onShow() { const casesCache = wx.getStorageSync('casesCache') app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_SUPPLEMENTMEDICALHISTORY_VISIT' }) this.getDict() if (casesCache) { const { formKeys } = this.data @@ -184,6 +185,11 @@ Page({ } else { num = num.slice(0, integerLimit) } + // 限制小数位位数 + const decimalIndex = num.indexOf('.') + if (decimalIndex !== -1) { + num = num.slice(0, decimalIndex + 3) + } return num }, getDict() { @@ -284,6 +290,7 @@ Page({ }) }, handleSubmit() { + app.mpBehavior({ PageName: 'BTN_FINISH_CLICK' }) const { formKeys, ...reset } = this.data const empty = formKeys.every((key) => { if (licia.isObj(reset[key])) { @@ -307,6 +314,10 @@ Page({ currentPage.handleUpdate() } }, + handleCancel() { + app.mpBehavior({ PageName: 'BTN_CANCEL_CLICK' }) + wx.navigateBack() + }, handleBack() { wx.navigateBack() }, @@ -316,12 +327,14 @@ Page({ }) }, handlePrev(e) { + app.mpBehavior({ PageName: 'BTN_PREVIOUS_CLICK' }) const { value } = e.currentTarget.dataset this.setData({ current: value, }) }, handleNext(e) { + app.mpBehavior({ PageName: 'BTN_NEXT_CLICK' }) const { value } = e.currentTarget.dataset this.setData({ current: value, diff --git a/src/patient/pages/casesAdd/index.wxml b/src/patient/pages/casesAdd/index.wxml index 7f7c47b..881dbe7 100644 --- a/src/patient/pages/casesAdd/index.wxml +++ b/src/patient/pages/casesAdd/index.wxml @@ -123,7 +123,7 @@ - 取消 + 取消 下一步 diff --git a/src/patient/pages/changeTel/index.ts b/src/patient/pages/changeTel/index.ts index 4c160f0..20c3b43 100644 --- a/src/patient/pages/changeTel/index.ts +++ b/src/patient/pages/changeTel/index.ts @@ -9,6 +9,12 @@ Page({ codeText: '发送验证码', }, onLoad() {}, + onUnload() { + if (timer) { + clearInterval(timer as number) + timer = null + } + }, getCode() { if (timer) return const mobile = this.data.mobile @@ -58,7 +64,7 @@ Page({ handleSubmit() { wx.showModal({ title: '确定修改此手机号?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (!res.confirm) return const { mobile, code } = this.data diff --git a/src/patient/pages/coltStat/index.ts b/src/patient/pages/coltStat/index.ts index 464269a..4efe13d 100644 --- a/src/patient/pages/coltStat/index.ts +++ b/src/patient/pages/coltStat/index.ts @@ -40,7 +40,7 @@ Page({ beginDate: dayjs().subtract(1, 'M').startOf('month').format('YYYY-MM-DD'), endDate: dayjs().format('YYYY-MM-DD'), - tabActve: 2, + tabActve: 3, iDays: '', list2: [] as any[], @@ -61,7 +61,10 @@ Page({ }, ecDataTrendComponent: null as any, onLoad() { - this.ecDataTrendComponent = this.selectComponent('#mychart-dom-bar') + app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_MYHEALTHCHANGE_VISIT' }) + this.ecDataTrendComponent = this.selectComponent('#mychart-dom-bar') + }) }, handleUpdate() { this.getDetail() @@ -510,13 +513,17 @@ Page({ }, handleTab(e: any) { - const { active } = e.currentTarget.dataset + const { active, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } this.setData({ tabActve: active, }) this.getList(1) }, handleFile() { + app.mpBehavior({ PageName: 'BTN_VIEWARCHIVE_CLICK' }) wx.navigateTo({ url: '/patient/pages/file/index', }) diff --git a/src/patient/pages/coltStat/index.wxml b/src/patient/pages/coltStat/index.wxml index 41cf74f..8b95bb6 100644 --- a/src/patient/pages/coltStat/index.wxml +++ b/src/patient/pages/coltStat/index.wxml @@ -79,11 +79,11 @@ - 凝血因子 - 生化检查 + 凝血因子 + 生化检查 - + 已记录 {{pagination2.count}} 条 @@ -93,7 +93,7 @@ - + @@ -102,7 +102,7 @@ 因子检查 - {{pagination2.count}} + {{pagination3.count}} @@ -121,7 +121,7 @@ - + @@ -138,9 +138,9 @@ - + - + diff --git a/src/patient/pages/course/index.ts b/src/patient/pages/course/index.ts index 5db40a4..99b6622 100644 --- a/src/patient/pages/course/index.ts +++ b/src/patient/pages/course/index.ts @@ -27,12 +27,25 @@ Page({ }, onShow() { app.waitLogin({ type: 1 }).then(() => { + this.handleViewBehavior() this.handleUpdate() }) }, handleUpdate() { this.getPeriodInfo(this.data.current + 1, `periodInfo${this.data.current + 1}`) }, + handleViewBehavior() { + const { current } = this.data + const PageName = { + 0: 'PG_TREATMENTPROCESS1_VISIT', + 1: 'PG_TREATMENTPROCESS2_VISIT', + 2: 'PG_TREATMENTPROCESS3_VISIT', + 3: 'PG_TREATMENTPROCESS4_VISIT', + }[current] + if (PageName) { + app.mpBehavior({ PageName }) + } + }, getPeriodInfo(period: number, key: string) { wx.ajax({ method: 'GET', @@ -47,18 +60,24 @@ Page({ }) }, handleSwiperChange(e) { + const { current } = this.data this.setData({ current: e.detail.current, }) this.handleUpdate() + if (current != e.detail.current) { + this.handleViewBehavior() + } }, handleSelectHostipal() { const { periodInfo1 } = this.data + app.mpBehavior({ PageName: 'BTN_MYDESIGNATEDHOSPITAL_CLICK' }) wx.navigateTo({ url: `/patient/pages/selectHostipal/index?id=${periodInfo1.hospitalId}`, }) }, handleCasesAdd() { + app.mpBehavior({ PageName: 'BTN_SUPPLEMENTMEDICALHISTORY_CLICK' }) wx.navigateTo({ url: '/patient/pages/casesAdd/index', }) @@ -71,6 +90,7 @@ Page({ }) }, handleTCenter() { + app.mpBehavior({ PageName: 'BTN_TREATMENTCENTER_CLICK' }) const { periodInfo2 } = this.data wx.ajax({ method: 'GET', @@ -88,8 +108,11 @@ Page({ }) }, handlePreDiagnosisReport(e: any) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset const { examId } = this.data[`periodInfo${period}`] + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/patient/pages/preDiagnosisReport/index?examid=${examId}&period=${period}`, }) @@ -100,43 +123,53 @@ Page({ }) }, handleBbmReport() { + app.mpBehavior({ PageName: 'BTN_BBMH901INFUSIONLOG_CLICK' }) wx.navigateTo({ url: '/patient/pages/bbmReport/index', }) }, handleBbmRemark() { + app.mpBehavior({ PageName: 'BTN_INFUSIONFEELINGLOG_CLICK' }) wx.navigateTo({ url: '/patient/pages/bbmRemark/index', }) }, hadnleInjectDate() { + app.mpBehavior({ PageName: 'BTN_INJECTIONDAY_CLICK' }) wx.navigateTo({ url: '/patient/pages/injectDate/index', }) }, handleInhibitorsManage(e) { - const { period } = e.currentTarget.dataset + const { period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/patient/pages/inhibitorsManageList/index?period=${period}`, }) }, handleFollowPlan(e) { + app.mpBehavior({ PageName: 'BTN_MYFOLLOWUPPLAN_CLICK' }) const { period } = e.currentTarget.dataset wx.navigateTo({ url: `/patient/pages/followPlan/index?period=${period}`, }) }, handleLastDiagnosisReport() { + app.mpBehavior({ PageName: 'BTN_LATESTRECHECKRECORD_CLICK' }) wx.navigateTo({ url: `/patient/pages/revisitRecord/index?period=4`, }) }, handleColtStat() { + app.mpBehavior({ PageName: 'BTN_MYHEALTHCHANGE_CLICK' }) wx.navigateTo({ url: '/patient/pages/coltStat/index', }) }, handleBlood() { + app.mpBehavior({ PageName: 'BTN_MYBLEEDINGRECORD_CLICK' }) wx.navigateTo({ url: '/patient/pages/blood/index', }) diff --git a/src/patient/pages/course/index.wxml b/src/patient/pages/course/index.wxml index fe3cbfc..1146b07 100644 --- a/src/patient/pages/course/index.wxml +++ b/src/patient/pages/course/index.wxml @@ -70,7 +70,7 @@ - + - + - + - + 第{{periodInfo4.followUpWeekInfo.iWeek}}周 @@ -417,7 +417,7 @@ - + { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/doctorList/index.wxml b/src/patient/pages/doctorList/index.wxml index 60a1360..6c60038 100644 --- a/src/patient/pages/doctorList/index.wxml +++ b/src/patient/pages/doctorList/index.wxml @@ -20,7 +20,10 @@ {{item.introduce}} - + + + 您还没有绑定医生 + diff --git a/src/patient/pages/entryInfo/index.ts b/src/patient/pages/entryInfo/index.ts index d0307c1..1a68ca2 100644 --- a/src/patient/pages/entryInfo/index.ts +++ b/src/patient/pages/entryInfo/index.ts @@ -11,12 +11,14 @@ Page({ cityId: '', endDate: dayjs().format('YYYY-MM'), + birthMonthName: '', provinceName: '', cityName: '', }, onLoad(options) { const { aid } = options app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_PATPERSONALINFO' }) if (aid && aid !== '0') { this.getDetail(aid) } @@ -35,6 +37,7 @@ Page({ name: res.UserName, relationType: res.Relation, birthMonth: res.BirthMonth, + birthMonthName: dayjs(res.BirthMonth).format('YYYY年MM月'), provinceId: res.ProvinceId, cityId: res.CityId, @@ -58,7 +61,13 @@ Page({ cityName: value[1] ? value[1].label : '', }) }, + handleBirthChange(e) { + this.setData({ + birthMonthName: dayjs(e.detail.value).format('YYYY年MM月'), + }) + }, handleSubmit() { + app.mpBehavior({ PageName: 'BTN_PATJOINNOW' }) const { relationType, name, birthMonth, provinceId, cityId } = this.data let toast = '' if (!provinceId) { diff --git a/src/patient/pages/entryInfo/index.wxml b/src/patient/pages/entryInfo/index.wxml index 5bfa551..cb628a4 100644 --- a/src/patient/pages/entryInfo/index.wxml +++ b/src/patient/pages/entryInfo/index.wxml @@ -28,14 +28,14 @@ model:value="{{name}}" placeholder-class="place-input" type="text" - placeholder="请输入{{relationType == 2 ? '亲友' : '您'}}的姓名" + placeholder="请输入{{relationType == 2 ? '患者' : '您'}}的姓名" /> - + - {{birthMonth}} + {{birthMonthName}} @@ -44,7 +44,7 @@ - {{provinceName ? provinceName+ '/' : provinceName }}{{cityName}} + {{provinceName ? provinceName+ '/' : provinceName }}{{cityName}} diff --git a/src/patient/pages/family/index.ts b/src/patient/pages/family/index.ts index 056c9af..4325ba4 100644 --- a/src/patient/pages/family/index.ts +++ b/src/patient/pages/family/index.ts @@ -6,7 +6,8 @@ Page({ qrCode: '', }, onLoad() { - app.waitLogin({type:1}).then(() => { + app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_MYRELATIVES_VISIT' }) this.getMpInfo() this.getQrCode() }) diff --git a/src/patient/pages/familyList/index.ts b/src/patient/pages/familyList/index.ts index f679ce8..9ad74c4 100644 --- a/src/patient/pages/familyList/index.ts +++ b/src/patient/pages/familyList/index.ts @@ -30,7 +30,7 @@ Page({ const { id } = e.currentTarget.dataset wx.showModal({ title: '确认解绑?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { this.handleUnbinOk(id) diff --git a/src/patient/pages/file/index.scss b/src/patient/pages/file/index.scss index 66af65f..eb75e70 100644 --- a/src/patient/pages/file/index.scss +++ b/src/patient/pages/file/index.scss @@ -506,7 +506,7 @@ page { box-sizing: border-box; padding: 24rpx 32rpx; .title { - font-size: 32rpx; + font-size: 28rpx; color: rgba(255, 255, 255, 1); font-weight: bold; } diff --git a/src/patient/pages/file/index.ts b/src/patient/pages/file/index.ts index d036d7f..1ec4f6a 100644 --- a/src/patient/pages/file/index.ts +++ b/src/patient/pages/file/index.ts @@ -37,7 +37,7 @@ Page({ autoChoosedWhenJump: true, firstDayOfWeek: 'Mon', theme: 'geneb', - takeoverTap: false, + takeoverTap: true, highlightToday: true, onlyShowCurrentMonth: true, disableMode: { @@ -54,6 +54,7 @@ Page({ }, onShow() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_PROFILE_VISIT' }) this.getInfo() app.getUserInfo(1).then((userInfo) => { this.setData({ @@ -66,7 +67,10 @@ Page({ }) }, handleNav(e) { - const { nav } = e.currentTarget.dataset + const { nav, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } this.setData({ nav, }) @@ -195,7 +199,11 @@ Page({ }) console.log(this.data[fold]) }, - handleRevisitRecord() { + handleRevisitRecord(e) { + const { name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: '/patient/pages/lastDiagnosisReport/index?period=4', }) @@ -207,24 +215,32 @@ Page({ }) }, handleRevisitAll(e) { + app.mpBehavior({ PageName: 'BTN_VIEWALLFOLLOWUP_CLICK' }) const { period } = e.currentTarget.dataset wx.navigateTo({ url: `/patient/pages/revisitRecord/index?period=${period}`, }) }, handleCourse(e: any) { - const { progress } = e.currentTarget.dataset + const { progress, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/patient/pages/course/index?current=${progress}`, }) }, handleBbmDetail() { + app.mpBehavior({ PageName: 'BTN_VIEWINJECTIONDETAIL_CLICK' }) wx.navigateTo({ url: '/patient/pages/bbmReport/index', }) }, handlePreDiagnosisReport(e) { - const { id, period } = e.currentTarget.dataset + const { id, period, name } = e.currentTarget.dataset + if (name) { + app.mpBehavior({ PageName: name }) + } wx.navigateTo({ url: `/patient/pages/preDiagnosisReport/index?examid=${id}&period=${period}`, }) diff --git a/src/patient/pages/file/index.wxml b/src/patient/pages/file/index.wxml index bc9710e..ada9ecc 100644 --- a/src/patient/pages/file/index.wxml +++ b/src/patient/pages/file/index.wxml @@ -24,9 +24,25 @@ - 治疗档案 - 病史档案 - 随访日历 + + 治疗档案 + + + 病史档案 + + + 随访日历 + @@ -35,7 +51,7 @@ 随访期 - 添加随访记录 + 添加随访记录 - + 诊疗阶段详情 @@ -128,6 +144,7 @@ {{item.beginDate}}~ {{item.endDate}} + {{item.beginDate || item.endDate}} 未填写 @@ -139,7 +156,7 @@ {{item.totalNum}}/{{item.allNum}} - + 诊疗阶段详情 @@ -148,6 +165,7 @@ bind:tap="handlePreDiagnosisReport" data-id="{{item.examId}}" data-period="{{item.period}}" + data-name="BTN_VIEWGENETHERAPYDETAIL_CLICK" > 查看详情 @@ -171,6 +189,7 @@ {{item.beginDate}}~ {{item.endDate}} + {{item.beginDate || item.endDate}} 未填写 @@ -182,7 +201,7 @@ {{item.totalNum}}/{{item.allNum}} - + 诊疗阶段详情 @@ -191,6 +210,7 @@ bind:tap="handlePreDiagnosisReport" data-id="{{item.examId}}" data-period="{{item.period}}" + data-name="BTN_VIEWPRESCREENINGDETAIL_CLICK" > 查看详情 @@ -308,12 +328,14 @@ {{followExam.tipsInfo}} {{followExam.lastNoticeWeekInfo}} {{followExam.lastNoticeExamInfo}} + - + + - 添加复诊检查记录 + 添加复诊检查记录 diff --git a/src/patient/pages/followPlan/index.ts b/src/patient/pages/followPlan/index.ts index 975f81b..0d0732f 100644 --- a/src/patient/pages/followPlan/index.ts +++ b/src/patient/pages/followPlan/index.ts @@ -14,6 +14,7 @@ Page({ period: options.period || '', }) app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_MYFOLLOWUPPLAN_VISIT' }) this.getDetail() this.addVisitRecord() }) @@ -41,11 +42,13 @@ Page({ }) }, handleClander() { + app.mpBehavior({ PageName: 'BTN_MYFOLLOWUPCALENDAR_CLICK' }) wx.navigateTo({ url: '/patient/pages/file/index?nav=2', }) }, handleLastDiagnosisReport() { + app.mpBehavior({ PageName: 'BTN_ADDRECHECKRECORD_CLICK' }) wx.navigateTo({ // url: '/patient/pages/lastDiagnosisReport/index', url: `/patient/pages/lastDiagnosisReport/index?period=${this.data.period}`, diff --git a/src/patient/pages/followPlan/index.wxml b/src/patient/pages/followPlan/index.wxml index 03b26c8..870cbfa 100644 --- a/src/patient/pages/followPlan/index.wxml +++ b/src/patient/pages/followPlan/index.wxml @@ -70,7 +70,7 @@ 输注后 第1年~第2年内 - 每周1次 + 每3个月1次 diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index 3f4f477..191f050 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -14,11 +14,16 @@ page { align-items: center; .avatar { flex-shrink: 0; + padding: 0; + margin: 0; border: 2px solid #fff; border-radius: 50%; width: 98rpx; height: 98rpx; background-color: #fff; + &::after { + border: none; + } .avatar-img { width: 100%; height: 100%; @@ -289,7 +294,7 @@ page { display: flex; align-items: baseline; .num { - font-size: 64rpx; + font-size: 40rpx; color: rgba(1, 1, 5, 1); font-weight: bold; &:empty::after { @@ -302,26 +307,27 @@ page { .tip { margin-top: 14rpx; display: flex; - align-items: center; gap: 10rpx; font-size: 24rpx; color: rgba(255, 163, 112, 1); background-color: rgba(255, 244, 228, 1); - border-radius: 78rpx; - padding: 0 10rpx; + border-radius: 12rpx; + padding: 4rpx 10rpx; .icon { + margin-top: 6rpx; + flex-shrink: 0; width: 24rpx; height: 24rpx; } } } .line { - margin: 0 40rpx; + margin: 0 20rpx; flex-shrink: 0; border-right: 1px dashed rgba(207, 209, 213, 1); } .item2 { - min-width: 200rpx; + min-width: 160rpx; .title { font-size: 28rpx; color: rgba(161, 164, 172, 1); @@ -329,14 +335,14 @@ page { align-items: baseline; gap: 20rpx; .num { - font-size: 64rpx; + font-size: 40rpx; color: rgba(1, 1, 5, 1); font-weight: bold; } } .content { margin-top: 10rpx; - font-size: 28rpx; + font-size: 24rpx; color: rgba(161, 164, 172, 1); } } @@ -486,6 +492,55 @@ page { } } +.public-card { + padding: 30rpx 40rpx; + width: calc(100vw - 60rpx); + box-sizing: border-box; + position: fixed; + left: 30rpx; + bottom: 200rpx; + display: flex; + align-items: center; + justify-content: space-between; + background: linear-gradient(346deg, #ffffff 0%, #ffdcd8 100%); + border-radius: 24rpx 24rpx 24rpx 24rpx; + border: 2rpx solid #ffffff; + box-shadow: 0 4rpx 32rpx 0 rgba(55, 14, 26, 0.2); + .close { + position: absolute; + top: -18rpx; + left: -18rpx; + width: 36rpx; + height: 36rpx; + } + .icon { + flex-shrink: 0; + width: 38rpx; + height: 44rpx; + } + .title { + font-size: 28rpx; + color: rgba(1, 1, 5, 1); + font-weight: bold; + } + .btn { + display: flex; + align-items: center; + justify-content: center; + gap: 10rpx; + font-size: 28rpx; + color: rgba(246, 74, 58, 1); + width: 140rpx; + height: 48rpx; + border-radius: 140rpx 140rpx 140rpx 140rpx; + border: 2rpx solid #f64a3a; + .arrow { + width: 12rpx; + height: 20rpx; + } + } +} + .preview { position: fixed; width: 100vw; diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index 70596a5..c259214 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -3,12 +3,14 @@ const app = getApp() Page({ data: { popupShow: false, + popupType: '', // popupType: 'selectIdentity', // 选择您的身份 // popupType: 'bindDoctorReject', // 绑定失败 // popupType: 'bindDoctor', // 绑定成功 // popupType: 'bindDoctorQuestion', // 为什么绑定医生 // popupType: 'conformBindDoctorQuestion', // 确认绑定曾经扫码医生 - ptrueopupType: 'conformBindDoctorConform', // 注册后绑定医生码 + // ptrueopupType: 'conformBindDoctorConform', // 注册后绑定医生码 + // popupType: 'publicCard', // 关注公众号 popupParams: {}, doctorList: [], @@ -32,9 +34,12 @@ Page({ guide: 0, guideShow: false, guideList: ['1', '2', '3'], + + isPublicCard: false, }, onLoad() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_PATHOME' }) app.getUserInfo(1).then((userInfo) => { this.setData({ userInfo, @@ -47,6 +52,7 @@ Page({ this.getKnowledge() this.getBindDoctorList() this.getTeratmentInfo() + this.getPublicCard() const waitBindDoctorId = app.globalData.waitBindDoctorId if (waitBindDoctorId) { this.handleWaitBindDoctor(waitBindDoctorId) @@ -57,12 +63,26 @@ Page({ }) }, onShow() { + this.handleSwiperChange({ detail: { current: 0 } }) if (this.data.isLoad) { this.getBindDoctorList() this.getTeratmentInfo() - this.handleSwiperChange({ detail: { current: this.data.progress } }) + this.getPublicCard() } }, + getPublicCard() { + wx.ajax({ + method: 'GET', + url: '?r=wtx/popup/get-user-record', + data: { + type: 2, + }, + }).then((res) => { + this.setData({ + isPublicCard: res == 2, + }) + }) + }, getBindDoctorList() { wx.ajax({ method: 'GET', @@ -84,6 +104,7 @@ Page({ treatment: res, progress: res.period - 1, }) + this.handleSwiperChange({ detail: { current: res.period - 1 } }) }) }, getKnowledge() { @@ -97,12 +118,53 @@ Page({ }) }) }, + onChooseAvatar(e) { + const { avatarUrl } = e.detail + const url = `${app.globalData.upFileUrl}?r=file-service/upload-img` + wx.showLoading({ + title: '上传中', + }) + wx.uploadFile({ + url, + filePath: avatarUrl, + name: 'file', + success: (res) => { + const data = JSON.parse(res.data) + const avatarUrl = data.data.Url + wx.ajax({ + method: 'POST', + url: '?r=wtx/user/update-avatar', + data: { + Avatar: avatarUrl, + }, + }) + .then(() => { + wx.hideLoading() + wx.showToast({ + title: '头像更新成功!', + icon: 'none', + }) + this.setData({ + 'userInfo.Avatar': avatarUrl, + }) + }) + .catch(() => { + wx.hideLoading() + }) + }, + fail() { + wx.hideLoading() + }, + }) + }, handleInfoMore() { + app.mpBehavior({ PageName: 'BTN_PATKNOWLEDGEBASECARDALL' }) wx.navigateTo({ url: '/patient/pages/knowledge/index', }) }, handleInfoDetail(e) { + app.mpBehavior({ PageName: 'BTN_PATKNOWLEDGEBASECARD' }) const { index } = e.currentTarget.dataset const params = this.data.knowledgeList[index] if (params.Type == 1) { @@ -120,7 +182,6 @@ Page({ query.select(`#process${e.detail.current}`).boundingClientRect() query.exec((res) => { this.setData({ - progress: e.detail.current, swiperHeight: res[0].height + 22, }) }) @@ -183,37 +244,59 @@ Page({ }) }, handleBindDoctor() { + app.mpBehavior({ PageName: 'BTN_PATSCANBIND' }) wx.navigateTo({ url: '/patient/pages/bindDoctor/index', }) }, - handleProgress(e: any) { - const { index } = e.currentTarget.dataset - this.setData({ - progress: index, - }) - }, handleAskPatient() { + app.mpBehavior({ PageName: 'BTN_PATASKDOCTOR' }) wx.navigateTo({ url: '/patient/pages/askPatient/index', }) }, - handleCourse() { - const { progress } = this.data + handleCourse(e) { + const { current } = e.currentTarget.dataset + app.mpBehavior({ PageName: 'BTN_PATTREATMENTPROCESS' }) wx.navigateTo({ - url: `/patient/pages/course/index?current=${progress}`, + url: `/patient/pages/course/index?current=${current}`, }) }, handleColtStat() { + app.mpBehavior({ PageName: 'BTN_PATCLOTTINGFACTORCARD' }) wx.navigateTo({ url: '/patient/pages/coltStat/index', }) }, handleBleed() { + app.mpBehavior({ PageName: 'BTN_PATBLEEDINGCARD' }) wx.navigateTo({ url: '/patient/pages/blood/index', }) }, + handlePublicCard() { + this.setData({ + popupShow: true, + popupType: 'publicCard', + popupParams: { + close: true, + }, + }) + this.handleClosePublicCard() + }, + handleClosePublicCard() { + wx.ajax({ + method: 'POST', + url: '?r=wtx/popup/add-visit-record', + data: { + type: 2, + }, + }).then(() => { + this.setData({ + isPublicCard: false, + }) + }) + }, handlePopupOk() { const { popupType, userInfo } = this.data if (popupType === 'bindDoctorReject') { @@ -244,6 +327,13 @@ Page({ data: {}, }) } + if (popupType === 'publicCard') { + this.setData({ + popupShow: false, + popupType: '', + popupParams: {}, + }) + } this.setData({ popupShow: false, popupType: '', diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 65d3d18..9031ff7 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -6,9 +6,9 @@ style="padding-top:{{pageTop}}px;background:url('{{imageUrl}}bg4.png?t={{Timestamp}}') no-repeat top center/100% 666rpx" > - + Hi!{{userInfo.PatientName}} @@ -71,7 +71,7 @@ 了解您筛查全部流程和注意事项 - 查看我的诊疗计划 + 查看我的诊疗计划 @@ -94,7 +94,7 @@ 做好每一步检查,向美好生活继续! - 查看我的诊疗计划 + 查看我的诊疗计划 @@ -117,7 +117,7 @@ 重要的日子终于到来了~ - 查看我的诊疗计划 + 查看我的诊疗计划 @@ -146,7 +146,7 @@ 注射后 - + {{treatment.followUpWeekInfo.iYear}} 年 @@ -175,7 +175,7 @@ 最近一次复诊 - 查看我的诊疗计划 + 查看我的诊疗计划 @@ -185,7 +185,7 @@ 我们一直陪伴您,全程参与您的健康之旅 - 查看我的诊疗计划 + 查看我的诊疗计划 @@ -205,7 +205,7 @@ - + 向往的生活记录 @@ -215,7 +215,7 @@ {{treatment.clottingFactorInfo.clottingFactor}}% - 上次凝血因子水平(IX) + 最近一次凝血因子水平(IX) {{treatment.clottingFactorInfo.clottingFactorDate || ''}} @@ -245,6 +245,21 @@ + + + + 关注公众号重要提醒不丢失~ + + 关注 + + + + { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/inhibitorsManageDetail/index.ts b/src/patient/pages/inhibitorsManageDetail/index.ts index 9fac190..cd72aca 100644 --- a/src/patient/pages/inhibitorsManageDetail/index.ts +++ b/src/patient/pages/inhibitorsManageDetail/index.ts @@ -68,7 +68,7 @@ Page({ const { recordId } = this.data wx.showModal({ title: '确定删除吗?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/inhibitorsManageList/index.ts b/src/patient/pages/inhibitorsManageList/index.ts index 66da7ff..840439b 100644 --- a/src/patient/pages/inhibitorsManageList/index.ts +++ b/src/patient/pages/inhibitorsManageList/index.ts @@ -28,6 +28,7 @@ Page({ }, onShow() { app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_IMMUNOSUPPRESSANTLOG_VISIT' }) this.getList() this.addVisitRecord() }) @@ -64,7 +65,15 @@ Page({ url: `/patient/pages/inhibitorsManageDetail/index?id=${id}&peroid=${period}`, }) }, + handleAddEmpty() { + app.mpBehavior({ PageName: 'BTN_ENTERIMMUNODOSAGE_CLICK' }) + const { period } = this.data + wx.navigateTo({ + url: `/patient/pages/inhibitorsManage/index?period=${period}`, + }) + }, handleAdd() { + app.mpBehavior({ PageName: 'BTN_IMMUNOSUPPRESSANT_PLUSBUTTON_CLICK' }) const { period } = this.data wx.navigateTo({ url: `/patient/pages/inhibitorsManage/index?period=${period}`, diff --git a/src/patient/pages/inhibitorsManageList/index.wxml b/src/patient/pages/inhibitorsManageList/index.wxml index 8fdfddf..bd0ed72 100644 --- a/src/patient/pages/inhibitorsManageList/index.wxml +++ b/src/patient/pages/inhibitorsManageList/index.wxml @@ -35,6 +35,6 @@ 您的免疫抑制剂的使用剂量是多少? - 录入我的免疫制剂剂量信息 + 录入我的免疫制剂剂量信息 diff --git a/src/patient/pages/injectDate/index.ts b/src/patient/pages/injectDate/index.ts index 7551cfc..fc7415a 100644 --- a/src/patient/pages/injectDate/index.ts +++ b/src/patient/pages/injectDate/index.ts @@ -28,6 +28,7 @@ Page({ onLoad() { this.loadGifImage() app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_INJECTIONDAY_VISIT' }) this.getDetail() }) }, @@ -40,6 +41,11 @@ Page({ if (res.injectionDate) { const [year, month, date] = dayjs(res.injectionDate).format('YYYY-MM-DD').split('-') const calendar = this.selectComponent('#calendar').calendar + calendar.jump({ + year: year, + month: month, + date: 1, + }) calendar.setSelectedDates([ { year, @@ -93,9 +99,11 @@ Page({ }) }, handleBack() { + app.mpBehavior({ PageName: 'BTN_INJECTIONDAY_CANCELBUTTON_CLICK' }) wx.navigateBack() }, handleSubmit() { + app.mpBehavior({ PageName: 'BTN_COMPLETEBUTTON_CLICK' }) const { injectionDate } = this.data if (!injectionDate) { diff --git a/src/patient/pages/knowledge/index.ts b/src/patient/pages/knowledge/index.ts index f341bba..3f28c4e 100644 --- a/src/patient/pages/knowledge/index.ts +++ b/src/patient/pages/knowledge/index.ts @@ -12,8 +12,8 @@ Page({ }, }, onShow() { - app.waitLogin({type:1}).then(() => { - app.mpBehavior({ PageName: 'PG_EDUCATION' }) + app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_KNOWLEDGELIST_VISIT' }) this.getList() }) }, diff --git a/src/patient/pages/knowledgeDetail/index.scss b/src/patient/pages/knowledgeDetail/index.scss index 390a59b..89673a8 100644 --- a/src/patient/pages/knowledgeDetail/index.scss +++ b/src/patient/pages/knowledgeDetail/index.scss @@ -50,7 +50,7 @@ padding-bottom: env(safe-area-inset-bottom); display: flex; align-items: center; - background-color: #fff; + background-color: rgba(255,255,255, 0.93); box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05); .btn { flex: 1; diff --git a/src/patient/pages/lastDiagnosisReport/index.ts b/src/patient/pages/lastDiagnosisReport/index.ts index e1c066d..48ef596 100644 --- a/src/patient/pages/lastDiagnosisReport/index.ts +++ b/src/patient/pages/lastDiagnosisReport/index.ts @@ -61,6 +61,7 @@ Page({ }, onShow() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_LATESTRECHECKRECORD_VISIT' }) this.getDict() this.getDetail() }) @@ -85,8 +86,19 @@ Page({ } else { num = num.slice(0, integerLimit) } + // 限制小数位位数 + const decimalIndex = num.indexOf('.') + if (decimalIndex !== -1) { + num = num.slice(0, decimalIndex + 3) + } return num }, + handleStartDate() { + app.mpBehavior({ PageName: 'BTN_LATEST_SELECTSTARTTIME_CLICK' }) + }, + handleEndDate() { + app.mpBehavior({ PageName: 'BTN_LATEST_SELECTENDTIME_CLICK' }) + }, getDict() { wx.ajax({ method: 'GET', @@ -122,6 +134,7 @@ Page({ }) }, handleSelectHospital() { + app.mpBehavior({ PageName: 'BTN_LATEST_SELECTHOSPITAL_CLICK' }) wx.navigateTo({ url: `/patient/pages/selectHostipal/index?select=1&id=${this.data.hospitalId}`, events: { @@ -142,6 +155,7 @@ Page({ }) }, handleToggleCheck(e: any) { + app.mpBehavior({ PageName: 'BTN_LATEST_CHECKED_CLICK' }) const { check, fold } = e.currentTarget.dataset let foldValue = this.data[fold] if (this.data[check] == 2) { @@ -159,6 +173,13 @@ Page({ const { back } = (e as any).currentTarget.dataset isBack = back == 1 } + if (isBack && !this.data.beginDate && !this.data.endDate) { + wx.showToast({ + title: '请选择开始和结束日期', + icon:"none" + }) + return + } const { formKeys, period, examId, ...reset } = this.data const form = formKeys.reduce((pre, cur) => { pre[cur] = reset[cur] @@ -181,6 +202,9 @@ Page({ } }) }, + handleUploadTap() { + app.mpBehavior({ PageName: 'BTN_LATEST_UPLOADFILE_CLICK' }) + }, setFile(e: any) { const { type, key } = e.currentTarget.dataset const { examId, period } = this.data @@ -202,8 +226,9 @@ Page({ }) Promise.all(apiArr).then((res) => { const fileList = this.data[key] || [] + const sortRes = res.sort((a, b) => a.attachmentId - b.attachmentId) this.setData({ - [key]: fileList.concat(res), + [key]: fileList.concat(sortRes), }) }) }, @@ -240,7 +265,7 @@ Page({ const { examId } = this.data wx.showModal({ title: '确认删除?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/lastDiagnosisReport/index.wxml b/src/patient/pages/lastDiagnosisReport/index.wxml index 92acbee..5f4ed15 100644 --- a/src/patient/pages/lastDiagnosisReport/index.wxml +++ b/src/patient/pages/lastDiagnosisReport/index.wxml @@ -5,14 +5,14 @@ 检查时间 - + {{beginDate}} 至 - + {{endDate}} @@ -113,6 +113,7 @@ 请上传您的检查报告 请上传您的检查报告 提交您的检测报告 { + app.mpBehavior({ PageName: 'PG_PATIENT_LOGIN' }) + }) + }, + onUnload() { + if (timer) { + clearInterval(timer as number) + timer = null + } }, getCode() { if (timer) return @@ -66,6 +75,7 @@ Page({ }) }, handleDocRule() { + app.mpBehavior({ PageName: 'TN_PATMOBILEONECLICKLOGIN' }) const { check1, check2, check3 } = this.data return new Promise((resolve) => { if (check1 && check2 && check3) { @@ -78,6 +88,7 @@ Page({ }) }, async handleSubmit() { + app.mpBehavior({ PageName: 'BTN_PATLOGINCLICK' }) await this.handleDocRule() const { mobile, code } = this.data wx.ajax({ @@ -92,6 +103,7 @@ Page({ }) }, handleWxSubmit(e: WechatMiniprogram.CustomEvent) { + app.mpBehavior({ PageName: 'TN_PATMOBILEONECLICKLOGIN' }) const { iv, encryptedData } = e.detail if (iv && encryptedData) { wx.ajax({ @@ -124,6 +136,7 @@ Page({ }) }, handleShowTel() { + app.mpBehavior({ PageName: 'BTN_PATMOBILEVERIFYLOGIN' }) this.setData({ showTel: !this.data.showTel, }) @@ -134,6 +147,29 @@ Page({ url, }) }, + handleCheck(e) { + const { name } = e.currentTarget.dataset + app.mpBehavior({ PageName: name }) + }, + handleFamily() { + wx.scanCode({ + scanType: ['wxCode'], + success: (res) => { + console.log('DEBUGPRINT[140]: index.ts:157: res=', res) + const path = res.path + if (res.errMsg !== 'scanCode:ok' || !path || !path.includes('?scene=pId')) { + wx.showToast({ + icon: 'none', + title: '扫码失败,请重试', + }) + return + } + wx.reLaunch({ + url: `/${res.path}`, + }) + }, + }) + }, handleBack() { wx.navigateBack() }, diff --git a/src/patient/pages/login/index.wxml b/src/patient/pages/login/index.wxml index 73a137f..39903a3 100644 --- a/src/patient/pages/login/index.wxml +++ b/src/patient/pages/login/index.wxml @@ -37,7 +37,7 @@ - + 我特此同意 《个人信息及隐私协议政策》 @@ -57,7 +63,13 @@ - + 我特此同意 《用户协议》 @@ -65,7 +77,13 @@ - + 我特此同意 《个人信息共享知情同意书》 @@ -73,5 +91,5 @@ - 已经有亲友注册?扫描亲友邀约码绑定 + 已经有亲友注册?扫描亲友邀约码绑定 diff --git a/src/patient/pages/loginOut/index.ts b/src/patient/pages/loginOut/index.ts index 410e3ea..dd1c36f 100644 --- a/src/patient/pages/loginOut/index.ts +++ b/src/patient/pages/loginOut/index.ts @@ -6,7 +6,7 @@ Page({ handleLoginOut() { wx.showModal({ title: '确定注销吗?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({ diff --git a/src/patient/pages/my/index.ts b/src/patient/pages/my/index.ts index 3e5c23e..01d76f0 100644 --- a/src/patient/pages/my/index.ts +++ b/src/patient/pages/my/index.ts @@ -10,7 +10,8 @@ Page({ Days: '', }, onShow() { - app.waitLogin({type:1}).then(() => { + app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_MYPAGE_VISIT' }) app.getUserInfo(1).then((userInfo) => { this.setData({ userInfo, @@ -64,23 +65,26 @@ Page({ popupShow: false, }) }, - routerTo(e) { - const { url } = e.currentTarget.dataset + handleFile() { + app.mpBehavior({ PageName: 'BTN_VIEWHEALTHARCHIVE_CLICK' }) wx.navigateTo({ - url, + url: '/patient/pages/file/index', }) }, handleUserInfo() { + app.mpBehavior({ PageName: 'BTN_PERSONALINFO_CLICK' }) wx.navigateTo({ url: '/patient/pages/userInfo/index', }) }, handleDoctor() { + app.mpBehavior({ PageName: 'BTN_IAMDOCTOR_CLICK' }) wx.navigateTo({ url: '/doctor/pages/login/index', }) }, handleFamily() { + app.mpBehavior({ PageName: 'BTN_MYRELATIVES_CLICK' }) wx.navigateTo({ url: '/patient/pages/family/index', }) diff --git a/src/patient/pages/my/index.wxml b/src/patient/pages/my/index.wxml index a00a734..6877831 100644 --- a/src/patient/pages/my/index.wxml +++ b/src/patient/pages/my/index.wxml @@ -8,7 +8,9 @@ - {{userInfo.PatientName}}亲友 + + {{userInfo.PatientName}} 亲友 + 今天是陪伴您的第 @@ -16,7 +18,7 @@ - + 查看我的健康档案 diff --git a/src/patient/pages/preDiagnosisReport/index.ts b/src/patient/pages/preDiagnosisReport/index.ts index 368ecfa..a13a9b8 100644 --- a/src/patient/pages/preDiagnosisReport/index.ts +++ b/src/patient/pages/preDiagnosisReport/index.ts @@ -120,6 +120,7 @@ Page({ const { formKeys, period } = this.data const examinationCache = wx.getStorageSync(`examinationCache${period}`) app.waitLogin().then(() => { + app.mpBehavior({ PageName: 'PG_MYPREDIAGNOSISREPORT_VISIT' }) this.getDict() if (examinationCache) { const reset = formKeys.reduce((pre, cur) => { @@ -161,6 +162,11 @@ Page({ } else { num = num.slice(0, integerLimit) } + // 限制小数位位数 + const decimalIndex = num.indexOf('.') + if (decimalIndex !== -1) { + num = num.slice(0, decimalIndex + 3) + } return num }, getDict() { @@ -211,6 +217,7 @@ Page({ }) }, handleToggleCheck(e: any) { + app.mpBehavior({ PageName: 'BTN_CHECKED_CLICK' }) const { check, fold } = e.currentTarget.dataset let foldValue = this.data[fold] if (this.data[check] == 2 || !this.data[check]) { @@ -292,8 +299,9 @@ Page({ }) Promise.all(apiArr).then((res) => { const fileList = this.data[key] || [] + const sortRes = res.sort((a, b) => a.attachmentId - b.attachmentId) this.setData({ - [key]: fileList.concat(res), + [key]: fileList.concat(sortRes), }) }) }, @@ -326,6 +334,15 @@ Page({ [key]: newFileList, }) }, + handleStartDate() { + app.mpBehavior({ PageName: 'BTN_SELECTSTARTTIME_CLICK' }) + }, + handleEndDate() { + app.mpBehavior({ PageName: 'BTN_SELECTENDTIME_CLICK' }) + }, + handleUploadTap() { + app.mpBehavior({ PageName: 'BTN_UPLOADFILE_CLICK' }) + }, }) export {} diff --git a/src/patient/pages/preDiagnosisReport/index.wxml b/src/patient/pages/preDiagnosisReport/index.wxml index 389c72b..f7925a6 100644 --- a/src/patient/pages/preDiagnosisReport/index.wxml +++ b/src/patient/pages/preDiagnosisReport/index.wxml @@ -5,14 +5,14 @@ 检查时间 - + {{beginDate}} 至 - + {{endDate}} @@ -61,6 +61,7 @@ 请上传您的检查报告 请上传您的检查报告 请上传您的检查报告 可上传您的抑制物检查结果 请上传乙型肝炎检查报告 请上传丙型肝炎检查报告 提交您的HIV检测报告 提交您的AFP 检测报告 提交您的AAV检测报告 提交您的检测报告 { + app.mpBehavior({ PageName: 'PG_LATESTRECHECKLIST_VISIT' }) this.getList() }) }, @@ -57,6 +58,7 @@ Page({ }) }, handleAdd() { + app.mpBehavior({ PageName: 'BTN_LATEST_PLUSBUTTON_CLICK' }) wx.navigateTo({ url: `/patient/pages/lastDiagnosisReport/index?period=${this.data.period}`, }) diff --git a/src/patient/pages/selectHostipal/index.ts b/src/patient/pages/selectHostipal/index.ts index f9c8a95..a5da0d2 100644 --- a/src/patient/pages/selectHostipal/index.ts +++ b/src/patient/pages/selectHostipal/index.ts @@ -30,13 +30,24 @@ Page({ select: options.select === '1', }) app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_MYDESIGNATEDHOSPITAL_VISIT' }) this.getHospitalList() }) }, handleSearch() { this.getHospitalList(1) }, + handleSearchTap() { + app.mpBehavior({ PageName: 'BTN_SEARCHBOX_CLICK' }) + }, + handleProvince() { + app.mpBehavior({ PageName: 'BTN_SELECTPROVINCE_CLICK' }) + }, + handleCity() { + app.mpBehavior({ PageName: 'BTN_SELECTCITY_CLICK' }) + }, handleClear() { + app.mpBehavior({ PageName: 'BTN_RESELECT_CLICK' }) this.setData({ search: '', provinceId: '', @@ -87,6 +98,7 @@ Page({ } }, handleSelect(e) { + app.mpBehavior({ PageName: 'BTN_SELECTHOSPITAL_CLICK' }) const { index } = e.currentTarget.dataset const item = this.data.list[index] const { select } = this.data diff --git a/src/patient/pages/selectHostipal/index.wxml b/src/patient/pages/selectHostipal/index.wxml index 92d9c55..821e8d1 100644 --- a/src/patient/pages/selectHostipal/index.wxml +++ b/src/patient/pages/selectHostipal/index.wxml @@ -16,12 +16,13 @@ placeholder="请输入搜索您的定点检查医院" class="input" bindconfirm="handleSearch" + bind:tap="handleSearchTap" /> - {{provinceName || '省份'}} - {{cityName || '城市'}} + {{provinceName || '省份'}} + {{cityName || '城市'}} 重选 @@ -33,7 +34,11 @@ - + diff --git a/src/patient/pages/userInfo/index.ts b/src/patient/pages/userInfo/index.ts index dcd9db0..90569b9 100644 --- a/src/patient/pages/userInfo/index.ts +++ b/src/patient/pages/userInfo/index.ts @@ -20,6 +20,7 @@ Page({ }, onShow() { app.waitLogin({ type: 1 }).then(() => { + app.mpBehavior({ PageName: 'PG_PERSONALINFOEDIT_VISIT' }) app.getUserInfo(1).then((userInfo) => { this.setData({ name: userInfo.PatientName, @@ -68,14 +69,16 @@ Page({ }) }, handleLoginOut() { + app.mpBehavior({ PageName: 'BTN_LOGOUTACCOUNT_CLICK' }) wx.navigateTo({ url: '/patient/pages/loginOut/index', }) }, handleOut() { + app.mpBehavior({ PageName: 'BTN_SIGNOUT_CLICK' }) wx.showModal({ title: '确定退出登录吗?', - confirmColor: 'rgba(246, 74, 58, 1)', + confirmColor: '#F64A3A', success: (res) => { if (res.confirm) { wx.ajax({