Commit 9c862382 authored by zhangyanni's avatar zhangyanni

Merge remote-tracking branch 'origin/master'

parents 96248d12 41771b45
...@@ -548,6 +548,7 @@ ...@@ -548,6 +548,7 @@
} }
if(this.isshow){ if(this.isshow){
if(this.translateNum){ if(this.translateNum){
console.log(22222)
this.translateNum = false; this.translateNum = false;
this.gettransAxios(); this.gettransAxios();
} }
...@@ -863,7 +864,7 @@ ...@@ -863,7 +864,7 @@
this.isbtntype = false; this.isbtntype = false;
} }
this.Loadpatent(); this.Loadpatent();
this.isshow = this.publicFun.getCookie("language") == "en"&&this.publicFun.getCookie("language") =="zh-CN"?false:true; this.isshow = this.publicFun.getCookie("language")&&this.publicFun.getCookie("language") =="zh-CN"?false:true;
} }
} }
</script> </script>
......
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