Merge branch 'feature/up-landing-page3.12' of wmtx/platform into release

修改落地页/落地页记录下载日志

Application/Base/Service/PackageDownloadLogService.class.php

@@ -0,0 +1,24 @@
+<?php
+namespace Base\Service;
+
+use Base\Facade\Request;
+
+class PackageDownloadLogService
+{
+    public function add(array $params)
+    {
+        $userId = intval($params['user_id'] ?? 0);
+        $gameId = intval($params['game_id'] ?? 0);
+        $promoteId = intval($params['promote_id'] ?? 0);
+        $type = intval($params['type'] ?? 0);
+
+        return M('package_download_log', 'tab_')->add([
+            'user_id' => $userId,
+            'game_id' => $gameId,
+            'promote_id' => $promoteId,
+            'type' => $type,
+            'create_time' => time()
+        ]);
+
+    }
+}

Application/Home/Controller/HomeController.class.php

@@ -5,6 +5,7 @@ use Think\Controller;
 use User\Api\MemberApi;
 use Base\Facade\Request;
 use Base\Service\ApplyService;
+use Base\Service\PackageDownloadLogService;
 
 /**
  * 前台公共控制器
@@ -316,6 +317,14 @@ class HomeController extends Controller
             $this->error('链接丢失');
         }
 
+        $packageDownloadLogService = new PackageDownloadLogService();
+        $packageDownloadLogService->add([
+            'user_id' => 0,
+            'game_id' => $gameId,
+            'promote_id' => $promoteId,
+            'type' => 1,
+        ]);
+
         if ($status == 1) {
             $downLink = 'itms-services://?action=download-manifest&url=' . "https://" . $_SERVER["HTTP_HOST"] . ltrim(M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'), '.');
         } else {

Application/Home/Controller/PackageController.class.php

@@ -7,6 +7,7 @@ use Think\Think;
 use Base\Service\PromoteService;
 use Base\Facade\Request;
 use Base\Service\ApplyService;
+use Base\Service\PackageDownloadLogService;
 
 /**
  * @author elf<360197197@qq.com>
@@ -85,6 +86,14 @@ class PackageController extends Controller
         if (Request::isAndroid()) {
             $this->gotoPkgUrl($packageUrl);
         } else if (Request::isIOS()) {
+            $packageDownloadLogService = new PackageDownloadLogService();
+            $packageDownloadLogService->add([
+                'user_id' => 0,
+                'game_id' => $gameId,
+                'promote_id' => $promoteId,
+                'type' => 1,
+            ]);
+
             $plistUrl = substr($packageUrl, 1, strlen($packageUrl));
             header("HTTP/1.1 303 See Other");
             header("Location: "."itms-services://?action=download-manifest&url=" . C('DOMAIN_DOWNLOAD') . '/' . ltrim($plistUrl, '/'));
@@ -113,4 +122,21 @@ class PackageController extends Controller
             }
         }
     }
+
+    public function addDownloadLog()
+    {
+        $params = $_POST;
+        $packageDownloadLogService = new PackageDownloadLogService();
+        if ($packageDownloadLogService->add($params)) {
+            $this->ajaxReturn([
+                'status' => true,
+                'message' => '记录成功'
+            ]);
+        } else {
+            $this->ajaxReturn([
+                'status' => false,
+                'message' => '系统异常'
+            ]);
+        }
+    }
 }

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

@@ -292,61 +292,35 @@
     </div>
   </div>
 </div>
-<div class="second" style="display: none;z-index: 1000">
+
+<div class="second" style="display: none;">
   <div class="second-box">
-    <div class="title">升级IOS9后，游戏打不开怎么办</div>
       <div class="carousel">
           <div class="swiper-container">
               <div class="swiper-wrapper">
                   <div class="swiper-slide">
                       <div class="swiper-slide-box">
-              <div>一、游戏安装完毕，点击游戏图标弹出如下提示：</div>
-              <div class="slide-img">
-                <img src="__IMG__/1.png" alt="" style=" height: 2.86rem;">
-                <img src="__IMG__/box-scroll.png" alt="" class="case">
-              </div>
-            </div>
-          </div>
-          <div class="swiper-slide">
-            <div class="swiper-slide-box">
-              <div>二、进入[设置] - [通用] - [描述文件]：找到对应证书名称</div>
-              <div class="slide-img">
-                <img src="__IMG__/2.png" alt="" style="height: 2.75rem;">
-                <img src="__IMG__/box-scroll.png" alt="" class="case">
-              </div>
-            </div>
-          </div>
-          <div class="swiper-slide">
-            <div class="swiper-slide-box">
-              <div>三、信任当前证书</div>
                           <div class="slide-img">
-                <img src="__IMG__/4.png" alt="" style="height: 2.88rem;">
-                <img src="__IMG__/box-scroll.png" alt="" class="case">
+                              <img src="__IMG__/20191225/1.png" alt="" style=" height: 4.34rem;">
                           </div>
+                          <div>一、请先安装并打开testflight平台</div>
                       </div>
                   </div>
                   <div class="swiper-slide">
                       <div class="swiper-slide-box">
-              <div>四、下载过程中若出现以下情况，请检查网络和内存再次尝试下载</div>
                           <div class="slide-img">
-                <img src="__IMG__/3.png" alt="" style="height: 2.06rem;">
-                <img src="__IMG__/box-scroll.png" alt="" class="case">
-              </div>
+                              <img src="__IMG__/20191225/2.png" alt="" style=" height: 4.34rem;">
                           </div>
-          </div>
-          <div class="swiper-slide">
-            <div class="swiper-slide-box">
-              <div>五、如果您已验证并正常体验游戏，一段时间后，点击游戏图标再次出现信任提示且无法信任时，请卸载游戏包，重新安装游戏验证</div>
+                          <div>二、安装步骤窗口点击按钮，下载游戏</div>
                       </div>
                   </div>
               </div>
-        <!-- Add Pagination -->
               <div class="swiper-pagination"></div>
           </div>
       </div>
-    <div class="blue-btn" id="go_confirm">点我去信任</div>
   </div>
 </div>
+
 <?php
 
 ?>
@@ -370,11 +344,15 @@
 <!-- 登录 -->
 <div id="login-box" class="register login" style="display: none;">
   <div class="register-box">
-    <div class="register-heard">
-      登录
-      <a href="#"></a>
+      <div class="register-heard" style="display: flex;box-shadow:0px 0px 6px 0px rgba(109,121,145,0.2); 
+      background-color: #fff;color: #000;">
+          <li style="border-top-left-radius:0.3rem ; " class="select">普通登录</li>
+          <li style="border-top-right-radius:0.3rem ;">快速登录</li>
       </div>
+     
       <div class="register-input">
+          <div class="content">
+              <div>
                   <div class="input-box">
                       <img src="__IMG__/20191225/yonghu.png" alt="">
                       <input name="account" type="text" placeholder="请输入用户名">
@@ -383,30 +361,51 @@
                       <img src="__IMG__/20191225/mima.png" alt="">
                       <input name="password" type="password" placeholder="请输入密码">
                   </div>
-      <div class="input-code">
+                  <!-- <div class="input-code">
                     <div>
                       <img src="__IMG__/20191225/yanzhengma.png" alt="">
                       <input name="verify_code" type="text" placeholder="请输入验证码">
                     </div>
                     <img id="verifyCode" src="/mobile.php?s=/Common/verify.html" alt="">
-      </div>
-      <div class="register-btn">
+                  </div> -->
+                  <div class="register-btn" style="margin-top: 1.8rem;">
                       <div id="loginBtn" class="loginBtn">登录</div>
                       <div class="enroll">注册</div>
                   </div>
+              </div>
+              <div style="display: none;">
+                  <div class="input-box">
+                      <img src="__IMG__/20191225/yonghu.png" alt="">
+                      <input name="mobile" type="text" placeholder="请输入手机号">
+                  </div>
+                  <div class="input-code">
+                      <div>
+                          <img src="__IMG__/20191225/yanzhengma.png" alt="">
+                          <input name="verify_code" type="text" placeholder="请输入短信验证码">
+                      </div>
+                      <div id="loginGetPhoneCode" class="gain">获取验证码</div>
+                  </div>
+                  <div class="register-btn" style="margin-top: 1.8rem;">
+                      <div id="mobileLoginBtn" class="loginBtn">登录</div>
+                      <div class="enroll">注册</div>
+                  </div>
+              </div>
+          </div>
+          
           <div class="register-forget" style="width: 4.6rem;">
               <div class="forgetbtn">
-          <img src="__IMG__/20191225/forget.png" alt="">
+                  <img src="img/forget.png" alt="">
                   <span>忘记密码</span>
               </div>
               <div>
-          <img src="__IMG__/20191225/kefu.png" alt="">
+                  <img src="img/kefu.png" alt="">
                   <span class="service_qq">联系客服</span>
               </div>
           </div>
       </div>
   </div>
 </div>
+
 <!-- 忘记密码 -->
 <div id="forget-box" class="register forgetPass" style="display: none;">
   <div class="register-box">
@@ -452,7 +451,8 @@
       <div class="register-heard" style="display: flex;box-shadow:0px 0px 6px 0px rgba(109,121,145,0.2); 
       background-color: #fff;color: #000;">
           <li style="border-top-left-radius:0.3rem ;" class="select">普通注册</li>
-          <li style="border-top-right-radius:0.3rem ;">手机注册</li>
+          <li style="border-top-right-radius:0.3rem ;"><img src="__IMG__/20191225/damuzhi.png" style="width: 0.28rem;height: 0.28rem;" alt="">
+            快捷注册</li>
       </div>
 
       <div class="content">
@@ -474,7 +474,7 @@
                   <div class="register-forget">
                       <div>
                           <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
-                          <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
+                          <span><a style="color:#21B1EB; font-size:0.24rem" href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
                       </div>
                       <div class="commonCut" style="margin-right: 0.2rem;">
                           <img src="__IMG__/20191225/denglu.png" alt="" style="margin-right: 0.07rem;">
@@ -505,7 +505,7 @@
                   <div class="register-forget">
                       <div>
                           <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
-                          <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
+                          <span><a style="color:#21B1EB; font-size:0.24rem" href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
                       </div>
                       <div class="commonCut" style="margin-right: 0.2rem;">
                           <img src="__IMG__/20191225/denglu.png" alt="" style="margin-right: 0.07rem;">
@@ -527,39 +527,35 @@ display: flex;
 align-items: center;
 justify-content: center;
 background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
-<!-- 安装步骤1 -->
+
 <div class="mounting" style="display: none;">
   <div class="mounting-box">
-    <div class="register-heard">
-      安装步骤(1/2)
-      <a href="#"></a>
+    <div class="carousel">
+      <div class="swiper-container">
+        <div class="swiper-wrapper">
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div class="slide-img">
+                <img src="__IMG__/20191225/1.png" alt="" style=" height: 4.34rem;">
+              </div>
+              <div>一、请先安装并打开testflight平台</div>
             </div>
-    <div class="mounting-text">
-      <div class="title-one">
-        <span> 应苹果最新政策要求，苹果用户在使用本游戏最新版本需要先下载苹果的官方</span>
-        <img src="__IMG__/20191225/biaoshi.png" alt="">
-        <span>Testflight平台，然后在返回当前页面进入下一步骤。</span>
           </div>
-      <a href="https://itunes.apple.com/cn/app/testflight/id899247664?mt=8" target="_blank" class="mounting-btn">点击安装TestFlight平台</a>
-      <!-- <div class="title-two">第二步：点击下方按钮安装游戏</div> -->
-      <a href="#" class="mounting-btn nextStep">下一步</a>
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div class="slide-img">
+                <img src="__IMG__/20191225/2.png" alt="" style=" height: 4.34rem;">
               </div>
+              <div>二、安装步骤窗口点击按钮，下载游戏</div>
             </div>
-</div>
-<!-- 安装步骤2 -->
-<div class="mounting-two" style="display: none;">
-  <div class="mounting-box">
-    <div class="register-heard">
-      安装步骤(2/2)
-      <a href="#"></a>
+          </div>
+        </div>
+        <div class="swiper-pagination"></div>
       </div>
       <div class="mounting-text">
-      <div class="title-one" style="width: 4.06rem;padding: 0;margin-bottom: 0;">
-          <img src="__IMG__/20191225/bg.png" alt="" style="width: 100%;height: 100%;box-shadow:0px 0px 6px 0px rgba(109,121,145,0.2)">
+        <a href="https://itunes.apple.com/cn/app/testflight/id899247664?mt=8" target="_blank" class="mounting-btn">点我去安装TestFlight平台</a>
+        <a id="beta-url" href="javascript:;" class="mounting-btn">点我去TF平台下载游戏</a>
       </div>
-      <a id="beta-url" href="{$game['beta_url']}" class="mounting-btn">点击安装游戏</a>
-      <!-- <div class="title-two">第二步：点击下方按钮安装游戏</div> -->
-      <a href="#" class="mounting-btn lastStep">上一步</a>
     </div>
   </div>
 </div>
@@ -569,9 +565,13 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
 <script src="__STATIC__/js.cookie.min.js"></script>
 <script>
+var curUserId = 0;
 var gameId = parseInt("{$game.id}");
 var promoteId = parseInt("{$promoteId}");
-var isLogin = Cookies.get('is_landing_login') == undefined ? false : true;
+console.log(promoteId)
+var betaUrl = "{$game['beta_url']}";
+curUserId = Cookies.get('landing_login_user') == undefined ? 0 : Cookies.get('landing_login_user');
+var isLogin = (curUserId == 0 ? false : true);
 var PhoneObj = {
   i:60,
   codeflag: true,
@@ -590,9 +590,11 @@ var PhoneObj = {
       PhoneObj.i = PhoneObj.i - 1;  
       $("#getPhoneCode").html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");
       $("#forgetGetPhoneCode").html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");
+      $("#loginGetPhoneCode").html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");
       if (PhoneObj.i == 0) {  
           $("#getPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");  
           $("#forgetGetPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");
+          $("#loginGetPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");
           PhoneObj.codeflag = true;  
           PhoneObj.i = 60;  
           return;  
@@ -674,22 +676,18 @@ var PhoneObj = {
             PhoneObj.countDown(dom);
         });
     })
-    $(".nextStep").click(function(){
-      $(".mounting").hide();
-      $(".mounting-two").show();
+    $("#loginGetPhoneCode").on("click",function(){
+        //获取手机
+        var dom = $(this);
+        var phone = $('#login-box').find('[name=mobile]').val();
+        PhoneObj.sendPhoneCode(phone,function(){
+            PhoneObj.countDown(dom);
         });
-    $(".lastStep").click(function(){
-      $(".mounting").show();
-      $(".mounting-two").hide();
     })
     $(".mounting .register-heard>a").click(function(){
       $(".mode").hide();
       $(".mounting").hide();
     })
-    $(".mounting-two .register-heard>a").click(function(){
-      $(".mounting").show();
-      $(".mounting-two").hide();
-    })
     // $(".login").click(function(){
     //     $(".login").hide();
     // });
@@ -741,6 +739,26 @@ var PhoneObj = {
       }
     })
 
+    $('#beta-url').on({
+      click: function () {
+        $.ajax({
+          type: 'POST',
+          url: '/index.php?s=/Home/Package/addDownloadLog.html',
+          dataType: 'JSON',
+          data:{
+            user_id: curUserId,
+            promote_id: promoteId,
+            game_id: gameId,
+            type: 2
+          },
+          success: function (result) {
+            console.log(betaUrl)
+            window.location.href = betaUrl
+          }
+        })
+      }
+    })
+
     function GetVerityCode() {
       //刷新验证码
       $("#verifyCode").attr("src", "/mobile.php?s=/Common/verify.html&id=" + Math.random());
@@ -774,7 +792,7 @@ var PhoneObj = {
         },
         success: function (result) {
           if (result.code == '0000') {
-            setLoginStatus()
+            setLoginStatus(result.data.user_id)
             $(".commonWindow").hide();
             showMounting()
           } else {
@@ -784,20 +802,46 @@ var PhoneObj = {
       })
     })
 
-    function setLoginStatus()
+    function setLoginStatus(userId)
     {
       var expireTime = new Date(new Date().getTime() + 10 * 60 * 1000);
-      Cookies.set('is_landing_login', 1, { expires: expireTime })
-      isLogin = true;
+      Cookies.set('landing_login_user', userId, { expires: expireTime })
+      isLogin = (curUserId == 0 ? false : true);
+      curUserId = userId
     }
 
     function showMounting()
     {
       $(".mode").show();
       $('.mounting').show();
+      swiperGet2();
       // $('#beta-url').attr('href', $('[name=betaUrl]').val())
     }
 
+    function swiperGet2(){
+      var mySwiper = new Swiper('.mounting-box .swiper-container', {
+        loop: true,
+        observer: true,//修改swiper自己或子元素时，自动初始化swiper
+        observeParents: true,//修改swiper的父元素时，自动初始化swiper
+        lazyLoading:true,//图片延迟加载
+        lazyLoadingInPrevNext:true,//前一个和后一个延迟加载
+        autoplayDisableOnInteraction : false,
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: {
+          delay: 2000,
+          stopOnLastSlide: false,
+          disableOnInteraction: false,
+        },
+        onSlideChangeEnd: function(swiper){ 
+          // swiper.update();  
+          mySwiper.startAutoplay();
+        }
+      })
+    }
+
     $("#loginBtn").on("click",function() {
       var box = $('#login-box')
       var account = box.find('[name=account]').val()
@@ -811,10 +855,10 @@ var PhoneObj = {
           alert("密码不能为空");
           return false;
       }
-      if (verifyCode == "") {
+      /* if (verifyCode == "") {
           alert("验证码不能为空");
           return false;
-      }
+      } */
       if (promoteId == "") {
           alert("推广员ID不能为空");
           return false;
@@ -827,6 +871,7 @@ var PhoneObj = {
             'password': password,
             'verify_code': verifyCode,
             'promote_id': promoteId,
+            'skip_verify': 1,
         },
         dataType: 'JSON',
         xhrFields: {
@@ -836,7 +881,52 @@ var PhoneObj = {
         cache: false,
         success: function (result) {
           if (result.code == '0000') {
-            setLoginStatus()
+            setLoginStatus(result.data.user_id)
+            $('.login').hide();
+            showMounting()
+
+          } else {
+            alert(result.msg);
+          }
+          GetVerityCode();
+        }
+      });
+    })
+
+    $("#mobileLoginBtn").on("click",function() {
+      var box = $('#login-box')
+      var mobile = box.find('[name=mobile]').val()
+      var verifyCode = box.find('[name=verify_code]').val()
+      if (mobile == "") {
+          alert("手机号不能为空");
+          return false;
+      }
+      if (verifyCode == "") {
+          alert("验证码不能为空");
+          return false;
+      }
+      if (promoteId == "") {
+          alert("推广员ID不能为空");
+          return false;
+      }
+      $.ajax({
+        type: 'POST',
+        url: 'mobile.php?s=/Common/login.html',
+        data: {
+            'mobile': mobile,
+            'verify_code': verifyCode,
+            'promote_id': promoteId,
+            'skip_verify': 1,
+        },
+        dataType: 'JSON',
+        xhrFields: {
+            withCredentials: true
+        },
+        async: false,
+        cache: false,
+        success: function (result) {
+          if (result.code == '0000') {
+            setLoginStatus(result.data.user_id)
             $('.login').hide();
             showMounting()
           } else {
@@ -883,7 +973,7 @@ var PhoneObj = {
           },
           success: function (result) {
             if (result.code == '0000') {
-              setLoginStatus()
+              setLoginStatus(result.data.user_id)
               $(".commonWindow").hide();
               showMounting()
             } else {
@@ -1096,7 +1186,7 @@ var PhoneObj = {
     });
 
     function swiperGet(){
-      var swiper = new Swiper('.swiper-container', {
+      var swiper1 = new Swiper('.second-box .swiper-container', {
         loop: true,
         observer: true,//修改swiper自己或子元素时，自动初始化swiper
         observeParents: true,//修改swiper的父元素时，自动初始化swiper
@@ -1112,11 +1202,26 @@ var PhoneObj = {
           stopOnLastSlide: false,
           disableOnInteraction: false,
         },
+        onSlideChangeEnd: function(swiper){ 
+          // swiper.update();  
+          swiper1.startAutoplay();
+        }
       });
     };
-    swiperGet();
     $(".commonWindow li").click(function(){
-      var divShow = $(".content").children("div");
+      var divShow = $(".commonWindow .content").children("div");
+      if($(this).hasClass("")){
+        var index = $(this).index();
+        $(this).addClass("select");
+        isSign = $(this).attr('name');
+        $(this).siblings("li").removeClass("select");
+        $(divShow[index]).show();  
+        $(divShow[index]).siblings("div").hide();
+      }
+    })
+
+    $(".login li").click(function() {
+      var divShow = $(".login .content").children("div");
       if($(this).hasClass("")){
         var index = $(this).index();
         $(this).addClass("select");
@@ -1126,6 +1231,7 @@ var PhoneObj = {
         $(divShow[index]).siblings("div").hide();
       }
     })
+
     $(".download").click(function(){
       
       var isTipSafari = is_tip_safari();
@@ -1177,6 +1283,7 @@ var PhoneObj = {
       $(".second").hide();
       document.body.style.overflow = 'auto';
     })
+
     $(".doubt").click(function(){
       var isTipSafari = is_tip_safari();
       if (isTipSafari) {
@@ -1184,9 +1291,22 @@ var PhoneObj = {
         return;
       }
       $(".second").show();
+      $('.mode').show();
+      swiperGet()
       document.body.style.overflow = 'hidden';
-      // swiperGet();
     })
+
+
+    /* $(".doubt").click(function(){
+      var isTipSafari = is_tip_safari();
+      if (isTipSafari) {
+        $('.safari').show();
+        return;
+      }
+      $(".second").show();
+      document.body.style.overflow = 'hidden';
+    }) */
+
   });
 
   $.ajax({

Application/Mobile/Controller/CommonController.class.php

@@ -25,19 +25,39 @@ class CommonController extends BaseController {
     //用户登录
     public function login()
     {
-        $account = I('account');
+        $account = I('account', '');
+        $mobile = I('mobile', '');
         $password =  I('password');
         $verifyCode = I('verify_code', '');
         $promoteId =  I('promote_id', 0);
+        $skipVerify =  I('skip_verify', 0);
 
         if (!$promoteId) {
             $this->respondError('参数非法');
         }
         
+        if ($skipVerify != 1) {
             $verify = new \Think\Verify();
             if (!$verify->check($verifyCode)) {
                 $this->respondError('验证码错误');
             }
+        }
+
+        if ($account == '' && $mobile == '') {
+            $this->respondError('请输入账号');
+        }
+
+        if ($mobile != '') {
+            $user = M('user', 'tab_')->field(['id', 'account'])->where(['phone' => $mobile])->find();
+            if (!$user) {
+                $this->respondError('手机号错误');
+            }
+            $account = $user->account;
+            if (!$this->smsVerify($params['account'], $params['verify_code'])) {
+                $this->respondError('验证失败');
+            }
+        }
+        
         $promote = M('promote', 'tab_')->where(['id' => $promoteId])->find();
 
         $userApi = new MemberApi();
@@ -46,10 +66,10 @@ class CommonController extends BaseController {
         if ($userId <= 0) {
             switch ($userId) {
                 case -1000 :
-                    $resMsg = "用户不存在";
+                    $resMsg = "账号或密码错误";
                     break;
                 case -10021 :
-                    $resMsg = "登录密码错误";
+                    $resMsg = "账号或密码错误";
                     break;
                 default :
                     $resMsg = "未知错误";
@@ -65,7 +85,7 @@ class CommonController extends BaseController {
                 'promote_account' => $promote['account']
             ]);
         }
-        $this->respondSuccess($resMsg);
+        $this->setData(['user_id' => $userId])->respondSuccess($resMsg);
     }
 
     //验证码
@@ -119,7 +139,7 @@ class CommonController extends BaseController {
         $userApi = new MemberApi();
         $userId = $userApi->login($params['account'], $params['password'], 1);
         $_SESSION['user_id'] = $userId;
-        $this->respondSuccess('添加成功');
+        $this->setData(['user_id' => $userId])->respondSuccess('添加成功');
     }
 
     //忘记密码
@@ -165,7 +185,7 @@ class CommonController extends BaseController {
         $userApi = new MemberApi();
         $userId = $userApi->login($account, $password, 1);
         $_SESSION['user_id'] = $userId;
-        $this->respondSuccess('注册成功');
+        $this->setData(['user_id' => $userId])->respondSuccess('注册成功');
     }
 
     //真正注册代码

Application/Mobile/Controller/SsgController.class.php

@@ -6,6 +6,7 @@ use User\Api\MemberApi;
 use Base\Tool\TaskClient;
 use Think\Log;
 use Base\Service\GameService;
+use Base\Service\PackageDownloadLogService;
 
 class SsgController extends BaseController {
     const USER_NOT_ILLEGAL = -1;        //用户名不合法
@@ -488,6 +489,15 @@ class SsgController extends BaseController {
         ))->find();
 
         if($isPay){
+
+            $packageDownloadLogService = new PackageDownloadLogService();
+            $packageDownloadLogService->add([
+                'user_id' => $userId,
+                'game_id' => $gameId,
+                'promote_id' => $promoteId,
+                'type' => 3,
+            ]);
+
             redirect("/mobile.php/Ssg/install_show/user_id/$userId/game_id/$gameId/order_id/".$isPay['order_id']);
         }else{
             if (!$gameInfo['supersign_token']) {

Public/Home/css/index2.css

@@ -487,10 +487,11 @@
     align-items: center;
     justify-content: center;
     background:rgba(0,0,0,0);
+    z-index: 1000;
 }
 .second-box{
     width: 5.50rem;
-    height: 7.4rem;
+    height: 6rem;
     border-radius:0.3rem;
     background-color: #fff;
     display: flex;
@@ -520,14 +521,14 @@
    width: 100%;
 }
 .swiper-slide-box{
-    padding: 0 0.5rem;
+    padding: 0 0.32rem;
 }
-.swiper-slide-box>div:first-child{
-    margin-bottom: 0.3rem;
-    font-size:0.28rem;
-    font-weight:400;
+.swiper-slide-box>div{
+    font-size:0.24rem;
+    font-weight:500;
     color:rgba(41,41,41,1);
     line-height:0.36rem;
+    text-align: center;
 }
 .swiper-slide-box>.slide-img{
     width: 100%;
@@ -545,7 +546,7 @@
     width: 100%;
 }
 .swiper-container-horizontal>.swiper-pagination-bullets{
-    bottom: -9px !important;
+    bottom: -10px !important;
 }
 
 .safari{
@@ -621,7 +622,7 @@
 }
 .register-box{
     width: 6rem;
-    height: 7.4rem;
+    height: 7rem;
     background-color: #fff;
     border-radius: 0.3rem;
 }
@@ -772,16 +773,17 @@
     color: #E30000;
     font-size: 0.2rem;
 }
+
 .mounting{
     position: fixed;
     top: 0;
     left: 0;
     width: 5.7rem;
-    height: 7rem;
+    height: 8rem;
     left: 50%;
     top: 50%;
     margin-left: -2.85rem;
-    margin-top: -3.5rem;
+    margin-top: -4rem;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -790,30 +792,38 @@
 }
 .mounting-box{
     width: 5.7rem;
-    height: 7rem;
+    height: 8rem;
     background-color: #fff;
     border-radius: 0.3rem;
 }
-.mounting-heard{
-    height: 1rem;
-    width: 100%;
-    text-align: center;
-    line-height: 1rem;
-    background-color: #489EF6;
-    font-size: 0.32rem;
-    color: #fff;
-    font-weight: 500;
-    border-top-left-radius: 0.3rem;
-    border-top-right-radius: 0.3rem;
-}
 .mounting-text{
-    margin-top: 0.67rem;
-
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
 }
+.mounting-btn{
+    width:4.4rem;
+    height:0.7rem;
+    background:linear-gradient(0deg,rgba(33,177,235,1),rgba(88,197,240,1));
+    box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17);
+    border-radius:0.35rem;
+    text-align: center;
+    line-height: 0.7rem;
+    font-size: 0.28rem;
+    color: #FFFFFF;
+    margin-top: 0.25rem;
+}
+.carousel{
+    width: 100%;
+    margin-top: 0.3rem;
+}
+.swiper-container{
+    padding-bottom: 0.6rem;
+}
+.swiper-slide{
+   width: 100%;
+}
 
 .title-one>img{
     width: 0.3rem;
@@ -832,18 +842,7 @@
     font-size: 0.24rem;
     font-weight: 400;
 }
-.mounting-btn{
-    width:4.6rem;
-    height:0.7rem;
-    background:linear-gradient(0deg,rgba(33,177,235,1),rgba(88,197,240,1));
-    box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17);
-    border-radius:0.35rem;
-    text-align: center;
-    line-height: 0.7rem;
-    font-size: 0.28rem;
-    color: #FFFFFF;
-    margin-top: 0.46rem;
-}
+
 .title-two{
     margin-top: 0.67rem;
     color: #292929;
@@ -852,47 +851,7 @@
     width: 4.6rem;
 }
 
-.mounting,.mounting-two{
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 5.7rem;
-    height: 7rem;
-    left: 50%;
-    top: 50%;
-    margin-left: -2.85rem;
-    margin-top: -3.5rem;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background:rgba(0,0,0,0);
-    z-index: 1000;
-}
-.mounting-box{
-    width: 5.7rem;
-    height: 7rem;
-    background-color: #fff;
-    border-radius: 0.3rem;
-}
-.mounting-heard{
-    height: 1rem;
-    width: 100%;
-    text-align: center;
-    line-height: 1rem;
-    background-color: #489EF6;
-    font-size: 0.32rem;
-    color: #fff;
-    font-weight: 500;
-    border-top-left-radius: 0.3rem;
-    border-top-right-radius: 0.3rem;
-}
-.mounting-text{
-    margin-top: 0.48em;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-}
+
 .title-one{
     height: 2.78rem;
     padding: 0 0.38rem;
@@ -945,8 +904,23 @@
     height: 100%;
     text-align: center;
     list-style: none;
+    background-color: #F5F5F5;
 }
 .register-heard>li.select{
-    background-color: #489EF6;
+    background-color: #46BEEE;
     color: #fff;
+    position: relative;
+}
+.register-heard>li.select::after{
+    position: absolute;
+    content: '';
+    bottom: -40%;
+    right: 50%;
+    margin-right: -0.33rem;
+    margin-top: 0.28rem;
+    width: 0.66rem;
+    height: 0.56rem;
+    background-image: url("../images/20191225/sanjiao.png");
+    background-size: 100% 100%;
+    font-size: 0.12rem;
 }