Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

src/jfw/modules/app/src/web/templates/vipsubscribe/choose_area_upgrade.html

@@ -472,7 +472,6 @@
             if (province == $.trim($(dom).text())) {
               $(".checkbox.other").attr("checked", false); //取消全国选中
               $(dom).children('.checkbox').attr({"checked": true,"disabled":!canClick});//选中此省份
-              $(this).parent(".tab:not(.municipality)").next().slideDown(500);
               if(canClick){
               	$(dom).parents().siblings('.tab_content').find(".city").addClass("active").attr({"disabled":!canClick});
               }else{
@@ -487,7 +486,6 @@
 	            	$('.tab_content .city').each(function(){
 	            		$(this).attr("disabled",!canClick);
 	            	});
-	            	$(".tips_d_money").hide();
 	            }
             }
           })
@@ -508,6 +506,7 @@
                             "checked": true,
                             "disabled": "disabled"
                         })
+                        $(dom).parents().slideDown(500);
                     }
                 }
             })
@@ -632,8 +631,6 @@
 //        console.log("this.selectObj:",this.selectObj)
           $('.result_name').append(html)
           AreaChoose.isOpen()
-          //刷新价格
-          AreaChoose.flushPrice();
         },
         submitArea:function(){
           let addCity = $('.result_name').text(); //新增的城市
@@ -655,14 +652,6 @@
         		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
           }
         },
-        getNationwide:function(){/*默认选中全国 */
-//        $('.other').prop('checked', true);
-//        $('.tab_content').slideUp(500)
-//        $('.tab span i').css({
-//            "display":"inline-block",
-//            "transform":"rotate(0)"
-//        });
-        },
         isOpen:function(){
           let pHeight = $('.result_text').height()
           let minHeight = $('.result_text').css('min-height')
@@ -694,9 +683,9 @@
           }
         },
         inintClick:function(){
-        	$('.tab_content').each(function(){
-          		AreaChoose.showSelected(false);
-        	})
+//      	$('.tab_content').each(function(){
+//        		AreaChoose.showSelected(false);
+//      	})
           $('.detail').click(function () {  
                 $('.result_text').removeClass('line_two')
                 $(".result").css("padding-bottom","0.3rem")
@@ -835,14 +824,6 @@
                 $(".tips_btn .btns .reset-btn").attr("disabled","disabled");
             	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
             }
-        },
-        flushPrice:function(){
-          if(this.vipSubisTrial){
-            $('.tips_d_money').css("display","none");
-          }else{
-            var price=getsubVipOrderPrice(this.selectObj,this.selectedIndustryArr,this.timeSelect);
-            $('.tips_d_money').text('￥'+price);
-          }
         }
       }
       
@@ -850,8 +831,7 @@
             AreaChoose.isOpen()
             AreaChoose.inintData(); //初始化 已选择和已购买数据
             AreaChoose.inintPage(); //初始化城市数据
-
-            AreaChoose.getNationwide();//默认选中全国 
+            AreaChoose.showSelected(false);
             AreaChoose.showSelected(true);//回显已选择
             /* 判断已购买的城市 在不在 全部城市里面，在，将按钮置灰，不可点击 */
 

src/jfw/modules/app/src/web/templates/vipsubscribe/renew_notice.html

@@ -115,9 +115,10 @@
 							return   
 					    }
 					    if(exprie === "will"){
-					    	let a = (endstime/1000) - (86400 * 3)
-					    	let b = nowTime/1000
-					    	if(b > a){
+					    	let a = (endstime/1000) - (86400 * 3);
+					    	let b = nowTime/1000;
+					    	let c = endstime/1000;
+					    	if(a < b&&b < c){
 					    		$(".renew_service").show();
 						    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
 						    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")

src/jfw/modules/app/src/web/templates/vipsubscribe/trial_info.html

@@ -49,12 +49,14 @@
                                        onchange="check_tel($(this),$('.code_btn'),true)">
                             </div>
                             <div class="form_item form_item_line">
-                                <input type="number" placeholder="图形验证码" value="" class="code imgcode input" maxlength="4"
+                                <input type="number" placeholder="图形验证码" value="" class="code imgcode input"
+                                       maxlength="4"
                                        onchange="check_imgcode($(this),$('.code_btn'),true)">
                                 <img src="/subscribepay/trial/captcha" class="checkCode">
                             </div>
                             <div class="form_item">
-                                <input type="number" placeholder="手机验证码" value="" class="code phonecode input" maxlength="6"
+                                <input type="number" placeholder="手机验证码" value="" class="code phonecode input"
+                                       maxlength="6"
                                        onchange="check_phonecode($(this),true)">
                                 <button class="code_btn" type="button">获取验证码</button>
                             </div>
@@ -181,21 +183,32 @@
     });
 
     function scrollView(obj) {
-        var view_height = $(document.body).height();
+        var view_height = $(document.body).height()
 
         function change() {
             $(document.body).height(view_height)
         }
+
         change();
         window.addEventListener('resize', change);
-        $('.' + obj).on('blur', function () {
+        $('.' + obj).on('blur', function (e) {
             setTimeout(() => {
-                if (!document.activeElement.className.includes(obj)) {
+                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 {
                     window.scroll(0, 0)
                 }
             }, 50)
         })
     }
+    
     {{else}}
     $('#formInfo').submit(function (e) {
         window.location.replace("/jyapp/vipsubscribe/vipsubscribe_trial");

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

@@ -475,7 +475,6 @@
             if (province == $.trim($(dom).text())) {
               $(".checkbox.other").attr("checked", false); //取消全国选中
               $(dom).children('.checkbox').attr({"checked": true,"disabled":!canClick});//选中此省份
-              $(this).parent(".tab:not(.municipality)").next().slideDown(500);
               if(canClick){
               	$(dom).parents().siblings('.tab_content').find(".city").addClass("active").attr({"disabled":!canClick});
               }else{
@@ -490,7 +489,6 @@
 	            	$('.tab_content .city').each(function(){
 	            		$(this).attr("disabled",!canClick);
 	            	});
-	            	$(".tips_d_money").hide();
 	            }
             }
           })
@@ -511,6 +509,7 @@
                             "checked": true,
                             "disabled": "disabled"
                         })
+                        $(dom).parents().slideDown(500);
                     }
                 }
             })
@@ -635,8 +634,6 @@
 //        console.log("this.selectObj:",this.selectObj)
           $('.result_name').append(html)
           AreaChoose.isOpen()
-          //刷新价格
-          AreaChoose.flushPrice();
         },
         submitArea:function(){
           let addCity = $('.result_name').text(); //新增的城市
@@ -658,14 +655,6 @@
         		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
           }
         },
-        getNationwide:function(){/*默认选中全国 */
-//        $('.other').prop('checked', true);
-//        $('.tab_content').slideUp(500)
-//        $('.tab span i').css({
-//            "display":"inline-block",
-//            "transform":"rotate(0)"
-//        });
-        },
         isOpen:function(){
           let pHeight = $('.result_text').height()
           let minHeight = $('.result_text').css('min-height')
@@ -697,9 +686,9 @@
           }
         },
         inintClick:function(){
-        	$('.tab_content').each(function(){
-          		AreaChoose.showSelected(false);
-        	})
+//      	$('.tab_content').each(function(){
+//        		AreaChoose.showSelected(false);
+//      	})
           $('.detail').click(function () {  
                 $('.result_text').removeClass('line_two')
                 $(".result").css("padding-bottom","0.3rem")
@@ -838,14 +827,6 @@
                 $(".tips_btn .btns .reset-btn").attr("disabled","disabled");
             	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
             }
-        },
-        flushPrice:function(){
-          if(this.vipSubisTrial){
-            $('.tips_d_money').css("display","none");
-          }else{
-            var price=getsubVipOrderPrice(this.selectObj,this.selectedIndustryArr,this.timeSelect);
-            $('.tips_d_money').text('￥'+price);
-          }
         }
       }
       
@@ -853,8 +834,7 @@
             AreaChoose.isOpen()
             AreaChoose.inintData(); //初始化 已选择和已购买数据
             AreaChoose.inintPage(); //初始化城市数据
-
-            AreaChoose.getNationwide();//默认选中全国 
+            AreaChoose.showSelected(false);
             AreaChoose.showSelected(true);//回显已选择
             /* 判断已购买的城市 在不在 全部城市里面，在，将按钮置灰，不可点击 */
 

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

@@ -118,9 +118,10 @@
 							return   
 					    }
 					    if(exprie === "will"){
-					    	let a = (endstime/1000) - (86400 * 3)
-					    	let b = nowTime/1000
-					    	if(b > a){
+					    	let a = (endstime/1000) - (86400 * 3);
+					    	let b = nowTime/1000;
+					    	let c = endstime/1000;
+					    	if(a < b&&b < c){
 					    		$(".renew_service").show();
 						    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
 						    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")

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

@@ -187,16 +187,26 @@
 
     // 解决移动端软键盘弹起遮挡输入框及ios下软键盘关闭后底部留白问题
     function scrollView(obj) {
-        var view_height = $(document.body).height();
+        var view_height = $(document.body).height()
 
         function change() {
             $(document.body).height(view_height)
         }
+
         change();
         window.addEventListener('resize', change);
-        $('.' + obj).on('blur', function () {
+        $('.' + obj).on('blur', function (e) {
             setTimeout(() => {
-                if (!document.activeElement.className.includes(obj)) {
+                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 {
                     window.scroll(0, 0)
                 }
             }, 50)