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

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -1039,6 +1039,7 @@
 							var region_vip=""
 	                       if ((vip_type != 2)&&(vip_type!=1)){
 		                       	 //地区
+								 console.log(newbuyset)
 								if(!$.isEmptyObject(newbuyset)){	//不为空
 									if(newbuyset.areacount!=-1){
 										var newcitys=newbuyset.newcitys;
@@ -1049,17 +1050,26 @@
 										}
 										if(newbuyset.areacount>0){
 											region_vip=newbuyset.areacount+"个省级区域";
-											if(citynum>1){
-												region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
-											}else{
+											// if(citynum>1){
+											// 	region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
+											// }else{
 												region_vip+="、"+citynum+"个地市";
-											}
-										}else{
-											region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
+											//}
+										}
+										else{
+											// region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
+											region_vip+=citynum+"个地市";
 										}
 									}else{
 										region_vip="全国";
 									}
+									//行业
+									var industry_vip = newbuyset.buyerclasscount;	//数组
+									if(industry_vip==-1){
+										industry_vip="全行业";
+									}else{
+										industry_vip=industry_vip+"个行业";
+									}
 								}else{
 									var region_vipArr = filter_vip.area;
 									var province_length=0;
@@ -1157,13 +1167,14 @@
 										}
 										if(newbuyset.areacount>0){
 											region_vip=newbuyset.areacount+"个省级区域";
-											if(citynum>1){
-												region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
-											}else{
+											// if(citynum>1){
+											// 	region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
+											// }else{
 												region_vip+="、"+citynum+"个地市";
-											}
+											//}
 										}else{
-											region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
+											//region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
+											region_vip+=citynum+"个地市";
 										}
 									}else{
 										region_vip="全国";
@@ -1220,7 +1231,7 @@
 								filter_vip = JSON.parse(obj.filter);
 								var renewal_market=0; //续费市级地区
 								var buyset=filter_vip.buyset;
-								if (!$.isEmptyObject(buyset)){
+								if ($.isEmptyObject(newbuyset)){
 									//续费订单根据buyset 中ciyts判断 老订单为citys 新订单为newcitys  续费以外根据newbuyset判断 
 									if (buyset.ciyts!=undefined){
 										if (buyset.areacount==-1){
@@ -1246,32 +1257,33 @@
 										}else{
 											industry_vip=buyset.buyerclasscount+"个行业";
 										}
-									}else{
-										if (buyset.areacount!=-1){
-											var newcitys=buyset.newcitys;
-											var scatter=newcitys.length ;//分布
-											var citynum=0;
-											for(var k in newcitys){
-												citynum+=newcitys[k];
-											}
-											if(buyset.areacount>0){
-												region_vip=buyset.areacount+"个省级区域";
-												if(citynum>1){
-													region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
-												}else{
-													region_vip+="、"+citynum+"个地市";
-												}
-											}else{
-												region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
-											}
-										}else{
-											region_vip="全国";
+									}
+								}else{
+									if (newbuyset.areacount!=-1){
+										var newcitys=newbuyset.newcitys;
+										var scatter=newcitys.length ;//分布
+										var citynum=0;
+										for(var k in newcitys){
+											citynum+=newcitys[k];
 										}
-										if(buyset.buyerclasscount!=-1){
-											industry_vip= buyset.buyerclasscount+"个行业";
+										if(newbuyset.areacount>0){
+											region_vip=newbuyset.areacount+"个省级区域";
+											// if(citynum>1){
+											// 	region_vip+="、"+citynum+"个地市（分布在"+scatter+"省内)";
+											// }else{
+												region_vip+="、"+citynum+"个地市";
+											//}
 										}else{
-											industry_vip="全行业";
+											//region_vip+=citynum+"个地市（分布在"+scatter+"省内)";
+											region_vip+=citynum+"个地市";
 										}
+									}else{
+										region_vip="全国";
+									}
+									if(newbuyset.buyerclasscount!=-1){
+										industry_vip= newbuyset.buyerclasscount+"个行业";
+									}else{
+										industry_vip="全行业";
 									}
 								}
 								//订阅周期

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

@@ -398,36 +398,10 @@ try{
 	        }else if(r.data.order.vip_type==1){
 				var renewal_market=0; //续费市级地区
 				var buyset=filterObj.buyset;
-				if(!$.isEmptyObject(buyset)){ //p1
+				var newBuyset=filterObj.newBuyset;
+				if(!$.isEmptyObject(buyset)){ 
 					//续费都是buyset 根据 citys 和 newcitys 判断是老订单还是新订单
-					if (buyset.citys==undefined){
-						if (buyset.areacount!=-1){
-							var newcitys=buyset.newcitys;
-							var scatter=newcitys.length ;//分布
-							var citynum=0;
-							for(var k in newcitys){
-								citynum+=newcitys[k];
-							}
-							if(buyset.areacount>0){
-								areaText=buyset.areacount+"个省级区域";
-								if(citynum>1){
-									areaText+="、"+citynum+"个地市（分布在"+scatter+"省内)";
-								}else{
-									areaText+="、"+citynum+"个地市";
-								}
-							}else{
-								areaText+=citynum+"个地市（分布在"+scatter+"省内)";
-							}
-							$(".areaNum").text(areaText);
-						}else{
-							$(".areaNum").text("全国");
-						}
-						if(buyset.buyerclasscount!=-1){
-							$(".industryNum").text(buyset.buyerclasscount+"个行业");
-						}else{
-							$(".industryNum").text("全行业");
-						}
-					}else{
+					if (buyset.citys!=undefined){
 						if (buyset.areacount==-1){
 							$(".areaNum").text("全国");
 						}else{
@@ -454,6 +428,34 @@ try{
 						}
 					}
 				}
+				if(!$.isEmptyObject(newBuyset)){ //p1
+					if (newBuyset.areacount!=-1){
+						var newcitys=newBuyset.newcitys;
+						var scatter=newcitys.length ;//分布
+						var citynum=0;
+						for(var k in newcitys){
+							citynum+=newcitys[k];
+						}
+						if(newBuyset.areacount>0){
+							areaText=newBuyset.areacount+"个省级区域";
+							if(citynum>1){
+								areaText+="、"+citynum+"个地市（分布在"+scatter+"省内)";
+							}else{
+								areaText+="、"+citynum+"个地市";
+							}
+						}else{
+							areaText+=citynum+"个地市（分布在"+scatter+"省内)";
+						}
+						$(".areaNum").text(areaText);	
+					}else{
+						$(".areaNum").text("全国");
+					}
+					if(newBuyset.buyerclasscount!=-1){
+						$(".industryNum").text(newBuyset.buyerclasscount+"个行业");
+					}else{
+						$(".industryNum").text("全行业");
+					}
+				}
 			}
 			
         }