Merge branch 'release-1.0.1'

Application/Home/Controller/PromoteController.class.php

@@ -632,7 +632,7 @@ class PromoteController extends BaseController
             if (empty($user)) {
                 $this->redirect("Home/Index/index");
             }
-            $promoteUrl = "https://m.wmtxkj.com/mobile.php?s=Ssg/login/promote_id/" . $user['pid'];
+            $promoteUrl = "https://m.wmtxkj.com/mobile.php?s=Ssg/home/promote_id/" . $user['pid'];
             $this->assign("promote_url", $promoteUrl);
 
             $this->display();

Application/Mobile/Controller/SsgController.class.php

@@ -49,8 +49,9 @@ class SsgController extends BaseController {
     public function home(){
         //获取客服qq
         $appqq = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
-
+        $promoteId = I("promote_id", 0);
         $this->assign("app_qq", $appqq);
+        $this->assign("promote_id", $promoteId);
         $this->assign("rand", rand());
         $this->display();
     }

Application/Mobile/View/Ssg/home.html

@@ -40,7 +40,7 @@
             <img src="__IMG__/ssg/home/hader.png">
         </div>
        <div class="btn-login">
-            <a href="{:U('login')}"  onclick="return check()"><img src="__IMG__/ssg/home/button1.png"></a>
+            <a href="{:U('login'),'&promote_id='.$promote_id}"  onclick="return check()"><img src="__IMG__/ssg/home/button1.png"></a>
         </div>
         <div class="btn-group">
             <a href="{:U('process')}" onclick="return check()"><img src="__IMG__/ssg/home/button2.png"></a>
@@ -64,7 +64,7 @@
             </ul>
         </div>
         <div class="btn-download">
-            <a href="{:U('login')}"  onclick="return check()"><img src="__IMG__/ssg/home/button5.png"></a>
+            <a href="{:U('login'),'&promote_id='.$promote_id}"  onclick="return check()"><img src="__IMG__/ssg/home/button5.png"></a>
         </div>
     </div>
     <div class="footer home-box-footer">

Application/Mobile/View/Ssg/login.html

@@ -399,6 +399,7 @@
         }
     }
     function checkSafari() {
+        var promoteId = $("#promote_id").val();
         var ua = navigator.userAgent.toLowerCase();
         //判断是不是在iPhone的Safair浏览器打开的本页面
         if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
@@ -408,7 +409,7 @@
         }
         else {
             alert("请使用iPhone中的Safari浏览器打开本页面！");
-            window.location.href = 'mobile.php?s=/Ssg/home.html';
+            window.location.href = 'mobile.php?s=/Ssg/home.html&promote_id='+promoteId;
         }
     }
 </script>