فهرست منبع

Merge branch 'dev/v4.8.16_zsy' of qmx/jy into release/v4.8.16

zhangyuhan 2 سال پیش
والد
کامیت
0260887e5b
2فایلهای تغییر یافته به همراه8 افزوده شده و 15 حذف شده
  1. 5 12
      src/web/staticres/pccss/pc-detail.css
  2. 3 3
      src/web/templates/pc/biddetail_rec.html

+ 5 - 12
src/web/staticres/pccss/pc-detail.css

@@ -229,7 +229,7 @@ a {
 }
 .com-collect {
   float: right;
-  margin-left: 18px;
+  margin-left: 12px;
   position: relative;
   font-size: 14px;
   cursor: pointer;
@@ -237,11 +237,11 @@ a {
 .icon-title-img {
   width: 20px;
   height: 20px;
-  margin-right: 4px;
+  margin-right: 4px !important;
 }
 .j-content .com-wxshare,
 .j-content .com-guanzhu,.j-content .com-icon {
-  margin-left: 18px !important;
+  margin-left: 12px !important;
 }
 
 .sub-info-container {
@@ -545,20 +545,13 @@ a{
   font-size: 14px;
   margin-left: 22px;
 }
-.com-collect{
-  float: right;
-  margin-left: 18px;
-  position: relative;
-  font-size: 14px;
-  cursor: pointer;
-}
 .icon-title-img{
   width: 20px;
   height: 20px;
-  margin-right: 4px;
+  margin-right: 4px !important;
 }
 .j-content .com-wxshare, .j-content .com-guanzhu,.j-content .com-icon{
-  margin-left: 18px!important;
+  margin-left: 12px!important;
 }
 /* 自定义标签弹框 */
 .tags-box{

+ 3 - 3
src/web/templates/pc/biddetail_rec.html

@@ -499,12 +499,12 @@
                       if(data.userName) {
                         var userName = ""
                         $('.join-bid-persons').show()
-                        if(data.userName.split(',').length > 2) {
-                          userName = data.userName.split(',').slice(0, 2).join('、')  + '等'
+                        if(data.userName.split(',').length > 1) {
+                          userName = data.userName.split(',').slice(0, 1)  + ' 等'
                           $('.tooltip-names').text(data.userName.replace(/,/g, "、"))
                           $('.tooltip-names').show()
                         } else {
-                          userName = data.userName.replace(/,/g, "、")
+                          userName = data.userName
                         }
                        $('.join-bid-persons .persons').text(userName)
                       } else {