Merge branch 'dev4.5.2' of http://192.168.3.207:8080/qmx/jy into dev4.5.2

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1373,20 +1373,11 @@
       // 中标单位跳转
       $('.zhongbiaounit').on('click',function(){
         if (rerwinner!=""&&rerwinner!=null){
-            var landinfo = {
-                anchor:'企业全景分析',
-                landname:rerwinner
-            }
-            if(bigstatus <= 0 || (hasServiceArr.indexOf(4) == -1&&hasServiceArr.indexOf(12) == -1&&hasServiceArr.indexOf(13) == -1)){
-                location.href = '/jyapp/big/page/landingPage'
-                sessionStorage.setItem('landentinfo',JSON.stringify(landinfo))
-            }else {
-                sessionStorage.removeItem('$data-ent_portrait')
-                if (rerwinnerEntId) {
-                  location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent(rerwinnerEntId)
-                } else {
-                  EasyAlert.show("暂无数据");
-                }
+            sessionStorage.removeItem('$data-ent_portrait')
+            if (rerwinnerEntId) {
+                location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent(rerwinnerEntId)
+            } else {
+                EasyAlert.show("暂无数据");
             }
         }
       })
@@ -1878,7 +1869,7 @@
                 }
             },
             tagClick (i) {
-                location.href = '/jyapp/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].lid)
+                location.href = '/jyapp/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].id || this.list[i].lid)
             }
         }
     })
@@ -1904,6 +1895,8 @@
             // 取消收藏
             $icon.removeClass('shoucang').addClass('weishoucang')
             $text.text('收藏')
+            $('.collec_list').html()
+            $('.collec_list').hide()
         }
     }
     getCollectionState()

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

@@ -111,9 +111,9 @@ var vNode = {
                 btntext: '去开通'
             },
             entvisit: {
-                total: 150, // 本月画像次数总量
-                usage: 150, // 本月已使用次数
-                provin: -1 // 购买省份数量
+                total: 0, // 本月画像次数总量
+                usage: 0, // 本月已使用次数
+                provin: 0 // 购买省份数量
             }
         }
     },

src/web/staticres/common-module/collection/js/index-wx.js

@@ -422,7 +422,7 @@ var vNode = {
                 item.type = true
                 _this.selectTagList.push(lid)
                 _this.tagText.perText = '个人标签1'
-                _this.limitlist.label = item.lanme
+                _this.limitlist.label = item.lid
                 _this.reLoadList(true)
               }
             })

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

@@ -417,7 +417,7 @@ var vNode = {
                 item.type = true
                 _this.selectTagList.push(lid)
                 _this.tagText.perText = '个人标签1'
-                _this.limitlist.label = item.lanme
+                _this.limitlist.label = item.lid
                 _this.reLoadList(true)
               }
             })

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

@@ -323,7 +323,6 @@
   top: 0;
   right: 0;
   width:332px;
-  height: 340px;
   padding: 20px 16px;
   background: #FFFFFF;
   border: 1px solid #ECECEC;
@@ -335,6 +334,9 @@
 .tags-box .tags-inputs{
   position: relative;
   width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 .tags-box .tags-inputs .tag-input{
   width: 100%;
@@ -408,7 +410,7 @@
 .tags-box .tags-list{
   margin-top: 12px;
   overflow-y: auto;
-  max-height: 220px;
+  height: 220px;
 }
 .tags-box .tags-list::-webkit-scrollbar{
   width: 8px;
@@ -440,6 +442,40 @@
   background-size: 16px!important;
   border: 0!important;
 }
+.tags-item.disabled {
+  color: #8E8E8E!important;
+}
 .tag-label em {
   font-style: normal;
+}
+
+.add-tag-button {
+  margin-left: 16px;
+  color: #2cb7ca;
+  font-size: 14px;
+  line-height: 22px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+.tags-footer {
+  margin-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tags-button {
+  padding: 3px 17px;
+  color: #1d1d1d;
+  font-size: 14px;
+  line-height: 22px;
+  border-radius: 4px;
+  border: 1px solid #e0e0e0;
+  text-shadow: 0px 0px 28px 0px rgba(0,0,0,0.08);
+  cursor: pointer;
+}
+.button-confirm {
+  margin-right: 16px;
+  color: #fff;
+  background: #2cb7ca;
+  border-color: #2cb7ca;
 }

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

@@ -136,7 +136,7 @@ var vm = new Vue({
                 type: 'POST',
                 success: function (res) {
                     if (res.error_code === 0) {
-                        this.tagList = res.data || []
+                        this.tagList = res.data.reverse() || []
                         this.initSelectTagList()
                         if (this.urlFilterTagId.length) {
                             this.filterState.tags = this.filterState.tags.concat(this.urlFilterTagId)
@@ -226,7 +226,7 @@ var vm = new Vue({
                 success: function (res) {
                     if (res.error_code === 0 && res.data) {
                         this.addTagInfo.content = ''
-                        this.tagList.push({
+                        this.tagList.unshift({
                             count: 0,
                             lanme: name,
                             lid: res.data

src/web/staticres/js/pc_detail_tags.js

@@ -197,6 +197,7 @@ function inputTagList () {
   if ($('.tag-labels').children('.tag-label').length > 0) {
     $('.tag-placeholder').hide()
   }
+  checkTagDisabled()
 }
 // 渲染标签列表数据
 function renderTagsList (data) {
@@ -211,6 +212,7 @@ function renderTagsList (data) {
     })
     $('.tags-item').click(function(e) {
       e.stopPropagation()
+      if ($(this).hasClass('disabled')) return
       var id = $(this).attr('data-id');
       var name = $(this).text()
       $(this).toggleClass('tags-active')
@@ -227,7 +229,6 @@ function renderTagsList (data) {
         activeTags = newArr
         inputTagList ()
       }
-      
     })
   }
   inputTagList()
@@ -238,8 +239,8 @@ function getUserTags () {
     type:'post',
     url:'/publicapply/bidcoll/getLabel?t=' + Date.now(),
     success: function(r){
-      if (r.error_code == 0 && r.data) {
-        renderTagsList(r.data)
+      if (r.error_code == 0 && $.isArray(r.data)) {
+        renderTagsList(r.data.reverse())
       }
     }
   })
@@ -257,7 +258,7 @@ function getUserTags () {
   2：lids不为空；laction=”S”;binfo数组不为空->收藏信息绑定标签
   3：lids不为空；laction=”D”；->删除标签 并解绑收藏的信息
 */
-function saveChooseTags(params) {
+function saveChooseTags(params, callback) {
   $.ajax({
     type:'post',
     url:'/publicapply/bidcoll/label',
@@ -267,6 +268,7 @@ function saveChooseTags(params) {
     success: function(r){
       if (r.data) {
         toastFn("标签绑定成功", 1000)
+        callback && callback()
         getContentTags()
       }
     }
@@ -285,10 +287,12 @@ function addTagsAjax (name) {
       if (r.data) {
         $('.tag-input .clear-input').val('')
         // 添加标签成功后 绑定标签
-        activeTags.push({
-          lid: r.data,
-          lname: name
-        })
+        if (activeTags.length < 3) {
+          activeTags.push({
+            lid: r.data,
+            lname: name
+          })
+        }
         getUserTags()
       } else {
         toastFn(r.error_msg, 1000)
@@ -323,6 +327,15 @@ function collBidAction (baction, binfo, callback) {
     }
   })
 }
+function checkTagDisabled () {
+  if (activeTags.length >= 3) {
+    // 禁用标签
+    $('.tags-list').find('.tags-item:not(.tags-active)').addClass('disabled')
+  } else {
+    // 解除禁用
+    $('.tags-list').find('.disabled').removeClass('disabled')
+  }
+}
 // toast提示
 function toastFn (text, duration = 1000) {
   var _html = ""

src/web/staticres/pccss/pc-detail.css

@@ -243,135 +243,6 @@ a {
 .j-content .com-guanzhu {
   margin-left: 18px !important;
 }
-/* 自定义标签弹框 */
-.tags-box {
-  display: none;
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 332px;
-  height: 340px;
-  padding: 20px 16px;
-  background: #ffffff;
-  border: 1px solid #ececec;
-  box-sizing: border-box;
-  border-radius: 8px;
-  box-shadow: 0px 0px 28px 0px rgba(0, 0, 0, 0.08);
-  z-index: 99;
-}
-.tags-box .tags-inputs {
-  position: relative;
-  width: 100%;
-}
-.tags-box .tags-inputs .tag-input {
-  width: 100%;
-  padding: 0;
-  min-height: 34px;
-  max-height: 74px;
-  overflow-y: scroll;
-  display: inline-block;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  background-color: #fff;
-  cursor: text;
-}
-.tags-inputs .tag-input::-webkit-scrollbar {
-  width: 8px;
-}
-.tags-inputs .tag-input::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  background-color: #ececec;
-}
-.tag-input > .tag-labels {
-  display: inline;
-  vertical-align: middle;
-}
-.tag-input > .clear-input {
-  display: inline-block;
-  padding: 0 10px;
-  width: 98px;
-  height: 36px;
-  line-height: 1;
-  background: #fff;
-  border-radius: 2px;
-  vertical-align: middle;
-  border: none;
-  background-color: transparent;
-  box-shadow: none;
-  box-sizing: border-box;
-  font-size: 14px;
-  color: #1d1d1d;
-}
-.tag-input > .tag-labels > .tag-label {
-  display: inline-block;
-  padding: 5px 12px;
-  font-size: 14px;
-  line-height: 1.2;
-  margin: 5px;
-  cursor: pointer;
-  border: 1px solid #ececec;
-  box-sizing: border-box;
-  border-radius: 4px;
-  background: #f5f6f7;
-  color: #1d1d1d;
-}
-.tag-close {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  margin-left: 8px;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEwSURBVHgB7ZWxDYMwEEXPER1NRmEFJggUiJpJQiahRhSECViBUdzQIYgdgYQIPnwXmkT+DcbY/s9n3wHg5PTPKoriejRGYB+rqrpP0xT1fR9mWSaBaO77fiuEeCZJ8gAqwGyez68dBWIxV83gbSJEboK47HXWda1DF626Ar2gTUi35lo6iqbxuwBxHEvP80JF3lEg9sxhjp5pDnoHdCSGYWjVDj4W3B4HZo4dHQpgC8E1twI4gtANrrk1AAYxP1nmJAAEArjmZIADiI5TsC5AlJRS5zWcJVIEDLd9LXIUrCNgSjVqsWIBYHnOqZhrHR6BTZGhVEwSAKXCcSHEGebfQBjvAKe8cv6iRgC1i4ZijkHotUxz0TtQlmWuFrpxKtxyHOM4Nmma5sAVJaednH5SLxmyS6JIrGjkAAAAAElFTkSuQmCC);
-  background-position: center 2px;
-  background-repeat: no-repeat;
-  background-size: contain;
-}
-.tag-placeholder {
-  position: absolute;
-  top: 12px;
-  left: 16px;
-  color: #bbb;
-  font-size: 14px;
-}
-.tags-box .tags-list {
-  margin-top: 12px;
-  overflow-y: auto;
-  max-height: 220px;
-}
-.tags-box .tags-list::-webkit-scrollbar {
-  width: 8px;
-}
-.tags-box .tags-list::-webkit-scrollbar-thumb {
-  border-radius: 4px;
-  background-color: #ececec;
-}
-.tags-box .tags-list .tags-item {
-  float: left;
-  min-width: 44px;
-  padding: 0 8px;
-  margin: 10px 8px 0 0;
-  height: 24px;
-  line-height: 24px;
-  border-radius: 4px;
-  border: 1px solid #ececec;
-  box-sizing: border-box;
-  color: #1d1d1d;
-  text-align: center;
-  font-size: 14px;
-  background: #f5f6f7;
-  cursor: pointer;
-}
-.tags-item.tags-active {
-  padding: 0 8px 0 24px !important;
-  background: #2cb7ca
-    url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADPSURBVHgB7ZNREcIwDIYjYRImYRLmZHPAHAwHlUAdIAEJSKiESgjpEY7Qg7uFdXnKd5eXdMmfpX8BHMdxDEDEgSJQ9GANiU4UGZ9cwBISXPFNGWIAKyrxZLr+suq/xdkwV4oFlFBNR3ET4veS0zaJosGoqOtZ8EVUi4tGWbM+rklC/Ax7KH++dY18ZbmZuGi8iKbhxzdTJT5DSyo/LNXZSZxljV80A3T4aayR86vIJTzyjX8xZTATF0NIU24y5xFDSFNGU3ExxNzsmTmO4zAPYEiZdz83IV0AAAAASUVORK5CYII=)
-    no-repeat 6px center !important;
-  color: #fff !important;
-  background-size: 16px !important;
-  border: 0 !important;
-}
-.tag-label em {
-  font-style: normal;
-}
 
 .sub-info-container {
   display: flex;

src/web/templates/pc/biddetail_rec.html

@@ -58,8 +58,13 @@ function isWechat() {
             <input type="text" class="clear-input">
             <div class="tag-placeholder">新增标签回车保存</div>
           </div>
+          <div class="add-tag-button">添加并使用</div>
         </div> 
         <div class="tags-list clearfix"></div>
+        <div class="tags-footer">
+          <div class="tags-button button-confirm">确认添加</div>
+          <div class="tags-button button-cancel">暂不添加</div>
+        </div>
       </div>
       <span class="com-collect" id="bidCollect">
         <img class="icon-title-img" src='{{Msg "seo" "cdn"}}/images/collect.png' />
@@ -111,6 +116,7 @@ function isWechat() {
               $('#bidCollected').show()
               $('#bidCollect').hide()
               $('.tags-box').show().css('top', top)
+              toastFn('收藏成功', 1000)
               getUserTags()
             }
           })
@@ -142,20 +148,27 @@ function isWechat() {
         $('.tag-input .clear-input').keydown(function(event){
           event.stopPropagation()
           if (event.keyCode == 13) {
-            if($(this).val().length >= 2 && $(this).val().length < 6) {
-              // ajax提交自定义标签
-              addTagsAjax($(this).val())
+            if (!$('.tags-box').is(':hidden')) {
+              $('.tags-inputs .add-tag-button').trigger('click')
             }
           }
         })
+        // 添加标签按钮事件
+        $('.tags-inputs .add-tag-button').on('click', function () {
+          var input = $('.tag-input .clear-input')
+          if(input.val().length >= 2 && input.val().length < 6) {
+            // ajax提交自定义标签
+            addTagsAjax(input.val())
+          }
+        })
         // 标签输入框失去焦点事件
         $('.tag-input .clear-input').blur(function() {
           if($('.tag-labels').children().length == 0 && $(this).val() == '') {
             $('.tag-placeholder').show()
           }
         })
-        // 点击其他区域 隐藏其他筛选条件下拉框
-        $(document).click(function() {
+        // 点击确定按钮，绑定标签
+        $('.tags-footer .button-confirm').on('click', function () {
           if (!$('.tags-box').is(':hidden')){
             var lids = ""
             var lname = ""
@@ -177,22 +190,29 @@ function isWechat() {
               binfo: [
                 { bid: {{.T.obj._id}} }
               ]
-            } 
-            // console.log(params)
-            $('.tags-box').hide(function() {
-              // 执行保存绑定标签操作
-              if (params.lids !== '') {
-                saveChooseTags(params)
-              }
-              // 标签弹框消失时 清除上次选择的标签分类
-              activeTags = []
-              $('.tag-labels').empty()
-              $('.clear-input').val('')
-              $('.tags-list').find('.tags-item').removeClass('tags-active')
-              $('.tag-placeholder').show()
-            })
+            }
+            // 执行保存绑定标签操作
+            if (params.lids !== '') {
+              saveChooseTags(params, function () {
+                $('.tags-footer .button-cancel').trigger('click')
+              })
+            }
           }
         })
+        $('.tags-footer .button-cancel').on('click', function () {
+          $('.tags-box').hide(function() {
+            // 标签弹框消失时 清除上次选择的标签分类
+            activeTags = []
+            $('.tag-labels').empty()
+            $('.clear-input').val('')
+            $('.tags-list').find('.tags-item').removeClass('tags-active')
+            $('.tag-placeholder').show()
+          })
+        })
+        // 点击其他区域 隐藏其他筛选条件下拉框
+        // $(document).click(function() {
+        //   $('.tags-footer .button-cancel').trigger('click')
+        // })
       </script>
 				{{if .T.isMember}}
 					<!--大会员用户，可直接在pc端关注项目 -->

src/web/templates/pc/supsearch.html

@@ -1163,14 +1163,18 @@ $(function(){
       <!-- 自定义标签弹框 -->
       <div class="tags-box">
         <div class="tags-inputs">
-          <input type="hidden" class="tag-input-hidden" value="">
           <div class="tag-input">
             <div class="tag-labels"></div>
             <input type="text" class="clear-input">
             <div class="tag-placeholder">新增标签回车保存</div>
           </div>
-        </div> 
+          <div class="add-tag-button">添加并使用</div>
+        </div>
         <div class="tags-list clearfix"></div>
+        <div class="tags-footer">
+          <div class="tags-button button-confirm">确认添加</div>
+          <div class="tags-button button-cancel">暂不添加</div>
+        </div>
       </div>
 		</div>
 		<!--分页-->
@@ -1402,42 +1406,6 @@ $(function(){
   $(document).click(function() {
     $('.custom-select').css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
     $('.custom-select').siblings().hide()
-    // console.log('标签弹框是否隐藏',$('.tags-box').is(':hidden'))
-    // 自定义标签弹框消失时执行保存标签动作
-    if (!$('.tags-box').is(':hidden')){
-      var lids = ""
-      var lname = ""
-      $('.tags-item.tags-active').each(function() {
-        if ($(this).attr('data-id')){
-          if(lids != ""){
-            lids += ",";
-          }
-          if(lname != "") {
-            lname+= ",";
-          }
-          lids += $(this).attr('data-id');
-          lname += $(this).text()
-        }
-      })
-      var params = {
-        lids: lids,
-        laction: 'S',
-        binfo: JSON.parse(sessionStorage.getItem('$save-tags-binfo'))
-      } 
-      // console.log(params)
-      $('.tags-box').hide(function() {
-        // 执行保存绑定标签操作
-        if (params.lids !== '') {
-          saveChooseTags(params)
-        }
-        // 标签弹框消失时 清除上次选择的标签分类
-        activeTags = []
-        $('.tag-labels').empty()
-        $('.clear-input').val('')
-        $('.tags-list').find('.tags-item').removeClass('tags-active')
-        $('.tag-placeholder').show()
-      })
-    }
   })
   // 全选
   $('.custom-checkbox.check-all').on('change', function() {
@@ -1465,9 +1433,8 @@ $(function(){
   $('.tag-input .clear-input').keydown(function(event){
     event.stopPropagation()
     if (event.keyCode == 13) {
-      if($(this).val().length >= 2 && $(this).val().length < 6) {
-        // ajax提交自定义标签
-        addTagsAjax($(this).val())
+      if (!$('.tags-box').is(':hidden')) {
+        $('.tags-inputs .add-tag-button').trigger('click')
       }
     }
   })
@@ -1477,7 +1444,56 @@ $(function(){
       $('.tag-placeholder').show()
     }
   })
+  // 添加标签按钮事件
+  $('.tags-inputs .add-tag-button').on('click', function () {
+    var input = $('.tag-input .clear-input')
+    if(input.val().length >= 2 && input.val().length < 6) {
+      // ajax提交自定义标签
+      addTagsAjax(input.val())
+    }
+  })
+  // 点击确定按钮，绑定标签
+  $('.tags-footer .button-confirm').on('click', function () {
+    if (!$('.tags-box').is(':hidden')){
+      var lids = ""
+      var lname = ""
+      $('.tags-item.tags-active').each(function() {
+        if ($(this).attr('data-id')){
+          if(lids != ""){
+            lids += ",";
+          }
+          if(lname != "") {
+            lname+= ",";
+          }
+          lids += $(this).attr('data-id');
+          lname += $(this).text()
+        }
+      })
+      var params = {
+        lids: lids,
+        laction: 'S',
+        binfo: JSON.parse(sessionStorage.getItem('$save-tags-binfo'))
+      }
 
+      // 执行保存绑定标签操作
+      if (params.lids !== '') {
+        saveChooseTags(params, function () {
+          $('.tags-footer .button-cancel').trigger('click')
+        })
+      }
+    }
+  })
+
+  $('.tags-footer .button-cancel').on('click', function () {
+    $('.tags-box').hide(function() {
+      // 标签弹框消失时 清除上次选择的标签分类
+      activeTags = []
+      $('.tag-labels').empty()
+      $('.clear-input').val('')
+      $('.tags-list').find('.tags-item').removeClass('tags-active')
+      $('.tag-placeholder').show()
+    })
+  })
   // 查询标讯是否收藏
   getBidIsColl()
 })
@@ -1505,6 +1521,7 @@ function inputTagList () {
   if ($('.tag-labels').children('.tag-label').length > 0) {
     $('.tag-placeholder').hide()
   }
+  checkTagDisabled()
 }
 // 渲染标签列表数据
 function renderTagsList (data) {
@@ -1519,6 +1536,7 @@ function renderTagsList (data) {
     })
     $('.tags-item').click(function(e) {
       e.stopPropagation()
+      if ($(this).hasClass('disabled')) return
       var id = $(this).attr('data-id');
       var name = $(this).text()
       $(this).toggleClass('tags-active')
@@ -1547,8 +1565,8 @@ function getUserTags () {
     type:'post',
     url:'/publicapply/bidcoll/getLabel?t=' + Date.now(),
     success: function(r){
-      if (r.error_code == 0 && r.data) {
-        renderTagsList(r.data)
+      if (r.error_code == 0 && $.isArray(r.data)) {
+        renderTagsList(r.data.reverse())
       }
     }
   })
@@ -1566,7 +1584,7 @@ function getUserTags () {
   2：lids不为空；laction=”S”;binfo数组不为空->收藏信息绑定标签
   3：lids不为空；laction=”D”；->删除标签 并解绑收藏的信息
 */
-function saveChooseTags(params) {
+function saveChooseTags(params, callback) {
   $.ajax({
     type:'post',
     url:'/publicapply/bidcoll/label',
@@ -1576,6 +1594,7 @@ function saveChooseTags(params) {
     success: function(r){
       if (r.data) {
         toastFn("标签绑定成功", 1000)
+        callback && callback()
       }
     }
   })
@@ -1593,10 +1612,12 @@ function addTagsAjax (name) {
       if (r.data) {
         $('.tag-input .clear-input').val('')
         // 添加标签成功后 绑定标签
-        activeTags.push({
-          lid: r.data,
-          lname: name
-        })
+        if (activeTags.length < 3) {
+          activeTags.push({
+            lid: r.data,
+            lname: name
+          })
+        }
         getUserTags()
       } else {
         toastFn(r.error_msg, 1000)
@@ -1631,6 +1652,15 @@ function collBidAction (baction, binfo, callback) {
     }
   })
 }
+function checkTagDisabled () {
+  if (activeTags.length >= 3) {
+    // 禁用标签
+    $('.tags-list').find('.tags-item:not(.tags-active)').addClass('disabled')
+  } else {
+    // 解除禁用
+    $('.tags-list').find('.disabled').removeClass('disabled')
+  }
+}
 
 //
 function NullSuperSearch(){

src/web/templates/weixin/wxinfocontent_rec.html

@@ -527,6 +527,7 @@ pre {
 	display: flex;
 	align-items: flex-start;
 }
+.zhongbiao
 #tab1 .itemInfo>ul>li p.textcontent {
 	flex:1;
     width: 4.2rem;
@@ -1544,7 +1545,8 @@ $(function(){
 		var rerwinner = {{.T.obj.winner}};
     if(rerwinner==null){
       rerwinner=""
-    }
+		}
+		var rerwinnerEntId = {{.T.obj.entId}};
 		var rerbidamount = {{.T.obj.bidamount}};
     if(rerbidamount==null){
       rerbidamount=""
@@ -1562,7 +1564,7 @@ $(function(){
     }
     if(count>=5){
 		$("#bidInfoTitle").show();
-  		var bidInfohtml ='<li><p class="name">中标单位</p><p class="textcontent">'+rerwinner+'</p><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
+  		var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+rerwinnerEntId+'"><p class="name">中标单位</p><p class="textcontent" style="text-decoration-line: underline;color: #2ABED1;">'+rerwinner+'</p><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
   		bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
       if(winnertel!=""){
         bidInfohtml +='<li class="bbm0 winnertel"><p class="name">联系方式</p>';
@@ -1696,6 +1698,17 @@ $(function(){
     $.get("/front/shorturl/replication");
     });
 
+		// 中标单位跳转
+		$('.zhongbiaounit').on('click',function(){
+        if (rerwinner!=""&&rerwinner!=null){
+            sessionStorage.removeItem('$data-ent_portrait')
+            if (rerwinnerEntId) {
+                location.href = "/weixin/frontPage/collection/sess/ent_portrait?eId="+encodeURIComponent(rerwinnerEntId)
+            } else {
+                EasyAlert.show("暂无数据");
+            }
+        }
+      })
 	//纠错输入框
 	$(".rhrinput input").on("input propertychange",function(){
 		if($.trim($(this).val())!=""){
@@ -2249,8 +2262,7 @@ var vKeepComponent = new Vue({
 						}
 				},
 				tagClick (i) {
-						console.log(this.list[i])
-						location.href = '/weixin/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].lid)
+						location.href = '/weixin/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].id || this.list[i].lid)
 				}
     }
 })
@@ -2275,7 +2287,9 @@ function changeCollectStatus (f) {
     } else {
         // 取消收藏
         $icon.removeClass('shoucang').addClass('weishoucang')
-        $text.text('收藏')
+				$text.text('收藏')
+				$('.collec_list').html()
+        $('.collec_list').hide()
     }
 }
 getCollectionState()
@@ -2297,7 +2311,7 @@ function getCollectionState () {
 										vKeepComponent.list = res.data.labels
 										let collecHtml = ''
 										res.data.labels.forEach(function(item, index) {
-												collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.title}</span>`
+												collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.labelname}</span>`
 										})
 										$('.collec_list').html(collecHtml)
 								} else {