xiugai

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

@@ -169,28 +169,45 @@
 					    var buyerclassHtml = "";
 				//	    var dateName = "";
 					    var dateHtml = "";
-					    if (area !== "" && area !== undefined){
-					    	for(var province in area){
-					    		var citys = area[province]
-				//	    		console.log(citys);
-					    		if(citys.length===0){
-					    			provinceArr.push(province);
-					    		}else{
-					    			for(var i in citys){
-					    				var city = citys[i];
-					    				cityArr.push(city);
-					    			}
-					    		}
-					    	}
-					    	var provinceLen = provinceArr.length;
-					 		var cityLen = cityArr.length;
-					    	areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+						var oldBuyset = data.buyset;
+				// 	    if (area !== "" && area !== undefined){
+				// 	    	for(var province in area){
+				// 	    		var citys = area[province]
+				// //	    		console.log(citys);
+				// 	    		if(citys.length===0){
+				// 	    			provinceArr.push(province);
+				// 	    		}else{
+				// 	    			for(var i in citys){
+				// 	    				var city = citys[i];
+				// 	    				cityArr.push(city);
+				// 	    			}
+				// 	    		}
+				// 	    	}
+				// 	    	var provinceLen = provinceArr.length;
+				// 	 		var cityLen = cityArr.length;
+				// 	    	areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 					    	
-							if(checkObj(area)){
+				// 			if(checkObj(area)){
+				// 				areaHtml = "全国";
+				// 			}
+				// 	    	$(".area-list").text(areaHtml);
+				// 	    }
+						if(oldBuyset!==""&&oldBuyset!==undefined){
+							let provinceLen = 0;
+							provinceLen = oldBuyset.areacount
+							let citys = oldBuyset.citys
+							let cityLen = 0;
+							let areaHtml = ";"
+							for(let i in citys){
+								cityLen += citys[i];
+							}
+							if(provinceLen === -1){
 								areaHtml = "全国";
+							}else{
+								areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 							}
-					    	$(".area-list").text(areaHtml);
-					    }
+							$(".item_area .label_for").text(areaHtml);
+						}
 					    if(buyerclass !== "" && buyerclass !== undefined){
 					    	for(var i in buyerclass){
 					    		var industry = buyerclass[i];

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

@@ -588,6 +588,7 @@
 	    var ends = "";
 	    var monthPrice = "";
 	    var yearPrice = "";
+		var oldBuyset = "";
 	    //
 	    $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             if (data) {
@@ -600,8 +601,9 @@
 			    starts = data.starttime;
 			    endTime = data.end;
 			    ends = data.endtime;
-			    monthPrice = getsubVipOrderPrice(areas, industrys, [1, 2]);
-			    yearPrice = getsubVipOrderPrice(areas, industrys, [1, 1]);
+				oldBuyset = data.buyset;
+			    monthPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 2]);
+			    yearPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 1]);
 			    //
 			    var areaHtml = "";
 			    var provinceArr = [];
@@ -610,28 +612,45 @@
 			    var buyerclassHtml = "";
 			    var dateName = "";
 			    var dateHtml = "";
-			    if (areas !== "" && areas !== undefined){
-			    	for(var province in areas){
-			    		var citys = areas[province]
-		//	    		console.log(citys);
-			    		if(citys.length===0){
-			    			provinceArr.push(province);
-			    		}else{
-			    			for(var i in citys){
-			    				var city = citys[i];
-			    				cityArr.push(city);
-			    			}
-			    		}
-			    	}
-			    	var provinceLen = provinceArr.length;
-			 		var cityLen = cityArr.length;
-			    	areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+			    // if (areas !== "" && areas !== undefined){
+		// 	    	for(var province in areas){
+		// 	    		var citys = areas[province]
+		// //	    		console.log(citys);
+		// 	    		if(citys.length===0){
+		// 	    			provinceArr.push(province);
+		// 	    		}else{
+		// 	    			for(var i in citys){
+		// 	    				var city = citys[i];
+		// 	    				cityArr.push(city);
+		// 	    			}
+		// 	    		}
+		// 	    	}
+		// 	    	var provinceLen = provinceArr.length;
+		// 	 		var cityLen = cityArr.length;
+		// 	    	areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 			    	
-					if(checkObj(areas)){
+		// 			if(checkObj(areas)){
+		// 				areaHtml = "全国";
+		// 			}
+		// 	    	$(".item_area .label_for").text(areaHtml);
+					
+			    // }
+				if(oldBuyset!==""&&oldBuyset!==undefined){
+					let provinceLen = 0;
+					provinceLen = oldBuyset.areacount
+					let citys = oldBuyset.citys
+					let cityLen = 0;
+					let areaHtml = ";"
+					for(let i in citys){
+						cityLen += citys[i];
+					}
+					if(provinceLen === -1){
 						areaHtml = "全国";
+					}else{
+						areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 					}
-			    	$(".item_area .label_for").text(areaHtml);
-			    }
+					$(".item_area .label_for").text(areaHtml);
+				}
 			    if(industrys !== "" && industrys !== undefined){
 			    	for(var i in industrys){
 			    		var industry = industrys[i];