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

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -408,11 +408,11 @@ func (a *AfterPay) GetUserInfo() error {
 					city_i += qutil.IntAll(cv.(int))
 				}
 			}
-			if area_i != -1 && area_i != 0 && city_i != 0 {
+			if area_i > 0 && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域、" + strconv.Itoa(city_i) + "个地市"
-			} else if (area_i == -1 || area_i != 0) && city_i != 0 {
+			} else if area_i <= 0 && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(city_i) + "个地市"
-			} else if area_i != -1 && area_i != 0 && city_i == 0 {
+			} else if area_i > 0 && city_i == 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域"
 			} else {
 				(*data)["o_area"] = "全国"

src/web/staticres/vipsubscribe/js/common.js

@@ -148,7 +148,7 @@ function getsubVipOrderPriceBybuyset(buyset, t, price) {
 			}
 		}
 	}
-	
+	console.log(vipbuyset)
     //当省份数量大于price.ProvinceMaxCount 按照全国计算
     if (vipbuyset.areacount > price.provinceMaxCount) {
         vipbuyset.areacount = -1

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

@@ -178,7 +178,13 @@
 							if(provinceLen === -1){
 								areaHtml = "全国";
 							}else{
-								areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+								if(provinceLen !== 0 && cityLen!==0){
+									areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+								}else if(provinceLen !== 0 && cityLen === 0){
+									areaHtml = provinceLen+"个省级区域";
+								}else if(provinceLen === 0 && cityLen !== 0){
+									areaHtml = cityLen+"个市";
+								}
 							}
 							$(".area-list").text(areaHtml);
 							let industryLen = 0;

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

@@ -615,7 +615,13 @@
 					if(provinceLen === -1){
 						areaHtml = "全国";
 					}else{
-						areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+						if(provinceLen !== 0 && cityLen!==0){
+							areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+						}else if(provinceLen !== 0 && cityLen === 0){
+							areaHtml = provinceLen+"个省级区域";
+						}else if(provinceLen === 0 && cityLen !== 0){
+							areaHtml = cityLen+"个市";
+						}
 					}
 					$(".item_area .label_for").text(areaHtml);
 					let industryLen = 0;

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

@@ -647,8 +647,13 @@
 				areaHtml = "已新增全国";
 				$("#area").attr("placeholder", areaHtml);
 			}else{
-				areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
-				if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
+				if(Number(vipSubSelectArea.province) !== 0 && Number(cityLen) !== 0){
+					areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
+				}else if(Number(vipSubSelectArea.province) !== 0 && Number(cityLen) === 0){
+					areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域";
+				}else if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) !== 0){
+					areaHtml = "已新增 "+ cityLen +" 个地市";
+				}else if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
 					areaHtml = "选择升级区域";
 				}
 				$("#area").attr("placeholder", areaHtml);