youhua

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

@@ -750,8 +750,8 @@ $(function () {
     $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
     	if(data.success){
         	areaData["data"] = {
-        		"area" : data.area,
-        		"buyset" : data.buyset, 
+        		"area" : data.data.area,
+        		"buyset" : data.data.buyset, 
         	}
         	init();
     	}

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

@@ -475,10 +475,10 @@
                 //已购买行业
                 $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
                 	if(data.success){
-		            	buyIndustry = data.buyerclass;
+		            	buyIndustry = data.data.buyerclass;
 		            	buyLen = buyIndustry.length
 		            	buyIndustryLen = buyIndustry.length;
-		            	buyset = Number(data.buyset.buyerclasscount);
+		            	buyset = Number(data.data.buyset.buyerclasscount);
 		            	if(sessionStorage.buyIndustry !== undefined){
 							$(".buyset").text(sessionStorage.buyIndustry);
 						}else{

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

@@ -154,12 +154,10 @@
 			}else{
 				$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
 					if(data.success){
-						var area = data.allarea;
-					    var buyerclass = data.allindustry;
-					    var startTime = data.start;
-					    var endTime = data.end;
+					    var startTime = data.data.start;
+					    var endTime = data.data.end;
 					    var exprie = {{.T.exprie}};
-					    var vipStatus = Number(data.vipStatus);
+					    var vipStatus = Number(data.data.vipStatus);
 					    // orderCode = data.orderCode;
 					    //
 					    var areaHtml = "";
@@ -169,7 +167,7 @@
 					    var buyerclassHtml = "";
 				//	    var dateName = "";
 					    var dateHtml = "";
-						var oldBuyset = data.buyset;
+						var oldBuyset = data.data.buyset;
 				// 	    if (area !== "" && area !== undefined){
 				// 	    	for(var province in area){
 				// 	    		var citys = area[province]

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

@@ -592,16 +592,16 @@
 	    //
 	    $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             if (data.success) {
-                area = data.area;
-			    buyerclass = data.buyerclass;
-			    areas = data.allarea;
-			    industrys = data.allindustry;
-			    cyclecount = data.cyclecount;
-			    startTime = data.start;
-			    starts = data.starttime;
-			    endTime = data.end;
-			    ends = data.endtime;
-				oldBuyset = data.buyset;
+				console.log(data)
+                area = data.data.area;
+			    buyerclass = data.data.buyerclass;
+			    cyclecount = data.data.cyclecount;
+			    startTime = data.data.start;
+			    starts = data.data.starttime;
+			    endTime = data.data.end;
+			    ends = data.data.endtime;
+				oldBuyset = data.data.buyset;
+				console.log(oldBuyset)
 			    monthPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 2]);
 			    yearPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 1]);
 			    //
@@ -650,18 +650,15 @@
 						areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 					}
 					$(".item_area .label_for").text(areaHtml);
+					let industryLen = 0;
+					industryLen = oldBuyset.buyerclasscount;
+					if(industryLen === -1){
+						buyerclassHtml = "全行业";
+					}else{
+						buyerclassHtml = industryLen+"个行业";
+					}
+					$(".item_industry .label_for").text(buyerclassHtml);
 				}
-			    if(industrys !== "" && industrys !== undefined){
-			    	for(var i in industrys){
-			    		var industry = industrys[i];
-			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = buyerclassArr.length+"个行业";
-			    	}
-			    	if(checkObj(industrys)){
-			    		buyerclassHtml = "全行业";
-			    	}
-			    	$(".item_industry .label_for").text(buyerclassHtml);
-			    }
 			    if(startTime !== "" && endTime !== "" && startTime !== undefined && endTime !== undefined){
 			    	console.log(startTime)
 			    	var start = startTime.replace(/-/g, ".");

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

@@ -739,17 +739,17 @@
 		var oldBuyset = "";
 	 	$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             if (data.success) {
-                area = data.area;
-			    buyerclass = data.buyerclass;
-			    buyArea = data.allarea;
-			    buyIndustry = data.allindustry;
-			    cycleunit = data.cycleunit;
-			    cyclecount = data.cyclecount;
-			    startTime = data.start;
-			    starts = data.starttime;
-			    endTime = data.end;
-			    ends = data.endtime;
-				oldBuyset = data.buyset;
+                area = data.data.area;
+			    buyerclass = data.data.buyerclass;
+			    buyArea = data.data.allarea;
+			    buyIndustry = data.data.allindustry;
+			    cycleunit = data.data.cycleunit;
+			    cyclecount = data.data.cyclecount;
+			    startTime = data.data.start;
+			    starts = data.data.starttime;
+			    endTime = data.data.end;
+			    ends = data.data.endtime;
+				oldBuyset = data.data.buyset;
 			}
         },false);
 		console.log("666666666333",oldBuyset)