|
|
@@ -1051,9 +1051,9 @@
|
|
|
//行业
|
|
|
var industry_vip = filter_vip.industry.length; //数组
|
|
|
if(industry_vip==0){
|
|
|
- industry_vip="全";
|
|
|
+ industry_vip="全行业";
|
|
|
}else{
|
|
|
- industry_vip=industry_vip+"个";
|
|
|
+ industry_vip=industry_vip+"个行业";
|
|
|
}
|
|
|
var cyclecount_vip = filter_vip.cyclecount; //时长
|
|
|
var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
|
|
|
@@ -1112,25 +1112,25 @@
|
|
|
var region_vip ="";
|
|
|
//升级订单 单独处理
|
|
|
if(!$.isEmptyObject(filterObj.addarea)){
|
|
|
- var cityNum_u=0;
|
|
|
- var provinceNum_u=0;
|
|
|
- for(var i in filterObj.addarea) {
|
|
|
- let citys_u=filterObj.addarea[i];
|
|
|
- if (citys_u=="no"){
|
|
|
- region_vip="无"
|
|
|
- }else{
|
|
|
- if (citys_u.length>0){
|
|
|
- cityNum_u+=citys_u.length;
|
|
|
+ var cityNum_u=0;
|
|
|
+ var provinceNum_u=0;
|
|
|
+ for(var i in filterObj.addarea) {
|
|
|
+ let citys_u=filterObj.addarea[i];
|
|
|
+ if (citys_u=="no"){
|
|
|
+ region_vip="无"
|
|
|
}else{
|
|
|
- provinceNum_u++;
|
|
|
+ if (citys_u.length>0){
|
|
|
+ cityNum_u+=citys_u.length;
|
|
|
+ }else{
|
|
|
+ provinceNum_u++;
|
|
|
+ }
|
|
|
}
|
|
|
- if(provinceNum_u>0) region_vip= region_vip + provinceNum_u+"个省级区域";
|
|
|
- if(cityNum_u>0){
|
|
|
- if(provinceNum_u>0) region_vip= region_vip+"、"
|
|
|
- region_vip = region_vip+ cityNum_u+"个地市";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
+ if(provinceNum_u>0) region_vip= region_vip + provinceNum_u+"个省级区域";
|
|
|
+ if(cityNum_u>0){
|
|
|
+ if(provinceNum_u>0) region_vip= region_vip+"、"
|
|
|
+ region_vip = region_vip+ cityNum_u+"个地市";
|
|
|
+ }
|
|
|
}else {
|
|
|
region_vip="全国";
|
|
|
}
|
|
|
@@ -1141,11 +1141,13 @@
|
|
|
industry_vip="无";
|
|
|
}else{
|
|
|
if(filterObj.addindustry.length==0){
|
|
|
- industry_vip="全";
|
|
|
+ industry_vip="全行业";
|
|
|
}else{
|
|
|
- industry_vip=filterObj.addindustry.length+"个";
|
|
|
+ industry_vip=filterObj.addindustry.length+"个行业";
|
|
|
}
|
|
|
}
|
|
|
+ }else{
|
|
|
+ industry_vip="全行业";
|
|
|
}
|
|
|
//延长周期
|
|
|
var effectiveduration_vip="";
|
|
|
@@ -1236,15 +1238,15 @@
|
|
|
+'<div class="media-info">';
|
|
|
if (vip_type==1){//续费
|
|
|
listhtml+='<p class="item-ifo ellipsis">续费区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">续费行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">续费行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">续费周期：'+effectiveduration_vip+'</p>';
|
|
|
}else if (vip_type ==2){//升级
|
|
|
listhtml+='<p class="item-ifo ellipsis">升级区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">升级行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">升级行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">延长周期：'+effectiveduration_vip+'</p>';
|
|
|
}else{
|
|
|
listhtml+='<p class="item-ifo ellipsis">区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">订阅周期：'+effectiveduration_vip+'</p>';
|
|
|
}
|
|
|
listhtml+='</div>'
|
|
|
@@ -1276,17 +1278,17 @@
|
|
|
+'<div class="media-info">';
|
|
|
if(vip_type==1){ //续费
|
|
|
listhtml+='<p class="item-ifo ellipsis">续费区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">续费行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">续费行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">续费周期：'+effectiveduration_vip+'</p>'
|
|
|
+'<p class="item-ifo ellipsis">有效日期：'+effectivetime_vip+'</p>';
|
|
|
}else if (vip_type==2){ //升级
|
|
|
listhtml+='<p class="item-ifo ellipsis">升级区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">升级行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">升级行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">延长周期：'+effectiveduration_vip+'</p>'
|
|
|
+'<p class="item-ifo ellipsis">有效日期：'+effectivetime_vip+'</p>';
|
|
|
}else {
|
|
|
listhtml+='<p class="item-ifo ellipsis">区域：'+ region_vip+'</p>'
|
|
|
- +'<p class="item-ifo ellipsis">行业：'+ industry_vip +'行业</p>'
|
|
|
+ +'<p class="item-ifo ellipsis">行业：'+ industry_vip +'</p>'
|
|
|
+'<p class="item-ifo ellipsis">订阅周期：'+effectiveduration_vip+'</p>'
|
|
|
+'<p class="item-ifo ellipsis">有效日期：'+effectivetime_vip+'</p>';
|
|
|
}
|
