fix: 超前项目表格显示优化

src/web/staticres/common-module/mainSearch/js/advanced-project-table-mobile.js

@@ -52,20 +52,21 @@ var advanceProjectTable = {
         html += `<li><p class="name">省份</p><p class="textcontent">${this.tableInfo.area}</p></li>`
         // <业主类型>跳转画像
         // 判断不同平台代码(wx/app)
+        var hasOwnerAnchor = this.tableInfo.owner ? '' : 'hidden'
         if (this.platform === 'wx') {
             html += `<li>
                 <p class="name">业主单位</p>
-                <div class="unitcenter caigouunit">
-                    <p class="textcontent" data-cl-event="c_wx_unitportrait_buttonclick">${this.tableInfo.owner}</p>
-                    <span class="go-look go-buyer" data-cl-event="c_wx_unitportrait_buttonclick">立即查看</span>
+                <div class="unitcenter caigouunit"
+                    <p class="textcontent ${hasOwnerAnchor}" data-cl-event="c_wx_unitportrait_buttonclick">${this.tableInfo.owner}</p>
+                    <span class="go-look go-buyer ${hasOwnerAnchor}" data-cl-event="c_wx_unitportrait_buttonclick">立即查看</span>
                 </div>
             </li>`
         } else {
             html += `<li class="caigouunit commonUser">
                 <p class="name">业主单位</p>
                 <div class="unitcenter">
-                    <p class="textcontent">${this.tableInfo.owner}</p>
-                    <div class="unitbtn">
+                    <p class="textcontent ${hasOwnerAnchor}">${this.tableInfo.owner}</p>
+                    <div class="unitbtn ${hasOwnerAnchor}">
                         立即查看
                         <span class="iconunit" style="display:none;"></span>
                     </div>

src/web/staticres/common-module/mainSearch/js/advanced-project-table.js

@@ -64,6 +64,9 @@ var advanceProjectTable = new Vue({
     },
     mounted: function () {
         this.initBuyerEvents()
+        if (this.tableShow) {
+            this.appendToTab2()
+        }
     },
     methods: {
         initTableContent: function () {
@@ -87,6 +90,11 @@ var advanceProjectTable = new Vue({
             this.tableInfo.project_scale = content.project_scale || ''
         },
         // 初始化采购单位画像事件
-        initBuyerEvents: function () {}
+        initBuyerEvents: function () {},
+        appendToTab2: function () {
+            $('#tab2').html('')
+            $('#tab2')[0].appendChild($('#advanced-project-table')[0])
+            $('#tab2').show()
+        }
     }
 })

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

@@ -585,27 +585,28 @@
 [v-cloak] {
   display: none!important;
 }
-#advanced-project-table table {
-  border-collapse: collapse;
+#advanced-project-table {
+  margin-top: 30px;
 }
 .advanced-table {
-  margin-top: 30px;
+  border-spacing: 0;
+  border-collapse: unset; /* 火狐兼容问题 */
   width: 100%;
+  border-top: 1px solid #EBEBEB;
+  border-left: 1px solid #EBEBEB;
 }
 .advanced-table caption {
   font-size: 16px;
   color: #1d1d1d;
 }
-.advanced-table tr {
-  border: 1px solid #EBEBEB;
-}
 .advanced-table td {
   position: relative;
   padding: 10px;
   font-size: 16px;
   color: #1d1d1d;
   line-height: 24px;
-  border: 1px solid #EBEBEB;
+  border-right: 1px solid #EBEBEB;
+  border-bottom: 1px solid #EBEBEB;
 }
 .advanced-table .t-label {
   width: 100px;
@@ -615,8 +616,3 @@
 .advanced-table .t-text:not(.whole-line) {
   width: 375px;
 }
-.table-content-wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}

src/web/staticres/public-pc/js/article-content.js

@@ -750,12 +750,13 @@ $(window).scroll(function(event){
   var offsetTop = 0;
   var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
   var t1top = 0;
-  if(goTemplateData.params.obj.subtype!="拟建"&&goTemplateData.params.obj.subtype!="违规"){
-	if ($(".recoveryfat").html()!=undefined){
+  if(goTemplateData.params.obj.subtype!="违规"){
+	  if ($(".recoveryfat").html()!=undefined){
     	offsetTop = $(".recoveryfat").offset().top;
     	t1top = $(".tab1").offset().top;
     }
   }
+  console.log(offsetTop, t1top, scrollTop)
   if(t1top<=(scrollTop+65)&&t1top!=0){
     if(scrollflag){
       $(".tab1").addClass("active").siblings().removeClass("active");
@@ -1198,12 +1199,18 @@ $(function(){
     }
   }
 
-  if(goTemplateData.params.obj.subtype=="拟建"||goTemplateData.params.obj.toptype=="拟建"||goTemplateData.params.obj.subtype=="违规"){
+  if(goTemplateData.params.obj.subtype=="违规"){
     if(attaflag){
       $(".preb-enclosure").removeClass("hidden");
       $(".pdf-div").removeClass("hidden");
     }
-  }else{
+  }else if (goTemplateData.params.obj.subtype=="拟建"||goTemplateData.params.obj.subtype=="采购意向"||goTemplateData.params.obj.toptype=="拟建"){
+    if (advanceProjectTable.tableShow) {
+      $(".recoveryfat").show();
+      $(".explain").show();
+      // $(".lead-btn").show();
+    }
+  } else {
     if((count>=4 && !isbid)||(count>=5&&isbid)){
       $(".recoveryfat").show();
       $("#tab2").show();

src/web/templates/pc/biddetail_rec.html

@@ -892,8 +892,8 @@
 											:href-data="'/entpc/unit_portrayal/' + tableInfo.owner"
 											v-text="tableInfo.owner"
 											tip-data="查看采购单位画像"
-											class="cont-cont portrait_img"></div>
-										<div class="claim claim-no" v-if="ownerEnable">认领</div>
+											class="cont-cont portrait_img fl"></div>
+										<div class="claim claim-no fr" v-if="ownerEnable">认领</div>
 									</template>
 									<template v-else>
 										<div
@@ -901,8 +901,8 @@
 											:href-data="'/swordfish/page_big_pc/unit_portrayal/' + tableInfo.owner"
 											v-text="tableInfo.owner"
 											tip-data="查看采购单位画像"
-											class="cont-cont portrait_img"></div>
-										<div class="portrait_img only-text" v-if="ownerEnable">立即查看</div>
+											class="cont-cont portrait_img fl"></div>
+										<div class="portrait_img only-text fr" v-if="ownerEnable">立即查看</div>
 									</template>
 								</td>
 								<td class="t-label">业主类型</td>