Merge branch 'feature/v4.7.62' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.62

src/web/staticres/css/pc/index.css

@@ -276,7 +276,7 @@
 }
 .jy-index-search .tips i{
   position: absolute;
-  top: 40px;
+  top: 41px;
   left: 58px;
   display: inline-block;
   width: 14px;

src/web/staticres/js/superSearch.js

@@ -373,9 +373,9 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
             //领域化展示 商品&采购单位&中标单位
             // console.log(is_field && !selectContext, '领域化');
             if (is_field && !selectContext){
-              listHtml += '<div class="luce-field">'
+              // listHtml += '<div class="luce-field">'
               if (typeof(datas[i].purchasing) != "undefined" && datas[i].purchasing != null && datas[i].purchasing != ""){
-                listHtml += '<div class="nowrap"><span>产品</span><span>'+datas[i].purchasing +'</span></div>'
+                listHtml += '<div class="luce-field"><div class="nowrap"><span>产品</span><span>'+datas[i].purchasing +'</span></div></div>'
               }
 
               // let secondLine=''
@@ -390,8 +390,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
               // if (secondLine!=='') {
               //   listHtml += '<div class="secondLine">'+secondLine+'</div>'
               // }
-
-              listHtml += '</div>'
+              // listHtml += '</div>'
             }
             // 详细列表内容
             if (listModel === 'D') {

src/web/templates/pc/supsearch.html

@@ -1426,7 +1426,7 @@ var IframeOnClick = {
         >
         </el-pagination>
         <div class="nologin-hide">
-          <div class="over-run-tips" v-if="!vipState && listState.allCount >= 500">为您展示前500条，点击<span class="highlight-text" @click="onFreeTaste">查看更多信息</span></div>
+          <div class="over-run-tips" v-if="!vipState && listState.allCount >= 500">为您展示前500条，点击<span class="highlight-text" @click="onFreeTaste">免费查看更多信息</span></div>
         </div>
         <div class="over-run-tips" v-if="vipState  && listState.allCount >= 5000">为您展示前5000条，可细化筛选条件查看更多信息</div>
       </div>
@@ -1664,7 +1664,7 @@ $(function(){
     if(!goTemplateData.inIframe){
       var formNode_ = $('#zbSeatchT')
       var goHref_ = location.origin + '/jylab/supsearch/index.html'
-      // window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
+      window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
     }
 
   }
@@ -3342,11 +3342,15 @@ if(sessionselect){
                 })
                 r.data[0].flag = true
                 _this.filterCounts = r.data.length
-                // r.data.forEach(v => {
-                //   if (v.additionalWords) {
-                //     v.additionalWords = v.additionalWords.replace(/,/g, "，")
-                //   }
-                // })
+                r.data.forEach(v => {
+                  if (!v.subtype) {
+                    if (v.searchGroup === 1) {
+                      v.subtype = '招标预告,招标公告,招标结果,招标信用信息'
+                    } else if (v.searchGroup === 2) {
+                      v.subtype = '拟建项目,采购意向'
+                    }
+                  }
+                })
                 _this.filterData = r.data
               } else {
                 _this.filterData = []
@@ -3413,6 +3417,13 @@ if(sessionselect){
                 }
                 if (r.error_code == 0) {
                   _this.saveFilterDialog = true
+                  if (params.subtype === '') {
+                    if (params.searchGroup === 1) {
+                      params.subtype = '招标预告,招标公告,招标结果,招标信用信息'
+                    } else if (params.searchGroup === 2) {
+                      params.subtype = '拟建项目,采购意向'
+                    }
+                  }
                   _this.curFilter = _this.formatFilterData(params)
                   console.log(_this.curFilter, '22');
                   _this.filterInkey = r.data
@@ -3578,6 +3589,15 @@ if(sessionselect){
       },
       // 回显页面选中条件、表单隐藏域val值
       getEchoData: function(item) {
+        if (item.searchGroup === 1) {
+          if (item.subtype === '招标预告,招标公告,招标结果,招标信用信息') {
+            item.subtype = ''
+          }
+        } else if (item.searchGroup === 2) {
+          if (item.subtype === '拟建项目,采购意向') {
+            item.subtype = ''
+          }
+        }
         // 免费用户或付费用户到期后将付费筛选条件置为默认
         item.searchvalue = this.formatToSpace(item.searchvalue)
         item.selectType = vipState && item.selectType ? item.selectType : this.removePayScope(item.selectType)