Merge branch 'hotfix/landing-page' into release

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

@@ -518,7 +518,15 @@
      
   </div>
 </div>
-
+<div class="mode" style=" position: fixed;
+top: 0;
+left: 0;
+width: 100%;
+height: 100%;
+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">
@@ -547,7 +555,7 @@
     </div>
     <div class="mounting-text">
       <div class="title-one" style="width: 4.06rem;padding: 0;margin-bottom: 0;">
-          <img src="" alt="" style="width: 100%;height: 100%;">
+          <img src="__IMG__/20191225/bg.png" alt="" style="width: 100%;height: 100%;box-shadow:0px 0px 6px 0px rgba(109,121,145,0.2)">
       </div>
       <a id="beta-url" href="#" class="mounting-btn">点击安装游戏</a>
       <!-- <div class="title-two">第二步：点击下方按钮安装游戏</div> -->
@@ -642,6 +650,7 @@ var PhoneObj = {
         showMounting()
       } else {
         $(".commonWindow").show();
+        $(".mode").show();
       }
       $(".window").hide();
     });
@@ -674,8 +683,12 @@ var PhoneObj = {
       $(".mounting-two").hide();
     })
     $(".mounting .register-heard>a").click(function(){
+      $(".mode").hide();
       $(".mounting").hide();
-      $(".login").show();
+    })
+    $(".mounting-two .register-heard>a").click(function(){
+      $(".mounting").show();
+      $(".mounting-two").hide();
     })
     // $(".login").click(function(){
     //     $(".login").hide();
@@ -692,7 +705,16 @@ var PhoneObj = {
     $(".enroll").click(function(){
       $(".login").hide();
       $(".commonWindow").show();
+      $(".mode").show();
     });
+    $(".mode").click(function(){
+      $(".commonWindow").hide();
+      $(".mounting").hide();
+      $(".mounting-two").hide();
+      $(".second").hide();
+      $(".register").hide();
+      $(".mode").hide();
+    })
     $(".commonCut").click(function(){
       $(".commonWindow").hide();
       $(".login").show();
@@ -771,6 +793,7 @@ var PhoneObj = {
 
     function showMounting()
     {
+      $(".mode").show();
       $('.mounting').show();
       $('#beta-url').attr('href', $('[name=betaUrl]').val())
     }

Public/Home/css/index2.css

@@ -477,12 +477,16 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
-    height: 100%;
+    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.6);
+    background:rgba(0,0,0,0);
 }
 .second-box{
     width: 5.50rem;
@@ -603,12 +607,16 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
-    height: 100%;
+    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.6);
+    background:rgba(0,0,0,0);
     z-index: 1000;
 }
 .register-box{
@@ -768,12 +776,16 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
-    height: 100%;
+    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.6);
+    background:rgba(0,0,0,0);
     z-index: 1000;
 }
 .mounting-box{
@@ -844,12 +856,16 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
-    height: 100%;
+    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.6);
+    background:rgba(0,0,0,0);
     z-index: 1000;
 }
 .mounting-box{
@@ -923,15 +939,7 @@
     border-top-left-radius:0.3rem;
     border-top-right-radius:0.3rem;
 }
-.register-heard>a{
-    position: absolute;
-    left: 0.4rem;
-    top: 0.35rem;
-    width: 0.17rem;
-    height: 0.3rem;
-    background: url("../img/fanhui.png");
-    background-size: 100% 100%;
-}
+
 .register-heard>li{
     width: 50%;
     height: 100%;