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

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

@@ -116,7 +116,8 @@ var vNode = {
             entvisit: {
                 total: 0, // 本月画像次数总量
                 usage: 0, // 本月已使用次数
-                provin: 0 // 购买省份数量
+                provin: 0, // 购买省份数量
+                visited: false // 是否查看中标信息
             }
         }
     },
@@ -134,8 +135,8 @@ var vNode = {
         this.entInfo.id = eId
         this.entInfo.name = ''
         this.restore = this.reStoreState()
+        this.getPowerInfo()
         if (!this.restore) {
-            this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
         }
@@ -179,6 +180,13 @@ var vNode = {
                             _this.gotTab2 = true
                             console.log('获取企业中标动态...')
                         }
+                        if(_this.powerInfo.memberStatus <= 0) {
+                            // 不是大会员点击中标信息使用次数加一
+                            if(!_this.entvisit.visited) {
+                                _this.entvisit.usage++
+                                _this.entvisit.visited = true
+                            }
+                        }
                         _this.gotTab2 = true
                     }
                 });
@@ -196,13 +204,17 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0)
         },
         surplus: function () {
             return this.entvisit.total >= this.entvisit.usage
         }
     },
     methods: {
+        // 点击去开通记住tab栏下标
+        tabActive: function(data) {
+            this.savePageState()
+        },
         showToast: function (message) {
             this.$toast({
                 duration: 1500,
@@ -247,7 +259,7 @@ var vNode = {
                 entId: _this.entInfo.id
             }
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/winner'
 
             } else {
@@ -294,6 +306,9 @@ var vNode = {
             $.ajax({
                 type: "POST",
                 url: "/bigmember/portrait/subVipPortrait/usage",
+                data: {
+                    entId: _this.entInfo.id
+                },
                 success: function (res) {
                     console.log(res)
                     if(res.error_code == 0) {
@@ -368,7 +383,7 @@ var vNode = {
         getEntBaseInfo: function () {
             var _this = this
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/entDetail'
             } else {
                 urls = '/bigmember/portrait/ent/detail'
@@ -480,10 +495,8 @@ var vNode = {
                             if (res.data.memberStatus > 0 && (power.indexOf(4) != -1||power.indexOf(12) != -1||power.indexOf(13) != -1)) {
                                 _this.getEntFollowState()
                             } else {
-                                debugger
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
-                                // 不是大会员时才请求访问量接口
                                 _this.getEntVisits()
                             }
                             _this.singleTab = false

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

@@ -222,10 +222,16 @@ var mine = {
                 if (res && res.data) {
                     if (res.data.memberStatus != null || res.data.memberStatus != undefined) {
                         pageUserInfo.bigMemberStatus = res.data.memberStatus
-                        // 大会员和免费用户不显示企业画像记录菜单
-                        if(res.data.vipStatus > 0 && res.data.viper ) {
-                          $('.ent-follow-history').show()
-                        }
+                    }
+                    if (res.data.memberStatus <= 0) {
+                      // 大会员和免费用户不显示企业画像记录菜单
+                      if(res.data.vipStatus > 0 && res.data.viper ) {
+                        $('.ent-follow-history').show()
+                      } else {
+                        $('.ent-follow-history').hide()
+                      }
+                    } else {
+                      $('.ent-follow-history').hide()
                     }
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power

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

@@ -255,13 +255,13 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
                     <hispro-component type="winner" :id="entInfo.id"></hispro-component>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
@@ -280,7 +280,7 @@
                     <div class="tab-card-tip">注：项目金额指所有项目的中标金额之和，少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_2" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_2" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
@@ -296,7 +296,7 @@
                     <div class="tab-card-tip">注：少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_3" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_3" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
@@ -312,7 +312,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_4" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_4" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
@@ -328,7 +328,7 @@
                     <div class="tab-card-tip">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_5" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_5" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0 && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
@@ -338,7 +338,7 @@
                     <div class="tab-card-tip">注：各客户类型占比以中标金额计算，最多展示占比排名前十的客户类型。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_6" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_6" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0 && !getStatus">
                     <div class="tab-card-title">重点客户</div>
@@ -368,7 +368,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_7" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_7" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
                 </div>
             </van-tab>
         </van-tabs>

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

@@ -29,6 +29,9 @@
         background-size: 100% 100%;
         box-sizing: border-box;
     }
+    .bigVip_com{
+        display: none;
+    }
 </style>
 <body>
 <div class="j-container">
@@ -38,7 +41,7 @@
             <div class="j-img img-empty empty-img"></div>
             <p class="empty-text">暂无企业情报历史记录</p>
         </div>
-        <div class="vip_component" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+        <div class="vip_component bigVip_com" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
             <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
         </div>
         <ul class="ent-change-list" v-else key="changeList">
@@ -111,7 +114,8 @@ var vNode = {
     },
     computed: {
         getStatus: function () {
-            return this.conf._12 || (this.isVip && this.entvisit.total > this.entvisit.usage)
+            // 超级订阅用户没有企业情报监控权限，显示购买页
+            return this.conf._12
         }
     },
     methods: {
@@ -131,8 +135,10 @@ var vNode = {
                         var power = res.data.power
                         // 判断是否是超级订阅会员、老用户还是新用户
                         if (res.data.viper) {
+                            $('.bigVip_com').css({'display':'flex'})
                             _this.isVip = true
                         } else {
+                            $('.bigVip_com').css({'display':'flex'})
                             if(res.data.vipStatus > 0) {
                                 _this.vipststus = res.data.vipststus
                             }
@@ -140,6 +146,7 @@ var vNode = {
                         if (power.indexOf(12) != -1) {
                             // 获取企业情报历史记录-12
                             _this.conf._12 = true
+                            $('.bigVip_com').css({'display':'flex'})
                         }
                     }
                 }

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -1,5 +1,40 @@
 <html>
 <head>
+    <script>
+        try {
+            window.onlyUserID = {{session "userId"}}
+        } catch (e) {
+            console.log('获取ID失败')
+        }
+        function clearOtherUserLocalStorage () {
+            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
+            if (readUserID.length) {
+                try {
+                    var oCookie = window.onlyUserID || null
+                    var isUserNext = readUserID.indexOf(oCookie) === -1
+                    if (isUserNext) {
+                        localStorage.removeItem('big_member_full_video_play')
+                    } else {
+                        localStorage.setItem('big_member_full_video_play', 'true')
+                    }
+                } catch (e) {
+                    console.log('cookie 获取失败02')
+                }
+            } else {
+                localStorage.removeItem('big_member_full_video_play')
+            }
+        }
+        clearOtherUserLocalStorage()
+        if (localStorage.getItem('big_member_full_video_play')) {
+            console.log('已经播放')
+        } else {
+          console.log('应该跳转')
+          window.onload = function () {
+            history.pushState({state: 'full'}, null)
+            location.href = '/jyapp/big/page/full'
+          }
+        }
+    </script>
     {{include "/common/meta.html"}}
     <!--S-当前页必定需要预加载的资源-->
     <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js' />
@@ -24,11 +59,6 @@
     {{include "/common/js.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js'></script>
     <title>搜索</title>
-    <script>
-        try{
-            JyObj.hiddenBottom("1");
-        }catch(e){}
-    </script>
 </head>
 <body class="p13" id="home_main" data-weui-theme="light">
 <style>

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -610,9 +610,13 @@
                                         <p>开通超级订阅，全国企业随手查，<br>搜索信息更高效！</p>
                                     </div>
                                     <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="!isWaitBuy && conditionMap[activeTabIndex]">
-                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked}">
-                                            <div>@@item.title@@</div>
-                                            <i v-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
+                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked, 'disabled': item.disabled}">
+                                            <div class="row-item-group">
+                                                <span>@@item.title@@</span>
+                                                <div v-if="item.tag" class="tip-tag">@@item.tag@@</div>
+                                            </div>
+                                            <div class="disabled-tag" v-if="item.disabled === true">开通</div>
+                                            <i v-else-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
                                             <div class="more-icon-box" v-else>
                                                 <i  class="j-icon base-icon icon-tick-circle"></i>
                                                 <i  class="j-icon base-icon icon-tick-circle-fill"></i>

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -135,12 +135,17 @@ func (this *SubVipPortrait) PortraitUsage() {
 		if bigMsg.VipStatus <= 0 && bigMsg.Vip_BuySet.Upgrade != 1 {
 			return nil, fmt.Errorf("非法请求")
 		}
-		total, usage := bigMsg.SubVipPortraitUsage()
-		return map[string]interface{}{
+		entId := util.DecodeId(this.GetString("entId"))
+		total, usage, isUsed := bigMsg.SubVipPortraitUsage(db.Mysql, entId)
+		returnMap := map[string]interface{}{
 			"total":  total,
 			"usage":  usage,
 			"provin": bigMsg.Vip_BuySet.AreaCount,
-		}, nil
+		}
+		if entId != "" {
+			returnMap["visited"] = isUsed
+		}
+		return returnMap, nil
 	}()
 	if errMsg != nil {
 		log.Printf("%s SubVipPortrait-portraitUsage 企业画像浏览量查询出错:%s\n", userId, errMsg.Error())

src/jfw/modules/common/src/qfw/util/jy/subvipPortrait.go

@@ -15,7 +15,7 @@ const (
 	PortraitRecordTable = "portrait_record"
 )
 
-func (this *BigVipBaseMsg) SubVipPortraitUsage() (fullCount, usage int) {
+func (this *BigVipBaseMsg) SubVipPortraitUsage(mysql *mysql.Mysql, entId string) (fullCount, usage int, visited bool) {
 	if this.VipStatus <= 0 {
 		return
 	}
@@ -25,49 +25,67 @@ func (this *BigVipBaseMsg) SubVipPortraitUsage() (fullCount, usage int) {
 		fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
 	}
 	usage = redis.GetInt(PowerCacheDb, fmt.Sprintf(PortraitRecordTimes, this.Uid, int(time.Now().Month())))
+	if mysql != nil && entId != "" {
+		visited = this.isVisitEnt(mysql, entId)
+	}
 	return
 }
 
+func (this *BigVipBaseMsg) isVisitEnt(mysql *mysql.Mysql, entId string) bool {
+	if this.VipStatus <= 0 || entId == "" {
+		return false
+	}
+	now := time.Now()
+	//浏览缓存
+	visitedCache := fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId)
+	//本月有浏览记录
+	if exists, err := redis.Exists(PowerCacheDb, visitedCache); err == nil && exists {
+		return true
+	}
+	if mysql.CountBySql(fmt.Sprintf("select count(id) from %s where user_id =? and ent_id =? and year(create_time)=? and month(create_time)=?",
+		PortraitRecordTable), this.Uid, entId, now.Year(), int(now.Month())) == 0 {
+		return false
+	}
+	redis.Put(PowerCacheDb, fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId), 1, 60*60*5)
+	return true
+}
+
 func (this *BigVipBaseMsg) SubVipPortraitTimesCheck(mysql *mysql.Mysql, entId string) error {
 	if this.VipStatus <= 0 || entId == "" {
 		return fmt.Errorf("非法请求")
 	}
+
+	//查询本月是否浏览过
+	if this.isVisitEnt(mysql, entId) {
+		return nil
+	}
+
 	fullCount, now := 0, time.Now()
 	if this.Vip_BuySet.AreaCount == -1 {
 		fullCount = 16 * OneAreaTimes //全国全国行业
 	} else {
 		fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
 	}
-	//浏览缓存
-	visitedCache := fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId)
-	//本月有浏览记录
-	if exists, err := redis.Exists(PowerCacheDb, visitedCache); err == nil && exists {
-		return nil
-	}
 
-	if mysql.CountBySql(fmt.Sprintf("select count(id) from %s where user_id =? and ent_id =? and year(create_time)=? and month(create_time)=?",
-		PortraitRecordTable), this.Uid, entId, now.Year(), int(now.Month())) == 0 {
-		//校验本月次数是否使用完
-		useKey := fmt.Sprintf(PortraitRecordTimes, this.Uid, int(now.Month()))
+	//校验本月次数是否使用完
+	useKey := fmt.Sprintf(PortraitRecordTimes, this.Uid, int(now.Month()))
 
-		useCount := redis.GetInt(PowerCacheDb, useKey)
-		if useCount >= fullCount {
-			return fmt.Errorf("本月次数已使用完")
-		}
+	useCount := redis.GetInt(PowerCacheDb, useKey)
+	if useCount >= fullCount {
+		return fmt.Errorf("本月次数已使用完")
+	}
 
-		//新增使用记录
-		if mysql.Insert(PortraitRecordTable, map[string]interface{}{
-			"user_id":     this.Uid,
-			"ent_id":      entId,
-			"create_time": now.Format("2006-01-02 15:04:05"),
-		}) == 0 {
-			return fmt.Errorf("数据记录异常")
-		}
-		if redis.Incr(PowerCacheDb, useKey) == 1 {
-			_ = redis.SetExpire(PowerCacheDb, useKey, 24*60*60*31) //次数缓存一个月
-		}
+	//新增使用记录
+	if mysql.Insert(PortraitRecordTable, map[string]interface{}{
+		"user_id":     this.Uid,
+		"ent_id":      entId,
+		"create_time": now.Format("2006-01-02 15:04:05"),
+	}) == 0 {
+		return fmt.Errorf("数据记录异常")
+	}
+	if redis.Incr(PowerCacheDb, useKey) == 1 {
+		_ = redis.SetExpire(PowerCacheDb, useKey, 24*60*60*31) //次数缓存一个月
 	}
-	redis.Put(PowerCacheDb, fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId), 1, 60*60*5)
 	return nil
 }
 
@@ -80,7 +98,7 @@ func (this *BigVipBaseMsg) GetPortraitRecord(mysql *mysql.Mysql, year, month, pa
 			return
 		}
 	}
-	res := mysql.Query(fmt.Sprintf("select ent_id from %s where user_id =? and year(create_time)=? and month(create_time)=? order by create_time limit ?,?",
+	res := mysql.Query(fmt.Sprintf("select ent_id from %s where user_id =? and year(create_time)=? and month(create_time)=? order by create_time desc limit ?,?",
 		PortraitRecordTable), this.Uid, year, month, pageNum*pageSize, pageSize)
 	if res == nil {
 		return

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

@@ -852,7 +852,9 @@
 
 
 /* 企业画像历史项目联系人 */
-
+.history-list .project-info-item{
+    padding: .24rem 0;
+}
 .history-list .project-info-item .his-pro-title{
     width: 100%;
     font-size: .28rem;

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

@@ -307,11 +307,13 @@ var dateComponent = {
           t.start = t.end - durations.day30
           break
         }
+        // 最近一年
         case 'lastYear': {
-          const year = new Date(t.end).getFullYear()
-          const lastYear = year - 1
-          t.start = +new Date(`${lastYear}`)
-          t.end = +new Date(`${year}`) - durations.hour1 * 8 - 1
+          const year = new Date().getTime()
+          console.log(year)
+          const lastYear = year - 60 * 60 * 1000 * 24 * 30 * 12
+          t.start = +lastYear
+          t.end = year
           break
         }
         default: {
@@ -320,6 +322,7 @@ var dateComponent = {
           break
         }
       }
+      console.log(t)
       return t
     },
     selectFixedDate: function(item) {

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

@@ -114,7 +114,8 @@ var vNode = {
             entvisit: {
                 total: 0, // 本月画像次数总量
                 usage: 0, // 本月已使用次数
-                provin: 0 // 购买省份数量
+                provin: 0, // 购买省份数量
+                visited: false // 是否查看中标信息
             }
         }
     },
@@ -178,6 +179,13 @@ var vNode = {
                             _this.gotTab2 = true
                             console.log('获取企业中标动态...')
                         }
+                        if(_this.powerInfo.memberStatus <= 0) {
+                            // 不是大会员点击中标信息使用次数加一
+                            if(!_this.entvisit.visited) {
+                                _this.entvisit.usage++
+                                _this.entvisit.visited = true
+                            }
+                        }
                         _this.gotTab2 = true
                     }
                 });
@@ -202,6 +210,10 @@ var vNode = {
         }
     },
     methods: {
+        // 点击去开通记住tab栏下标
+        tabActive: function(data) {
+            this.savePageState()
+        },
         showToast: function (message) {
             this.$toast({
                 duration: 1500,
@@ -247,9 +259,8 @@ var vNode = {
                 entId: _this.entInfo.id
             }
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/winner'
-
             } else {
                 urls = '/bigmember/portrait/winner/getData'
             }
@@ -294,6 +305,9 @@ var vNode = {
             $.ajax({
                 type: "POST",
                 url: "/bigmember/portrait/subVipPortrait/usage",
+                data: {
+                    entId: _this.entInfo.id
+                },
                 success: function (res) {
                     console.log(res)
                     if(res.error_code == 0) {
@@ -368,7 +382,7 @@ var vNode = {
         getEntBaseInfo: function () {
             var _this = this
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/entDetail'
             } else {
                 urls = '/bigmember/portrait/ent/detail'

src/web/staticres/common-module/collection/js/history-project.js

@@ -95,18 +95,23 @@ var hisproComponent = {
           if(res.error_code == 0) {
             loading.clear()
             if(res.data && res.data.list && res.data.list.length !== 0) {
-              let phoneArr = []
               res.data.list.forEach(function(item, i) {
+                let phoneArr = []
                 if(item.date) {
                   item.date = new Date(item.date * 1000).pattern('yyyy-MM-dd')
                 } else {
                   item.date = ''
                 }
-                Object.keys(item.contacts)[0].split(',').forEach(function(items, i) {
-                  console.log(item.contacts)
-                  phoneArr.push({[items]: item.contacts[Object.keys(item.contacts)[0]]})
+                console.log(Object.keys(item.contacts))
+
+                Object.keys(item.contacts).forEach(function(items, index) {
+                  console.log(items)
+                  console.log({[items]: item.contacts[Object.keys(item.contacts)[index]]})
+                  phoneArr.push({[items]: item.contacts[Object.keys(item.contacts)[index]]})
                 })
                 item.contacts = phoneArr
+                // console.log(item.contacts)
+
               })
               if(res.data.list.length <= 3) {
                 _this.hisData.showMoreBtn = false

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

@@ -121,29 +121,31 @@ var keywordComponent = {
           if(res && res.userData) {
             let maxarr = []
             if(_this.isvip) {
-              let data = res.userData.o_vipjy.a_items
-              data.forEach(function(item,index) {
-                let minarr = []
-                let keyname = item.s_item
-                let eachArr = item.a_key
-                eachArr.forEach(function(data, i){
-                  data = {
-                    name: data.key[0],
+              if(res.userData && res.userData.o_vipjy) {
+                let data = res.userData.o_vipjy.a_items
+                data.forEach(function(item,index) {
+                  let minarr = []
+                  let keyname = item.s_item
+                  let eachArr = item.a_key
+                  eachArr.forEach(function(data, i){
+                    data = {
+                      name: data.key[0],
+                      type: false
+                    }
+                    minarr.push(data)
+                  })
+                  let obj = {
+                    [keyname]: minarr,
                     type: false
                   }
-                  minarr.push(data)
+                  maxarr.push(obj)
                 })
-                let obj = {
-                  [keyname]: minarr,
-                  type: false
+                _this.tablist = maxarr
+                if(maxarr.length == 0) {
+                  _this.active = 0
+                }else {
+                  _this.active = 1
                 }
-                maxarr.push(obj)
-              })
-              _this.tablist = maxarr
-              if(maxarr.length == 0) {
-                _this.active = 0
-              }else {
-                _this.active = 1
               }
             } else {
               let initArr = [

src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -140,12 +140,14 @@ var vipComponent = {
       }
     },
     goOpen: function() {
+      // 点击按钮保存tabActiveName值
+      this.$emit('tabactive', 'save')
       let isWeixin = utils.isWeiXinBrowser
       if(!isWeixin) {
         if (this.btnText == '去开通') {
-          if(this.type == 'item_9' || item.type == 'item_8') {
+          if(this.type == 'item_9' || this.type == 'item_8') {
             // 跳转到大会员
-            location.href = '/jyapp/big/page/landingPage'
+            location.href = '/jyapp/big/page/buy_commit'
           } else {
             // 跳转到超级订阅
             location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
@@ -159,9 +161,9 @@ var vipComponent = {
         }
       } else {
         if (this.btnText == '去开通') {
-          if(this.type == 'item_9') {
+          if(this.type == 'item_9' || this.type == 'item_8') {
             // 跳转到大会员
-            location.href = '/big/wx/page/landingPage'
+            location.href = '/big/wx/page/buy_commit'
           } else {
             // 跳转到超级订阅
             location.href = '/front/vipsubscribe/vipsubscribe_new'

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -14,6 +14,9 @@ var tempStyleComponent = `<style>
         background-position: center;
         background-size: contain;
     }
+    .van-toast {
+        z-index: 9999999 !important;
+    }
     .icon-corner-mark {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKUSURBVHgB7ZdPaxNBGIffmYS2aqBRKkWxur2lLWJy0HtbBY/6AfzTa3vQb6AeBA9CBbF4FLx4M54EQVZPCj3EeDF4MQepFkXXUqXYdqbzbrtlu53p7sxOsnvoc8lMZpY8eZN3frsA++yTXyovGw6BnIOStJe6uRYdfdWokiJ1OUCZQk6puM1rgSTOc1nREbd5g3B4EH4vdxUddZu3opJIriqKksDhtmwtN6Jj7sdZzvlN1Xrmos7zRvlguTALnF/fa1+mor5kP3XFsBq3NzPR4CAXQyfJ/kxEdSWRrouaSCJdFQ1HImjStQM/Gom6dKWiskjUpeMVVUWiLh2t6F6RqEvHROMiURfrokkjMUqldACW1tZhYeW/dL0AFglF4kWd62acQbg/dhKuDg3AspBtLv3btcdaM+FBLiQbkCC3ISI5PTy4PZ842i/dZ0XUNG2ikkj92y/p3tSiNiUftReh/v23dH+qZjKNRJXk3JdF5TXGzYSRSCl5hpLH+3rg4elTcHdkCIj46vPeX7ApaSyKkUg5PBbDPpxfOTEAl44d8dfOlktKWVNJgactuhWJ96LvB6Iq2RSSItzIey1RVSQurKz6r+cOl0Amm0Zyy/RF4mZKEonTQmgmIjTvLfvSxpICts7GY0V1I1Emm0ZSNGv708SZ4SLESWIkcp44bebamxIyWV1JX5SzO/iq/I/iQd5ziL7DIWgSNFH4P2skKarZmqxO4biokjRJmzBYWbwTwtPg9Y8/8PTrT9DE44SNBxPSCUkbrDF2+fP5Wj2Y78h6jMRCr38H5EB2eIyzqbAksi2a9inRBuKzPzDCaq3J2pPomv/T23hKTAM2DXa3TDCA2HwA08ATekKOv+UM6q0LtTdxF2wAr7U5snLQCTUAAAAASUVORK5CYII=);
     }
@@ -284,7 +287,7 @@ Vue.component('keep-component', {
             </div>
             <div class="kee-component-content">
                 <div class="keep-component-input-group">
-                    <input v-model.trim="tagInput" type="text" placeholder="请输入标签">
+                    <van-field maxlength="6" v-model.trim="tagInput" type="text" placeholder="请输入标签"></van-field>
                     <van-button v-show="isAddLoading || getOnlyStatus" @click="addTag" :loading="isAddLoading"  type="primary">添加并使用</van-button>
                 </div>
                 <div v-show="!isGetTagsLoading" class="keep-component-tag-group">
@@ -394,7 +397,7 @@ Vue.component('keep-component', {
               title: v.lanme,
               checked: false
             }
-          })
+          }).reverse()
         }
       })
     },
@@ -512,6 +515,7 @@ Vue.component('keep-component', {
     },
     toggleTagStatus (item) {
       if (this.getSelectLength && !item.checked) {
+        this.$toast('最多选择三个标签')
         return
       }
       item.checked = !item.checked
@@ -543,7 +547,7 @@ Vue.component('keep-component', {
     addTagInList (id) {
       var tempInput = this.tagInput
       this.tagInput = ''
-      this.tags.push({
+      this.tags.unshift({
         lid: id,
         title: tempInput,
         checked: !this.getSelectLength

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

@@ -136,7 +136,11 @@ var vm = new Vue({
                 type: 'POST',
                 success: function (res) {
                     if (res.error_code === 0) {
-                        this.tagList = res.data.reverse() || []
+                        if (res.data) {
+                            this.tagList = res.data.reverse()
+                        } else {
+                            this.tagList = []
+                        }
                         this.initSelectTagList()
                         if (this.urlFilterTagId.length) {
                             this.filterState.tags = this.filterState.tags.concat(this.urlFilterTagId)

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

@@ -46,6 +46,7 @@
 }
 .r-tabs .date-class .el-input__inner {
     padding: 0 8px 0 12px;
+    cursor: pointer;
 }
 .r-tabs .date-class .el-input__prefix{
     display: none;

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

@@ -40,15 +40,12 @@ var vm = new Vue({
             points: [],
             statusEnum: ['存续', '吊销', '注销', '撤销'],
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
-            listInfo: {
-                value: '',
-                pageNum: 0,
-                pageSize: 10,
-                total: -1,
-                loading: true,
-                finished: false
-            },
-            seeList: []
+            seeList: {
+                pageNum: 1, // 当前页
+                pageSize: 50, // 每页多少条数据
+                total: 0, // 总页数
+                list: [] // 返回的数据
+            }
         }
     },
     created() {
@@ -77,8 +74,8 @@ var vm = new Vue({
             return {
                 year: this.years,
                 month: this.months,
-                pageSize: this.listInfo.pageSize,
-                pageNum: this.listInfo.pageNum
+                pageSize: this.seeList.pageSize,
+                pageNum: this.seeList.pageNum
             }
         },
         subRecord() {
@@ -91,6 +88,9 @@ var vm = new Vue({
             }).done(res => {
                 var _this = this
                 if (res.error_code == 0 && res.data.list) {
+                    if (res.data.count) {
+                        this.listState.total = res.data.count
+                    }
                     res.data.list.forEach(v => {
                         const arrs = {
                             name: v.company_name,
@@ -106,16 +106,20 @@ var vm = new Vue({
                             statusWord: v.company_status,
                             checked: false
                         }
-                        this.seeList.push(arrs)
+                        this.seeList.list.push(arrs)
                     })
                 }
             })
         },
+        onPageChange(page) {
+            this.seeList.pageNum = page
+            this.subRecord()
+        },
         dateHandler(val) {
             this.years = val.getFullYear()
             this.months = val.getMonth() + 1
-            this.listInfo.pageNum = 0
-            this.seeList = []
+            this.seeList.pageNum = 0
+            this.seeList.list = []
             this.subRecord()
         },
         detailed(ids) {

src/web/staticres/js/ent-search-index-pc.js

@@ -504,7 +504,13 @@ var vm = new Vue({
             $('#go-customer-4').trigger('click')
         },
         toDetail: function (id) {
-            window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
+            if (this.powerInfo.vip > 1) {
+                // 去超级订阅画像
+                window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
+            } else {
+                // 去大会员画像
+                window.open('/swordfish/page_big_pc/ent_portrait/' + id)
+            }
         },
         calcListItemForCap: function (p) {
             if (p) {

src/web/staticres/me/js/mine.js

@@ -90,11 +90,15 @@ var mine = {
           url: '/bigmember/use/isAdd?t=' + Date.now(),
           success: function (res) {
               if (res && res.data) {
-                  if (res.data.memberStatus != null || res.data.memberStatus != undefined) {
+                  if (res.data.memberStatus <= 0) {
                       // 大会员和免费用户不显示企业画像记录菜单
                       if(res.data.vipStatus > 0 && res.data.viper ) {
                         $('#ent-follow-history').show()
+                      } else {
+                        $('#ent-follow-history').hide()
                       }
+                  } else {
+                    $('#ent-follow-history').hide()
                   }
               }
           }

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

@@ -275,7 +275,7 @@
                 top="25vh"
                 width="30%">
                 <span v-if="tagDrawer.currentDelTagInfo.count === 0">确定删除${tagDrawer.currentDelTagInfo.label ? ('“' + tagDrawer.currentDelTagInfo.label + '”') : '该'}标签？</span>
-                <span v-else>警告：当前有${tagDrawer.currentDelTagInfo.count}条标讯使用了该便签，如果删除标签，那么对应的标讯也将删除该关联标签。</span>
+                <span v-else>警告：当前有${tagDrawer.currentDelTagInfo.count}条标讯使用了该标签，如果删除标签，那么对应的标讯也将删除该关联标签。</span>
                 <span slot="footer" class="dialog-footer">
                     <button class="j-t-button confirm active" @click="delThisTagConfirm">确 定</el-button>
                     <button class="j-t-button cancel" @click="tagDrawer.dialogShow=false">取 消</button>

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

@@ -43,7 +43,7 @@
                     :clearable="false"
                     :editable="false">
                 </el-date-picker>
-                <i class="el-icon-arrow-down r-icons"></i>
+                <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
             </div>
         </div>
         <div class="see-content w" v-show="seeList.length !== 0">
@@ -59,6 +59,17 @@
                     <div class="cont-tips di-zhi">地址：<span>{item.address}</span></div>
                 </div>
             </div>
+            <div class="el-pagination-container">
+                <el-pagination
+                    background
+                    layout="prev, pager, next, ->"
+                    :hide-on-single-page="true"
+                    :current-page="seeList.pageNum"
+                    :page-size="seeList.pageSize"
+                    :total="seeList.total"
+                    @current-change="onPageChange"
+                ></el-pagination>
+            </div>
         </div>
         <div class="no-data" v-show="seeList.length === 0"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
     </section>

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -260,13 +260,13 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_1" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_1" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
                     <hispro-component type="winner" :id="entInfo.id"></hispro-component>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
@@ -285,7 +285,7 @@
                     <div class="tab-card-tip">注：项目金额指所有项目的中标金额之和，少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_2" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_2" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
@@ -301,7 +301,7 @@
                     <div class="tab-card-tip">注：少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_3" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_3" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
@@ -317,7 +317,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_4" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_4" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
@@ -333,7 +333,7 @@
                     <div class="tab-card-tip">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_5" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_5" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0  && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
@@ -343,7 +343,7 @@
                     <div class="tab-card-tip">注：各客户类型占比以中标金额计算，最多展示占比排名前十的客户类型。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_6" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_6" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0  && !getStatus">
                     <div class="tab-card-title">重点客户</div>
@@ -373,7 +373,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_7" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_7" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
                 </div>
             </van-tab>
         </van-tabs>

src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html

@@ -30,6 +30,9 @@
         background-size: 100% 100%;
         box-sizing: border-box;
     }
+    .bigVip_com{
+        display: none;
+    }
 </style>
 <body>
 <div class="j-container">
@@ -39,7 +42,7 @@
             <div class="j-img img-empty empty-img"></div>
             <p class="empty-text">暂无企业情报历史记录</p>
         </div>
-        <div class="vip_component" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+        <div class="vip_component bigVip_com" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
             <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
         </div>
         <ul class="ent-change-list" v-else key="changeList">
@@ -105,7 +108,7 @@ var vNode = {
     },
     computed: {
         getStatus: function () {
-            return this.conf._12 || (this.isVip && this.entvisit.total > this.entvisit.usage)
+            return this.conf._12
         }
     },
     methods: {
@@ -125,8 +128,10 @@ var vNode = {
                         var power = res.data.power
                         // 判断是否是超级订阅会员、老用户还是新用户
                         if (res.data.viper) {
+                            $('.bigVip_com').css({'display':'flex'})
                             _this.isVip = true
                         } else {
+                            $('.bigVip_com').css({'display':'flex'})
                             if(res.data.vipStatus > 0) {
                                 _this.vipststus = res.data.vipststus
                             }
@@ -134,6 +139,7 @@ var vNode = {
                         if (power.indexOf(12) != -1) {
                             // 获取企业情报历史记录-12
                             _this.conf._12 = true
+                            $('.bigVip_com').css({'display':'flex'})
                         }
                     }
                 }

src/web/templates/pc/entsearchindex.html

@@ -109,7 +109,8 @@
                                 </div>
                                 <div class="popover-content" v-else key="popover-content">
                                     <p>超级订阅用户，每购买一个省，每月可看50个画像。</p>
-                                    <p>您当前订阅了${getVipSubText}，查看机会已经消耗完毕。如需要更多服务，请前往<span class="popover-link" @click="openCustomerService">联系客服</span></p>
+                                    <p v-if="entUseInfo.province == -1">您当前订阅了${getVipSubText}，查看机会已经消耗完毕。如需要更多服务，请前往<span class="popover-link" @click="openCustomerService">联系客服</span></p>
+                                    <p v-else>您当前订阅了${getVipSubText}，如需查看更多，请前往订阅更多省份。<span class="popover-link" @click="openVipPage('popover-link')">前往</span></p>
                                 </div>
                                 <div class="used-counter" slot="reference">
                                     <span>当月已使用：</span>