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

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

@@ -108,7 +108,8 @@ var vNode = {
                 vip: 0,
                 text: '开通',
                 btntext: '去开通'
-            }
+            },
+            surplus: 0 // 中标信息剩余访问次数
         }
     },
     created: function () {
@@ -129,6 +130,7 @@ var vNode = {
             this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
+            this.getEntVisits()
         }
     },
     mounted: function () {
@@ -272,6 +274,22 @@ var vNode = {
                 }
             })
         },
+        // 企业画像访问量查询
+        getEntVisits: function() {
+            let _this = this
+            $.ajax({
+                type: "POST",
+                url: "/bigmember/portrait/subVipPortrait/usage",
+                success: function (res) {
+                    console.log(res)
+                    if(res.error_code == 0) {
+                        if(res.data) {
+                            _this.surplus = res.data.total
+                        }
+                    }
+                }
+            });
+        },
         // 获取项目动态
         getProjectNews: function () {
             var _this = this

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -824,6 +824,26 @@ pre {
     border: 0.5px solid rgba(0, 0, 0, 0.05);
 }
 
+.collec_list{
+    display: flex;
+    align-items: center;
+    margin-top: .08rem;
+    width: 100%;
+    height: .4rem;
+}
+.collec_list .collec_tags{
+    margin-right: .08rem;
+    padding: .02rem .16rem;
+    background: rgba(5,166,243,0.05);
+    border-radius: 4px;
+    font-size: .24rem;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    text-decoration: underline;
+    text-align: CENTER;
+    color: #05a6f3;
+}
+
 .buyerclass {}
 
 .type {}

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -106,7 +106,13 @@ var mine = {
             var url = $(this).attr('data-href')
             autoLogin(url)
         })
-        // 企业关注
+        // 企业画像记录
+        $('.ent-follow-history').on('click', function (e) {
+          setLiActive(e.currentTarget)
+          var url = $(this).attr('data-href')
+            autoLogin(url)
+        })
+        // 企业查询
         $('.ent-search').on('click', function (e) {
             setLiActive(e.currentTarget)
             var url = $(this).attr('data-href')

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

@@ -32,6 +32,13 @@
         color: #fb483d;
         line-height: 0.4rem;
     }
+    .bid_surplus{
+        height: .04rem;
+        opacity: 1;
+        font-size: .22rem;
+        font-weight: 500;
+        color: #2abed1;
+    }
     .vip_openDialog{
         padding: 0.56rem 0 0.64rem;
         height: 7.4rem;
@@ -253,6 +260,7 @@
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
                     <span v-if="!hasOnePower" class="bid_upgrade">升级</span>
+                    <span v-if="hasOnePower" class="bid_surplus">剩余:${surplus}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4">
                     <div class="card-row zb-info">

src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html

@@ -45,7 +45,7 @@
           </div>
           <van-dropdown-menu v-show="limitshow" :get-container="getContainer" :close-on-click-outside="false">
             <van-dropdown-item  :title="tagText.perText"  ref="tagItem">
-              <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
+              <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :lid="lid" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -168,6 +168,20 @@
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
+                    <div data-need-bind-phone class="menu_list ent-follow-history" data-href='/jyapp/frontPage/collection/sess/index'>
+                        <div class="menu_list_left">
+                            <span class="j-icon base-icon icon-company"></span>
+                            <span class="label">企业画像记录</span>
+                        </div>
+                        <div class="menu_list_right">
+                            <span style="margin-right: .08rem;">
+                                <span style="font-size: .28rem;color: #2ABED1;">12</span>
+                                <span style="font-size: .22rem;color: #9B9CA3;">/ 500</span>
+                            </span>
+                            <i class="dot-red"></i>
+                            <span class="j-icon base-icon icon-arrow-right"></span>
+                        </div>
+                    </div>
                 </div>
                 <div class="menu">
                   <div class="menu_list my-docs" data-need-bind-phone>

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

@@ -28,7 +28,7 @@
     <p><span></span></p>
 </div>
 <div id="jyKeepComponent">
-    <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
+    <keep-component ref="vKeepComponent" @on-save-tag="getKeepList" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
 <div class="share1">
 
@@ -240,6 +240,8 @@
                             }
                         </script>
                     </div>
+                    <!-- 标签列表 -->
+                    <div class="collec_list"></div>
                     <div class="time_label">
                         <script>
                             var l_publishtime = {{.T.obj.l_publishtime}};
@@ -1849,7 +1851,8 @@
         delimiters: ['${', '}'],
         el: '#jyKeepComponent',
         data: {
-            nowOpenBid: ''
+            nowOpenBid: '',
+            list: []
         },
         methods: {
             changeBid (id, type) {
@@ -1859,6 +1862,22 @@
             changeKeepStatus (type) {
                 changeCollectStatus(type)
                 changeListSessionData(type)
+            },
+            getKeepList (data) {
+                this.list = data
+                let collecHtml = ''
+                if(data && data.length !== 0) {
+                    $('.collec_list').show()
+                    data.forEach(function(item, index) {
+                        collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.labelname}</span>`
+                    })
+                    $('.collec_list').html(collecHtml)
+                } else {
+                    $('.collec_list').hide()
+                }
+            },
+            tagClick (i) {
+                location.href = '/jyapp/frontPage/collection/sess/index?tag=' + encodeURIComponent(this.list[i].id)
             }
         }
     })
@@ -1892,14 +1911,32 @@
             url: '/publicapply/bidcoll/isColl',
             type: 'POST',
             data: {
-                bids: id
+                bids: id,
+                label: 'info'
             },
             success: function (res) {
                 if (res.error_code === 0 && res.data) {
-                    if (res.data.length) {
+                    if (res.data.iscoll) {
                         changeCollectStatus(true)
                     }
+                    if(res.data.labels && res.data.labels.length) {
+                        $('.collec_list').show()
+                        vKeepComponent.list = res.data.labels
+                        let collecHtml = ''
+                        res.data.labels.forEach(function(item, index) {
+                            console.log(item)
+                            collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.labelname}</span>`
+                        })
+                        $('.collec_list').html(collecHtml)
+                    } else {
+                        $('.collec_list').hide()
+                    }
+                } else {
+                    $('.collec_list').hide()
                 }
+            },
+            error: function(err) {
+                $('.collec_list').hide()
             }
         })
     }

src/jfw/modules/subscribepay/src/config.json

@@ -27,7 +27,7 @@
 		"userName": "admin",
 		"password": "123456"
 	},
-    "redisaddrs": "other=192.168.3.206:1712,session=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001",
+    "redisaddrs": "other=192.168.3.11:1712,session=192.168.3.11:1713,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001",
     "elasticsearch": "http://192.168.3.206:9800",
     "elasticPoolSize": 30,
     "appid": "wx5b1c6e7cc4dac0e4",

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

@@ -65,6 +65,7 @@ var vNode = {
     condition: true, // 列表星星显示
     personTagactive:0, //个人标签选择按钮下标
     screenShow: false, // 筛选按钮是否显示
+    lid: '' // 获取从三级也跳转的id
   },
   computed: {
     getParamsStatus () {
@@ -74,9 +75,15 @@ var vNode = {
   created () {
     var recover = this.recover()
     if (!recover) {
-      this.getList()
+      let lid = utils.getParam('tag')
+      if(lid) {
+        lid = decodeURIComponent(lid)
+        this.getTagsList(lid)
+      }else{
+        this.getList()
+        this.getTagsList()
+      }
       this.getUserRoot()
-      this.getTagsList()
     }
     if(this.limitlist.label !=='' || this.limitlist.selectTime != '' || this.limitlist.buyerclass != '' ||  this.limitlist.buyerPhone != 0 || this.limitlist.winnerPhone != 0) {
       this.limitshow = true
@@ -385,16 +392,23 @@ var vNode = {
       this.$refs.winnerItem.toggle(false)
     },
     // 获取个人标签列表
-    getTagsList: function() {
+    getTagsList: function(lid) {
       let _this = this
       $.ajax({
         url: '/publicapply/bidcoll/getLabel',
         type: "POST",
         success: function(res){
-          console.log(res)
           if(res.error_code == 0 && res.data) {
             res.data.forEach(function(item, index){
               item.type = false
+              if(!lid) return
+              if(item.lid == lid){
+                item.type = true
+                _this.selectTagList.push(lid)
+                _this.tagText.perText = '个人标签1'
+                _this.limitlist.label = item.lanme
+                _this.reLoadList(true)
+              }
             })
             _this.tagList = res.data
           } else {

src/web/staticres/common-module/collection/js/tags-mobile.js

@@ -15,6 +15,20 @@ var tagsComponentTemplate = `
 var tagsComponent = {
   name: 'tags-mobile',
   props: ['taglist', 'selecttaglist'],
+  props: {
+    "taglist": {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    "selecttaglist": {
+      type: Array,
+      default: function () {
+        return []
+      }
+    }
+  },
   template: tagsComponentTemplate,
   data:function () {
     return {
@@ -58,7 +72,6 @@ var tagsComponent = {
     getbBtnClick: function() {
       let boolnum = -1
       let boolArr = []
-      console.log(this.taglist)
       this.taglist.forEach(function(itemall, index){
         let bool = true
           if(itemall.type) {

src/web/templates/weixin/my.html

@@ -117,7 +117,7 @@
                     <div class="menu-list-item clickable" id="project-follow" data-href="/follow/list">
                         <div class="m-l-i-left">
                             <span class="j-icon base-icon icon-case"></span>
-                            <span class="m-l-i-label">我关注的项目</span>
+                            <span class="m-l-i-label">项目关注</span>
                         </div>
                         <div class="m-l-i-right">
                             <i class="dot-red"></i>
@@ -137,13 +137,27 @@
                     <div class="menu-list-item clickable" id="ent-follow" data-href="/jylab/followent/entList">
                         <div class="m-l-i-left">
                             <span class="j-icon base-icon icon-company"></span>
-                            <span class="m-l-i-label">我关注的企业</span>
+                            <span class="m-l-i-label">企业情报</span>
                         </div>
                         <div class="m-l-i-right">
                             <i class="dot-red"></i>
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
+                    <div class="menu-list-item clickable" id="ent-follow-history" data-href="/jylab/followent/entList">
+                        <div class="m-l-i-left">
+                            <span class="j-icon base-icon icon-company"></span>
+                            <span class="m-l-i-label">企业画像记录</span>
+                        </div>
+                        <div class="m-l-i-right">
+                            <span style="margin-right: .08rem;">
+                                <span style="font-size: .28rem;color: #2ABED1;">12</span>
+                                <span style="font-size: .22rem;color: #9B9CA3;">/ 500</span>
+                            </span>
+                            <i class="dot-red"></i>
+                            <span class="j-icon base-icon icon-arrow-right"></span>
+                        </div>
+                    </div>
                 </div>
                 <div class="menu-list">
                   <div class="menu-list-item clickable" id="" data-href="/page_docs_mobile/user/lib">

src/web/templates/weixin/wxinfocontent_rec.html

@@ -443,6 +443,27 @@ pre {
   line-height: 0.40rem;
   border: 0.5px solid rgba(0, 0, 0, 0.05);
 }
+
+.collec_list{
+    display: flex;
+    align-items: center;
+    margin-top: .08rem;
+    width: 100%;
+    height: .4rem;
+}
+.collec_list .collec_tags{
+    margin-right: .08rem;
+    padding: .02rem .16rem;
+    background: rgba(5,166,243,0.05);
+    border-radius: 4px;
+    font-size: .24rem;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    text-decoration: underline;
+    text-align: CENTER;
+    color: #05a6f3;
+}
+
 .area {}
 
 .buyerclass{}
@@ -591,7 +612,7 @@ pre {
 </head>
 <body>
 <div id="jyKeepComponent">
-    <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
+    <keep-component ref="vKeepComponent" @on-save-tag="getKeepList" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
 <!-- 开启推送 -->
 <div class="open" onClick="window.location.href='/front/applysub/index'">
@@ -728,6 +749,8 @@ pre {
         {{ end }}
 			</script>
 		</div>
+		<!-- 标签列表 -->
+		<div class="collec_list"></div>
 		<div class="time_label">
 			<script>
 				var l_publishtime = {{.T.obj.l_publishtime}};
@@ -2200,7 +2223,8 @@ var vKeepComponent = new Vue({
     delimiters: ['${', '}'],
     el: '#jyKeepComponent',
     data: {
-        nowOpenBid: ''
+				nowOpenBid: '',
+				list: []
     },
     methods: {
         changeBid (id, type) {
@@ -2210,7 +2234,24 @@ var vKeepComponent = new Vue({
         changeKeepStatus (type) {
             changeCollectStatus(type)
             changeListSessionData(type)
-        }
+        },
+				getKeepList (data) {
+						this.list = data
+						let collecHtml = ''
+						if(data && data.length !== 0) {
+								$('.collec_list').show()
+								data.forEach(function(item, index) {
+										collecHtml += `<span class="collec_tags" onclick="vKeepComponent.tagClick(${index})">${item.title}</span>`
+								})
+								$('.collec_list').html(collecHtml)
+						} else {
+								$('.collec_list').hide()
+						}
+				},
+				tagClick (i) {
+						console.log(this.list[i])
+						location.href = '/weixin/frontPage/collection/sess/index?tag=' + this.list[i].title
+				}
     }
 })
 
@@ -2243,13 +2284,25 @@ function getCollectionState () {
         url: '/publicapply/bidcoll/isColl',
         type: 'POST',
         data: {
-            bids: id
+						bids: id,
+						label: 'info'
         },
         success: function (res) {
             if (res.error_code === 0 && res.data) {
-                if (res.data.length) {
+                if (res.data.iscoll) {
                     changeCollectStatus(true)
-                }
+								}
+								if(res.data.labels && res.data.labels.length) {
+										$('.collec_list').show()
+										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>`
+										})
+										$('.collec_list').html(collecHtml)
+								} else {
+										$('.collec_list').hide()
+								}
             }
         }
     })