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

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

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

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/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>