Commit ce0e0d0f authored by zhangyanni's avatar zhangyanni

提交

parent d736842a
...@@ -288,6 +288,7 @@ router.beforeEach((to, from, next) => { ...@@ -288,6 +288,7 @@ router.beforeEach((to, from, next) => {
publicFun.setUserInfoCookie("selected","mine"); publicFun.setUserInfoCookie("selected","mine");
} }
} }
if(to.name=="mineIndex"&&!publicFun.getUserInfoCookieType()&&publicFun.judgeBrandIsWechatOrHtml() == 1) router.replace({path:'/circleList'})
next(); next();
document.body.scrollTop=document.documentElement.scrollTop=0; document.body.scrollTop=document.documentElement.scrollTop=0;
// // 强制给index.html 加上时间戳 // // 强制给index.html 加上时间戳
......
...@@ -119,7 +119,8 @@ ...@@ -119,7 +119,8 @@
documentFront: "", documentFront: "",
frontImgUrl: "", frontImgUrl: "",
dialogVisible: false, dialogVisible: false,
isVisible:false isVisible:false,
isVisibleTimer:null
} }
}, },
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
sessionStorage.setItem("liveEmail", email); sessionStorage.setItem("liveEmail", email);
sessionStorage.setItem("liveName", res.result.empOtherName); sessionStorage.setItem("liveName", res.result.empOtherName);
if(this.lang==1){ if(this.lang==1){
this.setStatusFunc(); this.isShowChange();
} }
} else { } else {
console.log(res.msg); console.log(res.msg);
...@@ -156,6 +157,13 @@ ...@@ -156,6 +157,13 @@
}, 6000); }, 6000);
}, },
isVisibleTimerOut(){
var that = this;
this.isVisibleTimer = setInterval(function(){
that.isShowChange();
},60000*5);
},
handleChange(type) { handleChange(type) {
this.type = type; this.type = type;
if(type==1){ if(type==1){
...@@ -395,6 +403,7 @@ ...@@ -395,6 +403,7 @@
setApi.getIsChangeAxios(params).then((res)=>{ setApi.getIsChangeAxios(params).then((res)=>{
if(res.code==0){ if(res.code==0){
this.isVisible = res.result.exchangeCards==1?false:true; this.isVisible = res.result.exchangeCards==1?false:true;
if(this.isVisible) this.setStatusFunc();
}else this.$toast(res.msg); }else this.$toast(res.msg);
}).catch((err)=>{ }).catch((err)=>{
this.$toast(err); this.$toast(err);
...@@ -406,7 +415,7 @@ ...@@ -406,7 +415,7 @@
}, },
mounted(){ mounted(){
this.getDocumentFunc(); this.getDocumentFunc();
this.isShowChange() this.isVisibleTimerOut();
// ES6 标准 // ES6 标准
nativeshare().then(res => { nativeshare().then(res => {
NativeShare = res.default NativeShare = res.default
...@@ -429,6 +438,10 @@ ...@@ -429,6 +438,10 @@
clearTimeout(that.timerPopover); clearTimeout(that.timerPopover);
this.timerPopover = null; this.timerPopover = null;
} }
if(this.isVisibleTimer){
clearInterval(that.isVisibleTimerOut);
this.isVisibleTimer = null;
}
globalMsg.$emit("clearTimeout") globalMsg.$emit("clearTimeout")
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
...@@ -437,10 +450,11 @@ ...@@ -437,10 +450,11 @@
clearTimeout(that.timerPopover); clearTimeout(that.timerPopover);
this.timerPopover = null; this.timerPopover = null;
} }
if(this.isVisibleTimer){
clearInterval(that.isVisibleTimerOut);
this.isVisibleTimer = null;
}
globalMsg.$emit("clearTimeout") globalMsg.$emit("clearTimeout")
// if(this.lang==1){
// this.setStatusFunc(1,next);
// }
next(); next();
} }
......
...@@ -1610,6 +1610,9 @@ ...@@ -1610,6 +1610,9 @@
this.$router.replace({path: "/peoplehome", query: {id: this.$route.query.empId}}) this.$router.replace({path: "/peoplehome", query: {id: this.$route.query.empId}})
} }
} }
if(this.$route.name=="mineIndex"&&!this.userInfo){
this.$router.push({path:"/circleList"});
}
// ES6 标准 // ES6 标准
nativeshare().then(res => { nativeshare().then(res => {
NativeShare = res.default NativeShare = res.default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment