Merge branch 'feature/v4.8.39' into dev/v4.8.39_zsy

src/jfw/front/shorturl.go

@@ -432,7 +432,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 					}
 				}
 				if !canRead { //登录拟建&采购不展示遮罩 只打码
-					canRead = true
+					//canRead = true
 					//打码显示引导
 					otherFilter(obj, userId != "")
 				}

src/web/templates/pc/biddetail_rec.html

@@ -1611,18 +1611,13 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
       var pathname = location.pathname
       var entService = pathname.indexOf('entservice') !== -1
       var advancedProject = goTemplateData.params.obj.subtype == '采购意向' || goTemplateData.params.obj.subtype == '拟建'
+      // 是否展示真实内容(不打码，无遮罩)
       var canRead = location.href.indexOf('mailprivate') > -1 || {{.T.canRead}} || entService
       // 免费用户每日查看三次
       checkunPreBuildCanRead()
       // 非拟建采购意向 是否展示遮罩
       function checkunPreBuildCanRead () {
         var subType = goTemplateData.params.obj.subtype
-        if (subType == '采购意向') {
-          $('.caigouyixiang-guide').removeClass('hidden')
-        }
-        if(subType == "拟建") {
-          $('.nijian-guide').removeClass('hidden')
-        }
         if(!advancedProject && !canRead) {
           $('#tip-title').text('免费查看更多公告')
           $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
@@ -1657,25 +1652,28 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           $(".tip-box .tip-text").eq(0).text('提前1-3个月获取项目信息，及早介入准备更充分')
           $(".tip-box .tip-text").eq(1).text('')
           $(".detail-nj-btn").text("点击进入")
-          $('.caigouyixiang-guide').removeClass('hidden')
+          // $('.caigouyixiang-guide').removeClass('hidden')
         }
         if(subType == "拟建") {
           $('#tip-title').text('超前项目抢先知，中标更容易')
           $(".tip-box .tip-text").eq(0).text('提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。')
           $(".tip-box .tip-text").eq(1).text('')
           $(".detail-nj-btn").text("点击进入")
-          $('.nijian-guide').removeClass('hidden')
         }
 
         checkunPreBuildCanRead()
         if (!canRead && !privatedata){
-          $(".com-prebuilt").removeClass("hidden");
-          $(".com-prebuilt").css('height', '408px')
-          $('.original-text').hide()
-          $(".mask-zz").removeClass("hidden");
-          $(".tabfat").remove()
-          $(".recoveryfat").remove()
-          $("#attach-list").remove()
+          if (subType === '拟建') {
+            $('.nijian-guide').removeClass('hidden')
+          } else {
+            $(".com-prebuilt").removeClass("hidden");
+            $(".com-prebuilt").css('height', '408px')
+            $('.original-text').hide()
+            $(".mask-zz").removeClass("hidden");
+            $(".tabfat").remove()
+            $(".recoveryfat").remove()
+            $("#attach-list").remove()
+          }
         } else {
           getFileData()
           $(".com-prebuilt").css('height', 'unset')

src/web/templates/pc/classifylist.html

@@ -643,10 +643,10 @@ function priceCss(){
 					<font class="parent-node infoFist">拟建项目</font>
 					<font data-value="拟建" class="hidden">拟建</font>
 					<a id="whole"><img class="q-mark" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
-					<i class="diver"></i>
-					<font class="parent-node">采购意向</font>
+					<i class="diver nologin-hide"></i>
+					<font class="parent-node nologin-hide">采购意向</font>
 					<font data-value="采购意向" class="hidden">采购意向</font>
-					<a id="whole"><img class="q-mark-buyer" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+					<a id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
 					<i class="diver"></i>
 					<font class="parent-node">招标预告</font>
 					<font data-value="预告">预告</font>

src/web/templates/pc/supsearch.html

@@ -1050,10 +1050,10 @@
               <font v-show="showCQ" class="parent-node">拟建项目</font>
               <font v-show="showCQ" data-value="拟建" class="hidden">拟建</font>
               <a v-show="showCQ" id="whole"><img class="q-mark" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
-              <i v-show="showCQ" class="diver"></i>
-              <font v-show="showCQ" class="parent-node">采购意向</font>
+              <i v-show="showCQ" class="diver nologin-hide"></i>
+              <font v-show="showCQ" class="parent-node nologin-hide">采购意向</font>
               <font v-show="showCQ" data-value="采购意向" class="hidden">采购意向</font>
-              <a v-show="showCQ" id="whole"><img class="q-mark-buyer" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+              <a v-show="showCQ" id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
               <i v-show="hideCQ" class="diver"></i>
               <font v-show="hideCQ" class="parent-node">招标预告</font>
               <font v-show="hideCQ" data-value="预告">预告</font>
@@ -1682,7 +1682,6 @@
         var goHref_ = location.origin + '/jylab/supsearch/index.html'
         window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
       }
-
     }
     // 排除词
     $(".not-key-group input").on('focus', function () {