diff --git a/pages/index/index.js b/pages/index/index.js index ae8758e..d393095 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -15,7 +15,6 @@ Page({ nodata:false }, // 事件处理函数 - onLoad: async function () { this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, @@ -27,7 +26,6 @@ Page({ await this.getStaffbasicinfo() }, onShow(){ - this.getStaffbasicinfo() }, onScrollToLower(e){ if (this.data.loadMoreType === 'more') { @@ -103,7 +101,7 @@ onScrollToLower(e){ app.globalData.user = res.data }).catch(err=>{ console.log(err); - wx.navigateTo({ + wx.redirectTo({ url: '/pages/login/login', }) }) diff --git a/pages/login/login.json b/pages/login/login.json index 326a045..5c009c3 100644 --- a/pages/login/login.json +++ b/pages/login/login.json @@ -1,5 +1,7 @@ { "navigationBarTitleText": "", "usingComponents": {}, - "navigationBarBackgroundColor": "#1673ee" + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#1673ee", + "disableSwipeBack": true } \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 4e4c0b5..ee7bc7d 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -5,11 +5,11 @@ page { overflow-y: auto; } .header { - height: 400rpx; + height: 500rpx; width: 100%; background: linear-gradient(180deg, #1673ee 0%, #66A6FD 63%, #F7F7F7 100%); box-sizing: border-box; - padding: 100rpx 0rpx 100rpx 50rpx; + padding: 224rpx 0rpx 100rpx 50rpx; font-size: 40rpx; color: #FFFFFF; display: flex; diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js index 1bca114..678ec81 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js @@ -128,16 +128,16 @@ Page({ } }, handelClickedit(e){ - console.log(e); - if(this.data.type == 'resi'){ - wx.navigateTo({ - url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.resiId}`, - }) - }else{ - wx.navigateTo({ - url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.id}`, - }) - } + // console.log(e); + // if(this.data.type == 'resi'){ + // wx.navigateTo({ + // url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.resiId}`, + // }) + // }else{ + // wx.navigateTo({ + // url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.id}`, + // }) + // } }, back() { diff --git a/utils/config.js b/utils/config.js index 1ae6ec5..f262e68 100644 --- a/utils/config.js +++ b/utils/config.js @@ -7,8 +7,8 @@ module.exports = { function BASEURL() { // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 正式环境 - // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 - return 'http://192.168.1.144/api/' //测试环境 + return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 + // return 'http://192.168.1.144/api/' //测试环境 } function WEBROOT() {