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

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

@@ -0,0 +1,273 @@
+var vipDialog = `
+<div class="vip_openDialog">
+  <div class="vip_content">
+    <div class="vip_content_div">
+      <img class="vip_img" :src="imgurl" />
+      <span class="vip_example">示例</span>
+    </div>
+  </div>  
+  <div class="vip_head">
+      <span style="display:none;">{{getTextMap.titleText}}</span>
+      <span class="vip_extend"><span>{{getTextMap.headText.top}}</span><br/>{{getTextMap.headText.bot}}</span>
+  </div>
+  <div class="openBtn">
+      <button style="width:auto;color:#2cb7ca;font-size:0.26rem;" class="" @click="goOpen(getTextMap.headText.top,getTextMap.headText.bot, getTextMap.source)">{{getTextMap.btnText}}</button>
+  </div>
+</div>
+`
+
+var buyerExample = {
+  name: 'buyer-example',
+  template: vipDialog,
+  props: {
+    'imgurl': {
+      type: String,
+      default: function() {
+        return ''
+      }
+    },
+    "type": {
+      type: String,
+      default: function () {
+        return ''
+      }
+    },
+    "power": {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    "status": {
+      type: Number,
+      default: function () {
+        return 0
+      }
+    },
+    "userinfo": {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    "useage": {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+  },
+  data: function() {
+    return {
+      titleText: '开通大会员',
+      btnText: '免费体验',
+      headText: {
+        top: '通过实时监控项目的招标、中标、合同等',
+        bot: '信息，全面挖掘更多潜在商机！'
+      }
+    }
+  },
+  computed: {
+    getTextMap () {
+      var textMap = {
+        titleText: '开通大会员',
+        btnText: this.shadeBottomBtnText,
+        headText: {
+          top: '通过实时监控项目的招标、中标、合同等',
+          bot: '信息，全面挖掘更多潜在商机！'
+        },
+        source: ''
+      }
+      // if (this.power.indexOf(5) < 0 && this.status > 0) {
+      //   textMap.btnText = '联系客服'
+      // }
+      switch (this.type) {
+          // 历史项目联系方式
+        case 'item_1': {
+          textMap.headText.top = '采购单位项目动态全面获取,'
+          textMap.headText.bot = '帮助企业洞察采购需求，开发新客户！',
+          textMap.source = 'buyer_portrait_contacts_freeuser'
+          break
+        }
+          // 年度项目统计
+        case 'item_2': {
+          textMap.headText.top = '采购单位年度项目规模、增长趋势'
+          textMap.headText.bot = '一目了然，快速分析市场！'
+          textMap.source = 'buyer_portrait_yearData_freeuser'
+          break
+        }
+          // 月度采购规模统计
+        case 'item_3': {
+          textMap.headText.top = '通过纵向对比近3年月度中标金额，'
+          textMap.headText.bot = '快速分析行业月度采购趋势！'
+          textMap.source = 'buyer_portrait_monthData_freeuser'
+          break
+        }
+          // 采购规模分布
+        case 'item_4': {
+          textMap.headText.top = '全面了解采购单位的年度采购规划、'
+          textMap.headText.bot = '项目预算，帮助投标人制定投标策略！'
+          textMap.source = 'buyer_portrait_moneyRange_freeuser'
+          break
+        }
+          // 各类招标方式占比
+        case 'item_5': {
+          textMap.headText.top = '洞察采购单位招标方式、数量、金额占比，'
+          textMap.headText.bot = '综合了解采购单位，帮企业决策是否投标！'
+          textMap.source = 'buyer_portrait_bidtypeData_freeuser'
+          break
+        }
+          // 各行业项目平均节支率
+        case 'item_6': {
+          textMap.headText.top = '分析行业项目的预算、中标价格差额比率，'
+          textMap.headText.bot = '帮助企业核算采购项目的利润率！'
+          textMap.source = 'buyer_portrait_rate_freeuser'
+          break
+        }
+          // 各行业项目规模占比
+        case 'item_7': {
+          textMap.headText.top = '通过行业采购项目的规模、数量、利润率，'
+          textMap.headText.bot = '洞悉采购单位的采购状况！'
+          textMap.source = 'buyer_portrait_top12_freeuser'
+          break
+        }
+          // 重点合作企业
+        case 'item_8': {
+          textMap.headText.top = '通过挖掘重点合作企业，直观了解采购单位'
+          textMap.headText.bot = '与企业关系远近，辅助投标决策！'
+          textMap.source = 'buyer_portrait_topShow_freeuser'
+          break
+        }
+          // 合作企业注册资本分布
+        case 'item_9': {
+          textMap.headText.top = '通过分析合作企业注册资本、采购项目规模、'
+          textMap.headText.bot = '利润率，全面洞察采购单位合作企业！'
+          textMap.source = 'buyer_portrait_withCapitalData_freeuser'
+          break
+        }
+         // 合作企业年龄分布
+        case 'item_10': {
+          textMap.headText.top = '通过分析合作企业年龄、数量、规模分布情况，'
+          textMap.headText.bot = '全面洞察采购单位合作企业！'
+          textMap.source = 'buyer_portrait_withEstablishData_freeuser'
+          break
+        }
+        // 合作企业注册地分布
+        case 'item_11': {
+          textMap.headText.top = '通过分析合作企业的地址、数量、采购规模，'
+          textMap.headText.bot = '了解采购单位营商环境，辅助投标决策！'
+          textMap.source = 'buyer_portrait_withAreaData_freeuser'
+          break
+        }
+        // 重点合作代理机构
+        case 'item_12': {
+          textMap.headText.top = '通过提供合作代理机构的名录、数量，全面洞察'
+          textMap.headText.bot = '采购单位合作环境，辅助投标决策！'
+          textMap.source = 'buyer_portrait_topAgencyData_freeuser'
+          break
+        }
+      }
+      return textMap
+    },
+    // 遮罩按钮对应文案
+    shadeBottomBtnText () {
+      let btnText = '采购单位画像超过次数限制，请联系客服'
+      // var info = this.userinfo
+      // var usage = this.useage
+      // 【立即解锁】：未体验过采购单位画像的免费用户，点击进行“欢迎体验采购单位全景分析”留资
+      // 【去开通】：已体验过1次采购单位画像的免费用户，点击进入超级订阅购买页
+      // 【前往升级】：超级订阅老版用户+购买了非全国采购单位画像余额为0的超级订阅新版用户，点击进入超级订阅升级页
+      // 【联系客服】：购买了全国采购单位画像余额为0的超级订阅新版用户+无采购单位画像权限的大会员客户；点击调起智齿在线客服
+      // if (info.isFree) {
+      //   if (info.freeBuyerPort === 0) {
+      //     btnText = '立即解锁'
+      //   } else {
+      //     btnText = '去开通'
+      //   }
+      // } else {
+      //   // 老超级订阅用户
+      //   var oldVip = info.vipStatus > 0 && !info.viper
+      //   // 新超级订阅用户
+      //   var newVip = info.vipStatus > 0 && info.viper
+      //   // 大会员用户
+      //   var member = this.status > 0
+      //   // 新超级订阅用户买的非全国 余额为0
+      //   var noAllProvinNoCounts = newVip && usage.provin !== -1 && usage.surplus <= 0
+      //   // 超级订阅新用户 购买的全国 余额为0
+      //   var allProvinNoCounts = newVip && usage.provin === -1 && usage.surplus <= 0
+      //   // 无权限的大会员用户
+      //   var noAuthMember = member && this.power.indexOf(5) === -1
+      //   // 纯商机管理用户
+      //   var entniche = info.entniche && !oldVip && !newVip && !member
+      //   if (oldVip || noAllProvinNoCounts) {
+      //     btnText = '前往升级'
+      //   } else if (allProvinNoCounts || noAuthMember || entniche) {
+      //     btnText = '联系客服'
+      //   }
+      // }
+      return btnText
+    }
+  },
+  methods: {
+    linkFn: function(id, source) {
+      var isWeixin = utils.isWeiXinBrowser
+      if(!isWeixin) {
+        if (this.getTextMap.btnText == '立即解锁') {
+          // 留资
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source
+        } else if (this.getTextMap.btnText == '联系客服') {
+          // try {
+          //   JyObj.callPhone('400-108-6670');
+          // } catch (error) {
+          //   console.log(error)
+          // }
+          location.href = '/jyapp/free/customer' // 客服
+        } else if (this.getTextMap.btnText == '去开通') {
+          location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+        } else if (this.getTextMap.btnText == '前往升级') {
+          location.href = '/jyapp/vipsubscribe/upgradePage'
+        }
+      } else {
+        if (this.getTextMap.btnText == '立即解锁') {
+          // 留资
+          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + source
+        } else if (this.getTextMap.btnText == '联系客服') {
+          // location.href = 'tel:400-108-6670'
+          location.href = '/big/wx/page/customer'
+        } else if (this.getTextMap.btnText == '去开通') {
+          location.href = '/front/vipsubscribe/vipsubscribe_new'
+        } else if (this.getTextMap.btnText == '前往升级') {
+          location.href = '/front/vipsubscribe/upgradePage'
+        }
+      }
+    },
+    goOpen: function(top, bot, source) {
+      return
+      console.log(this.$parent.encryptId)
+      var params = {
+        mold: 'isCBBT',
+        id: this.$parent.encryptId,
+        introduce: top + bot
+      }
+      var _this = this
+      console.log(_this.getTextMap.btnText)
+      if (_this.getTextMap.btnText == '立即解锁') {
+        $.ajax({
+          type: 'POST',
+          url: '/publicapply/drainage/buyerunit',
+          contentType: "application/json",
+          data: JSON.stringify(params),
+          success: function (res) {
+            _this.linkFn(_this.$parent.encryptId, source)
+          },
+          error: function (error) {
+            console.log(error)
+            _this.linkFn(_this.$parent.encryptId, source)
+          }
+        })
+      } else {
+        _this.linkFn(_this.$parent.encryptId)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,536 @@
+var matchTypeListForComputed = [
+    {
+        label: '标题搜索',
+        value: 'title'
+    },
+    {
+        label: '正文搜索',
+        value: 'content'
+    },
+    {
+        label: '中标项目/标的物',
+        value: 'purchasing'
+    },
+    {
+        label: '采购单位',
+        value: 'buyer'
+    },
+    {
+        label: '招标代理机构',
+        value: 'agency'
+    },
+    {
+        label: '附件',
+        value: 'file'
+    }
+]
+try {
+    if (is_weixin()) {
+        matchTypeListForComputed.pop()
+    }
+} catch (e) {}
+var vConfig = {
+    delimiters: ['${', '}'],
+    el: '#ent-project-news',
+    components: {
+        popupSelectComponent: popupSelectComponent,
+        areaComponent: areaComponent,
+        noticeComponent: noticeComponent,
+    },
+    data: {
+        platform: pageInfo.platform,
+        sessStorageKey: '$data-ent_project_news',
+        // 企业信息
+        entInfo: {
+            eid: '', // 企业id
+            name: '',
+            follow: 0,
+            followSearchFinish: false,
+            entExist: true,
+            buyerName: ''
+        },
+        searchInfo: {
+            content: ''
+        },
+        searchFilters: {
+            matchType: ['title', 'content'],
+            area: [],
+            infoType: [],
+            pushTime: ['5year'],
+        },
+        listState: {
+            refreshing: false,
+            loaded: false,
+            loading: false,
+            finished: false,
+            pageNum: 1,
+            pageSize: 10,
+            count: 0,
+            offset: 50,
+            scrollTop: 0,
+            list: []
+        },
+        matchTypeList: matchTypeListForComputed,
+        publishTimeList: [
+            {
+                label: '最近7天',
+                value: '7day'
+            },
+            {
+                label: '最新30天',
+                value: '30day'
+            },
+            {
+                label: '1年内',
+                value: '1year'
+            },
+            {
+                label: '3年内',
+                value: '3year'
+            },
+            {
+                label: '5年内',
+                value: '5year'
+            }
+        ],
+        filterInitData: {
+            areaArr: [],
+            infoType: [],
+            timeRange: [],
+        },
+        reqSign: 'bigmember',
+        info: {
+          bigStatus: false,
+          vipStatus: false,
+          viper: false,
+          power: []
+        }
+    },
+    computed: {
+        projectNewUrl: function () {
+            // var urlMap = {
+            //     bigmember: '/bigmember/portrait/winner/getNewMsg', // 大会员
+            //     svip: '/bigmember/portrait/subVipPortrait/winnerNewMsg' // 超级订阅
+            // }
+            var url = '/entnicheNew/portrait/buyer/getNewMsg'
+            if (urlMap[this.reqSign]) {
+                url = urlMap[this.reqSign]
+            }
+            return url
+        },
+        filterInfoUrl: function () {
+            // var urlMap = {
+            //     bigmember: '/bigmember/portrait/winner/getNewMsgSelects', // 大会员
+            //     svip: '/bigmember/portrait/subVipPortrait/getNewMsgSelects' // 超级订阅
+            // }
+            var url = '/entnicheNew/portrait/buyer/selects'
+            if (urlMap[this.reqSign]) {
+                url = urlMap[this.reqSign]
+            }
+            return url
+        },
+    },
+    created: function () {
+        // var eid = utils.getParam('eid')
+        // var reqSign = utils.getParam('reqSign')
+        // if (eid) {
+        //     this.entInfo.eid = decodeURIComponent(eid)
+        // }
+        // if (reqSign) {
+        //     this.reqSign = reqSign
+        // }
+        var entName = decodeURIComponent(utils.getParam('entName'))
+        if (entName) {
+          this.entInfo.buyerName = entName
+        }
+        // this.getUserInfo()
+        var recover = this.recover()
+        if (!recover) {
+          // this.getFilterInfo()
+          this.onLoad()
+        } else {
+          this.initSelector(_this.filterInitData)
+        }
+    },
+    mounted: function () {},
+    methods: {
+        // getUserInfo: function() {
+        //   var _this = this
+        //   $.ajax({
+        //     type: 'POST',
+        //     url: '/bigmember/use/isAdd?t=' + Date.now(),
+        //     timeout: 6000,
+        //     success: function (res) {
+        //         if (res.data) {
+        //           _this.info.bigStatus = res.data.memberStatus
+        //           _this.info.power = res.data.power
+        //           _this.info.vipStatus = res.data.vipStatus
+        //           _this.info.viper = res.data.viper
+        //           var recover = _this.recover()
+        //           if (!recover) {
+        //               // this.getFilterInfo()
+        //               _this.onLoad()
+        //           } else {
+        //               _this.initSelector(_this.filterInitData)
+        //           }
+        //         }
+        //     },
+        //     error: function (error) {
+        //       console.log(error)
+        //     }
+        //   })
+        // },
+        showToast: function (message) {
+            this.$toast({
+                duration: 1500,
+                forbidClick: true,
+                message: message,
+            })
+        },
+        showLoading: function () {
+            var loading = this.$toast.loading({
+                duration: 0,
+                forbidClick: true,
+                message: 'loading...',
+            })
+            return loading
+        },
+        // getFilterInfo: function () {
+        //     var _this = this
+        //     var loading = this.showLoading()
+        //     $.ajax({
+        //         type: 'POST',
+        //         url: this.filterInfoUrl,
+        //         data: {
+        //             entId: _this.entInfo.eid
+        //         },
+        //         success: function (res) {
+        //             if (res.error_code == 0) {
+        //                 loading.clear()
+        //                 _this.filterInitData = res.data
+        //                 _this.initSelector(res.data)
+        //             } else {
+        //                 _this.showToast(res.error_msg)
+        //             }
+        //         },
+        //         error: function (error) {
+        //             loading.clear()
+        //             console.log(error)
+        //         }
+        //     })
+        // },
+        onLoad: function () {
+            var _this = this
+            var t = this.listState
+            t.loading = true
+            var storageSet = JSON.parse(sessionStorage.getItem('buyer_high_set'))
+            // var bigUrl = '/bigmember/portrait/buyer/getNewMsg'
+            // var vipUrl = '/bigmember/subVipPortrait/buyer/getNewMsg'
+            var data = {
+              buyer: _this.entInfo.buyerName,
+              // match: _this.searchInfo.content,
+              // matchType: _this.searchFilters.matchType.join(','),
+              // area: _this.searchFilters.area.join(','),
+              // infoType: _this.searchFilters.infoType.join(','),
+              // pushTime: _this.searchFilters.pushTime.join(','),
+              pageNum: _this.listState.pageNum,
+              pageSize: _this.listState.pageSize,
+            }
+            var isMember = _this.info.bigStatus > 0 && _this.info.power.indexOf(5) > -1
+            $.ajax({
+                type: 'POST',
+                url: '/entnicheNew/portrait/buyer/getNewMsg',
+                data: storageSet ? Object.assign(data, storageSet) : data,
+                success: function (res) {
+                    if (res.data) {
+                        // 判断是否为刷新
+                        if (t.refreshing) {
+                            t.list = []
+                            t.refreshing = false
+                        }
+            
+                        // 列表赋值
+                        var list = res.data.list
+                        var count = res.data.count
+                        if (Array.isArray(list)) {
+                            _this.preSortList(list)
+                            if (_this.listState.pageNum === 1) {
+                                t.list = []
+                            }
+                            t.list = t.list.concat(list)
+                        } else {
+                            // list不为数组，则直接finish
+                            t.loaded = true
+                            t.loading = false
+                            t.finished = true
+                        }
+                        if (count && count != -1) {
+                            _this.listState.count = count
+                        }
+            
+                        // 加载状态结束
+                        t.loaded = true
+                        t.loading = false
+            
+                        // 翻页
+                        var hasNextPage = _this.listState.pageNum * _this.listState.pageSize < _this.listState.count
+                        if (hasNextPage) {
+                            t.pageNum++
+                        } else {
+                            t.finished = true
+                        }
+                    } else {
+                        t.loaded = true
+                        t.loading = false
+                        t.finished = true
+                        _this.$toast('请求失败')
+                    }
+                },
+                error: function (error) {
+                    console.log(error)
+                }
+            })
+        },
+        onRefresh: function () {
+            // 重置数据
+            this.listState.pageNum = 1
+            // 解除加载完成状态
+            this.listState.finished = false
+            // 重新加载数据
+            // 将 loading 设置为 true，表示处于加载状态
+            this.listState.loading = true
+            // 请求数据
+            this.onLoad()
+        },
+        resetState: function () {
+            var rState = {
+                refreshing: false,
+                loaded: false,
+                loading: false,
+                finished: false,
+                pageNum: 1,
+                pageSize: 10,
+                scrollTop: 0,
+                list: []
+            }
+            Object.assign(this.listState, rState)
+        },
+        doSearch: function () {
+            this.resetState()
+            this.onRefresh()
+            this.closeDropDownMenu(-1)
+        },
+        preSortList: function (list) {
+            return list
+        },
+        changeFollowState: function () {
+            return this.changeFollowStateRequest()
+            var _this = this
+            if (this.entInfo.follow) {
+                this.$dialog.confirm({
+                    title: '提示信息',
+                    message: '取消对“' + _this.entInfo.name + '”的关注？',
+                    confirmButtonColor: '#2cb7ca'
+                }).then(function () {
+                    _this.changeFollowStateRequest()
+                }).catch(function () {
+                    console.log('取消操作')
+                })
+            } else {
+                this.changeFollowStateRequest()
+            }
+        },
+        // 修改企业关注状态
+        changeFollowStateRequest: function () {
+            var _this = this
+            var loading = this.showLoading()
+            var urls = {
+                addFollow: '/bigmember/follow/ent/addFollow',
+                delFollow: '/bigmember/follow/ent/delFollow'
+            }
+            var url = !!this.entInfo.follow ? urls.delFollow : urls.addFollow
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: {
+                    entId: _this.entInfo.eid
+                },
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        // 清除上个页面缓存
+                        sessionStorage.removeItem('$data-ent_portrait')
+                        loading.clear()
+                        if (res.data && res.data == 'success') {
+                            _this.entInfo.follow = !_this.entInfo.follow
+                        }
+                    } else {
+                        _this.showToast(res.error_msg)
+                    }
+                },
+                error: function (error) {
+                    loading.clear()
+                    console.log(error)
+                }
+            })
+        },
+        initSelector: function (data) {
+            // this.initMatchTypeSelector()
+            // this.initInfoTypeSelector(data.infoType)
+            // this.initProjectAreaSelector(data.areaArr)
+            // this.initPublishTimeSelector(data.timeRange)
+
+            // this.recoverFilterState()
+        },
+        initMatchTypeSelector: function () {
+            this.$refs.matchTypeSelector.setState(this.searchFilters.matchType)
+        },
+        initInfoTypeSelector: function (infoTypeList) {
+            if (!Array.isArray(infoTypeList)) return
+
+            var list = []
+            infoTypeSelectorMap.forEach(function (item) {
+                for (var key in item) {
+                    var arr = []
+                    item[key].forEach(function (t) {
+                        if (infoTypeList.indexOf(t) !== -1) {
+                            arr.push(t)
+                        }
+                    })
+                    if (arr.length) {
+                        list.push({
+                            [key]: arr
+                        })
+                    }
+                }
+            })
+
+            this.$refs.infoTypeSelector.getIndustryData(list)
+            this.$refs.infoTypeSelector.getbBtnClick()
+            this.$refs.infoTypeSelector.setStates()
+
+            this.$refs.infoTypeSelector.checkBoxAll()
+        },
+        initProjectAreaSelector: function (areaArr) {
+            if (!Array.isArray(areaArr)) return
+
+            if (areaArr.indexOf('全国') === -1) {
+                areaArr.unshift('全国')
+            }
+
+            var areaMap = this.$refs.projectAreaSelector.provinceListMap
+            var map = {}
+            for (var key in areaMap) {
+                var arr = []
+                areaMap[key].forEach(function (item) {
+                    if (areaArr.indexOf(item) !== -1) {
+                        arr.push(item)
+                    }
+                })
+                if (arr.length) {
+                    map[key] = arr
+                }
+            }
+            this.$refs.projectAreaSelector.arrangeListMap(map)
+        },
+        initPublishTimeSelector: function (timeRange) {
+            if (!Array.isArray(timeRange)) return
+            var arr = []
+            this.publishTimeList.forEach(function (item) {
+                if (timeRange.indexOf(item.value) !== -1) {
+                    arr.push(item)
+                }
+            })
+            this.publishTimeList = JSON.parse(JSON.stringify(arr))
+            this.$refs.publishTimeSelector.setSortedList(this.publishTimeList)
+        },
+        cancel: function (data) {
+            if (data.name === 'noticeItem') {
+                this.searchFilters.infoType = []
+                this.$refs.infoTypeSelector.setState()
+            } else if (data.name === 'areaItem') {
+                this.searchFilters.area = []
+            }
+        },
+        confirm: function (data) {
+            if (data.name === 'noticeItem') {
+                this.searchFilters.infoType = data.data
+            } else if (data.name === 'areaItem') {
+                this.searchFilters.area = data.data
+            }
+            this.doSearch()
+        },
+        closeDropDownMenu: function (index) {
+            if (index === 0) {
+                this.$refs.matchTypeMenu.toggle(false)
+            } else if (index === 1) {
+                this.$refs.infoTypeMenu.toggle(false)
+            } else if (index === 2) {
+                this.$refs.projectAreaMenu.toggle(false)
+            } else if (index === 3) {
+                this.$refs.publishTimeMenu.toggle(false)
+            } else if (index === -1) {
+                this.closeDropDownMenu(0)
+                this.closeDropDownMenu(1)
+                this.closeDropDownMenu(2)
+                this.closeDropDownMenu(3)
+            }
+        },
+        pConfirm: function (e, type) {
+            if (type === 'matchType') {
+                this.searchFilters.matchType = e.data
+            } else if (type === 'publishTime') {
+                this.searchFilters.pushTime = e.data
+            }
+            this.doSearch()
+        },
+        goToDetail: function (item) {
+            this.saveState()
+            var href = ''
+            if (this.platform === 'app') {
+                href = '/jyapp/article/content/' + item.id + '.html'
+            } else {
+                href = '/article/content/' + item.id + '.html'
+            }
+            location.href = href
+        },
+        recoverFilterState: function () {
+            if (this.searchFilters.infoType.length) {
+                this.$refs.infoTypeSelector.setState(this.searchFilters.infoType)
+            }
+            if (this.searchFilters.area.length) {
+                this.$refs.projectAreaSelector.setState(this.searchFilters.area)
+            } else {
+                this.$refs.projectAreaSelector.resetAll()
+            }
+            this.$refs.publishTimeSelector.setState(this.searchFilters.pushTime)
+        },
+        saveState: function () {
+            // 保存滚动高度
+            this.listState.scrollTop = parseInt(this.$refs.jList.scrollTop)
+            var $data = JSON.stringify(this.$data)
+            sessionStorage.setItem(this.sessStorageKey, $data)
+        },
+        recover: function () {
+            var _this = this
+            var excludeKey = ['sessStorageKey', 'matchTypeList', 'publishTimeList']
+            var $data = sessionStorage.getItem(this.sessStorageKey)
+            if ($data) {
+                $data = JSON.parse($data)
+                if (this.entInfo.eid !== $data.entInfo.eid) return
+                for (var key in $data) {
+                    if (excludeKey.indexOf(key) !== -1) {
+                        continue
+                    }
+                    this.$data[key] = $data[key]
+                }
+
+                this.$nextTick(function () {
+                    _this.$refs.jList.scrollTop = _this.listState.scrollTop
+                })
+                sessionStorage.removeItem(this.sessStorageKey)
+            }
+            return !!$data
+        },
+    }
+}
+var vm = new Vue(vConfig)

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

@@ -176,6 +176,7 @@ var vNode = {
             })
         },
         getStatus: function () {
+          console.log(this.usageInfo);
           return !this.newEntNiche
           // return !entniche || !(this.getDataObj && this.contactsObj && this.getNewMsgObj)
         },
@@ -197,6 +198,12 @@ var vNode = {
             text = '前往升级'
           }
           return text 
+        },
+        noAuth () {
+          var usage = this.usageInfo
+          var hasCount = usage.surplus > 0
+          var noCount = usage.surplus <= 0 && usage.visited
+          return !hasCount && !noCount
         }
     },
     watch: {
@@ -227,8 +234,11 @@ var vNode = {
       }
     },
     created () {
-      this.getPowerInfo()
+      // this.getPowerInfo()
       this.getNewEntNiche()
+      this.getUsage(); // 超级订阅用户剩余次数
+      this.getNewMsg(); // 中标动态
+      this.getChartData(); // 企业画像
       this.getActionState(decodeURIComponent(utils.getParam('entName')), 'g')
       this.getActionState(decodeURIComponent(utils.getParam('entName')), 'r')
     },
@@ -246,28 +256,24 @@ var vNode = {
       window.removeEventListener("resize", this.init,20);
     },
     methods: {
-        // 查询超级订阅采购单位画像浏览次数
+        // 查询商机管理使用次数
         getUsage: function () {
           var _this = this
-          console.log(this.superVipPort)
-          if (this.superVipPort) {
-            $.ajax({
-              type: 'POST',
-              url: '/bigmember/portrait/subVipPortrait/usage',
-              data: {
-                buyer: decodeURIComponent(utils.getParam('entName')),
-                p_type: '1'
-              },
-              success: function (res) {
-                if (res.error_code == 0 && res.data) {
-                  res.data.surplus = res.data.total - res.data.usage
-                  _this.usageInfo = res.data
-                } else {
-                  console.log(res.error_msg)
-                }
+          $.ajax({
+            type: 'POST',
+            url: '/entnicheNew/portrait/subVipPortrait/usage',
+            data: {
+              buyer: decodeURIComponent(utils.getParam('entName'))
+            },
+            success: function (res) {
+              if (res.error_code == 0 && res.data) {
+                res.data.surplus = res.data.total - res.data.usage
+                _this.usageInfo = res.data
+              } else {
+                console.log(res.error_msg)
               }
-            })
-          }
+            }
+          })
         },
         // 查询是否是新版商机管理
         getNewEntNiche () {
@@ -285,111 +291,7 @@ var vNode = {
         noMoreData (data) {
           this.contactsObj = data
         },
-        // 获取权限信息
-        getPowerInfo: function () {
-            var _this = this
-            $.ajax({
-              type: 'POST',
-              url: '/bigmember/use/isAdd?t=' + Date.now(),
-              timeout: 6000,
-              success: function (res) {
-                  if (res.data) {
-                    _this.power = res.data.power
-                    _this.bigStatus = res.data.memberStatus
-                    var entniche = res.data.entniche
-                    var member = res.data.memberStatus
-                    var vip = res.data.vipStatus
-                    var userType = ''
-                    //免费用户可查看采购单位画像次数（-1：已使用；0：未使用；1：可使用次数）
-                    _this.userInfo.isFree = res.data.isFree
-                    _this.userInfo.vipStatus = res.data.vipStatus
-                    _this.userInfo.viper = res.data.viper
-                    _this.userInfo.freeBuyerPort = res.data.freeBuyerPort
-                    _this.userInfo.entniche = res.data.entniche
-                    if (vip > 0) {
-                      userType = '1'
-                    }
-                    if (member > 0) {
-                      if (userType !== '') {
-                        userType += ','
-                      }
-                      userType += '2'
-                    }
-                    if (entniche) {
-                      if (userType !== '') {
-                        userType += ','
-                      }
-                      userType += '3'
-                    }
-                    if (userType === '') {
-                      userType = '0'
-                    }
-                    // 没有采购单位画像权限的 则添加埋点
-                    if (res.data.power.indexOf(5) === -1) {
-                      _this.getBuried(userType)
-                    }
-                    _this.getUsage(); // 超级订阅用户剩余次数
-                    _this.getNewMsg(); // 中标动态
-                    _this.getChartData(); // 企业画像
-                  }
-              },
-              error: function (error) {
-                console.log(error)
-                setTimeout(function() {
-                  _this.getPowerInfo()
-                }, 3000)
-              }
-            })
-        },
-        // 进入页面埋点 非大会员用户请求
-        getBuried: function(type) {
-          var _this = this
-          var params = {
-            userType: type,
-            platform: utils.isIos ? 'AI' : 'AA'
-          }
-          $.ajax({
-            type: 'POST',
-            url: '/publicapply/drainage/buyerunit',
-            contentType: "application/json",
-            data: JSON.stringify(params),
-            success: function (res) {
-                if (res.data && res.data.status) {
-                  _this.encryptId = res.data.id
-                }
-            },
-            error: function (error) {
-              console.log(error)
-            }
-          })
-        },
-        // 点击去开通埋点方法(免费体验埋点)
-        goBuyBuried: function(text) {
-          var _this = this
-          var params = {
-            mold: 'isCBBT',
-            id: _this.encryptId,
-            introduce: text
-          }
-          $.ajax({
-            type: 'POST',
-            url: '/publicapply/drainage/buyerunit',
-            contentType: "application/json",
-            data: JSON.stringify(params),
-            success: function (res) {
-              console.log(res)
-              setTimeout(function() {
-                // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-                location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
-              }, 200)
-            },
-            error: function (error) {
-              console.log(error)
-              // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-              location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
-            }
-          })
-        },
+        
         init() {
           setTimeout(function() {
             window.addEventListener('resize', function() {
@@ -403,35 +305,9 @@ var vNode = {
           }, 20)
         },
         goEntInfo: function(item) {
+            return
             location.href = './ent_portrait?eId=' + encodeURIComponent(item.entId)
         },
-        // 查询采购单位地址(暂不需要)
-        getBuyer:function(){
-            var that = this;
-            $.ajax({
-                type:'POST',
-                url:'/bigmember/portrait/ent/buyerAddress',
-                data:{
-                    entName: decodeURIComponent(utils.getParam('entName'))
-                },
-                success:function(res) {
-                    // console.log(res)
-                    if(res.error_code == 0) {
-                        if(res.data.province) {
-                            that.buyer.area = res.data.province.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, '');
-                        }
-                        if(res.data.city){
-                            that.buyer.city = res.data.city;
-                        }
-                    }else{
-                        console.log("未获取到")
-                    }
-                },
-                error:function(err) {
-                    console.log(err)
-                }
-            })
-        },
         // 是否认领和关注企业
         getActionState (names, str) {
           let _this = this
@@ -524,40 +400,18 @@ var vNode = {
         // 跳转招标动态新页面
         goProjectPage: function () {
           // 无权限的弹出弹框提醒
-          if (this.getStatus) {
-            var u = this.usageInfo
-            if (u.provin == -1 && u.usage >= u.total) {
-              this.$dialog.confirm({
-                message: '每订购<span class="on">1</span>个省，每月可查看<span class="on">5</span>个采购单位画像，上限为<span class="on">80</span>个。您当前订阅全国，查看机会已经消耗完毕。如需要更多服务，请前往联系客服。',
-                width: 303,
-                className: 'pro-log',
-                messageAlign: 'left',
-                showCancelButton: 'true',
-                confirmButtonColor: '#2ABED1',
-                confirmButtonText: '联系客服',
-                showCancelButton: true
-              }).then(function () {
-                location.href = '/jyapp/free/customer'
-              }).catch(function () { })
-            } else if (u.provin >=1 && u.usage >= u.total) {
-              this.$dialog.confirm({
-                message: `每订购<span class="on">1</span>个省，每月可查看<span class="on">5</span>个采购单位画像，上限为<span class="on">80</span>个。您当前订阅了<span class="on">${u.provin}</span>个省，如需查看更多，请前往订阅更多省份。`,
-                width: 303,
-                className: 'pro-log',
-                messageAlign: 'left',
-                showCancelButton: 'true',
-                confirmButtonColor: '#2ABED1',
-                confirmButtonText: '前往升级',
-                showCancelButton: true
-              }).then(function () {
-                location.href = '/jyapp/vipsubscribe/upgradePage'
-              }).catch(function () { })
-            } else {
-              this.openDialog()
-            }
-            return
+          if (this.noAuth) {
+            this.$dialog({
+              width: 303,
+              className: 'custom-dialog',
+              title: '温馨提示',
+              message: '采购单位画像超过次数限制，请联系客服',
+              messageAlign:'center',
+              confirmButtonText: '我知道了',
+              confirmButtonColor: '#2ABED1'
+            });
           } else {
-            location.href = './free_buyer_project_news?entName=' + decodeURIComponent(utils.getParam('entName'))
+            location.href = './client_buyer_project_news?entName=' + decodeURIComponent(utils.getParam('entName'))
           }
         },
         // 获取中标动态数据
@@ -570,7 +424,7 @@ var vNode = {
               // pageSign: that.dt.isMore,
               pageNum: 1
           }
-          var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
+          // var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
           $.ajax({
             type:'POST',
             url: '/entnicheNew/portrait/buyer/getNewMsg',
@@ -621,9 +475,6 @@ var vNode = {
             },
             error:function(err) {
               console.log(err)
-              // setTimeout(function() {
-              //   that.getNewMsg()
-              // }, 3000)
             }
           })
         },
@@ -634,7 +485,7 @@ var vNode = {
           var data = {
             buyer: decodeURIComponent(utils.getParam('entName'))
           }
-          var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
+          // var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
           $.ajax({
             type:'POST',
             url: '/entnicheNew/portrait/buyer/getData',
@@ -644,11 +495,11 @@ var vNode = {
                 if(res.error_code == 0) {
                   if(res.data && Object.keys(res.data).length > 0) {
                       that.detailObj = res.data
-                      that.chartLoading = false;
+                      that.chartLoading = false
                       // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
-                      if (res.data.onTrial) {
-                        that.freeTrial = res.data.onTrial
-                      }
+                      // if (res.data.onTrial) {
+                      //   that.freeTrial = res.data.onTrial
+                      // }
                       that.initChartData('', res.data)
                   } else {
                     that.getDataObj = res.data
@@ -663,9 +514,6 @@ var vNode = {
             },
             error:function(err) {
               console.log(err)
-              // setTimeout(function() {
-              //   that.getChartData()
-              // }, 3000)
             }
           })
         },

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

@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="zh-CN" style="font-size: 50px;">
+<head>
+    <title>招标动态</title>
+
+    <!--引入公共资源头部-->
+    {{include "/big-member/meta.html"}}
+
+    <!--S-当前页面的css资源-->
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/css/ent_project_news.css?v={{Msg "seo" "version"}}' />
+    <!--E-当前页面的css资源-->
+    <!--临时处理区域选择仅有一个时展示问题-->
+    <style>
+        .select-area-box.j-container.hide-all .van-index-bar__sidebar + .key-card-box {
+            display: none;
+        }
+        .select-area-box.j-container.hide-all .van-index-bar__sidebar + .key-card-box + .key-card-box .area-card-item:after {
+            content: "";
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==);
+            width: 14px;
+            height: 14px;
+            background-size: 100% 100%;
+        }
+        .select-area-box.j-container.hide-all .van-index-bar__sidebar + .key-card-box + .key-card-box .area-card-item {
+            position: relative;
+            background: #E8FAFD;
+            color: #2ABED1;
+        }
+    </style>
+</head>
+<body>
+<div class="j-container">
+    {{include "/big-member/header.html"}}
+    <div id="ent-project-news" class="j-main" v-cloak>
+        <div class="j-container search-container">
+            <div class="search-header">
+                <div class="header-ent-name border-line-b clickable">
+                    <span class="j-icon icon-company"></span>
+                    <span class="ent-title">${ entInfo.buyerName }</span>
+                    <!-- <div class="ent-follow">
+                        <span class="j-icon"
+                            :class="!!entInfo.follow ? 'icon-favorite' : 'icon-add-favorite'"
+                            @click="changeFollowState"
+                            v-if="entInfo.followSearchFinish && entInfo.entExist">
+                        </span>
+                        <van-loading v-if="!entInfo.followSearchFinish" size="24px"></van-loading>
+                    </div> -->
+                </div>
+                <!-- <div class="search-input">
+                    <van-search
+                        v-model.trim="searchInfo.content"
+                        @search="doSearch"
+                        maxlength="50"
+                        placeholder="输入关键词">
+                        <template #left-icon>
+                            <span class="j-icon base-icon icon-search"></span>
+                        </template>
+                    </van-search>
+                    <div class="action-text clickable" @click="doSearch">搜索</div>
+                </div>
+                <div class="search-filters">
+                    <van-dropdown-menu :close-on-click-outside="false">
+                        <van-dropdown-item get-container="body" :lazy-render="false" title="搜索范围" ref="matchTypeMenu">
+                            <popup-select-component :data-list="matchTypeList" multiple show-all-button @confirm="pConfirm($event, 'matchType')" ref="matchTypeSelector"></popup-select-component>
+                        </van-dropdown-item>
+                        <van-dropdown-item get-container="body" :lazy-render="false" title="信息类型" class="collection" ref="infoTypeMenu">
+                            <notice-component class="collection" @cancel="cancel" @confirm="confirm" :selectnoticelist="searchFilters.infoType"  ref="infoTypeSelector"></notice-component>
+                        </van-dropdown-item>
+                        <van-dropdown-item get-container="body" :lazy-render="false" title="项目地区" ref="projectAreaMenu">
+                            <area-component :class="{'hide-all': filterInitData.areaArr.length == 2}" ref="projectAreaSelector" @cancel="cancel" @confirm="confirm"></area-component>
+                        </van-dropdown-item>
+                        <van-dropdown-item get-container="body" :lazy-render="false" title="发布时间" ref="publishTimeMenu">
+                            <popup-select-component ref="publishTimeSelector" button-type="button" :data-list="publishTimeList" @confirm="pConfirm($event, 'publishTime')"></popup-select-component>
+                        </van-dropdown-item>
+                    </van-dropdown-menu>
+                </div> -->
+            </div>
+            <div class="j-main" ref="jList">
+                <div class="list-wrapper">
+                    <van-list
+                        v-model="listState.loading"
+                        :finished="listState.finished"
+                        :immediate-check="false"
+                        finished-text=""
+                        @load="onLoad"
+                        class="project-info-list">
+                        <div
+                            v-for="(item, index) in listState.list"
+                            class="project-info-item bg-white border-line-b clickable"
+                            :immediate-check="false"
+                            @click="goToDetail(item)"
+                            :key="item.id">
+                            <div class="project-name">${ item.title }</div>
+                            <div class="project-info">
+                                <span class="tags">
+                                    <span class="tag tag-success" v-if="item.area">${item.area}</span>
+                                    <span class="tag tag-success" v-if="item.bidstatus">${item.bidstatus}</span>
+                                    <span class="tag tag-success" v-if="item.bidamount">${utils.moneyUnit(item.bidamount)}</span>
+                                </span>
+                                <span class="project-time">
+                                    ${item.firsttime ? new Date(item.firsttime * 1000).pattern('yyyy-MM-dd') : '-'}
+                                </span>
+                            </div>
+                        </div>
+                    </van-list>
+                    <div class="empty-container" v-show="listState.list.length === 0 && listState.loaded && !listState.loading">
+                        <div class="empty-content-position">
+                            <div class="image">
+                                <img src="/jyapp/big-member/image/img-empty.png">
+                            </div>
+                            <div class="empty-main tip-text">暂无数据</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--S-当前页面的资源-->
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
+{{include "/big-member/commonjs.html"}}
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
+<script>
+    var pageInfo = {
+        version: {{Msg "seo" "version"}},
+        platform: 'app'
+    }
+</script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/popup-select-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/notice-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/client_buyer_project_news.js?v={{Msg "seo" "version"}}'></script>
+</body>
+</html>

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

@@ -479,6 +479,7 @@
                     url:'/entnicheNew/customer/list',
                     data:{
                         searchCode: _this.inputVal,
+                        isCliam: 999
                     },
                     success:function(res) {
                         if (res.error_code == 0){

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

@@ -129,20 +129,20 @@
                 </div>
             </div>
             <!-- 免费用户采购单位全景分析提示 -->
-            <div v-if="getfreeBuyerPort" style="margin-top: .24rem; " class="free-give">
+            <!-- <div v-if="getfreeBuyerPort" style="margin-top: .24rem; " class="free-give">
                 <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会！</div>
                 <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>
-            </div>
+            </div> -->
             <!-- 超级订阅用户展示  -->
-            <div v-if="superVipPort" style="margin-top: .24rem; " class="free-give">
+            <!-- <div v-if="superVipPort" style="margin-top: .24rem; " class="free-give">
               <div class="balance-text"> 当月采购单位画像余额：<em class="highlight-text">${usageInfo.surplus}</em></div>
               <div class="go-btn" @click="goUpgradeOrConcat(superVipBtnText)">${superVipBtnText}</div>
-            </div>
+            </div> -->
             <!-- 采购单位通讯录 -->
-            <div v-if="getStatus" style="margin-top: .24rem;">
+            <div v-if="noAuth" style="margin-top: .24rem;">
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title win-bid-title">采购单位通讯录</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png'></buyer-example>
+                <buyer-example  type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png'></buyer-example>
               </div>
             </div>
             <!-- 采购单位通讯录 -->
@@ -182,7 +182,7 @@
               </div>
               <div class="static-scope">数据统计范围：${statistics.start || '-'}-${statistics.end}</div>
             </div>
-            <div class="jy-empty" v-show="allNot && !getStatus">
+            <div class="jy-empty" v-show="allNot && !noAuth">
                 <div class="jy-empty-img"></div>
                 <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
             </div>
@@ -320,7 +320,7 @@
                           <div class="progress-bar-container">
                               <div class="progress-bar-item" v-for="(item,index) in c.topData" :key="index">
                                   <div class="item-label">
-                                      <span @click="goEntInfo(item)" class="ellipsis-2 item-name">${item.winnerName}</span>
+                                      <span style="text-decoration: none;" @click="goEntInfo(item)" class="ellipsis-2 item-name">${item.winnerName}</span>
                                       <span class="item-count">${item.countProject}个</span>
                                       <!-- <span class="item-rate">${item.rate}</span> -->
                                       <span class="item-time">${item.lastTime}</span>
@@ -387,66 +387,66 @@
               </div>
             </div>
             <!-- 遮罩部分 -->
-            <div v-if="getStatus">
+            <div v-if="noAuth">
               <!-- 历史项目联系人 -->
               <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">历史项目联系方式</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png'></buyer-example>
+                <buyer-example  type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png'></buyer-example>
               </div> -->
               <!-- 合作企业注册资本分布 -->
               <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/09-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">合作企业注册资本分布</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_9" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/09.png'></buyer-example>
+                <buyer-example  type="item_9" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/09.png'></buyer-example>
               </div> -->
               <!-- 合作企业年龄分布 -->
               <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/10-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">合作企业年龄分布</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_10" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/10.png'></buyer-example>
+                <buyer-example  type="item_10" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/10.png'></buyer-example>
               </div> -->
               <!-- 合作企业注册地分布 -->
               <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/11-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">合作企业注册地分布</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_11" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/11.png'></buyer-example>
+                <buyer-example  type="item_11" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/11.png'></buyer-example>
               </div> -->
               <!-- 年度项目统计 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/02-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">年度项目统计</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_2" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/02.png'></buyer-example>
+                <buyer-example  type="item_2" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/02.png'></buyer-example>
               </div>
               <!-- 月度采购规模统计 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/03-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">月度采购规模统计</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_3" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/03.png'></buyer-example>
+                <buyer-example  type="item_3" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/03.png'></buyer-example>
               </div>
               <!-- 采购规模分布 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/04-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">采购规模分布</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_4" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/04.png'></buyer-example>
+                <buyer-example  type="item_4" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/04.png'></buyer-example>
               </div>
               <!-- 各类招标方式占比(双柱图) -->
               <div class="vip_component" style="height:8.8rem;background:url('/common-module/collection/image/buyer/05-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">各类招标方式占比</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_5" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/05.png'></buyer-example>
+                <buyer-example  type="item_5" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/05.png'></buyer-example>
               </div>
               <!-- 各行业项目平均节支率 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/06-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">各行业项目平均节支率</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_6" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/06.png'></buyer-example>
+                <buyer-example  type="item_6" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/06.png'></buyer-example>
               </div>
               <!-- 重点合作代理机构 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/12-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">重点合作代理机构</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_12" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/12.png'></buyer-example>
+                <buyer-example  type="item_12" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/12.png'></buyer-example>
               </div>
               <!-- 重点合作企业 -->
               <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">重点合作企业</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_8" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/08.png'></buyer-example>
+                <buyer-example  type="item_8" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/08.png'></buyer-example>
               </div>
               <!-- 各行业项目规模占比 -->
               <div class="vip_component" style="height:11.2rem;background:url('/common-module/collection/image/buyer/07-bg.png') no-repeat;background-size:100% 100%">
                 <p class="example-title">各行业项目规模占比</p>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_7" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/07.png'></buyer-example>
+                <buyer-example  type="item_7" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/07.png'></buyer-example>
               </div>
             </div>
         </div>
@@ -470,7 +470,7 @@
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/echarts_option.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/chart_options.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/buyer-example.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/client_buyer-example.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/client_portrayal.js?v={{Msg "seo" "version"}}11'></script>

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

@@ -201,7 +201,7 @@
 					return
 				}
 				var phone = $.trim($("#tel").val());
-				if((!Verification.isPhone(phone))||(!CreatePhone.isPhone(phone))){
+				if((!Verification.isPhone(phone))&&(!CreatePhone.isPhone(phone))){
 					EasyAlert.show("手机号格式错误");
 					return
 				}

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

@@ -651,6 +651,7 @@
         console.log(res)
         if(res.error_code == 0) {
           SuperSearch.isEntNicheNew = res.data.isNew
+          jyUserPower.entniche = res.data.isNew || res.data.isPower
         }
       },
     })

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

@@ -844,12 +844,6 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src='/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
-<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
-<script>
-// 初始化
-var vConsole = new VConsole();
-console.log('Hello world');
-</script>
 <script>
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -1099,9 +1093,7 @@ console.log('Hello world');
                 bigstatus = res.data.memberStatus
                 hasServiceArr = res.data.power ? res.data.power : []
                 $('.commonUser').show()
-                if(res.data.memberStatus > 0) {
-                  isFollow()
-                }
+                isFollow()
                 if (window.isFree){
                   checkShowDialog()
                 }
@@ -1752,7 +1744,26 @@ console.log('Hello world');
                     // if (res.data.memberStatus <= 0 || res.data.power.indexOf(3) == -1) {
                     //     window.isNoMember = true
                     // }
+                    function goMemberFollowPage (url) {
+                        var objId = {
+                            fid:'',
+                            sid:''
+                        }
+                        if (followId != "" && jumpFlag){
+                            objId.fid = followId
+                            objId.sid = id
+                            sessionStorage.setItem('bigvip-fid',JSON.stringify(objId))
+                        }else{
+                            objId.fid = ''
+                            objId.sid = id
+                            sessionStorage.setItem('bigvip-fid',JSON.stringify(objId))
+                        }
+                        location.href = url
+                    }
                     if(res.data.memberStatus <= 0 || hasServiceArr.indexOf(14) == -1){
+                        if (newEntNiche) {
+                            return goMemberFollowPage('/jyapp/big/page/client_follow_detail')
+                        }
                         if (hsn){
                             if (projectname != "" || projectcode != "" ){
                                 if(sessionStorage){
@@ -1767,20 +1778,7 @@ console.log('Hello world');
                             }
                         }
                     }else{
-                        var objId = {
-                            fid:'',
-                            sid:''
-                        }
-                        if (followId != "" && jumpFlag){
-                            objId.fid = followId
-                            objId.sid = id
-                            sessionStorage.setItem('bigvip-fid',JSON.stringify(objId))
-                        }else{
-                            objId.fid = ''
-                            objId.sid = id
-                            sessionStorage.setItem('bigvip-fid',JSON.stringify(objId))
-                        }
-                        location.href = '/jyapp/big/page/pro_follow_detail'
+                        goMemberFollowPage('/jyapp/big/page/pro_follow_detail')
                     }
                 }
             })

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

@@ -57,11 +57,10 @@ func (s *switchService) GetEntniche(session *httpsession.Session, m MongodbSim,
 	v, _ := session.Get(s.SessionKey).(string)
 	u, ok := m.FindById("user", userId, `{"i_member_status":1,"i_vip_status":1}`)
 	entniche := false
-	fmt.Println("2222",entUserId)
 	if entUserId != 0 {
 		res := sql.SelectBySql(`SELECT i.isNew,i.name,i.phone,i.status,i.auth_status,u.power FROM entniche_user u LEFT JOIN entniche_info i
 			ON u.ent_id=i.id
-			ORDER BY  i.status DESC,i.auth_status DESC, CASE WHEN u.id=? THEN 0  ELSE 1 END  ASC`, entUserId)
+			 where u.id=? `, entUserId)
 		if res != nil && len(*res) > 0 {
 			//已购买企业未过期-商机管理用户
 			for _, v := range *res {
@@ -74,7 +73,6 @@ func (s *switchService) GetEntniche(session *httpsession.Session, m MongodbSim,
 			}
 		}
 	}
-	fmt.Println("22223",entniche)
 	if ok && u != nil {
 		if i_vip_status := util.IntAll((*u)["i_vip_status"]); v == s.Vip && i_vip_status > 0 {
 			return s.Vip

src/web/templates/pc/supsearch.html

@@ -1595,6 +1595,9 @@ $(function(){
     type:'POST',
     url:'/entnicheNew/buy/whetherbuy',
     success:function (res) {
+	  if (!vipState) {
+		  vipState = res.data.isNew || res.data.isPower
+	  }
       if (res.data.isNew) {
         $("#pursearch").css('display', 'inline-block')
       } else {