xiugai

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

@@ -231,8 +231,11 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				if reduce > 0 {
 					log.Println("industry", industry)
 					Leng := len(industry) - reduce
-					industry = industry[0:Leng]
-					log.Println("industry", industry)
+					if len(industry) > 0 {
+						if industry[0] != "no" {
+							industry = industry[0:Leng]
+						}
+					}
 				}
 			}
 
@@ -242,7 +245,12 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			oldAreaM := 0
 			addIndustryY := 0
 			addIndustryM := 0
-			if (*area)["no"] != "no" && industry[0] != "no" {
+			if (*area)["no"] != "no" && len(industry) > 0 {
+				if industry[0] != "no" {
+					addAreaY = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeYear, 1)
+					addAreaM = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeMonth, 2)
+				}
+			} else if (*area)["no"] != "no" && len(industry) == 0 {
 				addAreaY = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeYear, 1)
 				addAreaM = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeMonth, 2)
 			}
@@ -250,7 +258,12 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				oldAreaY = entity.JyVipSubStruct.GetSubVipPrice(area, industrys, upgradeYear, 1)
 				oldAreaM = entity.JyVipSubStruct.GetSubVipPrice(area, industrys, upgradeMonth, 2)
 			}
-			if industry[0] != "no" {
+			if len(industry) > 0 {
+				if industry[0] != "no" {
+					addIndustryY = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeYear, 1)
+					addIndustryM = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeMonth, 2)
+				}
+			} else {
 				addIndustryY = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeYear, 1)
 				addIndustryM = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeMonth, 2)
 			}

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

@@ -292,21 +292,30 @@
                 })
                 if(selectedArr.length > 0){
                 	let adds = selectedArr.length+buyIndustryLen
-                	if(adds <= buyset){
-                		$(".addUpgrade").hide();
-	            		buyLen = adds;
-	            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
-	            		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-						$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-	            	}else{
-	            		let add = adds - buyset;
-	            		$(".addUpgrade").text("已新增："+add+"个行业");
-	            		$(".addUpgrade").show();
-	            		$(".tips_btn .btns .save-btn").removeAttr("disabled");
-						$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-	            	}
+                	if(buyset !== "全部行业"){
+                		if(adds <= buyset){
+	                		$(".addUpgrade").hide();
+		            		buyLen = adds;
+		            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+		            		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+							$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+		            	}else{
+		            		let add = adds - buyset;
+		            		$(".addUpgrade").text("已新增："+add+"个行业");
+		            		$(".addUpgrade").show();
+		            		$(".tips_btn .btns .save-btn").removeAttr("disabled");
+							$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+		            	}
+                	}else{
+                		let adds = buyIndustry.length + selectedArr.length
+                		$(".buyset").text("已购买："+adds+"/"+buyset);
+                	}
                 }else{
-                	$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset+"个行业")
+                	if(buyset !== "全部行业"){
+                		$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset+"个行业")
+                	}else{
+                		$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset)
+                	}
                 }
                 for(var i in selectedArr){
                 	if(selectedArr[i] === "全部行业"){
@@ -454,8 +463,14 @@
 		            	buyIndustry = data.buyerclass;
 		            	buyLen = buyIndustry.length
 		            	buyIndustryLen = buyIndustry.length;
-		            	buyset = data.buyset.buyerclasscount;
-		            	$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+		            	buyset = Number(data.buyset.buyerclasscount);
+		            	console.log(buyset)
+		            	if(buyset === -1){
+		            		buyset = "全部行业";
+		            		$(".buyset").text("已购买："+buyLen+"/"+buyset);
+		            	}else{
+		            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+		            	}
                 	}
                 },false);
                 if(checkObj(buyIndustry)){

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

@@ -1447,7 +1447,10 @@
 //      	}
         	//
         	let areas = areasArr;
-        	let industrys = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
+        	let industrys = null;
+        	if(sessionStorage.vipSubSelectIndustryUpgrade !== undefined){
+        		industrys = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
+        	}
         	let industryArr = "";
         	let areaArr = "";
         	if(areas !== null){