Commit ce7b47df authored by zhangyanni's avatar zhangyanni

提交

parent e7f333cd
NODE_ENV="production" NODE_ENV="production"
VUE_APP_URL="prod" VUE_APP_URL="prod"
API_ROOT="/" API_ROOT="/"
VUE_APP_UPDATED="2.0.01" VUE_APP_UPDATED="2.1.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture" VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile" VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo" VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
VUE_APP_ACTICITYID = "21"
\ No newline at end of file
NODE_ENV="production" NODE_ENV="production"
VUE_APP_URL="dev" VUE_APP_URL="dev"
API_ROOT="/" API_ROOT="/"
VUE_APP_UPDATED="2.0.01" VUE_APP_UPDATED="2.1.01"
VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture" VUE_APP_UPLOAD_IMG="/base/upload/uploadPicture"
VUE_APP_UPLOAD_FILE="/base/upload/uploadFile" VUE_APP_UPLOAD_FILE="/base/upload/uploadFile"
VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo" VUE_APP_UPLOAD_LOGO="/base/upload/uploadLogo"
VUE_APP_ACTICITYID = "21"
\ No newline at end of file
...@@ -54,7 +54,6 @@ var ismobile = publicFun.getCookie('ismobile'); ...@@ -54,7 +54,6 @@ var ismobile = publicFun.getCookie('ismobile');
if(ismobile == null){ if(ismobile == null){
ismobile = flag||ucFlag ? 1 : 0 ismobile = flag||ucFlag ? 1 : 0
} }
console.log(111)
if(!publicFun.getCookie("language")){ if(!publicFun.getCookie("language")){
if(type=="Netscape"){ if(type=="Netscape"){
language =navigator.language; language =navigator.language;
...@@ -63,6 +62,11 @@ if(!publicFun.getCookie("language")){ ...@@ -63,6 +62,11 @@ if(!publicFun.getCookie("language")){
} }
publicFun.setUserInfoCookie("language",language!='zh'&&language!='zh-CN'?'en':'zh-CN'); publicFun.setUserInfoCookie("language",language!='zh'&&language!='zh-CN'?'en':'zh-CN');
} }
var userAgent = navigator.userAgent,shareUrl;
var isMini = /miniProgram/i.test(userAgent);
if(isMini){
window.reload();
}
// var userInfoObj = publicFun.getCookie("userInfo") ? JSON.parse(Base64.decode(publicFun.getCookie("userInfo"))) : "",userInfoData = ""; // var userInfoObj = publicFun.getCookie("userInfo") ? JSON.parse(Base64.decode(publicFun.getCookie("userInfo"))) : "",userInfoData = "";
// if (document.cookie.length > 0) { // if (document.cookie.length > 0) {
// var arr = document.cookie.split('; '); //这里显示的格式需要切割一下自己可输出看下 // var arr = document.cookie.split('; '); //这里显示的格式需要切割一下自己可输出看下
......
...@@ -689,7 +689,6 @@ ...@@ -689,7 +689,6 @@
}); });
var url = document.location.href.split("#/")[0]+"#/secondStageDetail?subId="+that.currentData.id+"&proId="+that.currentData.projectId+"&activityId="+that.$route.query.id+"&stage="+this.$route.query.stage;
let dataVal; let dataVal;
if(this.isActivityList&&this.subjectInfo){ if(this.isActivityList&&this.subjectInfo){
dataVal = { dataVal = {
......
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