城市提醒

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

@@ -660,8 +660,20 @@ $(function () {
 	function showCityTips(dom){
 		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;
 		let cityLength = $(dom).parent().find('.city').length;
-		if(selectedCityLength > 2){
+		let dataCount = $(dom).parent().parent().attr("data-buy-city-count");
+		if(dataCount === undefined){
+			dataCount = 0;
+		}else{
+			if(Number(dataCount) === disabledCityLength){
+				dataCount = 0;
+			}else{
+				dataCount = dataCount - disabledCityLength;
+			}
+		}
+		let showCount = selectedCityLength - dataCount;
+		if(showCount > 2){
 			$(".tips_d_text").text("已选择"+selectedCityLength+"个市，建议购买“全省”");
 			$(".tips_d_text").show();
 		}else{

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

@@ -40,7 +40,7 @@
     <div class="app-layout-content-b">
     <div class="vip_update">
         <div class="choose_condition">
-            <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期!</p>
+            <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期。升级完成后，将立即生效。</p>
             <ul class="chooseList">
                 <li class="choose_item">
                     <a href="/jyapp/vipsubscribe/toChooseAreaUpgrade">
@@ -113,8 +113,7 @@
                         </table>
                         <dl class="tips">
                             <dt>购买须知：</dt>
-                            <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
-                            <dd>用户最多购买/续费3年套餐；</dd>
+                            <dd>套餐周期内，不支持套餐降级，即将到期时续费可降级；</dd>
                             <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
                         </dl>
                     </div>

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

@@ -660,8 +660,20 @@ $(function () {
 	function showCityTips(dom){
 		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;
 		let cityLength = $(dom).parent().find('.city').length;
-		if(selectedCityLength > 2){
+		let dataCount = $(dom).parent().parent().attr("data-buy-city-count");
+		if(dataCount === undefined){
+			dataCount = 0;
+		}else{
+			if(Number(dataCount) === disabledCityLength){
+				dataCount = 0;
+			}else{
+				dataCount = dataCount - disabledCityLength;
+			}
+		}
+		let showCount = selectedCityLength - dataCount;
+		if(showCount > 2){
 			$(".tips_d_text").text("已选择"+selectedCityLength+"个市，建议购买“全省”");
 			$(".tips_d_text").show();
 		}else{

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

@@ -724,7 +724,6 @@
 				}
 			}
 		}
-		console.log(nowUpgrade)
 	    //
 	    if(sessionStorage.renew_cyclecount!==""&&sessionStorage.renew_cycleunit!==""){
 	 		var cycleunit = sessionStorage.renew_cycleunit;