Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Home/Controller/QueryController.class.php

@@ -1863,7 +1863,7 @@ class QueryController extends BaseController
                 ->field($field)
                 ->join('join tab_user as u on u.id = s.user_id')
                 ->where($map)
-                ->group('s.game_player_id, s.server_id, s.game_id')
+                ->group('s.game_player_id, s.server_id, s.game_id, s.user_id')
                 ->having($having)
                 ->buildSql();
             $query = M()->alias('record')

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

@@ -280,7 +280,7 @@
 
       <?php else:?>
       <div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">￥10至尊下载</div>
-      <div class="blue-btn stabilization" onclick="layer.msg('该游戏已关闭下载');">beta版下载</div>
+      <div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">beta版下载</div>
       <div class="gray-btn down-link"  onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
       <?php endif;?>
     </div>
@@ -467,7 +467,7 @@
       <div class="register-forget">
         <div>
           <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
-          <span>《用户协议》</span>
+          <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
         </div>
         <div class="phoneCut">
           <img src="__IMG__/20191225/qiehuan.png" alt="">
@@ -501,7 +501,7 @@
       <div class="register-forget">
         <div>
           <div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
-          <span>《用户协议》</span>
+          <span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
         </div>
         <div class="commonCut">
           <img src="__IMG__/20191225/qiehuan.png" alt="">
@@ -520,12 +520,12 @@
     <div class="mounting-text">
       <div class="title-one">
         第一步：下载苹果官方TestFlight
-        <a href="https://apps.apple.com/cn/app/testflight/id899247664"><img src="__IMG__/20191225/biaoshi.png" alt=""></a>
+        <img src="__IMG__/20191225/biaoshi.png" alt="">
       </div>
       <div class="one-contain">
         首次安装必须<span>打开应用</span>，并点击<span>“继续”</span>按钮后，才可进行第二步操作
       </div>
-      <a href="#" class="mounting-btn">点击安装TestFlight平台</a>
+      <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 id="beta-url" href="#" class="mounting-btn">点击安装游戏</a>
     </div>
@@ -534,9 +534,11 @@
 </body>
 </html>
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
+<script src="__STATIC__/js.cookie.min.js"></script>
 <script>
 var gameId = parseInt("{$game.id}");
 var promoteId = parseInt("{$promoteId}");
+var isLogin = Cookies.get('is_landing_login') == undefined ? false : true;
 var PhoneObj = {
   i:60,
   codeflag: true,
@@ -611,7 +613,11 @@ var PhoneObj = {
   $(function(){
     $(".stabilization").click(function(){
       event.stopPropagation();
-      $(".login").show();
+      if (isLogin) {
+        showMounting()
+      } else {
+        $(".login").show();
+      }
       $(".window").hide();
     });
     $(".login .register-heard>a").click(function(){
@@ -723,6 +729,8 @@ var PhoneObj = {
         },
         success: function (result) {
           if (result.code == '0000') {
+            Cookies.set('is_landing_login', 1, { expires: 1 })
+            isLogin = true;
             $(".phone").hide();
             showMounting()
           } else {
@@ -776,6 +784,8 @@ var PhoneObj = {
         cache: false,
         success: function (result) {
           if (result.code == '0000') {
+            Cookies.set('is_landing_login', 1, { expires: 1 })
+            isLogin = true;
             $('.login').hide();
             showMounting()
           } else {
@@ -822,6 +832,8 @@ var PhoneObj = {
           },
           success: function (result) {
             if (result.code == '0000') {
+              Cookies.set('is_landing_login', 1, { expires: 1 })
+              isLogin = true;
               $(".common").hide();
               showMounting()
             } else {

Application/Mobile/Controller/CommonController.class.php

@@ -56,7 +56,7 @@ class CommonController extends BaseController {
             $this->respondError($resMsg);
         }
 
-        // $_SESSION['user_id'] = $userId;
+        $_SESSION['user_id'] = $userId;
         $user = M('user', 'tab_')->where(['id' => $userId])->find();
         if (!$user['promote_id'] && $promote) {
             M('user', 'tab_')->where(['id' => $userId])->save([
@@ -114,7 +114,8 @@ class CommonController extends BaseController {
 
         //添加自动登录
         $userApi = new MemberApi();
-        $userId = $userApi->login($params['account'], $params['password'],1);
+        $userId = $userApi->login($params['account'], $params['password'], 1);
+        $_SESSION['user_id'] = $userId;
         $this->respondSuccess('添加成功');
     }
 
@@ -157,7 +158,8 @@ class CommonController extends BaseController {
 
         //添加自动登录
         $userApi = new MemberApi();
-        $user_id = $userApi->login($account, $password, 1);
+        $userId = $userApi->login($account, $password, 1);
+        $_SESSION['user_id'] = $userId;
         $this->respondSuccess('注册成功');
     }
 

Public/static/js.cookie.min.js

@@ -0,0 +1,2 @@
+/*! js-cookie v3.0.0-beta.3 | MIT */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self,function(){var n=e.Cookies,r=e.Cookies=t();r.noConflict=function(){return e.Cookies=n,r}}())}(this,function(){"use strict";var e={read:function(e){return e.replace(/(%[\dA-F]{2})+/gi,decodeURIComponent)},write:function(e){return encodeURIComponent(e).replace(/%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,decodeURIComponent)}};function t(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)e[r]=n[r]}return e}return function n(r,o){function i(e,n,i){if("undefined"!=typeof document){"number"==typeof(i=t({},o,i)).expires&&(i.expires=new Date(Date.now()+864e5*i.expires)),i.expires&&(i.expires=i.expires.toUTCString()),n=r.write(n,e),e=encodeURIComponent(e).replace(/%(2[346B]|5E|60|7C)/g,decodeURIComponent).replace(/[()]/g,escape);var c="";for(var u in i)i[u]&&(c+="; "+u,!0!==i[u]&&(c+="="+i[u].split(";")[0]));return document.cookie=e+"="+n+c}}return Object.create({set:i,get:function(t){if("undefined"!=typeof document&&(!arguments.length||t)){for(var n=document.cookie?document.cookie.split("; "):[],o={},i=0;i<n.length;i++){var c=n[i].split("="),u=c.slice(1).join("=");'"'===u[0]&&(u=u.slice(1,-1));try{var f=e.read(c[0]);if(o[f]=r.read(u,f),t===f)break}catch(e){}}return t?o[t]:o}},remove:function(e,n){i(e,"",t({},n,{expires:-1}))},withAttributes:function(e){return n(this.converter,t({},this.attributes,e))},withConverter:function(e){return n(t({},this.converter,e),this.attributes)}},{attributes:{value:Object.freeze(o)},converter:{value:Object.freeze(r)}})}(e,{path:"/"})});