合并分支 'lihong' 到 'master'

修改



查看合并请求 !180

@@ -102,32 +102,26 @@
 
 
 //软件盘
 //软件盘
     var flag = false;
     var flag = false;
-
     $("input").focus(function(){
     $("input").focus(function(){
 
 
         flag = true;
         flag = true;
         console.log(flag)
         console.log(flag)
 
 
     });
     });
-
     window.onresize = function(){
     window.onresize = function(){
 
 
         if(flag){
         if(flag){
 
 
            $(".bottom_icon position_a").css({"position":"initial"});
            $(".bottom_icon position_a").css({"position":"initial"});
             flag = false;
             flag = false;
-            
         }else {
         }else {
 
 
             $(".bottom_icon position_a").css({"position":"fixed"});
             $(".bottom_icon position_a").css({"position":"fixed"});
 
 
             if(document.activeElement.id == "user_login"||document.activeElement.id=="user_pass"){
             if(document.activeElement.id == "user_login"||document.activeElement.id=="user_pass"){
                 flag = true;
                 flag = true;
-
             };
             };
 
 
-
-
         };
         };
 
 
     };
     };

@@ -2,8 +2,7 @@ body{
 	background-color: #FFFFFF;
 	background-color: #FFFFFF;
 }
 }
 .position_a{
 .position_a{
-	position: fixed;
-	bottom:0.2rem;
+	position: absolute;
 }
 }
 .pic_wrap{
 .pic_wrap{
 	width: 2.3rem;
 	width: 2.3rem;
@@ -15,8 +14,8 @@ body{
 	display: flex;
 	display: flex;
 	width: 6.1rem;
 	width: 6.1rem;
 	height: 1rem;
 	height: 1rem;
-	align-items: center;
 	background-color: #F8F8F8;
 	background-color: #F8F8F8;
+	align-items: center;
 	border-radius: 0.2rem;
 	border-radius: 0.2rem;
 	background-color: #F8F8F8;
 	background-color: #F8F8F8;
 	position: relative;
 	position: relative;
@@ -36,8 +35,8 @@ body{
 
 
 .baby_input {
 .baby_input {
 	background-color: #F8F8F8;
 	background-color: #F8F8F8;
-	outline: none;
 	border: none;
 	border: none;
+	outline: none;
 	height: 90%;
 	height: 90%;
 	width: 3.5rem;
 	width: 3.5rem;
 	font-size: .3rem;
 	font-size: .3rem;