新增行业区域

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/updateArea.js

@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -686,7 +690,6 @@ $(function () {
 	
 	function showOther(){
 		let showCounts = newlyAdded.province;
-		console.log(showCounts)
 		if(showCounts > 9){
 			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();

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

@@ -336,8 +336,11 @@
                 	}
                 }
                 // 显示隐藏优惠tips
-                if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”");
+                let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
+                let showCount = buyset - disabledCount;
+                let showCounts = selectedArr.length - showCount;
+                if (showCounts > 3) {
+                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

src/web/staticres/vipsubscribe/js/updateArea.js

@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -686,7 +690,6 @@ $(function () {
 	
 	function showOther(){
 		let showCounts = newlyAdded.province;
-		console.log(showCounts)
 		if(showCounts > 9){
 			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();

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

@@ -335,8 +335,11 @@
                 	}
                 }
                 // 显示隐藏优惠tips
-                if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”");
+                let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
+                let showCount = buyset - disabledCount;
+                let showCounts = selectedArr.length - showCount;
+                if (showCounts > 3) {
+                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()