Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx

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

@@ -5,7 +5,7 @@
   <meta itemprop="image" content="{$game['icon']}"/>
   <meta name="description" itemprop="description" content="{$game['features']}"/>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
   <script src="__JS__/jquery-1.11.3.min.js"></script>
@@ -729,8 +729,7 @@ var PhoneObj = {
         },
         success: function (result) {
           if (result.code == '0000') {
-            Cookies.set('is_landing_login', 1, { expires: 1 })
-            isLogin = true;
+            setLoginStatus()
             $(".phone").hide();
             showMounting()
           } else {
@@ -740,6 +739,13 @@ var PhoneObj = {
       })
     })
 
+    function setLoginStatus()
+    {
+      var expireTime = new Date(new Date().getTime() + 10 * 60 * 1000);
+      Cookies.set('is_landing_login', 1, { expires: expireTime })
+      isLogin = true;
+    }
+
     function showMounting()
     {
       $('.mounting').show();
@@ -784,8 +790,7 @@ var PhoneObj = {
         cache: false,
         success: function (result) {
           if (result.code == '0000') {
-            Cookies.set('is_landing_login', 1, { expires: 1 })
-            isLogin = true;
+            setLoginStatus()
             $('.login').hide();
             showMounting()
           } else {
@@ -832,8 +837,7 @@ var PhoneObj = {
           },
           success: function (result) {
             if (result.code == '0000') {
-              Cookies.set('is_landing_login', 1, { expires: 1 })
-              isLogin = true;
+              setLoginStatus()
               $(".common").hide();
               showMounting()
             } else {