diff --git a/project.config.json b/project.config.json index 1d8faf4..625d498 100644 --- a/project.config.json +++ b/project.config.json @@ -71,5 +71,5 @@ } ] }, - "appid": "wx71ac9c27c3c3e3f4" + "appid": "wxf9ce8010f1ad24aa" } \ No newline at end of file diff --git a/src/app.ts b/src/app.ts index c48d9c2..1f34796 100644 --- a/src/app.ts +++ b/src/app.ts @@ -16,15 +16,15 @@ App({ // 测试号 wx2b0bb13edf717c1d // dev // appid:wxf9ce8010f1ad24aa - // url: 'https://m.xd.hbraas.com', - // upFileUrl: 'https://m.xd.hbraas.com/', - // imageUrl: 'https://m.xd.hbraas.com/xd/', + url: 'https://m.xd.hbraas.com', + upFileUrl: 'https://m.xd.hbraas.com/', + imageUrl: 'https://m.xd.hbraas.com/xd/', // pro // appid:wx71ac9c27c3c3e3f4 - url: 'https://m.xd.hbsaas.com', - upFileUrl: 'https://m.xd.hbsaas.com/', - imageUrl: 'https://m.xd.hbsaas.com/api/xd/', + // url: 'https://m.xd.hbsaas.com', + // upFileUrl: 'https://m.xd.hbsaas.com/', + // imageUrl: 'https://m.xd.hbsaas.com/api/xd/', loginState: '', isLogin: 0, diff --git a/src/images/za-images/live-banner.png b/src/images/za-images/live-banner.png index c32a0dc..645adc1 100644 Binary files a/src/images/za-images/live-banner.png and b/src/images/za-images/live-banner.png differ diff --git a/src/pages/d_patient/index.wxml b/src/pages/d_patient/index.wxml index 71efd2a..b3f4e7d 100644 --- a/src/pages/d_patient/index.wxml +++ b/src/pages/d_patient/index.wxml @@ -35,7 +35,7 @@ EDC患者 - 注册时间:{{item.BecomePatientTime}} + 邀约时间:{{item.InviteTime}} 消息 diff --git a/src/pages/start/index.ts b/src/pages/start/index.ts index d3b6b56..2bbd4f8 100644 --- a/src/pages/start/index.ts +++ b/src/pages/start/index.ts @@ -1,47 +1,54 @@ -const app = getApp(); +const app = getApp() Page({ data: {}, onLoad() { app.waitLogin().then(() => { - const { isLogin, isNewReg, loginType } = app.globalData; + const { isLogin, isNewReg, loginType, scene } = app.globalData if (isLogin === 0) { + // 未登录用户,扫医生邀请码,重定向到患者登录页 + if (scene?.doctorId) { + wx.reLaunch({ + url: '/patient/pages/login/index', + }) + return + } wx.reLaunch({ url: '/patient/pages/index/index', - }); - return; + }) + return } if (loginType === 0) { wx.reLaunch({ url: '/patient/pages/index/index', - }); - return; + }) + return } if (loginType === 1) { if (isNewReg === 1) { wx.reLaunch({ url: '/patient/pages/index/index', - }); - return; + }) + return } wx.reLaunch({ url: '/patient/pages/enterInfo/index', - }); - return; + }) + return } if (loginType === 2) { if (isNewReg === 1) { wx.reLaunch({ url: '/pages/home/index', - }); - return; + }) + return } wx.reLaunch({ url: '/pages/login/index', - }); + }) } - }); + }) }, -}); +}) -export {}; +export {} diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index 4765607..162b065 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -1,4 +1,5 @@ import dayjs from 'dayjs' + const app = getApp() const licia = require('miniprogram-licia') @@ -307,7 +308,8 @@ Page({ }, routerTo(e) { let { url, active, code } = e.currentTarget.dataset - if (!url) return + if (!url) + return if (code === 'doctor') { app.mpBehavior({ PageName: 'BTN_PatientHomeDoctorCard' }) } @@ -399,7 +401,8 @@ Page({ wx.navigateTo({ url: '/patient/pages/vipLogin/index', }) - } else if (MedicineAuditSwitch === '1') { + } + else if (MedicineAuditSwitch === '1') { const pendPath = { 0: '/patient/pages/vipPending/index', 1: '/patient/pages/vipStartPending/index', @@ -411,7 +414,8 @@ Page({ wx.navigateTo({ url: url || '/patient/pages/vipCert/index', }) - } else { + } + else { wx.showToast({ icon: 'none', title: '工程师正在努力建设中,敬请期待!', @@ -423,26 +427,31 @@ Page({ if (toastType === 'vipScan') { this.routerVipTo() this.handleToastCancel() - } else if (toastType === 'aldAlert') { + } + else if (toastType === 'aldAlert') { wx.navigateTo({ url: '/patient/pages/adl/index', }) this.handleToastCancel() - } else if (toastType === 'healthCare') { + } + else if (toastType === 'healthCare') { this.setPopupInfo() this.handleNRDL() this.handleToastCancel() - } else if (toastType === 'ndrlAldAlert') { + } + else if (toastType === 'ndrlAldAlert') { wx.navigateTo({ url: '/patient/pages/adl/index?nrdl=1', }) this.handleToastCancel() - } else if (toastType === 'doubleStandards') { + } + else if (toastType === 'doubleStandards') { wx.navigateTo({ url: '/patient/pages/adl/index', }) this.handleToastCancel() - } else if (toastType === 'dedicatedDoctor') { + } + else if (toastType === 'dedicatedDoctor') { wx.ajax({ method: 'POST', url: '?r=zd/popup/close-popup', @@ -455,7 +464,8 @@ Page({ }) }) this.handleToastCancel(null, false) - } else if (toastType === 'referral-toast') { + } + else if (toastType === 'referral-toast') { this.setData({ referralFromShow: true, }) @@ -465,7 +475,8 @@ Page({ data: {}, }) this.handleToastCancel(null, false) - } else if (toastType === 'drug-guide') { + } + else if (toastType === 'drug-guide') { wx.ajax({ method: 'POST', url: '?r=zd/popup/add-record', @@ -488,7 +499,8 @@ Page({ Type: 5, }, }) - } else if (toastType === 'dedicatedDoctor' && sure) { + } + else if (toastType === 'dedicatedDoctor' && sure) { wx.ajax({ method: 'POST', url: '?r=zd/popup/close-popup', @@ -496,13 +508,15 @@ Page({ Type: 6, }, }) - } else if (toastType === 'referral-toast') { + } + else if (toastType === 'referral-toast') { wx.ajax({ method: 'POST', url: '?r=zd/re-visit/update-popup-show-status', data: {}, }) - } else if (toastType === 'drug-guide' && sure) { + } + else if (toastType === 'drug-guide' && sure) { wx.ajax({ method: 'POST', url: '?r=zd/popup/add-record', @@ -570,7 +584,8 @@ Page({ infoList: list, }) }) - } else { + } + else { wx.ajax({ method: 'POST', url: '?r=zd/pic-text/collection', diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 0c8dbf7..5f9bb28 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -99,10 +99,21 @@ - + +