Merge branch 'release' of wmtx/platform into master

修改落地页超级签bug

Application/Home/Controller/HomeController.class.php

@@ -243,8 +243,10 @@ class HomeController extends Controller
         }
 
         $serviceQQ = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
-        $this->assign("serviceQQ", $serviceQQ);
         
+        $ssgUrl = C('DOMAIN_OFFICIAL_MOBILE') . '/mobile.php/Ssg/pay/game_id/' . $game['id'] . '/promote_id/' . $promoteId;
+
+        $this->assign("serviceQQ", $serviceQQ);
         $this->assign('isNewIos', $isNewIos);
         $this->assign('downloadUrl', $downloadUrl);
         $this->assign('isIOS13', $isIOS13);
@@ -254,6 +256,7 @@ class HomeController extends Controller
         $this->assign('apply', $apply);
         $this->assign('game', $game);
         $this->assign('promoteId', $promoteId);
+        $this->assign('ssgUrl', $ssgUrl);
         $cur_url = base64_encode(base64_encode("http://" . $_SERVER['HTTP_HOST'] . __SELF__));
         $this->assign('cur_url', $cur_url);
         if ($isIOS) {

Application/Home/View/default/Home/landingPage.html

@@ -273,7 +273,7 @@
           <?php endif;?>
     
           <?php if (($game['download_ways'] & 4) == 4):?>
-          <div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">￥10至尊下载</div>
+          <div class="blue-btn" onclick="location.href='{$ssgUrl}'">￥10至尊下载</div>
           <?php endif;?>
     
           <?php if (($game['download_ways'] & 1) == 1):?>
@@ -945,20 +945,16 @@ var PhoneObj = {
   <?php endif;?>
 
   function is_tip_safari() {
-    var isTipSafari = false;
     var ua = navigator.userAgent.toLowerCase();
-    if (ua.match(/MicroMessenger/i) == "micromessenger") {
+    //判断是不是在iPhone的Safair浏览器打开的本页面
-      isTipSafari =  true;
+    if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
-      //$('.safari').show();
+        ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&
-    } else if(ua.match(/QQ/i) == "qq") {
+        ua.indexOf('ios') === -1 && ua.indexOf('browser') === -1) {
-      isTipSafari =  true;
+        return false;
-      //$('.safari').show();
-    } else if(ua.match(/dingtalk/i) == "dingtalk") {
-      isTipSafari =  true;
-      //$('.safari').show();
     }
-    return isTipSafari;
+    return true;
   }
+
   function  checkSafari(){
     /*var ua = navigator.userAgent.toLowerCase();
     if (ua.match(/MicroMessenger/i) == "micromessenger") {