xiugai

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

@@ -342,7 +342,15 @@ $(function () {
 		}
         
         // 升级新增赋值
-        $('.result_text.add_new .added-info').text(`${addedInfo.p}、${addedInfo.c}`)
+		if (newlyAdded.city === 0) {
+			// 只买了省级区域
+			$('.result_text.add_new .added-info').text(`${addedInfo.p}`)
+		} else if (newlyAdded.province === 0){
+			// 只买了市
+			$('.result_text.add_new .added-info').text(`${addedInfo.c}`)
+		} else {
+			$('.result_text.add_new .added-info').text(`${addedInfo.p}、${addedInfo.c}`)
+		}
 
         if (newlyAdded.province !== 0 || newlyAdded.city !== 0) {
             $('.result_text.add_new').show()

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

@@ -928,7 +928,7 @@
 				}
 			}
 			nowRenew = nowUpgrade;
-			// console.log("monthold",nowUpgrade)
+			console.log("monthold",nowUpgrade)
 			//
 			var nowUpgradeYear = 0;
 			if(nowUpgrade >= 12 && nowUpgrade < 24){
@@ -942,8 +942,8 @@
 				nowUpgradeYear = nowUpgradeYear + 1;
 				nowUpgrade = 0;
 			}
-			// console.log("year",nowUpgradeYear)
-			// console.log("month",nowUpgrade)
+			console.log("year",nowUpgradeYear)
+			console.log("month",nowUpgrade)
 			//
 			if (nowUpgradeYear >= 1) {
 				// let monthprice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgrade, 2])
@@ -963,15 +963,15 @@
 				oldMonthPrice = (oldPrice / nowUpgrade)
 				oldYearPrice = ((oldPrice / nowUpgrade) * 10).toFixed(1);
 			}
-			// console.log("oldYearPrice",oldYearPrice)
-			// console.log("oldMonthPrice",oldMonthPrice)
+			console.log("oldYearPrice",oldYearPrice)
+			console.log("oldMonthPrice",oldMonthPrice)
 			
 			//
 			if(nowUpgradeYear >= 1){
-				let newPriceY = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgradeYear,1]);
-				let newPriceM = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgrade,2]);
-				let yearprice = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgradeYear,1]);
-				let monthprice = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgrade,2]);
+				let newPriceY = getsubVipOrderPriceBybuyset(newBuysetObj(buySetObj(areaObj())),[nowUpgradeYear,1]);
+				let newPriceM = getsubVipOrderPriceBybuyset(newBuysetObj(buySetObj(areaObj())),[nowUpgrade,2]);
+				let yearprice = getsubVipOrderPriceBybuyset(newBuysetObj(buySetObj(areaObj())),[nowUpgradeYear,1]);
+				let monthprice = getsubVipOrderPriceBybuyset(newBuysetObj(buySetObj(areaObj())),[nowUpgrade,2]);
 				price = newPriceY + newPriceM - oldPrice;
 				// ------- 升级延长周期价格计算 ---------
 				if(monthprice === 0){
@@ -982,9 +982,9 @@
 					completeYear = ((monthprice / nowUpgrade)*10).toFixed(1);
 				}
 				// ------- 升级延长周期价格计算 ---------
-				// console.log("yearprice",yearprice);
-				// console.log("monthprice",monthprice);
-				// console.log(">=1",price);
+				console.log("yearprice",yearprice);
+				console.log("monthprice",monthprice);
+				console.log(">=1",price);
 			}else{
 				let monthprice = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgrade,2]);
 				
@@ -1001,13 +1001,13 @@
 				// console.log("<1",price)
 			}
 			
-			// console.log("oldPrice", oldPrice);
+			console.log("oldPrice", oldPrice);
 			if(sessionStorage.vipSubSelectAreaUpgrade===undefined&&sessionStorage.vipSubSelectIndustryUpgrade===undefined){
 				completeMonth = oldMonthPrice;
 				completeYear = oldYearPrice;
 			}
-			// console.log("completeMonth",completeMonth)
-			// console.log("completeYear",completeYear)
+			console.log("completeMonth",completeMonth)
+			console.log("completeYear",completeYear)
 			// ------- 延长周期价格赋值 ---------
 			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
 				if(sessionStorage.upgrade_cycleunit === "1"){
@@ -1234,13 +1234,6 @@
 						}
 					}
 				}
-				// for(let n in nowset.citys){
-				// 	if(nowset.citys[n] > 2){
-				// 		let cityarr = nowset.citys
-				// 		delete cityarr[n]
-				// 		nowset.areacount += 1
-				// 	}
-				// }
 			}
 			return nowset
 		}