diff --git a/src/components/patient-tab-bar/index.ts b/src/components/patient-tab-bar/index.ts index f237027..48d4621 100644 --- a/src/components/patient-tab-bar/index.ts +++ b/src/components/patient-tab-bar/index.ts @@ -41,7 +41,6 @@ Component({ ], userInfo: {}, showRed: false, - anyWhere: false, config: {} as any, }, @@ -58,15 +57,11 @@ Component({ const active = this.data.list.findIndex((item) => item.pagePath === pagePath); this.setData({ active, - anyWhere: app.globalData.anyWhere, }); this.setData({ showRed: app.globalData.showRed, }); // getApp().registerListener(() => { - // this.setData({ - // anyWhere: app.globalData.anyWhere, - // }); // wx.ajax({ // method: 'GET', // url: '?r=zd/common/get-config', @@ -85,9 +80,6 @@ Component({ const { list, config } = this.data; const pagePath = list[index].pagePath; app.globalData.BeginnerCardId = ''; - this.setData({ - anyWhere: app.globalData.anyWhere, - }); if (pagePath == '/patient/pages/my/index') { app.zdPermissionVerification(2, 0, `/patient/pages/index/index`).then(() => { wx.reLaunch({ diff --git a/src/components/patient-tab-bar/index.wxml b/src/components/patient-tab-bar/index.wxml index 0bb9f3e..d76abe5 100644 --- a/src/components/patient-tab-bar/index.wxml +++ b/src/components/patient-tab-bar/index.wxml @@ -2,13 +2,10 @@ - - {{item.text}} diff --git a/src/patient/pages/adl/index.json b/src/patient/pages/adl/index.json index 18e7f7f..eced12c 100644 --- a/src/patient/pages/adl/index.json +++ b/src/patient/pages/adl/index.json @@ -1,5 +1,4 @@ { - "navigationStyle": "custom", "usingComponents": { "navBar": "/components/zd-navBar/navBar", "free-audio": "/components/freeAudio/index" diff --git a/src/patient/pages/adlResult/index.json b/src/patient/pages/adlResult/index.json index ffde765..07ff565 100644 --- a/src/patient/pages/adlResult/index.json +++ b/src/patient/pages/adlResult/index.json @@ -1,5 +1,4 @@ { - "navigationStyle": "custom", "usingComponents": { "navBar": "/components/zd-navBar/navBar", "van-icon": "@vant/weapp/icon/index", diff --git a/src/patient/pages/adlShare/index.json b/src/patient/pages/adlShare/index.json index c3f20c0..ae38c17 100644 --- a/src/patient/pages/adlShare/index.json +++ b/src/patient/pages/adlShare/index.json @@ -1,5 +1,4 @@ { - "navigationStyle": "custom", "usingComponents": { "navBar": "/components/zd-navBar/navBar", "free-audio": "/components/freeAudio/index", diff --git a/src/patient/pages/cancellation/index.ts b/src/patient/pages/cancellation/index.ts index 5781bc3..9aecf09 100644 --- a/src/patient/pages/cancellation/index.ts +++ b/src/patient/pages/cancellation/index.ts @@ -31,11 +31,11 @@ Page({ loading: true, }).then(() => { app.globalData.backPage = ''; - app.globalData.zdUserInfo = {}; - app.updateLoginInfo(() => { - wx.reLaunch({ - url: '/patient/pages/login/index', - }); + app.globalData.loginState = ''; + app.globalData.userInfo = {}; + app.startLogin(); + wx.reLaunch({ + url: '/pages/login/index', }); }); } diff --git a/src/patient/pages/doctor/siteShare/index.json b/src/patient/pages/doctor/siteShare/index.json index cf286db..bcfabf1 100644 --- a/src/patient/pages/doctor/siteShare/index.json +++ b/src/patient/pages/doctor/siteShare/index.json @@ -1,5 +1,6 @@ { "component": true, + "navigationStyle": "default", "usingComponents": { "van-popup": "@vant/weapp/popup/index", "van-icon": "@vant/weapp/icon/index" diff --git a/src/patient/pages/infusionCenter/index.json b/src/patient/pages/infusionCenter/index.json index d1465a7..d494ba6 100644 --- a/src/patient/pages/infusionCenter/index.json +++ b/src/patient/pages/infusionCenter/index.json @@ -1,4 +1,5 @@ -{ - "navigationBarTitleText": "输注中心", - "usingComponents": {} -} +{ + "navigationBarTitleText": "输注中心", + "navigationStyle": "default", + "usingComponents": {} +} diff --git a/src/patient/pages/interactivePatient/index.json b/src/patient/pages/interactivePatient/index.json index a3970b4..b6f0e56 100644 --- a/src/patient/pages/interactivePatient/index.json +++ b/src/patient/pages/interactivePatient/index.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "互动", + "navigationStyle": "default", "usingComponents": { "van-icon": "@vant/weapp/icon/index", "van-loading": "@vant/weapp/loading/index", diff --git a/src/patient/pages/liveResult/index.json b/src/patient/pages/liveResult/index.json index 94a8517..fc418b7 100644 --- a/src/patient/pages/liveResult/index.json +++ b/src/patient/pages/liveResult/index.json @@ -1,4 +1,5 @@ -{ - "navigationBarTitleText": "", - "usingComponents": {} -} +{ + "navigationBarTitleText": "", + "navigationStyle": "default", + "usingComponents": {} +} diff --git a/src/patient/pages/nrdlTable/index.json b/src/patient/pages/nrdlTable/index.json index a39a537..7727856 100644 --- a/src/patient/pages/nrdlTable/index.json +++ b/src/patient/pages/nrdlTable/index.json @@ -1,6 +1,7 @@ -{ - "navigationBarTitleText": "城市惠民保自付费用报销list", - "usingComponents": { - "timeOut": "/components/timeOut/index" - } -} +{ + "navigationBarTitleText": "城市惠民保自付费用报销list", + "navigationStyle": "default", + "usingComponents": { + "timeOut": "/components/timeOut/index" + } +} diff --git a/src/patient/pages/referral/index.json b/src/patient/pages/referral/index.json index 0dc20ec..333aed2 100644 --- a/src/patient/pages/referral/index.json +++ b/src/patient/pages/referral/index.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "复诊记录", + "navigationStyle": "default", "usingComponents": { "referralFrom": "/components/referralFrom/index" } diff --git a/src/patient/pages/signIn/index.json b/src/patient/pages/signIn/index.json index 331f962..579c8e5 100644 --- a/src/patient/pages/signIn/index.json +++ b/src/patient/pages/signIn/index.json @@ -1,4 +1,5 @@ -{ - "navigationBarTitleText": "报名", - "usingComponents": {} -} +{ + "navigationStyle": "default", + "navigationBarTitleText": "报名", + "usingComponents": {} +} diff --git a/src/patient/pages/smallPage/index.json b/src/patient/pages/smallPage/index.json index f5ab696..35f40b4 100644 --- a/src/patient/pages/smallPage/index.json +++ b/src/patient/pages/smallPage/index.json @@ -1,8 +1,9 @@ -{ - "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "", - "usingComponents": { - "van-popup": "@vant/weapp/popup/index", - "mp-html": "mp-html" - } -} +{ + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "", + "navigationStyle": "default", + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "mp-html": "mp-html" + } +} diff --git a/src/patient/pages/webview/index.json b/src/patient/pages/webview/index.json index b809fb9..39736e1 100644 --- a/src/patient/pages/webview/index.json +++ b/src/patient/pages/webview/index.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "", + "navigationStyle": "default", "usingComponents": { "toast": "/components/toast/index" }