Merge branch 'feature/v4.8.46' into dev/v4.8.46_zxl

src/jfw/front/pcIndex.go

@@ -521,7 +521,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 				datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","buyer","bidamount","budget","s_subscopeclass","projectname"`, startPage, limitcount)
 			} else {
 				//关键词  如果规定时间内未取到数据 则按照老规则取数据   //规则开发一半被砍 暂时注释
-				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", "", "", key_industry, "", "", "", "", "", "", "", 0, true, nil, bidSearch_field_1, "", false, false, "", 50, "")
+				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", "", "", key_industry, "", "", "", "", "", "", "", 0, true, nil, bidSearch_field_1, "", false, false, "", 300, "")
 				if datas != nil && len(*datas) > limitcount {
 					*datas = (*datas)[0:limitcount]
 				}

src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html

@@ -120,16 +120,18 @@
             display: flex;
             flex-direction: column;
             align-items: center;
-            padding-top: 1.6rem;
+            padding-top: 0.8rem;
         }
 
-        .empty-img {
-            width: 3.2rem;
-            height: 3.2rem;
+        .empty-img.noData {
+            width: 4rem;
+            height: 4rem;
+            padding: 0;
+            margin-bottom: 0;
         }
 
         .empty-tip {
-            margin-top: .24rem;
+            /* margin-top: .24rem; */
             font-size: .26rem;
             line-height: .4rem;
             color: #9B9CA3;
@@ -139,7 +141,7 @@
             display: inline-block;
             width: 3.3rem;
             height: .8rem;
-            margin-top: .96rem;
+            margin-top: 0.42rem;
             line-height: .8rem;
             border: 1px solid #2ABED1;
             border-radius: 4px;
@@ -336,7 +338,7 @@
                 </div>
             </div>
             <div class="empty" v-else>
-                <img class="empty-img" src="/jyapp/big-member/image/img-empty.png" alt="" />
+                <img class="empty-img noData" src="/jyapp/big-member/image/noData.png" alt="" />
                 <div v-show="set.notKey" style="text-align: center;">
                     <p class="empty-tip">暂无设置订阅关键词，无法进行预测</p>
                     <a class="link-btn" @click="goSetting" href="javascript:;" v-show="isSubCount">去设置</a>
@@ -419,8 +421,10 @@
                 startTime: '',
                 endTime: '',
                 dataType: 'fwl',
+                exact : 'all'
             },
             created() {
+                let that = this
                 var pData = JSON.parse(sessionStorage.getItem('$data-forecast_list'))
                 if (pData) {
                     this.isSet = pData.isSet;
@@ -431,10 +435,21 @@
                     this.loading = pData.loading;
                     this.finished = pData.finished;
                     this.isSubCount = pData.isSubCount;
+                    this.dataType = pData.dataType
+                    this.tabActiveName = pData.tabActiveName
+                    this.startTime = pData.startTime
+                    this.endTime = pData.endTime
+                    this.$nextTick(function(){
+                        if(that.exact){
+                            that.$refs.dateSelector.setState({exact:that.exact})
+                        }else{
+                            that.$refs.dateSelector.setState({startDate:parseInt(that.startTime*1000),endDate:parseInt(that.endTime*1000),exact:'exact'})
+                        }
+                    })
+                    
                 } else {
                     this.getList()
                 }
-
             },
             mounted() {
                 sessionStorage.removeItem('forecast_keys')
@@ -467,7 +482,7 @@
                             console.log(res)
                             if (res.error_code == 0) {
                                 that.isSubCount = !res.data.isSubCount
-                                if (res.data.code === 1 && !res.data.list) {
+                                if (res.data.code === 1 && (!res.data.list || res.data.list.length == 0)) {
                                     // 暂无设置订阅关键词，无法进行预测
                                     that.set.notKey = true;
                                 } else if (res.data.code === 2) {
@@ -535,6 +550,7 @@
                     this.dataType = val
                     this.list= [],
                     this.page = 1,
+                    this.finished = false,
                     this.getList()
                 },
                 confirm(val) {
@@ -549,18 +565,25 @@
             forecastList.$refs.dateSelector.clearDateTimePicker()
         }
         window.$chooseData = function (data) {
-            if (data) {
-                if (data.start == 0 && data.end == 0) {
+            if (data.result) {
+                if (data.result.start == 0 && data.result.end == 0) {
                     forecastList.startTime = ''
                     forecastList.endTime = ''
 
                 } else {
-                    forecastList.startTime = parseInt(data.start / 1000)
-                    forecastList.endTime = parseInt(data.end / 1000)
+                    forecastList.startTime = parseInt(data.result.start / 1000)
+                    forecastList.endTime = parseInt(data.result.end / 1000)
 
                 }
+                if(data.exact){
+                    forecastList.exact = data.exact
+                    
+                }else{
+                    forecastList.exact = null
+                }
                 forecastList.list = []
                 forecastList.page = 1
+                forecastList.finished = false,
                 forecastList.getList()
             }
         }

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -32,7 +32,7 @@ const (
 	bidSearch_field = ``
 
 	forecastQuery            = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match":1}}}`
-	filter_must_time         = `{"bool":{"%s":[{"exists":{"field":"top_category"}}]}},{"bool":{"should":[{"bool":{"must":[{"range":{"yucetime":{"gte":%d}}}],"must_not":[{"constant_score":{"filter":{"exists":{"field":"yuceendtime"}}}}]}},{"bool":{"must":[{"constant_score":{"filter":{"exists":{"field":"yuceendtime"}}}},{"range":{"yuceendtime":{"gte":%d,"lte":%d}}}]}}]}}`
+	filter_must_time         = `{"bool":{"%s":[{"exists":{"field":"top_category"}}]}},{"bool":{"should":[{"bool":{"must":[{"constant_score":{"filter":{"exists":{"field":"yuceendtime"}}}},{"range":{"yuceendtime":{"gte":%d,"lte":%d}}}]}}]}}`
 	filter_must_area_city    = `{"bool":{"should":[%s]}}`
 	query_should_keys        = `{"bool":{"must":[%s],"must_not":[%s]}}`
 	query_should_multi_match = `{"multi_match":{"query":"%s","type":"phrase","fields":["results.purchasing.mypurchasing"]}}`
@@ -57,9 +57,9 @@ func getForecastProjectSql(scd *util.ViewCondition, startTime, endTime int, data
 		endTime = int(time.Now().Unix())
 	}
 	if dataType == "nj" {
-		musts = append(musts, fmt.Sprintf(filter_must_time, "must", startTime, startTime, endTime))
+		musts = append(musts, fmt.Sprintf(filter_must_time, "must", startTime, endTime))
 	} else {
-		musts = append(musts, fmt.Sprintf(filter_must_time, "must_not", startTime, startTime, endTime))
+		musts = append(musts, fmt.Sprintf(filter_must_time, "must_not", startTime, endTime))
 	}
 	//省份
 	areaCity := []string{}

src/web/staticres/common-module/collection/js/date-mobile.js

@@ -448,7 +448,7 @@ var dateComponent = {
       try{ 
        window.$tagsChange()
        let result = that.getState()
-        window.$chooseData(result)
+        window.$chooseData({result,exact:item.value})
       }catch(e){
 
       }
@@ -557,7 +557,7 @@ var dateComponent = {
       this.sortTime(this.dateTimePickerState.start, this.dateTimePickerState.end)
       try{
         let result = that.getState()
-        window.$chooseData(result)
+        window.$chooseData({result,exact:null})
       }catch(e){
 
       }
@@ -571,7 +571,7 @@ var dateComponent = {
       let that = this
       try{
         let result = that.getState()
-        window.$chooseData(result)
+        window.$chooseData({result,exact:null})
       }catch(e){
 
       }

src/web/staticres/css/dev2/newBidSearch.css

@@ -17,15 +17,15 @@
 
 .searchSpace .search-list .search-list-checkbox{
   float: left;
-  padding-left: 22px;
+  padding-left: 28px;
   cursor: pointer;
-  background: url(/images/biddingSearch/icon-checkbox.png) no-repeat center left;
-  background-size: 14px 14px;
+  background: url(/images/biddingSearch/icon-checkbox-new.png) no-repeat center left;
+  background-size: 22px 22px;
   border: 0;
 }
 .searchSpace .search-list-checkbox.checkbox-checked{
-  background: url(/images/biddingSearch/icon-checked.png) no-repeat center left;
-  background-size: 14px 14px;
+  background: url(/images/biddingSearch/icon-checked-new.png) no-repeat center left;
+  background-size: 22px 22px;
 }
 .searchSpace .search-list .icon-vip{
   /* float: left; */
@@ -156,9 +156,10 @@
   cursor: pointer;
   text-align: left;
 }
-.custom-option > li:hover{
+/* .custom-option > li:hover{
   background: #ececec;
-}
+} */
+
 .other-filter .buy-select > select,
 .other-filter .bid-select > select{
   border: 0;

src/web/staticres/css/dev2/superSearch-inside.css

@@ -517,12 +517,14 @@ input, textarea {
 }
 .custom-select.others{
   width: 200px;
+  padding-left: 0;
+  padding-right: 0;
 }
-.selector-card-content.mini-select .el-input__inner:hover{
-  border-color: #DCDFE6;
+.other-filter .other-content .el-input__inner:hover{
+  border-color: #E0E0E0;
 }
-.selector-card-content.mini-select .el-input__inner{
-  border-color:#DCDFE6!important;
+.other-filter .other-content .el-input__inner{
+  border-color:#E0E0E0;
   width: 200px;
   box-sizing: border-box;
   color:#1D1D1D ;
@@ -565,4 +567,13 @@ input, textarea {
 .mr-16{
   margin-right: 16px;
 }
+.two-filter .custom-input.select-input{
+  width: 195px;
+  text-indent: 16px;
+
+}
+
+.active_select_custom.item_option{
+  background: #ececec;
+}
 

src/web/staticres/css/dev2/superSearch.css

@@ -589,9 +589,14 @@
     height: 18px;
     margin-left: 8px;
 }
-.searchSpace .vip_box .search-list-checkbox{
-  background: url(/images/biddingSearch/novip-icon.png) no-repeat center left !important;
-  background-size: 14px 14px!important;
+.searchSpace .vip_box .search-list .search-list-checkbox{
+  background: url(/images/biddingSearch/novip-icon.png) no-repeat center left;
+  background-size: 22px 22px;
+
+}
+.searchSpace .vip_box .search-list .search-list-checkbox.checkbox-checked{
+  background: url(/images/biddingSearch/novip-icon-check.png) no-repeat center left;
+  background-size: 22px 22px;
 
 }
 .searchSpace .vip_box .search-list-checkbox em{

src/web/staticres/css/selectCommon.css

@@ -24,10 +24,10 @@
   background-color: transparent;
 }
 #selectArea_ .el-input__inner:hover{
-  border-color: #DCDFE6;
+  border-color: #E0E0E0;
 }
 #selectArea_ .el-select.select_common:hover{
-  border-color: #DCDFE6;
+  border-color: #E0E0E0;
 
 }
 #selectArea_ .valueBox{

src/web/staticres/frontRouter/pc/collection/js/index-pc.js

@@ -838,7 +838,7 @@ var vm = new Vue({
         })
       },
       goCollect: function () {
-        window.open('/jylab/supsearch/index.html')
+        window.open('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(location.origin + '/jylab/supsearch/index.html'))
       }
     }
 })

src/web/staticres/js/ent-search-index-pc.js

@@ -317,16 +317,16 @@ var vm = new Vue({
          * 初始化页面搜索框与工作台顶部搜索联动事件函数，详情见对应函数 common.js
          * 需要在 dom 初始化后调用来监听事件，Vue中需要额外在 input 对应事件额外手动触发事件
          */
-        if (goTemplateData.inIframe) {
-          this._$SearchEvent = initSearchPageEvent({
-            type: 'company',
-            el: '.search-header-top .input-container',
-            submitSelector: '.search-button',
-            change: function(val) {
-              this.searchContent = val
-            }
-          })
-        }
+        // if (goTemplateData.inIframe) {
+        //   this._$SearchEvent = initSearchPageEvent({
+        //     type: 'company',
+        //     el: '.search-header-top .input-container',
+        //     submitSelector: '.search-button',
+        //     change: function(val) {
+        //       this.searchContent = val
+        //     }
+        //   })
+        // }
     },
     methods: {
         industryTab: function() {

src/web/staticres/js/pur-search-index-pc.js

@@ -223,16 +223,16 @@ var vm = new Vue({
          * 初始化页面搜索框与工作台顶部搜索联动事件函数，详情见对应函数 common.js
          * 需要在 dom 初始化后调用来监听事件，Vue中需要额外在 input 对应事件额外手动触发事件
          */
-        if (goTemplateData.inIframe) {
-          this._$SearchEvent = initSearchPageEvent({
-            type: 'buyer',
-            el: '.search-header-top .input-container',
-            submitSelector: '.search-button',
-            change: function(val) {
-              this.searchContent = val
-            }
-          })
-        }
+        // if (goTemplateData.inIframe) {
+        //   this._$SearchEvent = initSearchPageEvent({
+        //     type: 'buyer',
+        //     el: '.search-header-top .input-container',
+        //     submitSelector: '.search-button',
+        //     change: function(val) {
+        //       this.searchContent = val
+        //     }
+        //   })
+        // }
     },
     methods: {
         randomBgc: function () {

src/web/staticres/js/selector/area-city-data.js

@@ -42,7 +42,8 @@ var selectAreachoose = {
       nowindex: 0,
       chooseData: {},
       active :0,
-      num:''
+      num:'',
+      originalData:[]
     };
   },
   computed: {
@@ -56,6 +57,7 @@ var selectAreachoose = {
         item.children[0].disabled = true
       }
     })
+    this.originalData = JSON.parse(JSON.stringify(list))
     this.leftList = list 
     this.rightList = this.leftList[0].children
     this.getData()
@@ -66,6 +68,11 @@ var selectAreachoose = {
 
   },
   methods: {
+    initData(){ //还原初始数据
+      let left = JSON.parse(JSON.stringify(this.originalData))
+      this.leftList = left
+      this.rightList = this.leftList[0].children
+    },
     processingarea(area,city){
       console.log(area,city,'地区组件调用回显获取的省市')
       if(area || city){
@@ -86,17 +93,23 @@ var selectAreachoose = {
             })
           }) 
         }
+       
         // 有城市则说明所在省是半选
         if(c&&c.length>0){
           c.forEach((item) => {
             this.leftList.forEach(ele =>{
-              ele.forEach( items =>{
-                if(items == item){ // 回显市在多层级数据中的位置
-                  items.selected = true
+              ele.children.forEach( items =>{
+                if(items.value == item){ // 回显市在多层级数据中的
                   ele.selected = false // 省级半选
                   ele.indeterminate = true
-                  items.initialSelect = true
                   ele.initialSelect = false
+                  ele.children[0].selected = false
+                  ele.children[0].indeterminate = true
+                  ele.children[0].initialSelect = false
+                  items.selected = true
+                  items.initialSelect = true
+                  items.indeterminate = false
+                  
                 }
               })
             })
@@ -394,7 +407,7 @@ var selectAreachoose = {
       })
       let one_noall = this.removeElements(one, '全部') // 去掉一级全部选项的所有选中
       let two_noall = this.removeElements(two, '全部')// 去掉二级全部选项的所有选中
-      let arr_ = noSecondlevel.concat(two_noall)
+      let arr_ = noSecondlevel.concat(two_noall) // 没有二级选项的一级选项选中和二级选项所有选中合并得出总数
       if((this.leftList[0].value=='全部'||this.leftList[0].value=='全国')&&this.leftList[0].selected){
         this.num = this.leftList[0].value  
       }else{

src/web/staticres/js/superSearch.js

@@ -44,6 +44,7 @@ $(function() {
     }
 		priceCss();
 		beforeSubmit('filter-price');
+    searchInnerVue.$refs.selectprice.blur()
 	})
 	//
 	$("#timebut").click(function(){
@@ -1588,7 +1589,7 @@ function collectClick() {
             if (selectType == 'title') {
               $('.custom-checkbox:not(".check-all"):checked').siblings().children('.icon-collect').addClass('checked')
             } else {
-              $('.custom-checkbox:not(".check-all"):checked').parents('.liLuceneList').find('.icon-collect').addClass('checked')
+              $('.custom-checkbox:not(".check-all"):checked').parents('.liLuceneList').find('.icon-beforeSubmitcollect').addClass('checked')
             }
             // 收藏成功后再查一次收藏状态，为了区分达到收藏上限点时部分收藏成功，部分收藏失败
             getBidIsColl()

src/web/templates/pc/supsearch.html

@@ -581,7 +581,7 @@
       // 回显模板里返回的其他筛选条件
       if (buyerTelVal){
         // var text = buyerTelVal == 'y' ? '有联系方式' : '无联系方式'
-        var text = buyerTelVal == 'y' ? '有采购单位联系方式' : '无采购单位联系方式'
+        var text = buyerTelVal == 'y' ? '有采购单位联系方式' : '不限'
         $('.custom-input[name="buyertel"]').attr('data-value', buyerTelVal).val(text)
       } else {
         // $('.custom-input[name="buyertel"]').val('不限')
@@ -589,7 +589,7 @@
       }
       if(winnerTelVal){
         // var text = winnerTelVal == 'y' ? '有联系方式' : '无联系方式'
-        var text = winnerTelVal == 'y' ? '有中标企业联系方式' : '无中标企业联系方式'
+        var text = winnerTelVal == 'y' ? '有中标企业联系方式' : '不限'
         $('.custom-input[name="winnertel"]').attr('data-value', winnerTelVal).val(text)
       } else {
       //   $('.custom-input[name="winnertel"]').val('不限')
@@ -652,16 +652,16 @@
     /**
      * 初始化页面搜索框与工作台顶部搜索联动事件函数，详情见对应函数 common.js
      */
-    if (goTemplateData.inIframe) {
-      $(function () {
-        initSearchPageEvent({
-          type: 'bidding',
-          el: '.searchHeader-container .searchInput',
-          inputSelector: '#searchinput',
-          submitSelector: 'input[type="button"]'
-        })
-      })
-    }
+    // if (goTemplateData.inIframe) {
+    //   $(function () {
+    //     initSearchPageEvent({
+    //       type: 'bidding',
+    //       el: '.searchHeader-container .searchInput',
+    //       inputSelector: '#searchinput',
+    //       submitSelector: 'input[type="button"]'
+    //     })
+    //   })
+    // }
   </script>
   <script src='/js/biddingSearch.js?v={{Msg "seo" "version"}}'></script>
   <script src='/js/superSearch.js?v={{Msg "seo" "version"}}'></script>
@@ -1037,7 +1037,7 @@
             <div class="leftTitle">
               搜索范围：
             </div>
-            <div class="search-content" v-if = "vipState || !islogin">
+            <div class="search-content" v-show = "vipState || !islogin">
               <!-- <span class="search-list">
                 <span data-name="all" class="search-list-checkbox">全部</span>
               </span> -->
@@ -1090,7 +1090,7 @@
               </span>
             </div>
             <!-- 非VIP用户 -->
-            <div class="search-content flex-box" v-else> 
+            <div class="search-content flex-box" v-show = "!(vipState || !islogin)"> 
               <!-- <span class="search-list">
                 <span data-name="all" class="search-list-checkbox">全部</span>
               </span> -->
@@ -1106,9 +1106,11 @@
               <div class="vip_box">
                 <span class="search-list nologin-hide">
                   <span data-name="ppa" class="search-list-checkbox" onClick="return openVipDialog();">项目名称/标的物</span>
+                  <span class="icon-vip"></span>
                 </span>
                 <span class="search-list nologin-hide">
                   <span data-name="buyer" class="search-list-checkbox" onClick="return openVipDialog();">采购单位</span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -1117,7 +1119,8 @@
                   </span>
                 </span>
                 <span class="search-list nologin-hide">
-                  <span data-name="winner" class="search-list-checkbox" onClick="return openVipDialog();">中标企业<em style="color: #B1700E;font-size: 12px;"> 老用户免费专享</em></span>
+                  <span data-name="winner" class="search-list-checkbox">中标企业<em style="color: #B1700E;font-size: 12px;"> 老用户免费专享</em></span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -1127,6 +1130,7 @@
                 </span>
                 <span class="search-list nologin-hide">
                   <span data-name="agency" class="search-list-checkbox" onClick="return openVipDialog();">招标代理机构</span>
+                  <span class="icon-vip"></span>
                   <img src="{{Msg "seo" "cdn"}}/images/biddingSearch/desc-icon.png?v={{Msg "seo" "version"}}" alt="" class="desc-icon">
                   <span class="remind_ desc-con-box" style="display:none;">
                     <span class="remindone_"></span>
@@ -1268,7 +1272,7 @@
                 <div class="one-filter clearfix">
                   <!-- 地区下拉筛选 -->
                    <div class="select-area mr-16">
-                    <select-areachoose ref='selectAreachoose' :list-data="province_city_data" :value-label="'项目地区'" left-tit="省级" right-tit="市级" :vip="vipState" :viplimit="true" :login="islogin" :type="'area'" @datachange = "areadataChange" @limit="limit_">
+                    <select-areachoose ref='selectAreachoose'   :list-data="province_city_data" :value-label="'项目地区'" left-tit="省级" right-tit="市级" :vip="vipState" :viplimit="true" :login="islogin" :type="'area'" @datachange = "areadataChange" @limit="limit_">
                     </select-areachoose>
                    </div>
                    <!--领域化页面不展示-->
@@ -1303,7 +1307,7 @@
                         <span class="value_">
                         </span> -->
                       </div>
-                      <el-select ref="selectchoose" :placeholder="''" :value="''" :popper-append-to-body="false" class="select_common">
+                      <el-select ref="selectprice" :placeholder="''" :value="''" :popper-append-to-body="false" class="select_common">
                         <div slot="empty" class="select_box moneyBox">
                           <div class="Price clearfix select">
                             <div class="Price-content clearfix">
@@ -1339,12 +1343,12 @@
                   <div class="buy-select others">
                     <div style="float: left;position: relative;">
                       <div class="custom-select others">
-                        <input class="custom-input" name="buyertel" data-value="" type="text" readonly placeholder="采购单位联系方式" />
+                        <input class="custom-input select-input" name="buyertel" data-value="" type="text" readonly placeholder="采购单位联系方式" />
                         <i class="icon-arrow"></i>
                       </div>
                       <ol class="custom-option" style="display:none;">
-                        <li data-value="">无采购单位联系方式</li>
-                        <li data-value="y">有采购单位联系方式</li>
+                        <li data-value="" class="item_option">不限</li>
+                        <li data-value="y" class="item_option">有采购单位联系方式</li>
                       </ol>
                     </div>
                   </div>
@@ -1352,12 +1356,12 @@
                     <!-- <span style="float: left;line-height: 30px;margin-right: 12px;color: #686868;">中标企业联系方式</span> -->
                     <div style="float: left;position: relative;">
                       <div class="custom-select others">
-                        <input class="custom-input" name="winnertel" data-value="" type="text" readonly placeholder="中标企业联系方式" />
+                        <input class="custom-input select-input" name="winnertel" data-value="" type="text" readonly placeholder="中标企业联系方式"/>
                         <i class="icon-arrow"></i>
                       </div>
                       <ol class="custom-option" style="display:none;">
-                        <li data-value="">无中标企业联系方式</li>
-                        <li data-value="y">有中标企业联系方式</li>
+                        <li data-value="" class="item_option">不限</li>
+                        <li data-value="y" class="item_option">有中标企业联系方式</li>
                       </ol>
                     </div>
                   </div>
@@ -1388,7 +1392,7 @@
                       <img src="{{Msg "seo" "cdn"}}/images/novip-down.png?v={{Msg "seo" "version"}}" alt="" class="novip-down">
                      </div>
                      <div class="item_select mr-16">
-                      <span class="span_tit">采购单位联系方式</span>
+                      <span class="span_tit">中标企业联系方式</span>
                       <img src="{{Msg "seo" "cdn"}}/images/novip-down.png?v={{Msg "seo" "version"}}" alt="" class="novip-down">
                      </div>
                      <div class="item_select">
@@ -2223,6 +2227,19 @@
       e.stopPropagation()
       // $('.custom-select').css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
       // $('.custom-select').siblings().hide()
+      if($(this).children('input').val() == '采购单位联系方式' || $(this).children('input').val() == '中标企业联系方式'){
+         $(this).children('input').val('不限')
+      }
+      
+      let that = $(this)
+      $(this).next().children('li').each(function(index,ele){
+         if(that.children('input').val() == $(ele).text()){
+          $(ele).addClass('active_select_custom')
+        }else{
+          $(ele).removeClass('active_select_custom')
+        }
+      })
+      
       if($(this).siblings().css('display') == 'none'){
         $(this).css("border-color", '#2cb7ca').siblings().show()
         $(this).children('.icon-arrow').addClass('up')
@@ -2230,7 +2247,6 @@
         $(this).css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
         $(this).siblings().hide()
       }
-      
       console.log($(this).siblings().css('display'))
       $('.custom-option li').off('click').bind('click',function(e) {
         e.stopPropagation()
@@ -2241,6 +2257,19 @@
         $(this).parent().siblings().children('.custom-input').val(text).attr('data-value', val)
         beforeSubmit('filter-custom');
       })
+    })
+    $('.custom-option .item_option').hover(function() {
+        $(this).addClass('active_select_custom').siblings().removeClass('active_select_custom')
+      }, function() {
+      })
+    $('.custom-select .custom-input').blur(function(){
+      let that =this
+      setTimeout(function(){
+        $(that).parent().css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
+        $(that).parent().siblings().hide()
+      },200);
+      
+
     })
     // 点击其他区域 隐藏其他筛选条件下拉框
     $(document).click(function() {
@@ -2390,7 +2419,7 @@
       var hasVipIcon = $(this).siblings().hasClass('icon-vip'); // 有无点击付费的搜索范围
       // 如果是老用户（版本更新前注册的用户）可以使用中标企业搜索范围
       // 不是付费用户引导去付费
-      // console.log(vipState, hasVipIcon);
+      console.log(vipState, hasVipIcon);
       if (!vipState && hasVipIcon) {
         if($(this).text().indexOf('中标企业')> -1 && isOld) {
           var typeArr = selectType ? selectType.split(',') : []
@@ -2439,6 +2468,7 @@
       changeDefaultForSearchRange('set', 'Title', selectType.indexOf('title') !== -1)
       changeDefaultForSearchRange('set', 'Content', selectType.indexOf('content') !== -1)
     })
+
   })
   function tab_serch (actionHref) {
 
@@ -2940,7 +2970,7 @@ function checkTagDisabled () {
         selectorlist:[{value:'0',label:'附件'},{value:'1',label:'有附件'},{value:'-1',label:'无附件'}],
         province_city_data:[],
         industrylist_data:[],
-        buyerclass_data:[]
+        buyerclass_data:[],
       }
     },
     computed: {
@@ -4136,7 +4166,7 @@ function checkTagDisabled () {
         }
         // 采购单位下拉组件 重置
         try{
-          searchInnerVue.$refs.selectBuyerclasschoose.processingbuyerclass(null)
+          this.$refs.selectBuyerclasschoose.processingbuyerclass(null)
         
         }catch(e){
 
@@ -4252,11 +4282,6 @@ function checkTagDisabled () {
             }
           });
         }
-        try{ // 行业下拉回显
-          this.$refs.selectIndustrychoose.processingindustry(item.industry)
-         }catch(e){
-          console.log(e)
-         }
         // 回显价格
         if(item.minprice || item.maxprice){
           $("#minprice").val(item.minprice);
@@ -4324,16 +4349,6 @@ function checkTagDisabled () {
         }catch(e){
 
         }
-        // 下拉组件地区
-        try{
-        let areas_ = item.area?item.area:null
-        let cityTemp_ = item.city?item.city:null
-        this.$refs.selectAreachoose.processingarea(areas_,cityTemp_)
-
-      }catch(e){
-        console.log(e)
-
-      }
         
         // 回显信息类型
         if(item.subtype){
@@ -4387,15 +4402,32 @@ function checkTagDisabled () {
         } else {
           $('.buyclass .buyclass-all').addClass('active')
         }
-        // 采购单位下拉组件回显
+        try{ // 行业下拉回显
+            this.$refs.selectIndustrychoose.initData()
+            this.$refs.selectIndustrychoose.processingindustry(item.industry)
+         }catch(e){
+          console.log(e)
+         }
+          // 下拉组件地区
         try{
+        let areas_ = item.area?item.area:null
+        let cityTemp_ = item.city?item.city:null
+        this.$refs.selectAreachoose.initData()
+        this.$refs.selectAreachoose.processingarea(areas_,cityTemp_)
+      }catch(e){
+        console.log(e)
+
+      }
+        // 采购单位下拉组件回显
+        try{ 
+         this.$refs.selectBuyerclasschoose.initData()
          this.$refs.selectBuyerclasschoose.processingbuyerclass(item.buyerclass)
          }catch(e){
 
          }
         // 回显采购单位联系方式
         if (item.buyertel){
-          var text = item.buyertel == 'y' ? '有采购单位联系方式' : '无采购单位联系方式'
+          var text = item.buyertel == 'y' ? '有采购单位联系方式' : '不限'
           $('.custom-input[name="buyertel"]').attr('data-value', item.buyertel).val(text)
         } else {
           $('.custom-input[name="buyertel"]').attr('data-value', '')
@@ -4403,7 +4435,7 @@ function checkTagDisabled () {
         }
         // 回显中标企业联系方式
         if(item.winnertel){
-          var text = item.winnertel == 'y' ? '有中标企业联系方式' : '无中标企业联系方式'
+          var text = item.winnertel == 'y' ? '有中标企业联系方式' : '不限'
           $('.custom-input[name="winnertel"]').attr('data-value', item.winnertel).val(text)
         } else {
           $('.custom-input[name="winnertel"]').attr('data-value', '')
@@ -4570,14 +4602,14 @@ function checkTagDisabled () {
           if (val == 'y') {
             return '有采购单位联系方式'
           }else{
-            return '无采购单位联系方式'
+            return '不限'
           }
         
         }else if(type == 'winnertel'){
           if (val == 'y') {
             return '有中标企业联系方式'
           }else{
-            return '无中标企业联系方式'
+            return '不限'
           }
         }
       },