Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/web/staticres/vipsubscribe/css/trial_info.css

@@ -1,22 +1,21 @@
 
 .trial_info {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
   width: 100%;
   height: 100%;
-  overflow: hidden;
-  padding-bottom: .94rem;
+  overflow-x: hidden;
 }
 
 .trial_info .form {
+  flex: 1;
   width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  flex-direction: column;
+  overflow-y: scroll;
 }
 
 .trial_info .trial_body {
-  overflow-y: scroll;
-  flex: 1;
   background: #34355A;
 }
 
@@ -183,8 +182,8 @@
 }
 
 .trial_info .trial_btn{
-	position: fixed;
-	bottom: 0;
+	/*position: fixed;*/
+	/*bottom: 0;*/
 	width: 100%;
 	background: #fff;
 }

src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -14,7 +14,8 @@
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
 	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+	<!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style type="text/css">
 	body,html {

src/web/templates/weixin/vipsubscribe/choose_industry_upgrade.html

@@ -12,7 +12,8 @@
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         {{include "/common/weixin.html"}}
-        <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+        <!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+    	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style type="text/css">
     	body,html {

src/web/templates/weixin/vipsubscribe/renew_notice.html

@@ -10,7 +10,8 @@
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
 		{{include "/common/weixin.html"}}
-		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+		<!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+		<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	<style type="text/css">
 		body,html {

src/web/templates/weixin/vipsubscribe/trial_info.html

@@ -70,13 +70,12 @@
                 <p class="explain_item">3、如用户在试用期间购买付费套餐，则试用权限在购买支付后自动失效。</p>
             </div>
         </div>
-        <div class="trial_btn">
-            <!-- 未完善个人信息展示的按钮 type类型为submit-->
-            <button class="btn" type="submit">立即免费试用</button>
-            <!-- 已完善过个人信息 展示的按钮 type类型为button -->
-        </div>
-
     </form>
+    <div class="trial_btn">
+        <!-- 未完善个人信息展示的按钮 type类型为submit-->
+        <button class="btn" type="submit">立即免费试用</button>
+        <!-- 已完善过个人信息 展示的按钮 type类型为button -->
+    </div>
 </div>
 {{include "/common/weixin.html"}}
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
@@ -187,27 +186,47 @@
 
     // 解决移动端软键盘弹起遮挡输入框及ios下软键盘关闭后底部留白问题
     function scrollView(obj) {
-        var view_height = $(document.body).height()
+        let u = navigator.userAgent, app = navigator.appVersion;
+        let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
 
+        var view_height = $(document.body).height()
         function change() {
             $(document.body).height(view_height)
         }
+        // 给所有input绑定一个focus事件，用来判断键盘弹起。执行完成就解绑该事件
+        function focusOnce() {
+            $('.' + obj).on('focus', function(e) {
+                e.target.scrollIntoView({"block": "center"})
+                $('.' + obj).off('focus')
+            })
+        }
 
-        change();
-        window.addEventListener('resize', change);
+
+        if (isAndroid) {
+            // 在安卓中键盘弹起会触发window.resize事件
+            // ios中则不会触发window.resize事件
+            change();
+            window.addEventListener('resize', change);
+        } else {
+            // 进入页面绑定，触发一次就解绑
+            focusOnce()
+        }
+        
+        
         $('.' + obj).on('blur', function (e) {
             setTimeout(() => {
                 let dom = document.activeElement;
-                // console.dir(dom);
                 if (dom.className.includes(obj)) {
-                    let u = navigator.userAgent, app = navigator.appVersion;
-                    let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
                     if (isAndroid) {
                         dom.scrollIntoView({"block": "center"})
+                    } else {
+                        // dom.scrollIntoView({"block": "bottom"})
                     }
-
                 } else {
                     window.scroll(0, 0)
+                    // 当页面上没有获得焦点的input时候就说明键盘收起来了。
+                    // 给input绑定focus事件用来监听其弹起
+                    focusOnce()
                 }
             }, 50)
         })