Merge branch 'dev/4.8.52.6_zsy' of qmx/jy into hotfix/v4.8.52.6

src/web/templates/pc/supsearch.html

@@ -378,7 +378,7 @@
       }catch(e){
         console.log(e)
       }
-  
+
       /*
         if(areas != ""){
           $("#regionBtn").removeClass("active");
@@ -574,7 +574,7 @@
       // 采购单位下拉组件回显
       try{
         searchInnerVue.$refs.selectBuyerclasschoose.processingbuyerclass(buyerclassVal)
-        
+
       }catch(e){
 
       }
@@ -1098,7 +1098,7 @@
               </span>
             </div>
             <!-- 非VIP用户 -->
-            <div class="search-content flex-box" v-show = "!(vipState || !islogin)"> 
+            <div class="search-content flex-box" v-show = "!(vipState || !islogin)">
               <!-- <span class="search-list">
                 <span data-name="all" class="search-list-checkbox">全部</span>
               </span> -->
@@ -1281,7 +1281,7 @@
           <!-- <div class="advanced-filter clearfix nologin-hide">
             <div class="advanced-title" {{if .T.bidField}}style="margin: 0;"{{end}}>
               <strong>高级筛选</strong>
-              <img class="icon-vip" src="{{Msg "seo" "cdn"}}/images/biddingSearch/VIP.png" alt="" />  
+              <img class="icon-vip" src="{{Msg "seo" "cdn"}}/images/biddingSearch/VIP.png" alt="" />
             </div> -->
             <!--领域化页面不展示-->
             <!-- {{if not .T.bidField}}
@@ -1347,12 +1347,12 @@
                                   <font class="maxwy">万元</font>
                                   <input type="text" name="maxprice" id="maxprice" value="" placeholder="" />
                                 </div>
-                                
+
                               </div>
                               <button class="pricebut selectbtn">确定</button>
                             </div>
                           </div>
-                          
+
                         </div>
                       </el-select>
                     </div>
@@ -2082,7 +2082,7 @@
       type:'POST',
       url:'/entnicheNew/buy/whetherbuy',
       success:function (res) {
-        if (!vipState) {
+        if (!vipState && res.data) {
           vipState = res.data.isNew || res.data.isPower
           typeof changeVipSelect === 'function' ? changeVipSelect(vipState) : null
         }
@@ -2284,7 +2284,7 @@
       // if($(this).children('input').val() == '采购单位联系方式' || $(this).children('input').val() == '中标企业联系方式'){
       //    $(this).children('input').val('不限')
       // }
-      
+
       let that = $(this)
       if(that.children('input').val() == '采购单位联系方式' || that.children('input').val() == '中标企业联系方式' ){
         that.next().children('li').removeClass('active_select_custom')
@@ -2299,7 +2299,7 @@
         }
        })
 
-        }    
+        }
       if($(this).siblings().css('display') == 'none'){
         $(this).css("border-color", '#2cb7ca').siblings().show()
         $(this).children('.icon-arrow').addClass('up')
@@ -2313,7 +2313,7 @@
         $(this).parent().hide().siblings().children('.icon-arrow').removeClass('up')
         $(this).parent().hide().siblings().css("border-color", '#e0e0e0')
         var val = $(this).attr('data-value')
-        var text 
+        var text
         if($(this).text() == '不限' && $(this).next().text() == '有采购单位联系方式'){
           text = '采购单位联系方式'
         }else if($(this).text() == '不限' && $(this).next().text() == '有中标企业联系方式'){
@@ -2336,7 +2336,7 @@
         $(that).parent().css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
         $(that).parent().siblings().hide()
       },200);
-      
+
 
     })
     // 点击其他区域 隐藏其他筛选条件下拉框
@@ -3123,14 +3123,14 @@ function checkTagDisabled () {
         this.bidTotalCount()
       }
     },
-    created: function () { 
+    created: function () {
       this.getAreaData()
       this.getIndustryData()
       this.getBuyerclassData()
       this.getPower()
     },
     mounted: function () {
-     
+
       this.getCustomReportData()
       // console.log('总页码：' + totalPage + ',当前页：' + currentPage + ',一页数量：' + pageSize + ',总条数：' + totalCount)
       var isClickSearch = sessionStorage.getItem('is-click-search')
@@ -3185,12 +3185,12 @@ function checkTagDisabled () {
           }
           if(ele.children){
             ele.children.forEach(e =>{
-              e.value = e.label 
-              e.parent = ele.value    
+              e.value = e.label
+              e.parent = ele.value
             })
             ele.children.unshift({label:'全部',value:'全部',parent:ele.value})
           }
-         })    
+         })
         this.province_city_data = data
       },
       getIndustryData(){ // 行业初始数据处理
@@ -3206,30 +3206,30 @@ function checkTagDisabled () {
             if(key == ele){
               let list = map[key]
               let child = []
-              list.forEach(e =>{ 
+              list.forEach(e =>{
                 let obj = {}
                 obj.value = e
                 obj.label =e
-                obj.parent = ele 
+                obj.parent = ele
                 obj.id = ele+'_'+e
-                child.push(obj)  
-              })  
-              item.children = child  
-            } 
+                child.push(obj)
+              })
+              item.children = child
+            }
           }
           data.push(item)
         })
         data.unshift({label:'全部',value:'全部',children:[]})
         data.forEach(ele =>{
           ele.children.unshift({label:'全部',value:'全部',parent:ele.value})
-        })  
+        })
         let keysToAdd = [{ 'selected': false},{'indeterminate':false},{'disabled':false}];
-        let datas = this.deleteAndAddKeys(data,[],keysToAdd); 
+        let datas = this.deleteAndAddKeys(data,[],keysToAdd);
         this.industrylist_data = datas
       },
       getBuyerclassData(){
         console.log(buyclassArr,'采购单位全部数据')
-        console.log(buyerclassVal,'采购单位模版变量回显') 
+        console.log(buyerclassVal,'采购单位模版变量回显')
        let map = buyclassArr
        let data = []
        for (let key in map) {
@@ -3251,13 +3251,13 @@ function checkTagDisabled () {
         data.unshift({label:'全部',value:'全部',children:[]})
         data.forEach(ele =>{
           ele.children.unshift({label:'全部',value:'全部',parent:ele.value})
-        })  
+        })
         let keysToAdd = [{ 'selected': false},{'indeterminate':false},{'disabled':false}];
-        let datas = this.deleteAndAddKeys(data,[],keysToAdd); 
-        this.buyerclass_data = datas 
+        let datas = this.deleteAndAddKeys(data,[],keysToAdd);
+        this.buyerclass_data = datas
       },
       areadataChange:debounce(function(data){ // 地区提交搜索
-        
+
         let area_arr
         let city
         if(!data.area.includes('全国')){
@@ -3270,13 +3270,13 @@ function checkTagDisabled () {
         $("#zbSeatchT [name='area']").val(area_arr.toString())
         $("#zbSeatchT [name='city']").val(city.toString())
         beforeSubmit('filter-area')
-       
+
       },200),
       limit_(){ // 选地市无权限
         if (!this.vipState) {
           openVipDialog()
-          
-        } 
+
+        }
       },
       deleteAndAddKeys(obj, keysToDelete, keysToAdd) {
        // 遍历keysToDelete数组，删除对应的key
@@ -3304,7 +3304,7 @@ function checkTagDisabled () {
         return obj
       },
       industryChange:debounce(function(data){ //行业提交搜索
-        let val 
+        let val
         if(data.oneAndtwo.length>=data.alltwo.length){
           val = ''
         }else{
@@ -3312,18 +3312,18 @@ function checkTagDisabled () {
         }
         $("#zbSeatchT [name='industry']").val(val.toString())
         beforeSubmit('filter-industry')
-  
+
       },200),
       buyerclassChange :debounce(function(data){ //采购单位提交搜索
-        let val 
+        let val
         if(data.two_noall.length>=data.alltwo.length){
           val = ''
         }else{
           val = data.two_noall
-        }  
+        }
         $("#zbSeatchT [name='buyerclass']").val(val.toString())
         beforeSubmit('filter-buyerclass')
-  
+
       },200),
       // 搜索到的标讯总数
       bidTotalCount: function () {
@@ -4264,7 +4264,7 @@ function checkTagDisabled () {
         // 采购单位下拉组件 重置
         try{
           this.$refs.selectBuyerclasschoose.processingbuyerclass(null)
-        
+
         }catch(e){
 
         }
@@ -4448,7 +4448,7 @@ function checkTagDisabled () {
         }catch(e){
 
         }
-        
+
         // 回显信息类型
         if(item.subtype){
           $("#infoBtn").removeClass("active");
@@ -4518,7 +4518,7 @@ function checkTagDisabled () {
 
       }
         // 采购单位下拉组件回显
-        try{ 
+        try{
          this.$refs.selectBuyerclasschoose.initData()
          this.$refs.selectBuyerclasschoose.processingbuyerclass(item.buyerclass)
          }catch(e){
@@ -4596,14 +4596,14 @@ function checkTagDisabled () {
         console.log(item)
         this.attachVal_cg = item
         $("#zbSeatchT [name='buyertel']").val(item)
-        beforeSubmit('filter-custom') 
+        beforeSubmit('filter-custom')
       },
       onAttachClick_zb: function (item) {
         console.log(item)
         this.attachVal_zb = item
         //中标单位联系方式有无
        $("#zbSeatchT [name='winnertel']").val(item)
-        beforeSubmit('filter-custom') 
+        beforeSubmit('filter-custom')
       },
       handleExpand (val) {
         // this.selectorlist = [{label:'全部',value:'0'},{label:'有附件',value:'1'},{label:'无附件',value:'-1'}]
@@ -4718,7 +4718,7 @@ function checkTagDisabled () {
           }else{
             return '采购单位联系方式'
           }
-        
+
         }else if(type == 'winnertel'){
           if (val == 'y') {
             return '有中标企业联系方式'