diff --git a/src/utils/request.js b/src/utils/request.js index a582b88f..30548865 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -63,17 +63,17 @@ service.interceptors.response.use(res => { if (code === 401) { console.log(this.$route.path) - // Dialog.confirm({ - // title: '系统提示', - // message: '登录状态已过期,您可以继续留在该页面,或者重新登录', - // confirmButtonText: '重新登录', - // cancelButtonText: '取消' - // }) - // .then(() => { - // store.dispatch('LogOut').then(() => { - // location.href = '/index'; - // }) - // }) + Dialog.confirm({ + title: '系统提示', + message: '登录状态已过期,您可以继续留在该页面,或者重新登录', + confirmButtonText: '重新登录', + cancelButtonText: '取消' + }) + .then(() => { + store.dispatch('LogOut').then(() => { + location.href = '/index'; + }) + }) } else if (code === 500) { Dialog.alert({ type: 'warning', message: msg }); return Promise.reject(new Error(msg)) diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue index b539f87f..ff544497 100644 --- a/src/views/homestead/index.vue +++ b/src/views/homestead/index.vue @@ -16,8 +16,7 @@
@@ -624,7 +623,8 @@ export default { orderVillageOptions: [], //村选择框高度 villageOptionsHeight: 0, - + // 待租列表显示 + ishcBotton: false, // 待租列表 类型 0 农房 1 农地 statusList: 0, //待租列表 房 @@ -723,13 +723,13 @@ export default { }); this.hcBottonHouseArr = houseArr; this.hcBottonLandArr = landArr; - console.log(houseArr); - console.log(landArr); + this.ishcBotton = true; }); } else { this.hcBottonHouseArr = []; //待租列表 地 this.hcBottonLandArr = []; + this.ishcBotton = false; } // console.log(); }, @@ -802,6 +802,9 @@ export default { /*右侧列表 --展开收缩*/ selectionPush() { + if (this.ishcBotton == false) { + return false; + } $(".homesteadList_wrap").animate( { right: "0",