zhangxinlei1996 5 жил өмнө
parent
commit
682ed6f101

+ 28 - 16
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="全国";
@@ -1256,13 +1267,14 @@
 											}
 											if(buyset.areacount>0){
 												region_vip=buyset.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="全国";