Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

html/GT_activities.html

@@ -11,7 +11,7 @@
     <meta name="x5-orientation" content="portrait">
     </meta>
     <!--    <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon" />-->
-    <link rel="stylesheet" href="../css/GT_activities.css">
+    <link rel="stylesheet" href="../css/GT_activities.css?r=2341654165">
     <link rel="stylesheet" href="../css/GT_activities2.css" media="screen" type="text/css" />
     <div id='wx_pic' style='margin:0 auto;display:none;'>
         <img src='../images/18logo.png' />
@@ -257,7 +257,7 @@
         let login = true; //判断是否登录
         let userInfo = {};
         let platform = "H5";
-        if (localStorage.u) {
+        if (localStorage.u && href.indexOf("platform") == -1) {
             try {
                 userInfo = JSON.parse(localStorage.u);
                 if (!userInfo.customerId) {
@@ -277,8 +277,6 @@
                 login = false
             }
         } else {
-
-
             // 如果进入页面没有登录的参数 处理跳到h5页面登录
             if (href.split('?')[1]) {
 
@@ -300,7 +298,6 @@
                         secretKey: param[3].split('=')[1]
                     }
                     platform = param[4].split('=')[1] //获取从哪里跳过来的
-
                 }
             } else {
                 // window.location.href = 'https://activity.oytour.com/html/login.html';

js/mian.js

-
 let locationName = window.location.hostname;
+
 function getApiUrl() {
-  let url = {
-    urlPost:  "https://reborn.oytour.com/api/common/post",
-     //urlPost: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.2.214:8082/api/common/post",
-     //urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
-    urlJava: "https://efficient.oytour.com/"
-  }
-  return url
+    let url = {
+        urlPost: "https://reborn.oytour.com/api/common/post",
+        //urlPost: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.2.214:8082/api/common/post",
+        //urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
+        urlJava: "https://efficient.oytour.com/"
+    }
+    return url
 }
-String.prototype.myReplace=function(f,e){  //时间格式化 苹果手机-替换为/
-  var reg=new RegExp(f,"g"); //创建正则RegExp对象
-  return this.replace(reg,e);
+String.prototype.myReplace = function(f, e) { //时间格式化 苹果手机-替换为/
+    var reg = new RegExp(f, "g"); //创建正则RegExp对象
+    return this.replace(reg, e);
 }
+
 function getLocalStorage() {
-  var localStorageData = window.localStorage["userInfo"];
-  if (localStorageData != undefined) {
-      return JSON.parse(localStorageData);
-  } else {
-      return null;
-  }
+    var localStorageData = window.localStorage["userInfo"];
+    if (localStorageData != undefined) {
+        return JSON.parse(localStorageData);
+    } else {
+        return null;
+    }
 }
+
 function getLocalStorage2() {
-  var localStorageData = window.localStorage["userInfo2"];
-  if (localStorageData != undefined) {
-      return JSON.parse(localStorageData);
-  } else {
-      return null;
-  }
+    var localStorageData = window.localStorage["userInfo2"];
+    if (localStorageData != undefined) {
+        return JSON.parse(localStorageData);
+    } else {
+        return null;
+    }
 }
 
 function clearLocalStorage() {
-  window.localStorage.removeItem('userInfo')
+    window.localStorage.removeItem('userInfo')
 }
+
 function getAjaxData(cmd, msg, tk) {
-  if (msg == null || msg == "") {
-      msg = {}
-  }
-  let timestamp = (new Date()).valueOf();
-  let token = "";
-  let key = "";
-  if (getLocalStorage() != null) {
-      token = getLocalStorage().token;
-      key = getLocalStorage().secretKey;
-  }
-  let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
-  let md5Str = hex_md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
-  let postData = {
-      "msg": msg,
-      "cmd": cmd,
-      "timestamp": timestamp,
-      "token": tk ? tk : token,
-      "sign": md5Str
-  }
-  return JSON.stringify(postData)
+    if (msg == null || msg == "") {
+        msg = {}
+    }
+    let timestamp = (new Date()).valueOf();
+    let token = "";
+    let key = "";
+    if (getLocalStorage() != null) {
+        token = getLocalStorage().token;
+        key = getLocalStorage().secretKey;
+    }
+    let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+    let md5Str = hex_md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+    let postData = {
+        "msg": msg,
+        "cmd": cmd,
+        "timestamp": timestamp,
+        "token": tk ? tk : token,
+        "sign": md5Str
+    }
+    return JSON.stringify(postData)
 }
+
 function getJavaData(msg) {
-  if (msg == null || msg == "") {
-      msg = {}
-  }
-  let timestamp = (new Date()).valueOf();
-  let token = "";
-  let key = "";
-  if (getLocalStorage() != null) {
-    token = getLocalStorage().token;
-    key = getLocalStorage().SecretKey;
-  } else if (getLocalStorage2() != null) {
-    if (getLocalStorage2() != null) {
-      token = getLocalStorage2().token;
-      key = getLocalStorage2().secretKey;
-  }
-  }
-  let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : JSON.parse(localStorage.userInfo2) ? JSON.parse(localStorage.userInfo2) : ''
-  let uid = userInfo.accountId ? userInfo.accountId : 0
-  let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
-  let md5Str = hex_md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
-  let postData = {
-      "groupId": 2,
-      "msg": msg,
-      "uid": uid,
-      "timestamp": timestamp,
-      "token": token,
-      "sign": md5Str
-  }
-  return JSON.stringify(postData)
+    if (msg == null || msg == "") {
+        msg = {}
+    }
+    let timestamp = (new Date()).valueOf();
+    let token = "";
+    let key = "";
+    if (getLocalStorage() != null) {
+        token = getLocalStorage().token;
+        key = getLocalStorage().secretKey;
+    } else if (getLocalStorage2() != null) {
+        if (getLocalStorage2() != null) {
+            token = getLocalStorage2().token;
+            key = getLocalStorage2().secretKey;
+        }
+    }
+    let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : JSON.parse(localStorage.userInfo2) ? JSON.parse(localStorage.userInfo2) : ''
+    let uid = userInfo.accountId ? userInfo.accountId : 0
+    let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+    let md5Str = hex_md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+    let postData = {
+        "groupId": 2,
+        "msg": msg,
+        "uid": uid,
+        "timestamp": timestamp,
+        "token": token,
+        "sign": md5Str
+    }
+    return JSON.stringify(postData)
 }
 
 function getJavaA(msg, tk) {
@@ -110,4 +114,4 @@ function getJavaA(msg, tk) {
         "uid": uid,
     }
     return JSON.stringify(postData)
-}
+}
\ No newline at end of file