From 34eefab0bbf35ebf329dc3dce010ef3c80c5f5b5 Mon Sep 17 00:00:00 2001 From: kola-web Date: Thu, 10 Jul 2025 18:45:31 +0800 Subject: [PATCH] =?UTF-8?q?2.0bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 58 +++++++++++++++++++------------- src/components/popup/index.scss | 1 + src/components/popup/index.wxml | 17 ++++------ src/components/popupDoctor/index.scss | 2 +- src/doctor/pages/changeTel/index.wxml | 2 +- src/doctor/pages/login/index.ts | 2 +- src/doctor/pages/my/index.ts | 2 +- src/images/icon22.png | Bin 1548 -> 3670 bytes src/pages/applyFrom/index.wxml | 6 ++-- src/pages/my/index.ts | 2 +- src/pages/start/index.ts | 8 ++++- src/patient/pages/askPatient/index.scss | 6 ++++ src/patient/pages/askPatient/index.ts | 19 ++++++++++- src/patient/pages/askPatient/index.wxml | 2 +- src/patient/pages/bindDoctor/index.ts | 4 +++ src/patient/pages/changeTel/index.wxml | 2 +- src/patient/pages/doctorList/index.ts | 7 ++++ src/patient/pages/doctorList/index.wxml | 2 ++ src/patient/pages/entryInfo/index.json | 3 +- src/patient/pages/entryInfo/index.ts | 3 ++ src/patient/pages/entryInfo/index.wxml | 11 +++--- src/patient/pages/family/index.scss | 3 +- src/patient/pages/familyList/index.scss | 6 ++-- src/patient/pages/familyList/index.ts | 2 +- src/patient/pages/familyList/index.wxml | 6 ++-- src/patient/pages/familyScan/index.ts | 18 ++++++---- src/patient/pages/familyScan/index.wxml | 4 +-- src/patient/pages/index/index.scss | 9 +++-- src/patient/pages/index/index.ts | 10 +++++- src/patient/pages/index/index.wxml | 13 ++++--- src/patient/pages/login/index.json | 4 ++- src/patient/pages/login/index.scss | 7 +++- src/patient/pages/login/index.ts | 17 ++++++++-- src/patient/pages/login/index.wxml | 18 +++++++--- src/patient/pages/my/index.ts | 2 +- src/patient/pages/my/index.wxml | 12 +++---- src/patient/pages/userInfo/index.ts | 9 +++-- typings/index.d.ts | 2 +- 38 files changed, 206 insertions(+), 95 deletions(-) diff --git a/src/app.ts b/src/app.ts index ee0714e..b5e631d 100644 --- a/src/app.ts +++ b/src/app.ts @@ -115,28 +115,40 @@ App({ }) }, checkLoginType(type: 0 | 1 | 2) { - const { loginType, isLogin } = this.globalData.initLoginInfo - if (!isLogin) { - if (type === 0) { - return true - } else { - wx.reLaunch({ - url: '/pages/index/index', - }) - } + const { loginType, isLogin, isReg } = this.globalData.initLoginInfo + + if (type === 0) { + return true + } + + if (isLogin !== 1) { + wx.reLaunch({ + url: '/pages/index/index', + }) return false } - if (loginType === type) { - return true + if (isReg !== 1) { + const typePageUrl = { + 1: '/patient/pages/entryInfo/index', + 2: '/doctor/pages/login/index', + }[loginType as 1 | 2] + wx.reLaunch({ + url: typePageUrl, + }) + return false } - const typePageUrl = { - 1: '/patient/pages/index/index', - 2: '/doctor/pages/index/index', - }[loginType as 1 | 2] - wx.reLaunch({ - url: typePageUrl, - }) - return false + + if (loginType !== type) { + const typePageUrl = { + 1: '/patient/pages/index/index', + 2: '/doctor/pages/index/index', + }[loginType as 1 | 2] + wx.reLaunch({ + url: typePageUrl, + }) + } + + return true }, mpBehavior(data: { PageName: string }) { wx.ajax({ @@ -150,11 +162,11 @@ App({ }) }, - getUserInfo(type: 1 | 2 | 3 = 1) { + getUserInfo(type: 0 | 1 | 2 = 0) { const url = { - 1: '?r=wtx/user/userinfo', - 2: '?r=wtx/account/info', - 3: '?r=wtx/doctor/account/info', + 0: '?r=wtx/user/userinfo', + 1: '?r=wtx/account/info', + 2: '?r=wtx/doctor/account/info', }[type] return wx.ajax({ method: 'GET', diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index fa8185c..2e322c7 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -898,6 +898,7 @@ color: rgba(161, 164, 172, 1); } .tag { + vertical-align: 2rpx; display: inline-block; font-size: 20rpx; color: rgba(255, 255, 255, 1); diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 6192668..891cca1 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -235,7 +235,7 @@ 取消 - 提交 + 确定 @@ -256,15 +256,12 @@ - + - 王青 + {{params.name}} - 北京积水潭医院龙泽院区 - 三甲 + {{params.hostipal}} + {{params.className}}{{params.levelName}} @@ -296,8 +293,8 @@ - 取消 - 确定 + 取消 + 确定 diff --git a/src/components/popupDoctor/index.scss b/src/components/popupDoctor/index.scss index e77322b..cc1b327 100644 --- a/src/components/popupDoctor/index.scss +++ b/src/components/popupDoctor/index.scss @@ -56,7 +56,7 @@ .col { .content { margin-right: 8rpx; - display: inline-block; + display: inline; font-size: 32rpx; color: rgba(1, 1, 5, 1); max-height: 30vh; diff --git a/src/doctor/pages/changeTel/index.wxml b/src/doctor/pages/changeTel/index.wxml index 7f6067e..4101d77 100644 --- a/src/doctor/pages/changeTel/index.wxml +++ b/src/doctor/pages/changeTel/index.wxml @@ -26,5 +26,5 @@ - + diff --git a/src/doctor/pages/login/index.ts b/src/doctor/pages/login/index.ts index 20c77bc..a4f11a9 100644 --- a/src/doctor/pages/login/index.ts +++ b/src/doctor/pages/login/index.ts @@ -100,7 +100,7 @@ Page({ } }, submitCallback() { - app.getUserInfo(3).then(() => { + app.getUserInfo(2).then(() => { wx.reLaunch({ url: `/doctor/pages/index/index`, }) diff --git a/src/doctor/pages/my/index.ts b/src/doctor/pages/my/index.ts index e7a7747..2c2c281 100644 --- a/src/doctor/pages/my/index.ts +++ b/src/doctor/pages/my/index.ts @@ -11,7 +11,7 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.getUserInfo(3).then((userInfo) => { + app.getUserInfo(2).then((userInfo) => { this.setData({ userInfo, // 数字变红 diff --git a/src/images/icon22.png b/src/images/icon22.png index a4ac5fa9f97ddef06d7a92f7bf55ed94d0eba907..80d2f0f9323ebc98dd7be7f5ec86dfe0a15c7237 100644 GIT binary patch literal 3670 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 @@ -34,7 +34,7 @@ - {{BirthMonth}} + {{BirthMonth}} @@ -48,7 +48,7 @@ - {{ProvinceName ? ProvinceName+ '/' : ProvinceName }}{{CityName}} + {{ProvinceName ? ProvinceName+ '/' : ProvinceName }}{{CityName}} diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index eda2551..79a97df 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -8,7 +8,7 @@ Page({ showPatient: false, }, - onLoad() { + onShow() { app.waitLogin().then(() => { app.mpBehavior({ PageName: 'BTN_MY_NAV' }) app.getUserInfo().then((userInfo) => { diff --git a/src/pages/start/index.ts b/src/pages/start/index.ts index c63c7c7..50cfc26 100644 --- a/src/pages/start/index.ts +++ b/src/pages/start/index.ts @@ -16,8 +16,14 @@ Page({ }) } if (initLoginInfo.loginType === 1) { + if (initLoginInfo.isReg === 1) { + wx.reLaunch({ + url: '/patient/pages/index/index', + }) + return + } wx.reLaunch({ - url: '/patient/pages/index/index', + url: '/patient/pages/entryInfo/login', }) } if (initLoginInfo.loginType === 2) { diff --git a/src/patient/pages/askPatient/index.scss b/src/patient/pages/askPatient/index.scss index 7e6f965..7258338 100644 --- a/src/patient/pages/askPatient/index.scss +++ b/src/patient/pages/askPatient/index.scss @@ -45,14 +45,20 @@ page { } .name { margin: -20rpx auto 0; + padding: 0 0.5em; width: 116rpx; height: 36rpx; line-height: 36rpx; font-size: 24rpx; color: rgba(255, 255, 255, 1); text-align: center; + box-sizing: border-box; background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%); border-radius: 35rpx 35rpx 35rpx 35rpx; + max-width: 5em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } } diff --git a/src/patient/pages/askPatient/index.ts b/src/patient/pages/askPatient/index.ts index 21be853..86c2ce4 100644 --- a/src/patient/pages/askPatient/index.ts +++ b/src/patient/pages/askPatient/index.ts @@ -56,7 +56,7 @@ Page({ userInfo: {}, }, onLoad() { - app.waitLogin().then(() => { + app.waitLogin({ type: 1 }).then(() => { app.mpBehavior({ PageName: 'PG_FAQ' }) app.getUserInfo().then((userInfo) => { this.setData({ @@ -68,6 +68,11 @@ Page({ this.getMessageList() }) }, + onShow() { + if (app.globalData.loginState) { + this.getBindDoctorList() + } + }, getBindDoctorList() { wx.ajax({ method: 'GET', @@ -266,6 +271,13 @@ Page({ messageList, }) }, + handleSendDate() { + this.setData({ + popupShow: true, + popupType: 'selectDoctor', + popupParams: {}, + }) + }, handleQuestionTab(e) { const { index } = e.currentTarget.dataset this.setData({ @@ -288,6 +300,11 @@ Page({ url: '/patient/pages/doctorList/index', }) }, + handlePopupCancel() { + this.setData({ + popupShow: false, + }) + }, handleBack() { wx.navigateBack() }, diff --git a/src/patient/pages/askPatient/index.wxml b/src/patient/pages/askPatient/index.wxml index bbc6b07..64d0447 100644 --- a/src/patient/pages/askPatient/index.wxml +++ b/src/patient/pages/askPatient/index.wxml @@ -124,7 +124,7 @@ 我要提问 - + 出诊时间 diff --git a/src/patient/pages/bindDoctor/index.ts b/src/patient/pages/bindDoctor/index.ts index 8c72fce..b2d9dea 100644 --- a/src/patient/pages/bindDoctor/index.ts +++ b/src/patient/pages/bindDoctor/index.ts @@ -73,6 +73,10 @@ Page({ }) }, handlePopupOk() { + const { popupType } = this.data + if (popupType === 'bindDoctor') { + wx.navigateBack() + } this.handlePopupCancel() }, handlePopupCancel() { diff --git a/src/patient/pages/changeTel/index.wxml b/src/patient/pages/changeTel/index.wxml index 7f6067e..4101d77 100644 --- a/src/patient/pages/changeTel/index.wxml +++ b/src/patient/pages/changeTel/index.wxml @@ -26,5 +26,5 @@ - + diff --git a/src/patient/pages/doctorList/index.ts b/src/patient/pages/doctorList/index.ts index ed75b9b..1f27ce8 100644 --- a/src/patient/pages/doctorList/index.ts +++ b/src/patient/pages/doctorList/index.ts @@ -3,6 +3,12 @@ const app = getApp() Page({ data: { doctorList: [], + + pagination: { + page: 1, + pages: 1, + count: 1, + }, }, onShow() { app.waitLogin({ type: 1 }).then(() => { @@ -17,6 +23,7 @@ Page({ }).then((res) => { this.setData({ doctorList: res, + ['pagination.count']: res.length, }) }) }, diff --git a/src/patient/pages/doctorList/index.wxml b/src/patient/pages/doctorList/index.wxml index 4f507a2..60a1360 100644 --- a/src/patient/pages/doctorList/index.wxml +++ b/src/patient/pages/doctorList/index.wxml @@ -20,5 +20,7 @@ {{item.introduce}} + + diff --git a/src/patient/pages/entryInfo/index.json b/src/patient/pages/entryInfo/index.json index 5d0894b..35e99ca 100644 --- a/src/patient/pages/entryInfo/index.json +++ b/src/patient/pages/entryInfo/index.json @@ -1,6 +1,7 @@ { "navigationStyle": "custom", "usingComponents": { - "pickerArea": "/components/pickerArea/index" + "pickerArea": "/components/pickerArea/index", + "navbar": "/components/navbar/index" } } diff --git a/src/patient/pages/entryInfo/index.ts b/src/patient/pages/entryInfo/index.ts index 6ef8102..b6f9a11 100644 --- a/src/patient/pages/entryInfo/index.ts +++ b/src/patient/pages/entryInfo/index.ts @@ -95,6 +95,9 @@ Page({ }) }) }, + handleBack() { + wx.navigateBack() + }, }) export {} diff --git a/src/patient/pages/entryInfo/index.wxml b/src/patient/pages/entryInfo/index.wxml index d8405c8..79a2163 100644 --- a/src/patient/pages/entryInfo/index.wxml +++ b/src/patient/pages/entryInfo/index.wxml @@ -1,3 +1,6 @@ + + + - {{birthMonth}} + {{birthMonth}} @@ -41,12 +44,12 @@ - {{provinceName ? provinceName+ '/' : provinceName }}{{cityName}} + {{provinceName ? provinceName+ '/' : provinceName }}{{cityName}} 立即加入 - 取消 + 取消 diff --git a/src/patient/pages/family/index.scss b/src/patient/pages/family/index.scss index 747b374..04f504c 100644 --- a/src/patient/pages/family/index.scss +++ b/src/patient/pages/family/index.scss @@ -7,7 +7,7 @@ page { .container { margin-top: 184rpx; position: relative; - background: linear-gradient(292deg, #ffffff 0%, #fff3f2 100%); + background: linear-gradient( 291deg, #FFFFFF 0%, #FFFCFC 55%, #FFF7F7 100%); border-radius: 24rpx 24rpx 24rpx 24rpx; border: 2rpx solid #ffffff; padding: 136rpx 40rpx 48rpx; @@ -43,6 +43,7 @@ page { display: block; width: 296rpx; height: 296rpx; + border-radius: 50%; } .tip { margin-top: 22rpx; diff --git a/src/patient/pages/familyList/index.scss b/src/patient/pages/familyList/index.scss index b13b220..d18c9d6 100644 --- a/src/patient/pages/familyList/index.scss +++ b/src/patient/pages/familyList/index.scss @@ -13,6 +13,8 @@ page { justify-content: space-between; .wrap { .w-header { + display: flex; + align-items: center; .name { display: inline; font-size: 32rpx; @@ -30,13 +32,13 @@ page { border-radius: 4rpx; } } - .date{ + .date { margin-top: 20rpx; font-size: 28rpx; color: rgba(161, 164, 172, 1); } } - .unbind{ + .unbind { flex-shrink: 0; padding: 32rpx 0 32rpx 32rpx; font-size: 28rpx; diff --git a/src/patient/pages/familyList/index.ts b/src/patient/pages/familyList/index.ts index 09bd388..e525c65 100644 --- a/src/patient/pages/familyList/index.ts +++ b/src/patient/pages/familyList/index.ts @@ -8,7 +8,7 @@ Page({ onLoad() { app.waitLogin().then(() => { this.getList() - app.getUserInfo(2).then((res) => { + app.getUserInfo(1).then((res) => { this.setData({ userInfo: res, }) diff --git a/src/patient/pages/familyList/index.wxml b/src/patient/pages/familyList/index.wxml index 3ac24a3..4548ea6 100644 --- a/src/patient/pages/familyList/index.wxml +++ b/src/patient/pages/familyList/index.wxml @@ -2,9 +2,9 @@ - ID:{{userInfo.PatientId}} - ID:{{userInfo.PatientId}}亲友 - {{item.RelationType === '1' ? '本人': '亲友'}} + {{userInfo.PatientName}} + {{userInfo.PatientName}}亲友 + 本人 绑定时间:{{item.BindPatientTime}} diff --git a/src/patient/pages/familyScan/index.ts b/src/patient/pages/familyScan/index.ts index b123e8c..ae56c92 100644 --- a/src/patient/pages/familyScan/index.ts +++ b/src/patient/pages/familyScan/index.ts @@ -20,6 +20,12 @@ Page({ }, onShow() { app.waitLogin().then(() => { + if (app.globalData.initLoginInfo.loginType === 2) { + wx.reLaunch({ + url: '/doctor/pages/index/index', + }) + return + } app.getUserInfo().then(() => { this.getMpPatientInfo() }) @@ -35,12 +41,10 @@ Page({ loading: true, }).then((res) => { let RelationType = res.HasSelf == 1 ? '2' : '' - if (!res.PatientId) { - if (!this.data.ignoreAgreement) { - wx.navigateTo({ - url: `/patient/pages/login/index?page=/patient/pages/familyScan/index`, - }) - } + if (!res.isLogin) { + wx.navigateTo({ + url: `/patient/pages/login/index?back=1`, + }) } this.setData({ mpPatientInfo: res, @@ -59,7 +63,7 @@ Page({ resetBind: true, }) }, - handleSwitchRType(e) { + handleSwitchType(e) { const { type } = e.currentTarget.dataset this.setData({ RelationType: type, diff --git a/src/patient/pages/familyScan/index.wxml b/src/patient/pages/familyScan/index.wxml index 4cc26f7..98f8bbd 100644 --- a/src/patient/pages/familyScan/index.wxml +++ b/src/patient/pages/familyScan/index.wxml @@ -55,7 +55,7 @@ 请选择您的身份？ 本人 - + 亲友 diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index 05ae735..b228022 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -105,13 +105,14 @@ page { } .name { margin: -20rpx auto 0; - padding: 4rpx 20rpx; + padding: 4rpx 0.5em; font-size: 20rpx; color: #fff; line-height: 24rpx; background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%); border-radius: 28rpx 28rpx 28rpx 28rpx; - max-width: 4em; + max-width: 5em; + box-sizing: border-box; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -127,8 +128,10 @@ page { } .name { margin: -20rpx auto 0; - padding: 4rpx 20rpx; + padding: 4rpx 0.5em; + width: 5em; font-size: 20rpx; + box-sizing: border-box; color: rgba(161, 164, 172, 1); line-height: 24rpx; } diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index ab510c6..f800e57 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -20,7 +20,7 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.getUserInfo(2).then((userInfo) => { + app.getUserInfo(1).then((userInfo) => { this.setData({ userInfo, Days: userInfo.Days.replace( @@ -38,6 +38,11 @@ Page({ }) }) }, + onShow() { + if (app.globalData.loginState) { + this.getBindDoctorList() + } + }, getBindDoctorList() { wx.ajax({ method: 'GET', @@ -152,6 +157,9 @@ Page({ }, handlePopupCancel() { const { popupType } = this.data + if (popupType === 'bindDoctor') { + this.getBindDoctorList() + } if (popupType === 'conformBindDoctorQuestion') { wx.ajax({ method: 'POST', diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 9ab00a0..2547669 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -7,10 +7,7 @@ > - + Hi！{{userInfo.PatientName}} @@ -24,7 +21,13 @@ - + {{item.doctorName}} diff --git a/src/patient/pages/login/index.json b/src/patient/pages/login/index.json index 17c750f..613b839 100644 --- a/src/patient/pages/login/index.json +++ b/src/patient/pages/login/index.json @@ -1,6 +1,8 @@ { "navigationStyle": "custom", "usingComponents": { - "van-divider": "@vant/weapp/divider/index" + "van-divider": "@vant/weapp/divider/index", + "navbar": "/components/navbar/index", + "van-checkbox": "@vant/weapp/checkbox/index" } } diff --git a/src/patient/pages/login/index.scss b/src/patient/pages/login/index.scss index dd5b225..bdb046f 100644 --- a/src/patient/pages/login/index.scss +++ b/src/patient/pages/login/index.scss @@ -106,12 +106,17 @@ margin-top: -8rpx; transform: scale(0.8); } + .wx-checkbox-input.wx-checkbox-input-checked { + background: rgba(246, 74, 58, 1); + border-color: rgba(246, 74, 58, 1); + color: #ffffff; + } } .link { color: rgba(246, 74, 58, 1); } } - .family-tip{ + .family-tip { margin-top: 58rpx; font-size: 28rpx; color: rgba(246, 74, 58, 1); diff --git a/src/patient/pages/login/index.ts b/src/patient/pages/login/index.ts index 75df527..c10239b 100644 --- a/src/patient/pages/login/index.ts +++ b/src/patient/pages/login/index.ts @@ -12,8 +12,14 @@ Page({ check1: false, check2: false, check3: false, + + backPage: false, + }, + onLoad(options) { + this.setData({ + backPage: options.back === '1', + }) }, - onLoad() {}, getCode() { if (timer) return const mobile = this.data.mobile @@ -101,8 +107,10 @@ Page({ } }, submitCallback() { - app.getUserInfo(2).then((res) => { - if (res.PatientId) { + app.getUserInfo(1).then((res) => { + if (this.data.backPage) { + wx.navigateBack() + } else if (res.PatientId) { wx.reLaunch({ url: `/patient/pages/index/index`, }) @@ -118,6 +126,9 @@ Page({ showTel: !this.data.showTel, }) }, + handleBack() { + wx.navigateBack() + }, }) export {} diff --git a/src/patient/pages/login/index.wxml b/src/patient/pages/login/index.wxml index 26aa6c3..f657b7b 100644 --- a/src/patient/pages/login/index.wxml +++ b/src/patient/pages/login/index.wxml @@ -1,10 +1,20 @@ + + + 欢迎加入愈见守护 - + 或者 @@ -39,7 +49,7 @@ - + 我特此同意 《个人信息及隐私协议政策》 @@ -47,7 +57,7 @@ - + 我特此同意 《用户协议》 @@ -55,7 +65,7 @@ - + 我特此同意 《个人信息共享知情同意书》 diff --git a/src/patient/pages/my/index.ts b/src/patient/pages/my/index.ts index 6635fd9..04bd0a6 100644 --- a/src/patient/pages/my/index.ts +++ b/src/patient/pages/my/index.ts @@ -11,7 +11,7 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.getUserInfo().then((userInfo) => { + app.getUserInfo(1).then((userInfo) => { this.setData({ userInfo, // 数字变红 diff --git a/src/patient/pages/my/index.wxml b/src/patient/pages/my/index.wxml index 30bc15b..4e98397 100644 --- a/src/patient/pages/my/index.wxml +++ b/src/patient/pages/my/index.wxml @@ -8,7 +8,7 @@ - 你好 + {{userInfo.PatientName}} 今天是陪伴您的第 @@ -27,6 +27,11 @@ 个人信息 + + + 我的亲友 + + @@ -35,11 +40,6 @@ - - - 我的亲友 - - diff --git a/src/patient/pages/userInfo/index.ts b/src/patient/pages/userInfo/index.ts index 50ba5cd..0f35aad 100644 --- a/src/patient/pages/userInfo/index.ts +++ b/src/patient/pages/userInfo/index.ts @@ -16,7 +16,7 @@ Page({ }, onLoad() { app.waitLogin().then(() => { - app.getUserInfo(2).then((userInfo) => { + app.getUserInfo(1).then((userInfo) => { this.setData({ name: userInfo.PatientName, birthMonth: userInfo.PatientBirth, @@ -51,8 +51,11 @@ Page({ provinceId, cityId, }, - }).then((res) => { - console.log('res: ', res) + }).then(() => { + wx.showToast({ + icon: 'none', + title: '保存成功', + }) }) }, handleTel() { diff --git a/typings/index.d.ts b/typings/index.d.ts index da41466..624cda7 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -44,7 +44,7 @@ interface IAppOption { [propName: string]: any } - getUserInfo: (type?: 1 | 2 | 3) => Promise + getUserInfo: (type?: 0 | 1 | 2) => Promise startLogin: (callback?: () => void) => void waitLogin: (params?: { type?: 0 | 1 | 2 | 'any' }) => Promise checkLoginType: (type: 0 | 1 | 2) => boolean