Merge branch 'dev/4.8.59_cyl' of qmx/jy into feature/v4.8.59

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css

@@ -685,3 +685,8 @@
 .etable .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
     border:1px solid rgb(229,229,229);
 }
+
+.buyer-open img {
+    display: block;
+    width: 100%;
+}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -597,6 +597,7 @@ var vNode = {
     //招标信息是否被收藏
     getIsSc () {
       let _this = this
+      if (_this.list.length === 0) return
       $.ajax({
         url: '/publicapply/bidcoll/isColl',
         type: 'POST',

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -626,6 +626,7 @@ var vNode = {
     //招标信息是否被收藏
     getIsSc () {
       let _this = this
+      if (_this.list.length === 0) return
       $.ajax({
         url: '/publicapply/bidcoll/isColl',
         type: 'POST',

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -294,13 +294,6 @@
                 <em class="action-button-text">筛选条件</em>
               </div>
             </div>
-            <!-- 免费用户显示数据导出入口 -->
-            <div class="action-group" v-else-if="isFreeOrNotLogin" key="action-group">
-              <div class="action-button export" @click="onExport">
-                <i class="j-icon base-icon icon-download"></i>
-                <em class="action-button-text">数据导出</em>
-              </div>
-            </div>
           </div>
           <div class="module-notice-tip">注：1个项目如同时发布了中标、成交、合同等结果类公告，则有多条数据</div>
           <div class="tab-card-content vip_component" v-if="getStatus && hideDt"

src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -175,10 +175,8 @@
           <forwardshare :params="unitParams" v-if="isLogin"></forwardshare>
         </div>
         <!-- 留完资的免费用户 已体验和未体验的展示去开通 -->
-        <div v-if="getfreeBuyerOpen">
-          <van-sticky offset-top="21.33333vw">
-            <img @click="goOpenVip" src="/jyapp/big-member/image/buyer-open.png" alt="">
-          </van-sticky>
+        <div class="buyer-open" v-if="getfreeBuyerOpen" @click="goOpenVip">
+          <img src="/jyapp/big-member/image/buyer-open.png" alt="">
         </div>
         <van-tabs
           class="buyer-tabs-container"
@@ -220,12 +218,12 @@
                     <span>招标动态</span>
                     <!-- <span class="module-title-num">10</span> -->
                   </div>
-                  <div class="action-group">
+                  <div class="action-group" v-if="!getStatus">
                     <div class="action-button export" @click="onExport" v-if="dt.list.length">
                         <i class="j-icon base-icon icon-download"></i>
                         <em id="mainSearch-selLable-dataExport" class="action-button-text">数据导出</em>
                     </div>
-                    <div class="action-button filters-button" @click="goHighSet" v-if="!getStatus">
+                    <div class="action-button filters-button" @click="goHighSet">
                       <i class="j-icon base-icon icon-3hengxian"></i>
                       <em class="action-button-text">筛选条件</em>
                     </div>

src/web/staticres/big-member/css/unit_portrayal.css

@@ -624,3 +624,8 @@
     background: linear-gradient(270deg, #2ABED1 0.81%, #8DE0EB 100%);
     border-radius: 0 .28rem .28rem 0;
 }
+
+.buyer-open img {
+    display: block;
+    width: 100%;
+}

src/web/staticres/big-member/js/unit_portrayal.js

@@ -573,6 +573,7 @@ var vNode = {
         //招标信息是否被收藏
         getIsSc(){
           let _this = this
+          if (_this.list.length === 0) return
           $.ajax({
             url: '/publicapply/bidcoll/isColl',
             type: 'POST',

src/web/staticres/common-module/big-member/js/ent_project_news.js

@@ -296,6 +296,7 @@ var vConfig = {
         //招标信息是否被收藏
         getIsSc(){
           let _this = this
+          if (_this.list.length === 0) return
           $.ajax({
             url: '/publicapply/bidcoll/isColl',
             type: 'POST',

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -600,6 +600,7 @@ var vNode = {
     //招标信息是否被收藏
     getIsSc(){
       let _this = this
+      if (_this.list.length === 0) return
       $.ajax({
         url: '/publicapply/bidcoll/isColl',
         type: 'POST',

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -334,10 +334,8 @@
               <forwardshare :params="unitParams"></forwardshare>
           </div>
           <!-- 留完资的免费用户 已体验和未体验的展示去开通 -->
-          <div v-if="getfreeBuyerOpen">
-            <van-sticky>
-              <img @click="goOpenVip" src="/big-member/image/buyer-open.png" alt="">
-            </van-sticky>
+          <div class="buyer-open" v-if="getfreeBuyerOpen" @click="goOpenVip">
+              <img src="/big-member/image/buyer-open.png" alt="">
           </div>
         <van-tabs
             class="buyer-tabs-container"
@@ -374,12 +372,12 @@
                                 <span>招标动态</span>
                                 <!-- <span class="module-title-num">10</span> -->
                             </div>
-                            <div class="action-group">
+                            <div class="action-group" v-if="!getStatus">
                                 <div class="action-button export" @click="onExport" v-if="dt.list.length">
                                     <i class="j-icon base-icon icon-download"></i>
                                     <em id="mainSearch-selLable-dataExport" class="action-button-text">数据导出</em>
                                 </div>
-                                <div class="action-button filters-button" @click="goHighSet" v-if="!getStatus">
+                                <div class="action-button filters-button" @click="goHighSet">
                                     <i class="j-icon base-icon icon-3hengxian"></i>
                                     <em class="action-button-text">筛选条件</em>
                                 </div>

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -294,13 +294,6 @@
                                 <em class="action-button-text">筛选条件</em>
                             </div>
                         </div>
-                        <!-- 免费用户显示数据导出入口 -->
-                        <div class="action-group" v-else-if="isFreeOrNotLogin" key="action-group">
-                            <div class="action-button export" @click="onExport">
-                                <i class="j-icon base-icon icon-download"></i>
-                                <em class="action-button-text">数据导出</em>
-                            </div>
-                        </div>
                     </div>
                     <div class="module-notice-tip">注：1个项目如同时发布了中标、成交、合同等结果类公告，则有多条数据</div>
                     <div class="tab-card-content vip_component" v-if="getStatus && hideDt"

src/web/templates/weixin/wxinfocontent_rec.html

@@ -2579,11 +2579,8 @@ $(function(){
 		}
 		outhtml +='<li><p class="name">项目名称</p><p class="textcontent">'+rerprojectname+'</p><a dataName="项目名称" dataCont="'+rerprojectname+'" dataCode="projectname" onClick="recoveryAction(this)">纠错</a></li>'
 		var rerbuyer = {{.T.obj.buyer}} ? {{.T.obj.buyer}} : {{.T.obj.owner}};
-		if(rerbuyer==undefined||rerbuyer==null){
-			rerbuyer=""
-		}
 		var rerbuyer_show = ""
-		if(rerbuyer==undefined||rerbuyer==null){
+		if(rerbuyer==undefined||rerbuyer==null||!rerbuyer){
 			rerbuyer=""
 			rerbuyer_show = "hide"
 		}