Merge branch 'dev4.7.8' of http://192.168.3.207:8080/qmx/jy into dev4.7.8

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

@@ -359,7 +359,7 @@
 .tag-input > .clear-input{
   display: inline-block;
   padding: 0 10px;
-  width: 98px;
+  width: 160px;
   height: 36px;
   line-height: 1;
   background: #fff;

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

@@ -238,6 +238,7 @@
   margin-left: 8px;
   flex: 1;
   color: #1D1D1D;
+  text-align: left;
 }
 .filter-save-item .save-value-bg{
   margin-bottom: 8px;

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

@@ -289,7 +289,7 @@ var vm = new Vue({
         this.industryTab()
     },
     methods: {
-        industryTab() {
+        industryTab: function() {
             $.ajax({
                 type:'POST',
                 url:'/entnicheNew/buy/whetherbuy',
@@ -439,7 +439,7 @@ var vm = new Vue({
             this.doSearch()
         },
         //计算几年前的时间戳
-        getTimeDate(year){
+        getTimeDate: function(year){
             let time = Number(year);
             let date = new Date();
             let lastYear = Number(date.getFullYear()-time)+'-'+Number(date.getMonth()+1)+'-'+date.getDate();

src/web/staticres/js/superSearch.js

@@ -314,7 +314,7 @@ function getNewBiddings(){
 
 function appendDatas(datas,flag,isNew,onlyUpdateTable){
   // flag // 是否有输入
-  // console.log('selectType: ' + selectType,',flag: ',flag)
+  console.log('selectType: ' + selectType,',flag: ',flag)
 	var listHtml = '';
 	var tableHtml = '';
 	$(".working").hide();
@@ -405,12 +405,10 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
         }
         listHtml+='</div>'
         // 全文搜索选择框
-        if (detail) {
-          listHtml += '<div class="left-content" style="width:100%;padding:0;">'
-            + '<input class="custom-checkbox all-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
-						+'<a style="float:left;width:calc(100% - 32px)" href="javascript:volid(0);">'+detail+'...</a>'
-						+'</div>'
-        }
+        listHtml += '<div class="left-content" style="width:100%;padding:0;">'
+          + '<input class="custom-checkbox all-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
+          +'<a style="float:left;width:calc(100% - 32px)" href="javascript:volid(0);">'+detail+'...</a>'
+          +'</div>'
 			}
 			listHtml += '</div><div class="luce-right">'
 			if($.trim(datas[i].area) != "" && datas[i].area != "A"){

src/web/templates/pc/biddetail_rec.html

@@ -838,7 +838,7 @@
 						</table>
 					</div>
 					<div class="baseInfo" id="bidInfoTitle" style="display:none;">中标信息</div>
-					<div class="baseTable" id="bidInfoCont" style="display:none;position: relative">
+					<div class="baseTable" id="bidInfoCont" style="display:none;">
 						<table>
 							<tr>
 								<td class="tab-type">中标单位</td>
@@ -941,9 +941,11 @@
 									<div style="display:none;"></div>
 								</td>
 							</tr>
-							<tr class="winnertel" style="display:none;">
+							<tr class="winnertel" style="display:none;position: relative">
+                <tbody>
+                  <td style="position: absolute;right: 54px;margin-top:12px;font-size: 14px;display:none;color:#888;" id="tel_source"></td>
+                </tbody>
 								<td class="tab-type">联系方式</td>
-                <span style="position: absolute;right: 12px;top:60px;font-size: 14px;display:none;color:#888;" id="tel_source"></span>
 								<td class="tab-cont" style="border-right: none;">
 									{{if or .T.isVip .T.isEntniche .T.isMember}}
 									<div class="cont-cont"><span id="winnertel"></span></div>

src/web/templates/pc/entsearchindex.html

@@ -458,7 +458,7 @@
     <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/ent-search-index-pc.js?v={{Msg "seo" "version"}}'></script>
     <script type="text/javascript">
-    setTimeout(() => {
+    setTimeout(function() {
         if(!vm.powerInfo.entniche && !vm.powerInfo.member && vm.powerInfo.vip <= 0) {
             (window.slotbydup = window.slotbydup || []).push({
                 id: "u6603900",

src/web/templates/pc/index.html

@@ -938,7 +938,7 @@ if (ADList.length>0){
           player.startAnimation();
         })
       } else {
-        $("#index_tc").css("background", "url('"+adv_img+"')")
+        $("#index_tc").css("background-image", "url('"+adv_img+"')")
       }
       $(".tans").css({"opacity":adv_background_opacity});//遮罩层透明度
       break;

src/web/templates/pc/supsearch.html

@@ -120,7 +120,7 @@
   var buyerclassVal = {{.T.buyerclass}} != null ? {{.T.buyerclass}} : ""
   var buyerTelVal = {{.T.buyertel}} != null ? {{.T.buyertel}} : ""
   var winnerTelVal = {{.T.winnertel}} != null ? {{.T.winnertel}} : ""
-  var fileExistsTemp = {{.T.fileExists}} != null ? {{.T.fileExists}} : "0"
+  var fileExistsTemp = {{.T.fileExists}} ? {{.T.fileExists}} : "0"
   var cityTemp = {{.T.city}} != null ? {{.T.city}} : ""
   {{if .T.secondList}}
   secondList = {{.T.secondList}}
@@ -270,6 +270,7 @@
         selectPublishtime = 'thisyear'
         $(".timer [data-value='thisyear']").addClass("active").siblings().removeClass('active');
       }
+      $("#zbSeatchT [name='publishtime']").val(selectPublishtime)
     }
     if(selectTimeslot != "" && selectTimeslot.indexOf("_") > -1){
       $("#starttime").css({"border-color":"#2cb7ca"});
@@ -487,9 +488,12 @@
       $('.custom-input[name="winnertel"]').val('不限')
     }
     // 取模板缓存里的附件
-    if (fileExistsTemp) {
-      searchInnerVue.attachVal = fileExistsTemp
-    }
+    // console.log(fileExistsTemp, 'fileExistsTemp');
+    // if (fileExistsTemp) {
+    //   searchInnerVue.attachVal = fileExistsTemp
+    // }
+    searchInnerVue.attachVal = fileExistsTemp
+    $("#zbSeatchT [name='fileExists']").val(fileExistsTemp)
     /**
     //ie11 backspace禁止
     window.onload=function(){
@@ -1203,7 +1207,7 @@ var IframeOnClick = {
           <div style="display: flex;">
             <div class="save-value-bg" v-if="curFilter.price"><span>价格区间：</span>${curFilter.price}万元</div>
             <div class="save-value-bg" v-if="curFilter.publishTime"><span>发布时间：</span>${curFilter.publishTime}</div>
-            <div class="save-value-bg" v-if="curFilter.attach"><span>附件：</span>${curFilter.fileExists}</div>
+            <div class="save-value-bg" v-if="curFilter.fileExists != '全部'"><span>附件：</span>${curFilter.fileExists}</div>
           </div>
           <div class="save-value-bg" v-if="curFilter.region"><span>项目地区：</span>${curFilter.region}</div>
           <div class="save-value-bg" v-if="curFilter.infoType"><span>信息类型：</span>${curFilter.infoType}</div>
@@ -1211,7 +1215,7 @@ var IframeOnClick = {
           <div style="display: flex;">
             <div class="save-value-bg" v-if="curFilter.buyerTel"><span>采购单位联系方式：</span>${curFilter.buyerTel}</div>
             <div class="save-value-bg" v-if="curFilter.winnerTel"><span>中标单位联系方式：</span>${curFilter.winnerTel}</div>
-            <div class="save-value-bg" v-if="curFilter.notKey"><span>排除词：</span>${curFilter.notKey}</div>
+            <div class="save-value-bg" v-if="curFilter.notkey"><span>排除词：</span>${curFilter.notkey}</div>
           </div>
         </div>
       </div>
@@ -1247,7 +1251,7 @@ var IframeOnClick = {
                 <p class="f-l-c-item">
                   <span v-if="item.buyertel == 'y'">采购单位联系方式：<em class="i-value">${formatContact(item.buyertel)}</em></span>
                   <span v-if="item.winnertel == 'y'">中标单位联系方式：<em class="i-value">${formatContact(item.winnertel)}</em></span>
-                  <span v-if="item.notKey">排除词：<em class="i-value">${formatToSpace(item.notKey)}</em></span>
+                  <span v-if="item.notkey">排除词：<em class="i-value">${formatToSpace(item.notkey)}</em></span>
                 </p>
               </div>
             </div>
@@ -1699,16 +1703,19 @@ $(function(){
       $(this).removeClass('checkbox-checked')
       var index = typeArr.indexOf($(this).attr('data-name'))
       typeArr.splice(index, 1)
+      typeArr = unique(typeArr)
       $("#zbSeatchT [name='selectType']").val(typeArr.toString())
       selectType = typeArr.toString()
       beforeSubmit();
     } else {
       $(this).addClass('checkbox-checked')
       typeArr.push($(this).attr('data-name'))
+      typeArr = unique(typeArr)
       $("#zbSeatchT [name='selectType']").val(typeArr.toString())
       selectType = typeArr.toString()
       beforeSubmit();
     }
+    console.log(selectType, 'selectType');
 	// 筛选条件优化缓存选中标题/正文状态
 	changeDefaultForSearchRange('set', 'Title', selectType.indexOf('title') !== -1)
 	changeDefaultForSearchRange('set', 'Content', selectType.indexOf('content') !== -1)
@@ -2063,7 +2070,7 @@ if(sessionselect){
           buyerClass: '',
           buyerTel: '',
           winnerTel: '',
-          notKey: '',
+          notkey: '',
           fileExists: 0
         },
         filterData: [],
@@ -2182,7 +2189,7 @@ if(sessionselect){
           }
         })
         var obj = {}
-        areaName = Array.from(new Set(areaName))
+        areaName = unique(areaName) // 去重
         areaName.forEach(function(k) {
           obj[k] = newArr.map(function(v) {
             return v[k]
@@ -2495,6 +2502,8 @@ if(sessionselect){
       onSelectedFilter: function (item) {
         this.resetAll()
         console.log(item)
+        changeDefaultForSearchRange('set', 'Title', item.selectType.indexOf('title') !== -1)
+	      changeDefaultForSearchRange('set', 'Content', item.selectType.indexOf('content') !== -1)
         var datas = JSON.parse(JSON.stringify(item))
         var _this = this
         if (item.isPay && !vipState) {
@@ -2520,7 +2529,9 @@ if(sessionselect){
       // 重置
       resetAll: function () {
         // $("#zbSeatchT [name='keywords']").val(''),
-        $("#zbSeatchT [name='selectType']").val('title,content'),
+        var storageType = getDefaultRangeForLocal() // 从筛选条件优化-搜索范围缓存里读取
+        // console.log(storageType, '111');
+        $("#zbSeatchT [name='selectType']").val(storageType),
         $("#zbSeatchT [name='industry']").val(''),
         $("#zbSeatchT [name='minprice']").val(''),
         $("#zbSeatchT [name='maxprice']").val(''),
@@ -2533,9 +2544,13 @@ if(sessionselect){
         $("#zbSeatchT [name='fileExists']").val('0'),
         $("#zbSeatchT [name='area']").val(''),
         $("#zbSeatchT [name='city']").val('')
-        $('.searchSpace .search-list-checkbox').removeClass('checkbox-checked')
-        $('.searchSpace .search-list-checkbox[data-name=title]').addClass('checkbox-checked')
-        $('.searchSpace .search-list-checkbox[data-name=content]').addClass('checkbox-checked')
+        if (storageType) {
+          $('.searchSpace .search-list-checkbox').removeClass('checkbox-checked')
+          var arr = storageType.split(',')
+          arr.forEach(function(item) {
+            $('.searchSpace .search-list-checkbox[data-name=' + item + ']').addClass('checkbox-checked')
+          })
+        }
         $("#induAll").addClass("active").siblings().removeClass('active').removeClass('secondActice');
         $(".pricefat").removeClass("active");
         $("#priceAll").addClass("active");
@@ -2573,7 +2588,7 @@ if(sessionselect){
         item.buyerclass = vipState ? item.buyerclass : ''
         item.buyertel = vipState ? item.buyertel : ''
         item.winnertel = vipState ? item.winnertel : ''
-        item.notKey = vipState ? item.notKey : ''
+        item.notkey = vipState ? item.notkey : ''
         $("#zbSeatchT [name='keywords']").val(item.searchvalue)
         $("#zbSeatchT [name='selectType']").val(item.selectType)
         $("#zbSeatchT [name='industry']").val(item.industry)
@@ -2584,12 +2599,13 @@ if(sessionselect){
         $("#zbSeatchT [name='buyerclass']").val(item.buyerclass)
         $("#zbSeatchT [name='buyertel']").val(item.buyertel)
         $("#zbSeatchT [name='winnertel']").val(item.winnertel)
-        $(".not-key-input-group input").val(item.notKey)
+        $(".not-key-input-group input").val(item.notkey)
         $("#zbSeatchT [name='fileExists']").val(item.fileExists)
         $("#zbSeatchT [name='area']").val(item.area)
         $("#zbSeatchT [name='city']").val(item.city)
         //  回显搜索范围
         if(item.selectType) {
+          selectType = item.selectType
           var space = item.selectType.split(',')
           $('.searchSpace .search-list .search-list-checkbox').removeClass('checkbox-checked')
           space.forEach(function(v){
@@ -2734,7 +2750,7 @@ if(sessionselect){
           $('.custom-input[name="winnertel"]').val('不限')
         }
         // 回显排除词
-        $(".not-key-input-group input").val(item.notKey? item.notKey.replaceAll(',',' ') : '')
+        $(".not-key-input-group input").val(item.notkey? item.notkey.replace(/,/g, "") : '')
         // 回显附件
         this.attachVal = item.fileExists
         this.hasFilterDialog = false
@@ -2794,12 +2810,12 @@ if(sessionselect){
         temp.buyerClass = item.buyerclass ? this.formatBuyerClass(item.buyerclass) : ''
         temp.buyerTel = this.formatContact(item.buyertel)
         temp.winnerTel = this.formatContact(item.winnertel)
-        temp.notKey = item.notkey
+        temp.notkey = item.notkey
         temp.fileExists = this.formatAttach(item.fileExists)
         return temp
       },
       // 处理筛选筛选数据-搜索范围
-      formatScope: function (val, type = 'EN') {
+      formatScope: function (val, type) {
         if (!val) return
         var temp = {
           title: '标题',
@@ -2816,7 +2832,7 @@ if(sessionselect){
           var newArr = selectType.map(function(item){
             return temp[item]
           })
-          return newArr.toString().replaceAll(',', '，')
+          return newArr.toString().replace(/,/g, "，")
         } else {
           // 中文转英文
           var newArr = []
@@ -2867,11 +2883,13 @@ if(sessionselect){
       },
       // 处理筛选数据-附件
       formatAttach: function(val) {
-        if (!val || val == '全部') return
+        // if (!val || val == '全部') return
         if (val == 1 || val == '1') {
           return '有附件'
         } else if (val == -1 || val == '-1') {
           return '无附件'
+        } else {
+          return '全部'
         }
       },
       // 处理区域数据
@@ -2882,7 +2900,7 @@ if(sessionselect){
         } else {
           text = area || city
         }
-        return text.replaceAll(',', '，')
+        return text.replace(/,/g, "，")
       },
       // 处理筛选数据-信息类型
       formatInfoType: function(val) {
@@ -2913,7 +2931,7 @@ if(sessionselect){
             }
           }
         }
-        return result.toString().replaceAll(',', '，')
+        return result.toString().replace(/,/g, "，")
       },
       // 处理筛选数据-行业
       formatIndustry: function (val) {
@@ -2923,7 +2941,7 @@ if(sessionselect){
         var keyApeatArr = valArr.map(function(v) {
           return v.split('_')[0]
         })
-        var keysArr = Array.from(new Set(keyApeatArr))
+        var keysArr = unique(keyApeatArr) // 去重
         var temp = {}
         keysArr.forEach(function(v) {
           var values = valArr.filter(function(s) {
@@ -2949,7 +2967,7 @@ if(sessionselect){
             } 
           }
         }
-        return arr.toString().replaceAll(',', '，')
+        return arr.toString().replace(/,/g, "，")
       },
       // 处理筛选数据-采购单位行业
       formatBuyerClass: function(val) {
@@ -2981,7 +2999,7 @@ if(sessionselect){
             }
           }
         }
-        return result.toString().replaceAll(',', '，')
+        return result.toString().replace(/,/g, "，")
       },
       // 处理筛选数据-英文逗号转空格
       formatToSpace: function(val) {