Merge branch 'feature/v4.8.83' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.83_wmh

src/jfw/front/nzjProject.go

@@ -492,7 +492,10 @@ func NewHotEnt(isWinner bool, number int) (data []map[string]interface{}) {
 }
 
 // 中标喜报
-func WinnerGladTidings() (entBidArr []map[string]interface{}) {
+func WinnerGladTidings(number int) (entBidArr []map[string]interface{}) {
+	seed := time.Now().UnixNano()
+	rand.Seed(seed)
+
 	redisKey := "winnerGladTidings"
 	data, _ := redis.Get(RedisNameNew, redisKey).([]interface{})
 	if len(data) > 0 {
@@ -534,7 +537,11 @@ WHERE
 		}
 		wait.Wait()
 		if len(entBidArr) > 0 {
-			redis.Put(RedisNameNew, redisKey, entBidArr, 24*3600*7)
+			if len(entBidArr) > number {
+				randomNumber := rand.Intn(len(entBidArr) - number)
+				entBidArr = entBidArr[randomNumber : randomNumber+number]
+			}
+			redis.Put(RedisNameNew, redisKey, entBidArr, 24*3600)
 		}
 	}
 	return entBidArr

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

@@ -201,6 +201,9 @@ var vm = new Vue({
         getBIParams () {
           const urlParams = new URLSearchParams(window.location.search)
           return urlParams.get('resource')
+        },
+        loginIn () {
+          return this.isLogin
         }
     },
     created: function () {

src/web/templates/pc/entsearchindex.html

@@ -156,7 +156,7 @@
                     <span class="tab-item" v-show="!inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
                     <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                     <!-- <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">拟在建项目查询</span> -->
-                    <div class="search-tab-right">
+                    <div class="search-tab-right" v-show="isLogin && !inIframe">
                       <span>完整版筛选，戳我>></span>
                       <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
                     </div>

src/web/templates/pc/pursearchindex.html

@@ -105,7 +105,7 @@
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                   <!-- <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/entSearch/index.html')">拟在建项目查询</span> -->
-                  <div class="search-tab-right">
+                  <div class="search-tab-right" v-show="loginIn && !inIframe">
                     <span>完整版筛选，戳我>></span>
                     <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
                   </div>

src/web/templates/pc/supsearch.html

@@ -1961,15 +1961,17 @@
         searchInnerVue.searchTab = 1
       }
       $('#setInfoBtn').text('免费发布信息')
-      if(!searchInnerVue.hideCQ) {
-        $('.nologin-hide').removeClass('hide')
-        $('.badge-recommend').addClass('hide')
-        $('.search-tab-item-0').addClass('hide')
-      } else {
-        $('.nologin-hide').addClass('hide')
+      if(!goTemplateData.inIframe) {
+        if(!searchInnerVue.hideCQ) {
+          $('.nologin-hide').removeClass('hide')
+          $('.badge-recommend').addClass('hide')
+          $('.search-tab-item-0').addClass('hide')
+        } else {
+          $('.nologin-hide').addClass('hide')
+        }
+        $('.city-list-divide').addClass('hide')
+        $('#sideIcon').addClass('hide')
       }
-      $('.city-list-divide').addClass('hide')
-      $('#sideIcon').addClass('hide')
       try{
         searchInnerVue.$refs.areaRefs.shoWcity=false//隐藏地市
       }catch(e){
@@ -1997,29 +1999,26 @@
         })
     })
     window.loginCallback = function () {//登录成功回调
-
-      if(!goTemplateData.inIframe) {
-        $('#setInfoBtn').text('信息发布')
-        $('.badge-recommend').hide()
-        $('.search-tab-item-0').hide()
-        if(getParam('tab') === '2') {
-          searchInnerVue.searchTab = 2
-        } else {
-          searchInnerVue.searchTab = 1
-        }
-      } else {
-        $('.badge-recommend').show()
-        $('.search-tab-item-0').show()
-      }
       // @2023/9/26 未登录限制搜索条件
       $(".no-login-mask").remove()
 
       $('#go-customer-4').removeClass('hide')
       $('.nologin-hide').removeClass('hide')
       if(!goTemplateData.inIframe) {
+        $('.search-tab-right').show()
         $('.badge-recommend').hide()
         $('.search-tab-item-0').hide()
+      } else {
+        $('.search-tab-right').hide()
+        $('.badge-recommend').show()
+        $('.search-tab-item-0').show()
       }
+      if(getParam('tab') === '2') {
+        searchInnerVue.searchTab = 2
+      } else {
+        searchInnerVue.searchTab = 1
+      }
+      $('#setInfoBtn').text('信息发布')
       $('.city-list-divide').removeClass('hide')
       $('#sideIcon').removeClass('hide')
       try{
@@ -2031,7 +2030,8 @@
       for (let i = 0; i < searchDoms.length; i++) {
         if(goTemplateData.inIframe) {
           $(searchDoms[i]).hide()
-          $('.nologin-hide').addClass('hide')
+          $('.badge-recommend').show()
+          $('.search-tab-item-0').show()
         }
       }
       /**