Parcourir la source

Merge branch 'evaluation' of 121.43.114.153:/home/git/repositories/shopnc into evaluation

stanley-king il y a 8 ans
Parent
commit
2a60112b71

+ 1 - 0
data/resource/mobile/article/css/article.css

@@ -1,5 +1,6 @@
 img {
     width:100%;
+    height: auto;
 }
 p {
     font-size:16px;

+ 2 - 2
data/resource/mobile/bonus/css/content_rem.css

@@ -307,8 +307,8 @@ input,button {
 }
 .bottom_btn {
     background: #ff4e4e;
-    height: 1.3333rem;
-    line-height: 1.3333rem;
+    height: 1.34rem;
+    line-height: 1.34rem;
     border-bottom-right-radius: 10px;
     border-bottom-left-radius: 10px;
     color: #fff;

+ 7 - 4
data/resource/mobile/bonus/js/tel.js

@@ -1,5 +1,5 @@
 $(function(){
-    tel={
+   var tel={
         //总入口
         init:function(){
             var that=this;
@@ -12,7 +12,7 @@ $(function(){
             that.blurValidatetel('keyup');
             that.blurValidatetel('blur');
             that.message('#message');
-            that.focu();
+            that.focu(document);
         },
 
         //弹出信息
@@ -222,9 +222,12 @@ $(function(){
         },
         //收起键盘
         focu:function(id){
-            $(document).on('tap',function(){
+            $(id).on('tap',function(event){
+                var eventName=event.target.localName;
+                if(eventName.indexOf('input')!==-1||eventName.indexOf('button')!==-1){
+                    return;
+                }
                 $('input').blur();
-                //return false;
             })
         }
     };