Merge branch 'master' into feature/v4.8.96

src/jfw/timetask/timetask.go

@@ -52,9 +52,9 @@ func updateHotKeys() {
 	})
 	c.AddFunc("0 0 1 * * 1", func() { //每周1清理匿名用户日志表 保留最近30天
 		tm := time.Now().AddDate(0, 0, -qutil.IntAllDef(config.Sysconfig["anonymousTime"], 30)).Unix()
-		count := public.BaseMysql.CountBySql(fmt.Sprintf(`SELECT count(*) FROM anonymous_identity WHERE  creation_time < %d and refer = ''  and   fid is null`, tm))
+		count := public.BaseMysql.CountBySql(fmt.Sprintf(`SELECT count(*) FROM anonymous_identity WHERE  creation_time < %d and fid is null`, tm))
 		for i := 0; i < int(math.Ceil(float64(count)/float64(2000))); i++ {
-			public.BaseMysql.SelectBySql(fmt.Sprintf(`DELETE FROM anonymous_identity WHERE creation_time < %d and refer = '' AND fid IS NULL LIMIT 2000;`, tm))
+			public.BaseMysql.SelectBySql(fmt.Sprintf(`DELETE FROM anonymous_identity WHERE creation_time < %d AND fid IS NULL LIMIT 2000;`, tm))
 		}
 	})
 

src/web/staticres/css/dev2/biddingSearch.css

@@ -1118,7 +1118,7 @@ position: absolute;
   display: none;
 }
 .filter-table-container.fixed #fixed-table-header-container > table {
-  top: 116px !important;
+  top: 103px !important;
   position: fixed;
 }
 

src/web/staticres/css/pc.css

@@ -5496,3 +5496,31 @@ h6 {
 .theme-light .jy_friendlink_content ul li::after {
 	background-color: #E0E0E0;
 }
+
+#guide-go-workspace .highlight-content button {
+  text-decoration-line: underline;
+  background: transparent;
+  padding: 0;
+}
+#guide-go-workspace .highlight-content {
+  display: inline-block;
+  padding: 0 6px;
+  color: #2ABED1;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 22px;
+  font-family: -apple-system,system-ui,BlinkMacSystemFont,Helvetica Neue,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Arial,sans-serif;
+}
+#guide-go-workspace {
+  display: inline-block;
+  border-radius: 4px;
+  background: linear-gradient(270deg, rgba(42, 190, 209, 0.24) 1.5%, rgba(42, 190, 209, 0.12) 97.45%);
+  padding: 2px 8px;
+  color: #1D1D1D;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 24px;
+  margin-top: -4px;
+}

src/web/staticres/js/biddingSearch.js

@@ -293,7 +293,13 @@ $(function() {
 			$controlDiv = $("#allnews.tabContainer>div");
 			$controlDiv_2 = $(".tabContainer-2>div");
 		$tabBtn.on("click", function() {
+      try {
+        searchInnerVue.tableHeaderShow = false
+      } catch (e) { console.warn(e) }
 			if($(this).attr("id")=="right-table"){
+        try {
+          searchInnerVue.tableHeaderShow = true
+        } catch (e) { console.warn(e) }
         // searchInnerVue.onPageChange(searchInnerVue.listState.num)
 				// if(getVIPData()){
 					$("#right-table").addClass("active").siblings().removeClass("active");

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

@@ -343,7 +343,7 @@ var entSearch = new Vue({
         }
         this.initDOMEvents()
         this.filterEcho(this.filterState)
-        
+
         // 全选按钮逻辑
         // this.searchTypeChange([], true)
         this.industryTab()
@@ -363,6 +363,13 @@ var entSearch = new Vue({
         // }
     },
     methods: {
+      // 引导文案点击事件
+      guideGoWorkSpace: function () {
+        if (!this.isLogin) {
+          return openLoginDig()
+        }
+        this.goWorkSpace()
+      },
         goBack () {
           var back = function () {
             window.top.history.back()
@@ -372,7 +379,7 @@ var entSearch = new Vue({
             // 判断是否在iframe，如果在iframe，则用父级返回
             window.top.location.href = '/'
           }
-        
+
           var referer = document.referer
           if(referer) {
             var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0

src/web/templates/pc/entsearchindex.html

@@ -29,6 +29,10 @@
             .bg-white {
                 background-color: #fff;
             }
+            .selector-content.fix-group-width {
+              padding-right: 12px;
+              flex: unset;
+            }
             .diy-for-register-group.money-select-group .selector-content {
               flex: unset;
             }
@@ -141,6 +145,10 @@
             .search-tab-right{
               float: right;
             }
+            #guide-go-workspace {
+              height: 28px;
+              align-self: center;
+            }
         </style>
 	</head>
 
@@ -236,11 +244,15 @@
                         <div class="selector-card-content">
                             <select-list-component
                                 ref="searchType"
+                                :class="!goTemplateData.inIframe ? 'fix-group-width' : ''"
                                 :list="searchTypeListComputed"
                                 select-button-type="checkbox"
                                 :show-all-button="false"
                                 @change="searchTypeChange"
                             ></select-list-component>
+                          <div id="guide-go-workspace" v-if="!goTemplateData.inIframe">
+                            更多筛选条件和完整功能请<div class="highlight-content">“<button @click="guideGoWorkSpace">${!isLogin ? '登录后' : ''}进入工作台</button>”</div>使用
+                          </div>
                         </div>
                         <div class="selector-card-footer" v-if="showEntUsage">
                             <el-popover

src/web/templates/pc/supsearch.html

@@ -914,6 +914,9 @@
                 <!-- <img class="icon-vip nologin-hide" src="/images/biddingSearch/VIP.png" alt=""> -->
                 <li data-value="fiveyear" data-auth="vip"  onClick="if(!vipState) return openVipDialog();" class="nologin-hide">最近5年</li>
                 <!-- <img class="icon-vip nologin-hide" src="/images/biddingSearch/VIP.png" alt=""> -->
+                <div id="guide-go-workspace" v-if="!goTemplateData.inIframe">
+                  最近五年数据查询以及更多筛选条件请<div class="highlight-content">“<button @click="guideGoWorkSpace">${!islogin ? '登录后' : ''}进入工作台</button>”</div>检索
+                </div>
               </ul>
             </div>
             <div class="timerInput fl nologin-hide">
@@ -934,6 +937,9 @@
                 <li data-value="lately-7">最近7天</li>
                 <li data-value="lately-30">最近30天</li>
                 <li data-value="thisyear">最近1年</li>
+                <div id="guide-go-workspace" v-if="!goTemplateData.inIframe">
+                  最近五年数据查询以及更多筛选条件请<div class="highlight-content">“<button @click="guideGoWorkSpace">${!islogin ? '登录后' : ''}进入工作台</button>”</div>检索
+                </div>
               </ul>
             </div>
             <div class="vip_box fl clearfix" v-if="goTemplateData.inIframe">
@@ -1580,7 +1586,7 @@
           </div>
         </div>
         <div class="tabContainer" id="fix-tab" style="margin: 0">
-          <div v-show="tableFixedTop" class="lucene-table fixed-table-header-container" id="fixed-table-header-container" style="padding: 0"></div>
+          <div v-show="canShowFixedTableHeader" class="lucene-table fixed-table-header-container" id="fixed-table-header-container" style="padding: 0"></div>
         </div>
       </div>
       <!--tab切换内容-->
@@ -3028,6 +3034,8 @@ function checkTagDisabled () {
         attachVal_zb:"",
         fixedTop: false, // 筛选是否吸顶
         tableFixedTop: false, // 搜索结果是否吸顶
+        // 是否显示顶部表头
+        tableHeaderShow: false,
         saveFilterDialog: false,
         hasFilterDialog: false,
         curFilter: {
@@ -3171,6 +3179,9 @@ function checkTagDisabled () {
       canNextDataExport: function () {
         return this.listState.allCount > 0
       },
+      canShowFixedTableHeader: function () {
+        return this.tableHeaderShow && this.tableFixedTop
+      }
     },
     watch: {
       'listState.allCount': function (val) {
@@ -3228,6 +3239,13 @@ function checkTagDisabled () {
       }
     },
     methods: {
+      // 引导文案点击事件
+      guideGoWorkSpace: function () {
+        if (!this.islogin) {
+          return openLoginDig()
+        }
+        this.goWorkSpace()
+      },
       goBack () {
         var back = function () {
           // 判断是否在iframe，如果在iframe，则用父级返回
@@ -3736,6 +3754,7 @@ function checkTagDisabled () {
         } else {
           this.fixedTop = false
         }
+        $(".lucene-table.tabfixed.tababsolute").is(":visible")
         if (scrollTop >= watchTable) {
           this.tableFixedTop = true
         } else {