diff --git a/app.json b/app.json index d029af9..2effdc0 100644 --- a/app.json +++ b/app.json @@ -82,11 +82,7 @@ "pagePath": "pages/index/index", "iconPath": "images/icon/home.png" }, - { - "text": "消息", - "pagePath": "pages/message/message", - "iconPath": "images/icon/home.png" - }, + { "text": "服务", "pagePath": "pages/serve/serve", @@ -113,4 +109,4 @@ ], "plugins": { } -} \ No newline at end of file +} diff --git a/pages/index/index.js b/pages/index/index.js index e029962..b154bb3 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -189,7 +189,7 @@ Page({ }, navigateTo(e){ if(wx.getStorageSync('token')){ - if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){ + if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index' && e.currentTarget.dataset.url != '/subpages/index/checkOutConfirm/index/index'){ if(e.currentTarget.dataset.url === '/pages/serve/serve'){ wx.switchTab({ url: '/pages/serve/serve', @@ -198,7 +198,7 @@ Page({ wx.navigateTo({ url: e.currentTarget.dataset.url, }) - }else if(e.currentTarget.dataset.url){ + }else if(e.currentTarget.dataset.url === '/subpages/OCRCard/pages/index/index'){ if(!this.data.bindPhone){ if(this.data.userInfo.idCard){ wx.navigateTo({ @@ -214,7 +214,22 @@ Page({ url: '/pages/register/register', }) } - + }else if(e.currentTarget.dataset.url === '/subpages/index/checkOutConfirm/index/index'){ + if(!this.data.bindPhone){ + if(this.data.userInfo.idCard){ + wx.navigateTo({ + url: `/subpages/index/checkOutConfirm/index/index`, + }) + }else{ + wx.navigateTo({ + url: `/subpages/OCRCard/pages/index/index?type=out`, + }) + } + }else{ + wx.navigateTo({ + url: '/pages/register/register', + }) + } } } } diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml index 9216004..285dc44 100644 --- a/pages/serve/serve.wxml +++ b/pages/serve/serve.wxml @@ -21,10 +21,10 @@ 延租申请 - + - + diff --git a/subpages/index/checkOutConfirm/index/index.js b/subpages/index/checkOutConfirm/index/index.js index e528f68..117fe2b 100644 --- a/subpages/index/checkOutConfirm/index/index.js +++ b/subpages/index/checkOutConfirm/index/index.js @@ -131,11 +131,6 @@ console.log('area',scrollArea.node); navigationHeight: app.globalData.deviceInfo.navigationHeight, checkOutDate: `${year}-${month}-${day}` }) - - this.setData({ - - }) - }, getProcessingCheckOutInfo(){ getProcessingCheckOutInfo().then(res=>{ diff --git a/subpages/index/renewalApplication/renewalApplication.wxml b/subpages/index/renewalApplication/renewalApplication.wxml index aff743c..caafed4 100644 --- a/subpages/index/renewalApplication/renewalApplication.wxml +++ b/subpages/index/renewalApplication/renewalApplication.wxml @@ -5,7 +5,7 @@ 温馨提示: - 您需要登陆“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。 + 您需要登录“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。 diff --git a/utils/config.js b/utils/config.js index 02ccc2c..62064f1 100644 --- a/utils/config.js +++ b/utils/config.js @@ -13,8 +13,8 @@ module.exports = { }; function BASEURL() { - // return 'https://zsbz.qdcfy.com/mz-api' - return 'http://219.146.91.110:30801/mz-api' + return 'https://zsbz.qdcfy.com/mz-api' + // return 'http://219.146.91.110:30801/mz-api' // return 'https://epmet-test.elinkservice.cn/api/' }