Merge branch 'dev/v4.8.75_cyl' of qmx/jy into feature/v4.8.70

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

@@ -1668,18 +1668,18 @@ position: absolute;
   border: 1px solid #2CB7CA;
 }
 .liLuceneList .bid-list-tags .icon-collect,
-.liLuceneList .bid-list-tags .icon-canbiao,
+.liLuceneList .bid-list-tags .icon-canbiao-img,
 .liLuceneList .bid-list-tags .icon-shoulu{
   position: relative;
   width: 54px;
   background-size: 20px 20px;
   background-position: left center;
 }
-.liLuceneList .bid-list-tags .icon-canbiao{
+.liLuceneList .bid-list-tags .icon-canbiao-img{
     width: 60px;
 }
 .liLuceneList .bid-list-tags .icon-collect::after,
-.liLuceneList .bid-list-tags .icon-canbiao::after,
+.liLuceneList .bid-list-tags .icon-canbiao-img::after,
 .liLuceneList .bid-list-tags .icon-shoulu::after{
   position: absolute;
   content: '收藏';
@@ -1692,7 +1692,7 @@ position: absolute;
 .liLuceneList .bid-list-tags .icon-shoulu.icon-a-Property1yishoulu::after{
   width: 42px;
 }
-.liLuceneList .bid-list-tags .icon-canbiao::after {
+.liLuceneList .bid-list-tags .icon-canbiao-img::after {
     content: '参标';
 }
 .liLuceneList .bid-list-tags .icon-shoulu::after {
@@ -1701,11 +1701,11 @@ position: absolute;
 .liLuceneList .bid-list-tags .icon-collect.checked{
   width: 68px;
 }
-.liLuceneList .bid-list-tags .icon-canbiao.checked{
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked{
     width: 88px;
 }
 .liLuceneList .bid-list-tags .icon-collect.checked::after,
-.liLuceneList .bid-list-tags .icon-canbiao.checked::after,
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked::after,
 .liLuceneList .bid-list-tags .icon-shoulu.checked::after{
   position: absolute;
   content: '已收藏';
@@ -1716,7 +1716,7 @@ position: absolute;
   color: #1D1D1D;
 }
 
-.liLuceneList .bid-list-tags .icon-canbiao.checked::after{
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked::after{
     content: '终止参标';
     width: 88px !important;
 }

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

@@ -221,7 +221,7 @@
   background-size: 20px;
 }
 .icon-collect,
-.icon-canbiao{
+.icon-canbiao-img{
   display: inline-block;
   width: 20px;
   height: 20px;
@@ -236,11 +236,11 @@
   background-size: contain;
 }
 
-.icon-canbiao {
+.icon-canbiao-img {
   background-image: url(/images/canbiao.png);
 }
 
-.icon-canbiao.checked {
+.icon-canbiao-img.checked {
   background-image: url(/images/canbiao-active.png);
 }
 

src/web/staticres/frontRouter/pc/collection/css/index-pc.css

@@ -39,7 +39,7 @@
     background-repeat: no-repeat;
     background-size: contain;
 }
-.icon-canbiao {
+.icon-canbiao-img {
     background:transparent url(/images/canbiao.png) no-repeat center;
     background-size: contain;
 }
@@ -47,7 +47,7 @@
     margin-right:0px !important;
 }
 
-.icon-canbiao-active {
+.icon-canbiao-img-active {
     background:transparent url(/images/canbiao-active.png) no-repeat center;
     background-size: contain;
 }

src/web/staticres/js/superSearch.js

@@ -369,7 +369,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
             }
             // 分类标签、收藏
             listHtml += '<div class="bid-list-tags">'
-                +'<div>'
+                +'<div class="bid-list-tags-left">'
                 if (datas[i].site == '剑鱼信息发布平台') {
                   listHtml += '<span class="tags-item tags-publish">用户发布</span>'
                 }
@@ -415,9 +415,9 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
                   listHtml+='<span class="tags-item tags-file">'+'有附件'+'</span>'
                 }
                 listHtml+='</div>'
-                listHtml+='<div>'
+                listHtml+='<div class="bid-list-tags-right">'
                 // 是否参标（2022/05/12）
-                 listHtml += '<i class="icon-canbiao" style="display:none" dataid="'+datas[i]._id+'" ></i>'
+                 listHtml += '<i class="icon-canbiao-img" style="display:none" dataid="'+datas[i]._id+'" ></i>'
 
                 // // 是否收藏
                 var resource = inResourceBIiframe
@@ -1917,14 +1917,14 @@ function getBidIsJoin () {
         if(data.length > 0) {
           Bidrenewal_Dialog.initBidrenewalDialog = true // 加载参标状态更新弹窗
          }
-        $('.icon-canbiao').removeClass('checked')
+        $('.icon-canbiao-img').removeClass('checked')
         data.forEach(function (item, index) {
           if(!inResourceBIiframe) {
-            $('.icon-canbiao[dataid="' + item.id + '"]').show()
+            $('.icon-canbiao-img[dataid="' + item.id + '"]').show()
           }
-          // $('.icon-canbiao[dataid="' + item + '"]').css("display","inline-block");
+          // $('.icon-canbiao-img[dataid="' + item + '"]').css("display","inline-block");
           if(item.value) {
-            $('.icon-canbiao[dataid="' + item.id + '"]').addClass('checked')
+            $('.icon-canbiao-img[dataid="' + item.id + '"]').addClass('checked')
           }
         })
       }
@@ -1936,7 +1936,7 @@ function getBidIsJoin () {
 function joinBidsClick() {
   // console.log(vipState, '是否是超级订阅用户')
   // 单个参标点击事件
-  $('.icon-canbiao').unbind('click').on('click',function(e) {
+  $('.icon-canbiao-img').unbind('click').on('click',function(e) {
     // 登录判断
     if (!loginflag) {
       openLoginDig()

src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -228,7 +228,7 @@
                             </div>
                             <div class="append-container">
                                 <button class="bi-report-inject-button" :disabled="item.added" v-if="biEnv" @click.prevent.stop="biAddProject(item)">${ item.added ? '已添加' : '添加' }</button>
-                                <span class="j-icon i-canbiao" v-if="!biEnv && item.joinBid !== undefined" :class="item.joinBid ? 'icon-canbiao-active' : 'icon-canbiao'" @click.prevent.stop="joinBidAction(item)"></span>
+                                <span class="j-icon i-canbiao" v-if="!biEnv && item.joinBid !== undefined" :class="item.joinBid ? 'icon-canbiao-img-active' : 'icon-canbiao-img'" @click.prevent.stop="joinBidAction(item)"></span>
                                 <span class="j-icon" v-if="!biEnv" :class="item.star ? 'icon-star-active' : 'icon-star'" @click.prevent.stop="unStarThis(item)"></span>
                             </div>
                         </div>