瀏覽代碼

feat:pc招标搜索、app订阅添加用户发布标识

tsz 3 年之前
父節點
當前提交
d5a17578b7

+ 19 - 0
src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -133,6 +133,7 @@ img{
 	padding: 17px 0px 17px 0px;
 }
 .resnumb .two{
+  margin-top: .08rem;
   width: 100%;
 	font-size:16px;
 	font-weight:500;
@@ -2091,3 +2092,21 @@ html, body {
   left: 50%;
   border-width: 8px;
 }
+
+/*S-用户发布样式-S */
+.userPublish{
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 .16rem;
+  height: .36rem;
+  background: rgba(255, 58, 32, 0.1);
+  border-radius: 0px 0px 12px 0px;
+  font-size: .24rem;
+  font-weight: 500;
+  color: #FF3A20;
+}
+/* E-用户发布样式-E */

+ 8 - 46
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -1562,7 +1562,10 @@ function hasNoData() {
               var ad = $("#advertscript").html()
               if (ad != ""&&ad.length>20) {
                   listhtml += '<div class="tslist ' + visited + '" style="border-bottom: none;" words="' + mWords + '">'
-                      + '<div class="resnumb">'
+                    if (obj.site == '剑鱼信息发布平台') {
+                      listhtml += '<div class="userPublish">用户发布</div>'
+                    }
+                  listhtml += '<div class="resnumb">'
                       + '<div class="one">'
                       + '<span class="xh ' + visited + '">' + count + '.</span>'
                       + '</div>'
@@ -1583,52 +1586,11 @@ function hasNoData() {
                   continue
               }
           }
-        //   if (index == 8) {//广告位
-        //     listhtml += '<div class="tslist ' + visited + '" style="border-bottom: none;" words="' + mWords + '">'
-        //         + '<div class="resnumb">'
-        //         + '<div class="one">'
-        //         + '<span class="xh ' + visited + '">' + count + '.</span>'
-        //         + '</div>'
-        //         + '<div class="two bt-parent" style="display: flex;justify-content: space-between;padding-left:' + paddingLeft + 'px;">'
-        //         + '<a class="bt ' + visited + '" eid="' + obj["_id"] + '"  push_date="' + obj["ca_date"] + '" list_index="' + obj["ca_index"] + '" projectM="' + obj["ca_type"] + '">' + title + '</a>'
-        //         + '<div class="collec_star" collecnum="'+obj["collection"]+'" data-id="' + obj["_id"] + '">'
-        //         + '<span class="shoucang"></span>'
-        //         + '<span class="weishoucang"></span>'
-        //         + '</div>'
-        //         + '</div>'
-        //         + '</div>'
-        //         + '<div style="clear:both;">'
-        //         + '</div>'
-        //         + '<div class="restime time-diff">' + projectMList + showdateList + '</div>'
-        //         + '<div style="clear:both;"></div>'
-        //         + '</div>'
-        //         + '<div class="_36y1d8lbx9n">'+'</div>'
-        //     continue
-        //   }
-        //   if (index == 23) {//广告位
-        //     listhtml += '<div class="tslist ' + visited + '" style="border-bottom: none;" words="' + mWords + '">'
-        //         + '<div class="resnumb">'
-        //         + '<div class="one">'
-        //         + '<span class="xh ' + visited + '">' + count + '.</span>'
-        //         + '</div>'
-        //         + '<div class="two bt-parent" style="display: flex;justify-content: space-between;padding-left:' + paddingLeft + 'px;">'
-        //         + '<a class="bt ' + visited + '" eid="' + obj["_id"] + '"  push_date="' + obj["ca_date"] + '" list_index="' + obj["ca_index"] + '" projectM="' + obj["ca_type"] + '">' + title + '</a>'
-        //         + '<div class="collec_star" collecnum="'+obj["collection"]+'" data-id="' + obj["_id"] + '">'
-        //         + '<span class="shoucang"></span>'
-        //         + '<span class="weishoucang"></span>'
-        //         + '</div>'
-        //         + '</div>'
-        //         + '</div>'
-        //         + '<div style="clear:both;">'
-        //         + '</div>'
-        //         + '<div class="restime time-diff">' + projectMList + showdateList + '</div>'
-        //         + '<div style="clear:both;"></div>'
-        //         + '</div>'
-        //         + '<div class="_061vbh43quq3">'+'</div>'
-        //     continue
-        //   }
           listhtml += '<div class="tslist ' + visited + '" words="' + mWords + '">'
-              + '<div class="resnumb">'
+          if (obj.site == '剑鱼信息发布平台') {
+            listhtml += '<div class="userPublish">用户发布</div>'
+          }
+          listhtml += '<div class="resnumb">'
               + '<div class="one">'
               + '<span class="xh ' + visited + '">' + count + '.</span>'
               + '</div>'

+ 308 - 1
src/web/staticres/css/dev2/superSearch.css

@@ -110,4 +110,311 @@
 }
 .shade_table_blank{
 	height:50px;
-}
+}
+.attachment-filter{
+  padding: 16px 0 15px;
+  border-top: 1px dashed #e0e0e0;
+}
+.attachment-filter .attach-item{
+  float: left;
+  padding: 4px 7px;
+  cursor: pointer;
+  margin: 0 10px 4px 0;
+}
+.attachment-filter .attach-item.active {
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+  border-radius: 2px;
+}
+.filter-header{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 16px 0 30px;
+  margin: 0 -15px;
+  height: 50px;
+  line-height: 50px;
+  background: #F5F5FB;
+  border: 1px solid #ECECEC;
+}
+.filter-header .f-h-label{
+  width: 100px;
+  padding-left: 16px;
+  background-repeat: no-repeat;
+  background-position: right center;
+  background-size: 16px 16px;
+  cursor: pointer;
+}
+.filter-header .f-h-label > span{
+  display: inline-block;
+  height: 100%;
+  font-size: 16px;
+  color: #2cb7ca;
+  border-bottom: 2px solid #2cb7ca;
+}
+.filter-header .f-h-label.caret-up{
+  background-image: url("/images/biddingSearch/icon-caret-top-gold.png");
+}
+.filter-header .f-h-label.caret-down{
+  background-image: url("/images/biddingSearch/icon-caret-bottom-gold.png");
+}
+.filter-header .f-h-action{
+  display: flex;
+  align-items: center;
+}
+.filter-header .f-h-action .action-item{
+  min-width: 90px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  cursor: pointer;
+}
+.filter-header .reset-item{
+  margin-right: 16px;
+  border: 1px solid #2cb7ca;
+  color: #2cb7ca;
+  background-color: #fff;
+}
+.filter-header .has-item{
+  margin-right: 16px;
+  border: 1px solid #E0E0E0;
+  color: #1D1D1D;
+  background-color: #fff;
+}
+.filter-header .save-item{
+  background: #2CB7CA;
+  border: 1px solid #2cb7ca;
+  color: #fff;
+}
+
+.fixed-top{
+  position: fixed;
+  top: 64px;
+  width: 1200px;
+  z-index: 99;
+}
+.table-fixed-top{
+  position: fixed;
+  top: 64px;
+  width: 1200px;
+  background: #fff;
+  z-index: 100;
+}
+.filter-dialog{
+  padding: 32px;
+  border-radius: 8px!important;
+}
+.filter-dialog > .el-dialog__header {
+  padding: 0;
+}
+.filter-dialog > .el-dialog__header > .el-dialog__title{
+  color: #1D1D1D;
+}
+.save-filter-dialog > .el-dialog__body{
+  padding: 0 0 32px!important;
+}
+.has-filter-dialog > .el-dialog__body{
+  padding: 0!important;
+}
+.has-filter-dialog .el-dialog__headerbtn{
+  font-size: 18px;
+  top: 34px;
+  right: 32px;
+}
+.filter-dialog .filter-save-item{
+  display: flex;
+  margin-top: 20px;
+  line-height: 18px;
+}
+.filter-save-item .save-label{
+  min-width: 60px;
+  text-align: right;
+  color: #636467;
+  font-size: 12px;
+}
+.filter-save-item .save-value {
+  margin-left: 8px;
+  flex: 1;
+  color: #1D1D1D;
+  text-align: left;
+}
+.filter-save-item .save-value-bg{
+  margin-bottom: 8px;
+  margin-right: 8px;
+  padding: 6px 8px;
+  background: #F5F6F7;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #1D1D1D;
+  line-height: 18px;
+}
+.filter-save-item .save-value-bg > span{
+  color: #636467;
+}
+.filter-dialog .btn-group,
+.filter-messagebox .btn-group{
+  width: 132px;
+  height: 36px;
+  padding: 0;
+  border-radius: 6px;
+  font-size: 16px;
+}
+.filter-dialog .btn-group.confirm-btn,
+.filter-messagebox .btn-group.confirm-btn{
+  background: #2cb7ca;
+  margin-right: 52px;
+  border: 0;
+  color: #fff;
+}
+.filter-dialog .btn-group.confirm-btn:hover,
+.filter-dialog .btn-group.confirm-btn:focus,
+.filter-messagebox .btn-group.confirm-btn:hover,
+.filter-dialog .btn-group.confirm-btn:focus{
+  color: #fff;
+}
+.filter-data-container{
+  max-height: 400px;
+  overflow-y: scroll;
+}
+.filter-dialog ::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 0px!important;
+}
+.filter-data-container .filter-data-list{
+  margin-top: 12px;
+  padding: 0 16px;
+  background: #F5F6F7;
+  border-radius: 4px;
+}
+.filter-data-container  .f-l-title{
+  padding: 8px 0;
+}
+.filter-data-container .f-l-content {
+  padding: 12px 0;
+  border-top: 1px dashed #ddd;
+  font-size: 12px;
+  color: #686868;
+  cursor: pointer;
+}
+.icon-caret-bottom{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  background: url('/images/biddingSearch/icon-caret-bottom-gray.png') no-repeat center;
+  background-size: contain;
+  cursor: pointer;
+}
+.icon-caret-top{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  background: url('/images/biddingSearch/icon-caret-top-gray.png') no-repeat center;
+  background-size: contain;
+  cursor: pointer;
+}
+
+.icon-clean{
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background: url('/images/biddingSearch/icon-clean-gray.png') no-repeat center;
+  cursor: pointer;
+  background-size: contain;
+}
+.filter-data-list .f-l-title{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  cursor: pointer;
+  font-size: 14px;
+  color: #1D1D1D;
+}
+.filter-data-list .f-l-title .f-l-title-text{
+  flex: 1;
+  text-align: justify;
+  max-width: 582px;
+}
+.filter-data-list .f-l-title:hover .icon-caret-bottom{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  background: url('/images/biddingSearch/icon-caret-bottom-gold.png') no-repeat center;
+  background-size: contain;
+  cursor: pointer;
+}
+.filter-data-list .f-l-title:hover .icon-caret-top{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  background: url('/images/biddingSearch/icon-caret-top-gold.png') no-repeat center;
+  background-size: contain;
+  cursor: pointer;
+}
+.filter-data-list .f-l-title:hover .f-l-title-text{
+  color: #2cb7ca;
+}
+.filter-data-list .f-l-title:hover .icon-clean{
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background: url('/images/biddingSearch/icon-clean-gold.png') no-repeat center;
+  cursor: pointer;
+  background-size: contain;
+}
+.filter-data-list .f-l-c-item{
+  margin-top: 8px;
+  line-height: 18px;
+}
+.filter-data-list .f-l-c-item > span {
+  margin-right: 16px;
+}
+.filter-data-list .f-l-c-item .i-value {
+  color: #1D1D1D;
+}
+/* 删除筛选提示框 */
+.filter-messagebox{
+  width: 380px;
+  border-radius: 8px;
+  padding: 32px;
+}
+.el-message-box__title{
+  color: #1D1D1D;
+}
+.filter-messagebox .el-message-box__header{
+  padding: 0!important;
+}
+.filter-messagebox .el-message-box__content{
+  padding: 20px 0 32px;
+}
+.filter-messagebox .el-message-box__message p{
+  font-size: 14px;
+  color: #686868;
+}
+.filter-messagebox .el-message-box__btns{
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+
+/*S-用户发布样式-S */
+.userPublish{
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  margin: 4px 10px 0 0;
+  width: 80px;
+  height: 24px;
+  background: rgba(255, 58, 32, 0.1);
+  border-radius: 4px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #FF3A20;
+  float: left;
+}
+/* E-用户发布样式-E */

+ 26 - 8
src/web/staticres/js/superSearch.js

@@ -384,17 +384,35 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
       // 标题搜索 选择框
       if (selectType.indexOf('content') == -1 || !flag) {
         listHtml += '<input class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
-        listHtml +='<div class="luce-left"><em class="visited-hd">'+index+'.</em>'
-						+'<div class="left-title" style="width:700px;">'
-						+'<a class="visited-hd" onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
-						+'</div>'
+        listHtml +='<div class="luce-left">'
+        if(datas[i].site == '剑鱼信息发布平台') {
+          listHtml += '<span class="userPublish">用户发布</span>'
+        }
+        listHtml += '<em class="visited-hd">'+index+'.</em>'
+						+'<div class="left-title" style="width:auto;max-width:700px">'
+						+'<a class="visited-hd" onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+ '</a>'
+        if(fileExists) {
+          listHtml+='<span class="haveFile">'+'有附件'+'</span>' 
+        }
+        listHtml+='</div>'
       }
       // 全文搜索
 			if(flag && selectType.indexOf('content') > -1){
-        listHtml +='<div class="luce-left"><em class="visited-hd" style="padding-left:30px;">'+index+'.</em>'
-						+'<div class="left-title" style="width:1080px;">'
-						+'<a class="visited-hd" onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
-						+'</div>'
+        listHtml +='<div class="luce-left">'
+        if(datas[i].site == '剑鱼信息发布平台') {
+          listHtml += '<span class="userPublish">用户发布</span>'
+          listHtml+= '<em class="visited-hd">'+index+'.</em>'
+						+'<div class="left-title" style="width:auto;max-width:1080px">'
+						+'<a class="visited-hd" onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+ '</a>'
+        } else {
+          listHtml+= '<em class="visited-hd" style="padding-left:30px;">'+index+'.</em>'
+						+'<div class="left-title" style="width:auto;max-width:1080px">'
+						+'<a class="visited-hd" onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+ '</a>'
+        }
+        if(fileExists) {
+          listHtml+='<span class="haveFile">'+'有附件'+'</span>' 
+        }
+        listHtml+='</div>'
         // 全文搜索选择框
         listHtml += '<div class="left-content" style="width:100%;padding:0;">'
             + '<input class="custom-checkbox all-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'