diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 98c23c7..fc3b5bb 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -73,12 +73,14 @@ Page({ loadMoreVisible: false, defaultGridId:'',//默认网格 leaderGridId:'', //领导网格6.22 + workGridId:'', //工作网格7.08 completeInfoDialogVisible: false, //完善信息 homePagePhone: {} }, onShow: function() { if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) { if (!this.data.first) { + this.loadGridList() this.getBannerList() this.getFirstInfo() this.getNoticeList() @@ -153,6 +155,10 @@ Page({ that.setData({ leaderGridId:item.residentValue }) + } else if (item.residentType === 'default_grid' && item.residentCode === 'work_grid') { + that.setData({ + workGridId:item.residentValue + }) } }) } @@ -345,6 +351,7 @@ Page({ } wx.removeStorageSync('shareObj') } + that.loadGridList() that.getBannerList() that.getFirstInfo() that.getNoticeList() @@ -556,6 +563,39 @@ Page({ }) } }, + // 我有事做 7.08 ->工作端 + wysz() { + if(this.data.departmentId != this.data.workGridId){//工作网格处理 + wx.showToast({ + title: '无法使用该板块', + icon: 'none', + duration: 3000 + }) + }else{ + if (this.verifyCompleteInfo()) { + return false + } + api.getScrip().then(res => { + if (res.code === 0 && res.msg === 'success') { + console.log('getScrip',res.data) + wx.navigateToMiniProgram({ + appId: 'wx826a8435db9e0947', + path: 'pages/login/login?scrip='+res.data, + extraData: { + scrip: res.data + }, + envVersion: 'release',//trial //develop + success(res) { + console.log(res) + }, + fail(err) { + console.log(err) + } + }) + } + }) + } + }, dqhd() { wx.navigateTo({ url: `../../subpages/associationNew/pages/associationlist/associationlist` diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 10b6e37..0b0b4e5 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -84,12 +84,15 @@ - - + +