فهرست منبع

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

TANGSHIZHE 4 سال پیش
والد
کامیت
68b35ef6fd
40فایلهای تغییر یافته به همراه1229 افزوده شده و 86 حذف شده
  1. 5 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 9 3
      src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js
  3. 1 0
      src/jfw/modules/app/src/web/templates/big-member/commonjs.html
  4. 2 2
      src/jfw/modules/app/src/web/templates/common/baiducc.html
  5. 1 0
      src/jfw/modules/app/src/web/templates/commonPay/checkout.html
  6. 2 1
      src/jfw/modules/app/src/web/templates/commonPay/transferAccounts.html
  7. 1 0
      src/jfw/modules/app/src/web/templates/commonPay/transferAccountsResult.html
  8. 8 7
      src/jfw/modules/app/src/web/templates/weixin/historypush.html
  9. 3 3
      src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html
  10. 1 0
      src/jfw/modules/app/src/web/templates/weixin/sharePic.html
  11. 3 0
      src/jfw/modules/publicapply/src/applocation/apploc.json
  12. 37 0
      src/jfw/modules/publicapply/src/applocation/apploc/apploc.go
  13. 15 3
      src/jfw/modules/publicapply/src/applocation/entity/entity.go
  14. 1 0
      src/jfw/modules/publicapply/src/applocation/init.go
  15. 3 1
      src/jfw/modules/publicapply/src/applocation/service/service.go
  16. 936 0
      src/web/staticres/big-member/js/ent_portrait.js
  17. 6 0
      src/web/staticres/common-module/collection/js/ent_portrait.js
  18. 4 4
      src/web/staticres/common-module/coupon/js/pay-order-template.js
  19. 21 5
      src/web/staticres/common-module/ent-search/ent-search-template.js
  20. 11 0
      src/web/staticres/common-module/keep-tags/keep-tags-template.js
  21. 1 0
      src/web/staticres/common-module/public/fotter.js
  22. 17 0
      src/web/staticres/common-module/public/head.js
  23. 2 0
      src/web/staticres/frontRouter/pc/collection/js/index-pc.js
  24. 21 2
      src/web/staticres/js/ent-search-index-pc.js
  25. 23 13
      src/web/staticres/js/pcindex.js
  26. 24 4
      src/web/staticres/js/superSearch.js
  27. 9 3
      src/web/staticres/vipsubscribe/js/historypush.js
  28. 1 0
      src/web/templates/big-member/wx/page_customer.html
  29. 4 4
      src/web/templates/common/baiducc.html
  30. 1 1
      src/web/templates/demo-member/demo_action.html
  31. 8 0
      src/web/templates/frontRouter/pc/collection/sess/index.html
  32. 13 3
      src/web/templates/pc/biddetail_rec.html
  33. 4 4
      src/web/templates/pc/entsearchindex.html
  34. 10 7
      src/web/templates/pc/supsearch.html
  35. 3 2
      src/web/templates/weixin/commonPay/checkout.html
  36. 1 0
      src/web/templates/weixin/commonPay/transferAccounts.html
  37. 1 0
      src/web/templates/weixin/commonPay/transferAccountsResult.html
  38. 4 3
      src/web/templates/weixin/dataExport/dataExport_payOrder.html
  39. 9 8
      src/web/templates/weixin/historypush.html
  40. 3 3
      src/web/templates/weixin/search/tabSearch.html

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

@@ -210,6 +210,11 @@ var vNode = {
                 done(false)
                 this.overlayShow = true
             } else if (e === 'confirm') {
+                try {
+                  _hmt.push(['_trackEvent','超级订阅-app', 'click', '企业画像中标信息-去开通']);
+                } catch (e) {
+                  console.log('未初始化百度统计')
+                }
                 // 去开通
                 if(this.bidcollPowerInfo.vip == 1) {
                     location.href = '/jyapp/vipsubscribe/upgradePage'

+ 9 - 3
src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -54,7 +54,8 @@ var vm = new Vue({
         keytimer: '',
         noticetimer: ''
       },
-      iosMeauStyle: false
+      iosMeauStyle: false,
+      goUpText: ''
     }
   },
   created () {
@@ -170,8 +171,8 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
-    open: function() {
-      this.iosMeauStyle = true
+    open: function(name) {
+      this.goUpText = name
     },
     close: function() {
       this.iosMeauStyle = false
@@ -266,6 +267,11 @@ var vm = new Vue({
         this.tagText.noticeText = data.t
         this.subtype = data.data.join(',')
       } else if(data.name === 'rootItem'){
+        try {
+          _hmt.push(['_trackEvent','超级订阅-app', 'click', '推送列表页' + this.goUpText + '-去开通']);
+        } catch (e) {
+          console.log('未初始化百度统计')
+        }
         topay()
       } else {
         return console.log('暂无数据')

+ 1 - 0
src/jfw/modules/app/src/web/templates/big-member/commonjs.html

@@ -18,6 +18,7 @@
         } catch (error) {}
     })()
 </script>
+{{include "/common/baiducc.html"}}
 <!--es6垫片-->
 <!--<script src="https://polyfill.io/v3/polyfill.min.js"></script>-->
 <!--E-必定会使用的资源-->

+ 2 - 2
src/jfw/modules/app/src/web/templates/common/baiducc.html

@@ -10,9 +10,9 @@ var advUrl = window.location.href;
         testServer: /jianyu360\.cn$/g
     }
     // ip或者以jianyu360.cn结尾的使用测试环境百度统计
-    if (patterns.ip.test(host) || patterns.testServer.test(host)) {
+    if (patterns.ip.test(host) ||patterns.testServer.test(host)) {
         // 测试环境
-        hm.src = "https://hm.baidu.com/hm.js?76824641601c0cc52743ac46041455b6";
+        hm.src = "https://hm.baidu.com/hm.js?52c42de35032567eb9d7a24a43c84bda";
     } else {
         // 正式环境
         hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";

+ 1 - 0
src/jfw/modules/app/src/web/templates/commonPay/checkout.html

@@ -337,6 +337,7 @@
         checkout.init()
     })
 </script>
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

+ 2 - 1
src/jfw/modules/app/src/web/templates/commonPay/transferAccounts.html

@@ -219,7 +219,7 @@
                         } catch (e) {}
                         $("#uploaderInput").parent().hide();
                         $("#uploaderFiles").html(loadingHtml);
-                        
+
                         // iOS点击选择后创建一个定时器,查询是否获取到url(客户端上传成功回调)
                         if (vTools.androidOrIOS() != 'ios') return
                         // ios定时查询取消上传loading定时器标记
@@ -348,6 +348,7 @@
         $(".weui-uploader__input-box").show();
     }
 </script>
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

+ 1 - 0
src/jfw/modules/app/src/web/templates/commonPay/transferAccountsResult.html

@@ -62,5 +62,6 @@
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
+{{include "/common/baiducc.html"}}
 </body>
 </html>

+ 8 - 7
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -142,11 +142,12 @@
                         </p>
                     </div>
                 </div> -->
-                    <van-dropdown-menu style="width: auto;overflow-x: auto;"  :close-on-click-outside="false">
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open" @close="close">
+
+                    <van-dropdown-menu style="width: auto;overflow-x: auto;"  >
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open('时间')" @close="close">
                             <date-component type="only-picker" :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                         </van-dropdown-item>
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="areaItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="areaItem" @open="open('地区')" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="areaText">地区</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -157,7 +158,7 @@
                             <area-component :key="setTimer.areatimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="industryItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="industryItem" @open="open('行业')" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="industryText">行业</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -168,7 +169,7 @@
                             <industry-component :key="setTimer.industrytimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false"  ref="cateItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false"  ref="cateItem" @open="open('采购单位')" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="cateText">采购单位</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -179,7 +180,7 @@
                             <cate-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :key="setTimer.catetimer" :selectcatelist="selectCateList"></cate-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="关键词" ref="keywordItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="关键词" ref="keywordItem" @open="open('关键词')" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="keywordText">关键词</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -190,7 +191,7 @@
                             <keyword-component :key="setTimer.keytimer" @cancel="cancel" v-if="screenShow" @confirm="confirm"  :selectkeywordlist="selectKeyWordList"></keyword-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="公告类型" ref="noticeItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="公告类型" ref="noticeItem" @open="open('公告类型')" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="noticeText">公告类型</span>
                                 <span v-if="!screenShow" class="rootstyletitle">

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

@@ -629,7 +629,7 @@
                                 </div>
                                 <div class="pop-bottom" v-if="isWaitBuy">
                                     <van-button type="default" @click="resetCondition">再想一想</van-button>
-                                    <van-button type="primary" @click="goUpBuyPage">去开通</van-button>
+                                    <van-button type="primary" @click="goUpBuyPage(false)">去开通</van-button>
                                 </div>
                             </div>
                         </div>
@@ -673,7 +673,7 @@
                                 <div class="img-empty"></div>
                                 <span>未搜索到符合条件的企业</span>
                             </div>
-                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员,查看更多搜索结果</div>
+                            <div class="up-button" @click="goUpBuyPage('企业搜索底部-去升级')" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员,查看更多搜索结果</div>
                             <div class="ent-more-tip" v-if="false">
                                 <i class="j-icon base-icon icon-up-allow"></i>
                                 <span>上拉查看更多搜索结果</span>
@@ -769,7 +769,7 @@
                         </div>
                         <div class="pop-bottom" v-if="isWaitBuy">
                             <van-button type="default" @click="resetCondition">再想一想</van-button>
-                            <van-button type="primary" @click="goUpBuyPage">去开通</van-button>
+                            <van-button type="primary" @click="goUpBuyPage(false)">去开通</van-button>
                         </div>
                     </div>
                 </div>

+ 1 - 0
src/jfw/modules/app/src/web/templates/weixin/sharePic.html

@@ -245,5 +245,6 @@
         })
     </script>
 </div>
+{{include "/common/baiducc.html"}}
 </body>
 </html>

+ 3 - 0
src/jfw/modules/publicapply/src/applocation/apploc.json

@@ -0,0 +1,3 @@
+{
+	"colloctime":"12h"
+}

+ 37 - 0
src/jfw/modules/publicapply/src/applocation/apploc/apploc.go

@@ -0,0 +1,37 @@
+package applocation
+
+import (
+	"log"
+	"qfw/util"
+	"strconv"
+	"strings"
+)
+
+type apploc struct {
+	Colloctime string `json:"colloctime"` //间隔时间
+}
+
+var Apploctime = 12 * 60 * 60 //12小时
+var Apploc *apploc
+
+func init() {
+	util.ReadConfig("./applocation/apploc.json", &Apploc)
+	if Apploc.Colloctime != "" {
+		var seconds = 60 * 60
+		var shour = "60"
+		if strings.Contains(Apploc.Colloctime, "h") {
+			shour = strings.Split(Apploc.Colloctime, "h")[0]
+		} else if strings.Contains(Apploc.Colloctime, "m") {
+			shour = strings.Split(Apploc.Colloctime, "m")[0]
+			seconds = 60
+		} else if strings.Contains(Apploc.Colloctime, "s") {
+			shour = strings.Split(Apploc.Colloctime, "s")[0]
+			seconds = 1
+		}
+		ihour, _ := strconv.Atoi(shour)
+		if ihour > 0 {
+			Apploctime = ihour * seconds
+		}
+	}
+	log.Println("Apploctime:", Apploctime)
+}

+ 15 - 3
src/jfw/modules/publicapply/src/applocation/entity/entity.go

@@ -1,9 +1,12 @@
 package entity
 
 import (
+	ac "applocation/apploc"
 	"db"
 	"fmt"
 	"log"
+	"net/http"
+	"qfw/util"
 	"qfw/util/redis"
 	"time"
 )
@@ -12,10 +15,11 @@ type AppLocStruct struct {
 	UserId    string //用户id
 	Longitude string // 经度
 	Latitude  string //纬度
+	R         *http.Request
 }
 
-func NewAppLoc(userId, longitude, latitude string) *AppLocStruct {
-	return &AppLocStruct{userId, longitude, latitude}
+func NewAppLoc(userId, longitude, latitude string, r http.Request) *AppLocStruct {
+	return &AppLocStruct{userId, longitude, latitude, &r}
 }
 
 var AppLocLog = "apploc_log"
@@ -25,14 +29,22 @@ var RedisUserKey = "apploc_%s"
 func (this *AppLocStruct) SaveAppLocInfo() bool {
 	log.Println(this.Longitude, "---", this.Latitude)
 	timeNow := time.Now()
+	ref := this.R.Referer()
 	appLocInfo := map[string]interface{}{
 		"date":      timeNow.Unix(),
 		"userId":    this.UserId,
 		"longitude": this.Longitude,
 		"latitude":  this.Latitude,
+		"ip":        util.GetIp(this.R),
+		"refer":     ref,
+		"year":      timeNow.Year(),
+		"month":     timeNow.Month(),
+		"day":       timeNow.Day(),
+		"hour":      timeNow.Hour(),
+		"minutes":   timeNow.Minute(),
 	}
 	if db.Mgo_Log.Save(AppLocLog, appLocInfo) != "" {
-		redis.Put("other", fmt.Sprintf(RedisUserKey, this.UserId), timeNow.Day(), 12*60*60)
+		redis.Put("other", fmt.Sprintf(RedisUserKey, this.UserId), timeNow.Day(), ac.Apploctime)
 		return true
 	}
 	return false

+ 1 - 0
src/jfw/modules/publicapply/src/applocation/init.go

@@ -1,6 +1,7 @@
 package applocation
 
 import (
+	_ "applocation/apploc"
 	"applocation/service"
 
 	"github.com/go-xweb/xweb"

+ 3 - 1
src/jfw/modules/publicapply/src/applocation/service/service.go

@@ -4,6 +4,7 @@ import (
 	. "api"
 	"applocation/entity"
 	"log"
+	"net/http"
 	qu "qfw/util"
 
 	"github.com/go-xweb/xweb"
@@ -27,7 +28,8 @@ func (this *ServiceStruct) AppLocAction() {
 		}
 		longitude := this.GetString("longitude") //经度
 		latitude := this.GetString("latitude")   //纬度
-		newAppLoc := entity.NewAppLoc(userId, longitude, latitude)
+		var r http.Request
+		newAppLoc := entity.NewAppLoc(userId, longitude, latitude, r)
 		if newAppLoc.IsSaveBool() {
 			retBool = newAppLoc.SaveAppLocInfo()
 		}

+ 936 - 0
src/web/staticres/big-member/js/ent_portrait.js

@@ -0,0 +1,936 @@
+var vNode = {
+    delimiters: ['${', '}'],
+    el: '#ent-portrait',
+    data () {
+        // 修改柱状条颜色为渐变色
+        this.colorGreen = [new echarts.graphic.LinearGradient(
+            0, 0, 0, 1,
+            [
+                {offset: 1, color: '#2ABED1'},
+                {offset: 0.5, color: '#2ABED1'},
+                {offset: 0, color: '#8DE0EB'}
+            ], false
+        ), '#FF9F40']
+
+        return {
+            sessKey: '$data-ent_portrait',
+            conf: {
+                // 权限查询是否完成
+                powerLoaded: false,
+                // 是否只显示完整的企业画像
+                showPortraitAll: true,
+                // 是否显示,企业全景分析
+                _4: false,
+                // 是否显示中标企业动态
+                _13: false
+            },
+            powerInfo: {},
+            tabActiveName: '1',
+            // 企业信息
+            entInfo: {
+                name: '',
+                follow: 0,
+                followSearchFinish: false,
+                entExist: true
+            },
+            // tab1中的企业基础信息
+            entBaseInfo: {
+                type: null,
+                status: null,
+                creditNo: '',
+                capital: '',
+                employeeNo: '',
+                address: '',
+                scope: '',
+                operStart: -1,
+                operEnd: -1,
+                establish: '',
+                showEntChange: false,
+                org_code: '',
+                company_code: '',
+                legal: '',
+                phone: '',
+                taxCode: ''
+            },
+            // tab2中的项目动态
+            topProject: {
+                list: [],
+                count: '',
+                pageSign: '',
+                showGetNextButton: true
+            },
+            entPortraitInfo: {},
+            stickyTop: 80,
+            singleTab: true,
+            // 年度项目统计设置
+            annualSetting:{
+                showLine: ['项目金额'],
+                axisSite: { right: ['项目金额'] }
+            },
+            // 地图配置项
+            mapSettings: mapSettings,
+            // 年度项目统计数据
+            annualData: {
+                columns: ["日期","项目数量","项目金额"],
+                rows: []
+            },
+            // 地图数据
+            mapChartData: {
+                columns: ['name', 'value'],
+                rows: []
+            },
+            // 月度中标金额
+            monthZbData: {
+                columns: [],
+                rows: []
+            },
+            // 平均折扣率
+            rateData: {
+                columns: [],
+                rows: []
+            },
+            pieChartSettings: {
+                roseType: 'radius'
+            },
+            importantCustomers: [],
+            scrollTop: 0,
+            getEntPortraitInfoTimes: 0,
+            initEchartsOptions: {
+                renderer: 'svg'
+            },
+            gotTab2: false, // 是否已经获取到tab2的数据了
+            svip: false, // 判断是否是超级订阅的企业画像
+            digshow: false, // 判断是否是超级订阅会员
+            overlayShow: true // 弹窗遮罩是否显示
+        }
+    },
+    created: function () {
+        // svip是超级订阅企业查询, 如果是超级订阅不能查看企业情报历史记录
+        var svip = utils.getParam('svip')
+        if (svip) {
+            this.svip = true
+        }
+        // 企业名称恢复
+        var eId = utils.getParam('eId')
+        if (eId) {
+          eId = decodeURIComponent(eId)
+        }
+        this.entInfo.id = eId
+        this.entInfo.name = ''
+        this.restore = this.reStoreState()
+        if (!this.restore) {
+            this.getPowerInfo()
+            // 获取企业基本信息
+            this.getEntBaseInfo()
+        }
+    },
+    mounted: function () {
+        var _this = this
+        // 动态调整sticky距离顶部的高度
+        this.getStickyTop()
+        if (this.scrollTop) {
+            setTimeout(function () {
+                $('#ent-portrait').scrollTop(_this.scrollTop)
+            }, 0)
+        }
+
+        window.addEventListener('resize', function() {
+            _this.getStickyTop()
+        })
+    },
+    watch: {
+        tabActiveName: function (newVal, oldVal) {
+            var _this = this
+            if (newVal == '2') {
+                this.$nextTick(function () {
+                    if (_this.gotTab2) {
+                        // 初始化图表
+                        if (_this.entPortraitInfo && _this.conf.showPortraitAll && !_this.singleTab) {
+                            _this.initChartsData();
+                        }
+                    } else {
+                        if (_this.conf._4) {
+                            // 获取企业画像信息-4
+                            _this.getEntPortrait(function () {
+                                _this.initChartsData()
+                            })
+                            _this.gotTab2 = true
+                            console.log('获取企业全景分析...')
+                        }
+                        // 获取企业中标动态-13
+                        if (_this.conf._13) {
+                            _this.getProjectNews()
+                            _this.gotTab2 = true
+                            console.log('获取企业中标动态...')
+                        }
+                    }
+                });
+            }
+        },
+    },
+    methods: {
+        showToast: function (message) {
+            this.$toast({
+                duration: 1500,
+                forbidClick: true,
+                message: message,
+            })
+        },
+        showLoading: function() {
+            var loading = this.$toast.loading({
+                duration: 0,
+                forbidClick: true,
+                message: '',
+            })
+            return loading
+        },
+        // 超级订阅提示弹窗取消按钮事件
+        beforeClose: function (e, done) {
+            console.log(e)
+            if (e === 'cancel') {
+                this.tabActiveName = '1'
+                done(false)
+                this.digshow = true
+                this.overlayShow = true
+            } else if (e === 'confirm') {
+                try {
+                  _hmt.push(['_trackEvent','超级订阅-wx', 'click', '企业画像中标信息-去开通']);
+                } catch (e) {
+                  console.log('未初始化百度统计')
+                }
+                // 去开通
+                location.href = '/jyapp/vipsubscribe/introducePage'
+            }
+            this.overlayShow = true
+        },
+        // 获取画像信息
+        getEntPortrait: function (callback) {
+            var _this = this
+            var data = {
+                entId: _this.entInfo.id
+            }
+            let urls = ''
+            if (_this.svip) {
+                urls = '/bigmember/portrait/subVipPortrait/winner'
+
+            } else {
+                urls = '/bigmember/portrait/winner/getData'
+            }
+            _this.getEntPortraitInfoTimes++
+            $.ajax({
+                type: 'POST',
+                url: urls,
+                data: data,
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        _this.loading.clear()
+                        if (res.data && Object.keys(res.data).length !== 0) {
+                            _this.singleTab = false
+                            // 将数据保存到data中
+                            for (var key in res.data) {
+                                _this.entPortraitInfo[key] = res.data[key]
+                            }
+
+                            if (res.data.timeRange && res.data.timeRange.start) {
+                                _this.entPortraitInfo.timeRangeStart = res.data.timeRange.start
+                            }
+                            if (res.data.timeRange && res.data.timeRange.end) {
+                                _this.entPortraitInfo.timeRangeEnd = res.data.timeRange.end
+                            }
+
+                            callback && callback()
+                        } else {
+                            if (_this.getEntPortraitInfoTimes < 5) {
+                                _this.getEntPortrait()
+                            }
+                        }
+                    }
+                },
+                error: function (error) {
+                    _this.$toast('请求失败')
+                }
+            })
+        },
+        // 获取项目动态
+        getProjectNews: function () {
+            var _this = this
+            var data = {
+                entId: _this.entInfo.id,
+                count: _this.topProject.count,
+                pageSign: _this.topProject.pageSign
+            }
+
+            if (data.pageSign) {
+                this.loading = this.showLoading()
+            }
+
+            $.ajax({
+                type: 'POST',
+                url: '/bigmember/portrait/winner/getNewMsg',
+                data: data,
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        _this.loading.clear()
+                        _this.topProject.count = res.data.count
+                        if (res.data.list && $.isArray(res.data.list)) {
+                            if (!_this.topProject.pageSign) {
+                                _this.singleTab = false
+                            }
+
+                            // 修改当前pageSign值
+                            if (!_this.topProject.pageSign) {
+                                _this.topProject.list = []
+                                _this.topProject.pageSign = 'more'
+                                if(res.data.count <= 3) {
+                                    _this.topProject.showGetNextButton = false
+                                }
+                            } else if (_this.topProject.pageSign === 'more') {
+                                _this.topProject.pageSign = 'max'
+                                if(res.data.count <= 23) {
+                                    _this.topProject.showGetNextButton = false
+                                }
+                            } else if (_this.topProject.pageSign === 'max') {
+                                _this.topProject.showGetNextButton = false
+                            }
+
+                            _this.topProject.list = _this.topProject.list.concat(res.data.list)
+                        }
+                    } else {
+                        _this.$toast(res.error_msg)
+                    }
+                },
+                error: function (error) {
+                    _this.$toast('请求失败')
+                }
+            })
+        },
+        // 查询企业基础信息
+        getEntBaseInfo: function () {
+            var _this = this
+            let urls = ''
+            if (_this.svip) {
+                urls = '/bigmember/portrait/subVipPortrait/entDetail'
+            } else {
+                urls = '/bigmember/portrait/ent/detail'
+            }
+            $.ajax({
+                type: 'POST',
+                url: urls,
+                data: {
+                    entId: _this.entInfo.id
+                },
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        _this.loading.clear()
+                        if (res.data && Object.keys(res.data).length !== 0) {
+                            _this.entInfo.name = res.data.entName
+                            for (var key in res.data) {
+                                _this.entBaseInfo[key] = res.data[key]
+                            }
+                        }
+                    } else {
+                        // 不显示提示信息
+                        // _this.$toast(res.error_msg)
+                    }
+                },
+                error: function (error) {
+                    console.log(error)
+                }
+            })
+        },
+        // 查询企业是否存在和企业关注状态
+        getEntFollowState: function () {
+            var _this = this
+            _this.entInfo.followSearchFinish = false
+            $.ajax({
+                type: 'POST',
+                url: '/bigmember/follow/ent/followCheck',
+                data: {
+                  entId: _this.entInfo.id
+                },
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        _this.entInfo.followSearchFinish = true
+                        if (res.data) {
+                            _this.entInfo.follow = !!res.data.followed
+                            _this.entInfo.entExist = !!res.data.isShow
+                        } else {
+                            _this.entInfo.entExist = false
+                        }
+                    } else {
+                        _this.$toast(res.error_msg)
+                    }
+                },
+                error: function (error) {
+                    console.log(error)
+                }
+            })
+        },
+        changeFollowState: function () {
+            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()
+            }
+        },
+        // 获取权限信息
+        getPowerInfo: function () {
+            var _this = this
+            this.loading = this.showLoading()
+            $.ajax({
+                type: 'GET',
+                url: '/bigmember/use/isAdd',
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        _this.conf.powerLoaded = true
+                        if (res.data) {
+                            _this.powerInfo = res.data
+                        }
+                        if (res.data && $.isArray(res.data.power)) {
+                            // 显示完整企业画像(不完整的企业画像只有中标动态)
+                            // _this.conf.showPortraitAll = true
+                            // 根据power判断权限,企业画像包含权限(4,12,13)
+                            var power = res.data.power
+                            if (power.indexOf(4) != -1 || _this.svip || res.data.viper) {
+                                // 获取企业画像信息-4
+                                _this.conf._4 = true
+                            }
+                            if (power.indexOf(13) != -1) {
+                                // 获取企业中标动态-13
+                                _this.conf._13 = true
+                            }
+                            if (_this.conf._4 || _this.conf._13) {
+                                _this.singleTab = false
+                            } else {
+                                // 如果不是超级订阅会员,点击中标信息显示提示弹窗
+                                if (!res.data.viper) {
+                                    _this.digshow = true
+                                } else {
+                                    _this.digshow = false
+                                }
+                            }
+                        }
+                        // 如果不是大会员。判断是否是超级订阅会员,不是显示弹窗
+                        if (res.data.memberStatus <= 0) {
+                            if (!res.data.viper) {
+                                _this.digshow = true
+                            } else {
+                                _this.digshow = false
+                            }
+                        }
+                        if (_this.svip || res.data.viper) {
+                            _this.entInfo.followSearchFinish = true
+                            _this.entInfo.entExist = false
+                        }
+                        if(res.data.memberStatus > 0&&(power.indexOf(4) != -1||power.indexOf(12) != -1||power.indexOf(13) != -1)) {
+                            _this.entInfo.followSearchFinish = false
+                            _this.entInfo.entExist = true
+                            _this.getEntFollowState()
+                        }
+                    } else {
+                        _this.$toast(res.error_msg)
+                    }
+                },
+                complete: function () {
+                    if (_this.loading) {
+                        _this.loading.clear()
+                    }
+                },
+                error: function (error) {
+                    console.log(error)
+                }
+            })
+        },
+        // 修改企业关注状态
+        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.id
+                },
+                success: function (res) {
+                    if (res.error_code == 0) {
+                        // 清除上个页面缓存
+                     sessionStorage.removeItem('$data-ent_follow')
+                        loading.clear()
+                        if (res.data && res.data == 'success') {
+                            _this.entInfo.follow = !_this.entInfo.follow
+                        }
+
+                        if (!_this.entInfo.follow) {
+                            history.back()
+                        }
+                    } else {
+                        _this.showToast(res.error_msg)
+                    }
+                },
+                error: function (error) {
+                    console.log(error)
+                }
+            })
+        },
+        // 初始化图标数据
+        initChartsData: function () {
+            var dataSet = this.entPortraitInfo
+            // 初始化 年度项目统计数据
+            this.arrangeAnnualData(dataSet.yearData)
+            // 初始化 月度统计数据
+            this.arrangeMonthZbData(dataSet.monthData)
+            // 初始化 地图数据
+            this.arrangeMapData(dataSet.areaData)
+            // 初始化 平局折扣率数据
+            this.arrangeRateData(dataSet.rate)
+            // 初始化 饼图 客户类型分布
+            this.initPieChartData(dataSet.top10)
+            // 初始化 重要客户数据
+            this.arrangeImportantData(dataSet.topShow)
+        },
+        getStickyTop: function () {
+            this.stickyTop = $('.jy-app-header').height() - 1
+        },
+        goToEntHistory: function () {
+            // if (this.powerInfo.isSubCount) {
+            //     return this.showToast('子账号无法使用企业情报监控')
+            // }
+
+            this.savePageState()
+            var info = {
+                anchor: '企业情报监控'
+            }
+            sessionStorage.setItem('landinfo',JSON.stringify(info))
+            location.href = './ent_portrait_change?eId=' + encodeURIComponent(this.entInfo.id)
+        },
+        // 修改年度项目统计里点击浮窗显示效果
+        formatter: function (params) {
+            //移除重复的数据
+            for (var i = 0; i < params.length; i++) {
+                for (var j = params.length - 1; j > i; j--) {
+                    if (params[j].data == params[i].data) {
+                        params.splice(j, 1);
+                        break;
+                    }
+                }
+            }
+            var tip = '';
+            for (var i = 0; i < params.length; i++) {
+                // 因柱状图颜色为渐变色,此处获取到的柱状图颜色,css不能识别,需单独设置小圆点的颜色
+                params[0].marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#2ABED1"></span>'
+                if( i=== 0) {
+                    tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '个' + '<br/>';
+                }else if(i == 1){
+                    tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '万元' + '<br/>';
+                }
+            }
+            tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+            return tip;
+        },
+        // 1. 年度项目统计图表单独配置
+        annualConfig: function (options) {
+            var that = this;
+            options.grid.bottom = 60
+            options.tooltip.axisPointer.shadowStyle.color = 'rgba(42, 190, 209,0.1)' // 修改点击柱条后背景颜色
+            options.legend.show = true // 显示底部数量、金额、圆点
+            options.yAxis[1].axisLabel.show = true; // 显示右侧y轴刻度
+            options.yAxis[1].axisLabel.formatter = function(value, index) {
+                return value.toString().replace(/,/, '')
+            }  // 去掉右轴逗号分割
+            options.series[1].lineStyle.width = 2 // 折线
+            options.series[1].lineStyle.color = '#FF9F40'
+            // 以下代码为:处理左侧y轴与右侧y轴刻度保持在同一X轴水平线上
+            var maxCountList = this.annualData.rows.map(function(v){
+                return v['项目数量']
+            })
+            var maxPriceList = this.annualData.rows.map(function(v){
+                return v['项目金额']
+            })
+
+            var maxCount = Math.ceil(Math.max.apply(null,maxCountList)).toString();// 取出数量中最大值
+            var maxPrice = Math.ceil(Math.max.apply(null,maxPriceList)).toString();// 取出金额中最大值
+            // var minPrice = Math.min.apply(null,maxPriceList);// 去除金额最小值
+            maxPrice = Math.ceil(maxPrice / (Math.pow(10,maxPrice.length -1))) * Math.pow(10,maxPrice.length -1)
+            maxCount = Math.ceil(maxCount / (Math.pow(10,maxCount.length -1))) * Math.pow(10,maxCount.length -1)
+            var item = options.yAxis
+            item[0].min = 0;
+            item[1].min = 0;
+            item[0].max = maxCount;
+            item[0].interval = Math.ceil(maxCount / 5);
+            item[1].max = maxPrice;
+            item[1].interval = Math.ceil((maxPrice - 0) / 5);
+
+            // 处理点击浮窗显示效果
+            options.tooltip.formatter = function(params) {
+                return that.formatter(params)
+            }
+            options.legend.formatter = function (name) {
+                var wnYuan = ['金额', '项目金额']
+                var ge = ['数量', '项目数量']
+                if (wnYuan.indexOf(name) !== -1) {
+                    name += '(万元)-右轴'
+                } else if (ge.indexOf(name) !== -1) {
+                    name += '(个)'
+                }
+                return name;
+            }
+            return options
+        },
+        // 2. 月度中标金额(折线图)
+        lineChartConfig: function (options) {
+            options.yAxis[0].name = '中标金额(万元)';
+            options.legend.itemGap = 20;
+            options.tooltip.formatter = function(params) {
+                var tip = '';
+                for (var i = 0; i < params.length; i++) {
+                    params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
+                    if(params[i].value[1] !== undefined && params[i].value[1] !== null && !isNaN(params[i].value[1])) {
+                        tip = tip + params[i].marker + params[i].seriesName + params[i].name + '中标金额:' + params[i].value[1].toString().replace(/,/,'') + '万元' +'<br/>';
+                    }
+                }
+                tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+                return tip;
+            }
+            return options;
+        },
+        // 3. 地图配置项
+        mapConfig: function (options) {
+            var _this = this
+            var arr = this.mapChartData.rows
+            // 最大值、最小值
+            var maxNum = Math.max.apply(Math, arr.map(function(o) {return o.value}))
+            var minNum = Math.min.apply(Math, arr.map(function(o) {return o.value}))
+
+            options.visualMap.min = minNum;
+            options.visualMap.max = maxNum < 100 ? 100 : maxNum;
+
+            // 设置最大值
+            options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100
+            options.graphic[options.graphic.length - 1].children[1].style.text = 1;
+            options.visualMap.min = 1;
+            options.visualMap.max = maxNum < 100 ? 100 : maxNum;
+            options.graphic[0].children[0].style.text = '项目数量(个)'
+            options.tooltip.formatter = function (params) {
+                var index = params.dataIndex
+                var item = _this.mapChartData.rows[index]
+                var string = ''
+                if (item) {
+                    if (item.value && item.amount) {
+                        string = item.name + '<br/>项目数量:' + item.value + '个<br/>中标金额:' + item.amount + '万元'
+                    } else if (item.value) {
+                        string = item.name + '<br/>项目数量:' + item.value + '个'
+                    } else if (item.amount) {
+                        string = item.name + '<br/>中标金额:' + item.amount + '万元'
+                    }
+                }
+                return string
+            }
+            return options
+        },
+        // 4. 客户平均折扣率配置
+        rateConfig: function (options) {
+            options.color = ['#FB483D', '#05A6F3', '#0BD991', '#FF9F40','#8E6DF2','#C0C4CC'];
+            options.xAxis[0].axisLabel.margin = 12
+            options.yAxis[0].axisLabel.formatter = '{value}%'
+            options.grid = {
+                top: 20,
+                right: 16,
+                bottom: 70,
+                left: 10
+            }
+            options.legend.textStyle.padding = [0, 18, 0,0];
+            options.legend.left = 16;
+            options.legend.bottom = 10;
+            options.tooltip.formatter = function(params) {
+                var tip = '';
+                for (var i = 0; i < params.length; i++) {
+                    params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
+                    if(params[i].value[1] === undefined || params[i].value[1] == null) {
+                        tip = tip + params[i].marker + params[i].seriesName + ':--<br/>';
+                    } else {
+                        tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value[1] + '%<br/>';
+                    }
+                }
+                tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+                return tip;
+            }
+            return options;
+        },
+        // 整理年度项目统计数据
+        arrangeAnnualData: function (data) {
+            if (!data) return
+
+            var rows = [];
+            var count = 0;
+            for (var key in data) {
+                var item = data[key]
+                // 统计数据总数是否为0
+                count += item.Count
+                count += item.Money
+                rows.push({
+                    '日期': parseInt(key),
+                    '项目数量': item.Count,
+                    '项目金额': Math.round(item.Money / 10000)
+                })
+            }
+
+            // rows = utils.bSort(rows, '日期').reverse()
+            rows = utils.bSort(rows, '日期')
+
+            // 数据总量为0,不赋值
+            if (count != 0) {
+                this.annualData.rows = rows;
+            }
+        },
+        // 整理月度项目统计数据
+        arrangeMonthZbData: function (data) {
+            if (!data) return
+            var rows = []
+            var columns = ['月份']
+            var count = 0
+
+            // 1. 先将月份提取出来, 并排序
+            var yearArr = []
+            for (var key in data) {
+                yearArr.push(parseInt(key))
+            }
+            yearArr.sort(function (a, b) { return a - b })
+
+            // 2. 循环12个月份,并进行处理
+            yearArr.forEach(function (item) {
+                columns.push(item + '年')
+            })
+            for (var i = 1; i <= 12; i++) {
+                var columnsItem = {}
+                columns.forEach(function (item) {
+                    var value = ''
+                    if (item == '月份') {
+                        value = i + '月'
+                    } else if (/年/g.test(item)) {
+                        if (data[item.slice(0, -1)]) {
+                            value = data[item.slice(0, -1)][i]
+                            value = (value / 10000).fixed(2)
+                            count += parseInt(value)
+                        }
+                    }
+                    columnsItem[item] = value
+                })
+                rows.push(columnsItem)
+            }
+
+            // 数据总量为0,不赋值
+            if (count != 0) {
+                this.monthZbData.columns = columns;
+                this.monthZbData.rows = rows;
+            }
+        },
+        // 整理主要市场分布(中国地图)数据
+        arrangeMapData: function(data) {
+            if (!data) return
+
+            var mapRows = []
+            var count = 0
+            if (data && $.isArray(data)) {
+                data.forEach(function (n) {
+                    count += n.projectCount
+
+                    mapRows.push({
+                        name: n.areaName,
+                        value: n.projectCount,
+                        amount: (n.bidamountCount / 10000).fixed(2)
+                    })
+                })
+            }
+
+            // 数据总量为0,不赋值
+            if (count != 0) {
+                this.mapChartData.rows = mapRows;
+            }
+        },
+        // 整理平均折扣率数据
+        arrangeRateData: function (data) {
+            if (!data) return
+            var rows = []
+            var columns = ['日期', '全部客户']
+            var count = 0
+
+            for (var c in data) {
+                if (c !== '全部客户') {
+                    columns.push(c)
+                }
+            }
+            // 获取年份数组
+            var yearArr = []
+            for (var key in data['全部客户']) {
+                yearArr.push(key)
+            }
+            yearArr.sort(function (a, b) { return a - b })
+
+            yearArr.forEach(function (item) {
+                var rowsItem = {
+                    '日期': item + '年'
+                }
+                for (var k in data) {
+                    count += (data[k][item] * 100)
+                    rowsItem[k] = data[k][item] == null  ? null : (data[k][item] * 100).fixed(2)
+                }
+                rows.push(rowsItem)
+            })
+
+            // 数据总量为0,不赋值
+            if (count != 0) {
+                this.rateData.columns = columns;
+                this.rateData.rows = rows;
+            }
+        },
+        // 初始化饼图
+        initPieChartData: function (d) {
+            if (!d) return
+            var that = this
+            var arr = []
+            var data = JSON.parse(JSON.stringify(d))
+            // 降序排列
+            data.sort(function (a, b) {
+                return b.bidamount_share - a.bidamount_share
+            })
+            data.forEach(function (item){
+              arr.push(item.buyerClass,item.bidamount_share,item.bidamount_count,item.project_count,item.rate_avg)
+            })
+            var normal =['行业','中标金额占比','中标金额','项目数量','平均折扣率'];
+            var newArr = that.arrTrans(5,arr);
+            newArr.unshift(normal)
+            chartOptions.deformPieChart.dataset.source = newArr;
+            chartOptions.deformPieChart.tooltip.formatter = function(params){
+                var tip = '';
+                var data = params.data;
+                params.marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params.color +'"></span>';
+                var percent = '<span style="padding-left:13px;">中标金额占比:' + (data[1]*100).fixed(2) + '%</span></br>';
+                var scale = '<span style="padding-left:13px;">中标金额:' + utils.moneyUnit(data[2].fixed(2)) + '</span></br>';
+                var count = '<span style="padding-left:13px;">项目数量:' + data[3] + '个</span></br>';
+                var rate = (typeof data[4] === 'number' && !isNaN(data[4])) ? '<span style="padding-left:13px;">平均折扣率:' + (data[4]*100).fixed(2) + '%</span></br>' : '';
+                tip = params.marker + params.name +'<br/>' + percent + scale + count + rate
+                return tip;
+            }
+            chartOptions.deformPieChart.legend.formatter = null
+            that.$nextTick(function(){
+                var ref = that.$refs.pieChart;
+                var pieChart = echarts.init(ref, null, that.initEchartsOptions);
+                pieChart.setOption(chartOptions.deformPieChart);
+                pieChart.resize();
+            })
+        },
+        arrTrans: function(num, arr) { // 一维数组转换为二维数组
+            var iconsArr = [];
+            arr.forEach(function(item, index) {
+                var page = Math.floor(index / num); // 计算该元素为第几个素组内
+                if (!iconsArr[page]) { // 判断是否存在
+                    iconsArr[page] = [];
+                }
+                iconsArr[page].push(item);
+            });
+            return iconsArr;
+        },
+        // 整理重要客户数据
+        arrangeImportantData: function (data) {
+            if (!data) return
+            var arr = []
+            if ($.isArray(data)) {
+                data.forEach(function (list) {
+                    var i1 = {
+                        title: list.buyerclass,
+                        list: []
+                    }
+                    if (list.topData && $.isArray(list.topData)) {
+                        list.topData.forEach(function (item) {
+                            i1.list.push({
+                                name: item.BuyerName,
+                                money: item.CountMoney,
+                                count: item.CountProject,
+                                rate: item.AvgRate ? (item.AvgRate*100).fixed(2) : item.AvgRate,
+                                time: new Date(item.lastTime * 1000).pattern('yyyy/MM/dd'),
+                                percent: item.CountMoney / list.topData[0].CountMoney*100 + '%'
+                            })
+                        })
+                    }
+
+                    if (!list.buyerclass || ($.isArray(list.topData) && list.topData.length === 0)) {
+                        // console.log('此数据为空')
+                    } else {
+                        arr.push(i1)
+                    }
+                })
+            }
+            this.importantCustomers = arr
+        },
+        // 去公告详情页
+        toProjectDetail: function (item) {
+            this.savePageState()
+            if (item.id) {
+                var href = '/jyapp/article/content/' + item.id + '.html'
+                location.href = href
+            }
+        },
+        // 去中标单位画像
+        toUnitPortrayal: function (item) {
+            this.savePageState()
+            if (item.name) {
+                location.href = 'unit_portrayal?entName=' + item.name
+            }
+        },
+        savePageState: function () {
+            this.scrollTop = $('#ent-portrait').scrollTop()
+            var data = {
+                conf: this.conf,
+                tabActiveName: this.tabActiveName,
+                entInfo: this.entInfo,
+                entBaseInfo: this.entBaseInfo,
+                topProject: this.topProject,
+                entPortraitInfo: this.entPortraitInfo,
+                powerInfo: this.powerInfo,
+                singleTab: this.singleTab,
+                scrollTop: this.scrollTop,
+                gotTab2: this.gotTab2
+            }
+            sessionStorage.setItem(this.sessKey, JSON.stringify(data))
+        },
+        reStoreState: function () {
+            var $data = sessionStorage.getItem(this.sessKey)
+            if ($data) {
+                $data = JSON.parse($data)
+                // 如果恢复的企业名称和当前url企业名称不同,则清除缓存,重新请求
+                if (this.entInfo.id !== $data.entInfo.id) {
+                    sessionStorage.removeItem(this.sessKey)
+                    return false
+                }
+                this.tabActiveName = $data.tabActiveName
+                Object.assign(this.conf, $data.conf || {})
+                Object.assign(this.entInfo, $data.entInfo || {})
+                Object.assign(this.entBaseInfo, $data.entBaseInfo || {})
+                Object.assign(this.topProject, $data.topProject || {})
+                Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
+                Object.assign(this.powerInfo, $data.powerInfo || {})
+                this.singleTab = $data.singleTab
+                this.scrollTop = $data.scrollTop
+                this.gotTab2 = $data.gotTab2
+                sessionStorage.removeItem(this.sessKey)
+            }
+            return !!$data
+        }
+    }
+}
+var vueComponent = new Vue(vNode)

+ 6 - 0
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -209,6 +209,12 @@ var vNode = {
                 done(false)
                 this.overlayShow = true
             } else if (e === 'confirm') {
+                var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
+                try {
+                  _hmt.push(['_trackEvent','超级订阅-' + (isWeiXinBrowser ? 'wx' : 'app'), 'click', '企业画像中标信息-去开通']);
+                } catch (e) {
+                  console.log('未初始化百度统计')
+                }
                 // 去开通
                 if(this.bidcollPowerInfo.vip == 1) {
                     location.href = '/front/vipsubscribe/upgradePage'

+ 4 - 4
src/web/staticres/common-module/coupon/js/pay-order-template.js

@@ -109,9 +109,9 @@ var couponTem = {
             </div> 
           </div>
           <div class="handle-btn">
-            <div v-if="config.type == 'dataExport'" class="btn-item btn-default" @click="previewFn">预览数据</div>
-            <div v-if="config.type == 'vip-update'" class="btn-item btn-default" @click="cancelFn">取&nbsp;&nbsp;&nbsp;&nbsp;消</div>
-            <button type="button" class="btn-item btn-primary" :disabled="submitStatus" @click="submitFn">@@btnText@@</button> 
+            <div v-if="config.type == 'dataExport'" id="previewButton" class="btn-item btn-default" @click="previewFn">预览数据</div>
+            <div v-if="config.type == 'vip-update'" id="cancelButton" class="btn-item btn-default" @click="cancelFn">取&nbsp;&nbsp;&nbsp;&nbsp;消</div>
+            <button type="button" class="btn-item btn-primary" id="submitButton" :disabled="submitStatus" @click="submitFn">@@btnText@@</button> 
           </div>
         </div>
         <div class="order-service">
@@ -133,7 +133,7 @@ var couponTem = {
         return this.config.disPrice - this.coupon.value
       } else {
         return this.config.initPrice - this.coupon.value
-      } 
+      }
     }
   },
   methods: {

+ 21 - 5
src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -469,7 +469,15 @@ var vEntSearchComponent = new Vue({
         }
       }
     },
-    goUpBuyPage () {
+    goUpBuyPage (originName) {
+      if (!originName) {
+        originName = '企业搜索' + this.entTabs[this.activeTabIndex].title + '-去开通'
+      }
+      try {
+        _hmt.push(['_trackEvent','超级订阅-' + (utils.isWeiXinBrowser ? 'wx' : 'app'), 'click', originName]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
       window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/vipsubscribe_new'
     },
     getSearchParams () {
@@ -611,7 +619,7 @@ var vEntSearchComponent = new Vue({
           overlayClass: 'z-2030',
           confirmButtonText: '去升级',
         }).then(function () {
-          _this.goUpBuyPage()
+          _this.goUpBuyPage('标讯收藏满100条-去升级')
         }).catch(function () {});
         return
       }
@@ -999,7 +1007,15 @@ var vMainSearchComponent = new Vue({
         }
       }
     },
-    goUpBuyPage () {
+    goUpBuyPage (originName) {
+      if (!originName) {
+        originName = '标讯搜索' + this.entTabs[this.activeTabIndex].title + '-去开通'
+      }
+      try {
+        _hmt.push(['_trackEvent','超级订阅-' + (utils.isWeiXinBrowser ? 'wx' : 'app'), 'click', originName]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
       window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/vipsubscribe_new'
     },
     getSearchParams () {
@@ -1145,7 +1161,7 @@ var vMainSearchComponent = new Vue({
       }))
       SuperSearch.setSessionStorage()
       if(!this.checkNowPower()){
-        this.goUpBuyPage()
+        this.goUpBuyPage('标讯搜索企业画像-去升级')
       }else{
         var tempUrl = '/jyapp/big/page/ent_portrait?eId='
         if (utils.isWeiXinBrowser) {
@@ -1175,7 +1191,7 @@ var vMainSearchComponent = new Vue({
           overlayClass: 'z-2030',
           confirmButtonText: '去升级',
         }).then(function () {
-          _this.goUpBuyPage()
+          _this.goUpBuyPage('标讯收藏满100条-去升级')
         }).catch(function () {});
         return
       }

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

@@ -365,6 +365,12 @@ Vue.component('keep-component', {
       })
     },
     ajaxAddKeep (id, type) {
+      try {
+        var isContent = location.href.indexOf('/article/content') !== -1
+        _hmt.push(['_trackEvent','超级订阅-' + (utils.isWeiXinBrowser ? 'wx' : 'app'), 'click', (isContent ? '详情页标讯收藏按钮' : '列表页标讯收藏-星标')]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
       var t = this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true,
@@ -410,6 +416,11 @@ Vue.component('keep-component', {
       })
     },
     goUpBuyPage () {
+      try {
+        _hmt.push(['_trackEvent','超级订阅-' + (utils.isWeiXinBrowser ? 'wx' : 'app'), 'click', '标讯收藏满100条-去升级']);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
       window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/vipsubscribe_new'
     },
     togglePopStatus (type) {

+ 1 - 0
src/web/staticres/common-module/public/fotter.js

@@ -0,0 +1 @@
+console.log('footer.js')

+ 17 - 0
src/web/staticres/common-module/public/head.js

@@ -0,0 +1,17 @@
+;(function() {
+  var host = location.host
+  var hm = document.createElement("script");
+  var patterns = {
+    ip: /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/g,
+    testServer: /jianyu360\.cn$/g
+  }
+  if (patterns.ip.test(host) || patterns.testServer.test(host)) {
+    hm.src = "https://hm.baidu.com/hm.js?52c42de35032567eb9d7a24a43c84bda";
+  } else {
+    hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  }
+  setTimeout(function(){
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  }, 300);
+})();

+ 2 - 0
src/web/staticres/frontRouter/pc/collection/js/index-pc.js

@@ -297,6 +297,7 @@ var vm = new Vue({
         },
         // 批量取消收藏
         unStarSelected: function () {
+            baiduEvent('列表页标讯收藏-星标') // 收藏按钮百度统计
             var _this = this
             var info = this.getSelectedIdArr()
             var ids = info.ids
@@ -314,6 +315,7 @@ var vm = new Vue({
             })
         },
         unStarThis: function (item) {
+            baiduEvent('列表页标讯收藏-星标') // 收藏按钮百度统计
             var _this = this
             this.bidCollectAction([item._id], function () {
                 _this.showToast('已取消收藏', null, function () {

+ 21 - 2
src/web/staticres/js/ent-search-index-pc.js

@@ -169,6 +169,7 @@ var vm = new Vue({
             power: false,
             powerLoaded: false,
             powerDialogShow: false,
+            baiduName: ''
         }
     },
     watch: {
@@ -311,7 +312,8 @@ var vm = new Vue({
             this.filterState.entCapital = [p.min + '-' + p.max]
             this.doSearch()
         },
-        zbFilterChange: function () {
+        zbFilterChange: function (name) {
+            this.baiduName = name
             if (this.power) {
                 this.doSearch()
             } else {
@@ -434,7 +436,16 @@ var vm = new Vue({
             this.listState.pageNum = p
             this.getList()
         },
-        openVipPage: function () {
+        openVipPage: function (param) {
+            // 企业搜索中标区域-去开通
+            // 企业搜索单位类型-去开通
+            // 企业搜索联系方式-去开通
+            // 企业搜索底部第五条-去开通
+            if(param === 'more') {
+              this.baiduName = '底部第五条'
+            }
+            var str = '企业搜索' + this.baiduName + '-去开通'
+            baiduEvent(str) // 去开通按钮百度统计
             window.open('/front/subscribe.html')
         },
         toDetail: function (id) {
@@ -537,4 +548,12 @@ function ewmMoveHover() {
             "transition":"transform 0.2s"
         })
     })
+}
+function baiduEvent(name) {
+  console.log(name)
+  try {
+    _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+  } catch (e) {
+    console.log('未初始化百度统计')
+  }
 }

+ 23 - 13
src/web/staticres/js/pcindex.js

@@ -72,11 +72,11 @@ var fourScreenFlag = 0;
 var i_avg = 0;
 var i_govsite = 0;
 var i_entsite = 0;
-function GetRandomNum(Min,Max){   
-	var Range = Max - Min;   
-	var Rand = Math.random();   
-	return(Min + Math.round(Rand * Range));   
-}   
+function GetRandomNum(Min,Max){
+	var Range = Max - Min;
+	var Rand = Math.random();
+	return(Min + Math.round(Rand * Range));
+}
 function initFoutScreen(className,value,numIncSpace){
 	setTimeout(function(){
 		var numInc = 0;
@@ -338,7 +338,7 @@ $(function(){
 	$(window).scroll(function(){
 		afterScroll();
 	});
-	
+
 	//重新计算最新信息的发布时间
 	$("#lastBidNews .com-time").each(function(){
 		var diff = timeDiff(new Date(Number($(this).attr("data-value")+"000")));
@@ -347,10 +347,20 @@ $(function(){
 		}
 	});
 });
-var _hmt = _hmt || [];
-(function(){
-	var hm = document.createElement("script");
-	hm.src = "//hm.baidu.com/hm.js?d7bc90fd54f45f37f12967f13c4ba19a";
-	var s = document.getElementsByTagName("script")[0]; 
-	s.parentNode.insertBefore(hm, s);
-})();
+;(function() {
+  var host = location.host
+  var hm = document.createElement("script");
+  var patterns = {
+    ip: /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/g,
+    testServer: /jianyu360\.cn$/g
+  }
+  if (patterns.ip.test(host) || patterns.testServer.test(host)) {
+    hm.src = "https://hm.baidu.com/hm.js?52c42de35032567eb9d7a24a43c84bda";
+  } else {
+    hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  }
+  setTimeout(function(){
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  }, 300);
+})();

+ 24 - 4
src/web/staticres/js/superSearch.js

@@ -1051,6 +1051,7 @@ function collectClick() {
   // console.log(vipState, '是否是超级订阅用户')
   // 单个收藏点击事件
   $('.icon-collect').on('click',function(e) {
+    baiduEvent('列表页标讯收藏-星标') // 百度统计代码
     e.stopPropagation()
     var $that = $(this)
     var checked = $(this).hasClass('checked')
@@ -1102,7 +1103,7 @@ function collectClick() {
           if (vipState || res.error_msg.indexOf('付费') > -1) {
             toastFn('您的标讯收藏上限为5000条,请联系客服人员。', 1500)
           } else {
-            updateVipDialog()
+            updateVipDialog('标讯收藏满100条-去升级')
           }
         }
       })
@@ -1110,6 +1111,7 @@ function collectClick() {
   })
   // 批量收藏
   $('#bid-collect').off('click').bind('click',function(e){
+    baiduEvent('列表页标讯收藏-星标') // 百度统计代码
     e.stopPropagation()
     var top = (parseInt($(this).position().top) + 60 ) + 'px';
     var len = $('.custom-checkbox:not(".check-all"):checked').length;
@@ -1172,7 +1174,7 @@ function collectClick() {
           if (vipState || res.error_msg.indexOf('付费') > -1) {
             toastFn('您的标讯收藏上限为5000条,请联系客服人员。', 1500)
           } else {
-            updateVipDialog()
+            updateVipDialog('标讯收藏满100条-去升级')
           }
         }
       })
@@ -1183,18 +1185,36 @@ function collectClick() {
 }
 
 // 开通提醒弹框
-function  openVipDialog() {
+function  openVipDialog(str) {
   $('.auth-dialog').show()
   $('.auth-dialog .default-btn').click(function () { 
     $('.auth-dialog').hide(300)
   })
+  $('.auth-dialog .confirm-btn').off('click').bind('click',function () { 
+    var advName = '招标搜索' + str + '-去开通'
+    baiduEvent(advName) // 点击去开通事件 百度统计
+    window.open('/front/subscribe.html')
+  })
 }
 // 升级提醒弹框
-function  updateVipDialog() {
+function  updateVipDialog(str) {
   $('.update-dialog').show()
   $('.update-dialog .default-btn').click(function () { 
     $('.update-dialog').hide(300)
   })
+  $('.update-dialog .confirm-btn').off('click').bind('click',function () { 
+    baiduEvent(str) // 点击去升级事件 百度统计
+    window.open('/front/subscribe.html')
+  })
+}
+// 列表页收藏点击事件 百度统计
+function baiduEvent(name) {
+  console.log(name, 'name')
+  try {
+    _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+  } catch (e) {
+    console.log('未初始化百度统计')
+  }
 }
 
 // toast上限提示

+ 9 - 3
src/web/staticres/vipsubscribe/js/historypush.js

@@ -53,7 +53,8 @@ var vm = new Vue({
         keytimer: '',
         noticetimer: ''
       },
-      iosMeauStyle: false
+      iosMeauStyle: false,
+      goUpText: ''
     }
   },
   created () {
@@ -158,8 +159,8 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
-    open: function() {
-      this.iosMeauStyle = true
+    open: function(name) {
+      this.goUpText = name
     },
     close: function() {
       this.iosMeauStyle = false
@@ -252,6 +253,11 @@ var vm = new Vue({
         this.tagText.noticeText = data.t
         this.subtype = data.data.join(',')
       } else if(data.name === 'rootItem'){
+        try {
+          _hmt.push(['_trackEvent','超级订阅-wx', 'click', '推送列表页' + this.goUpText + '-去开通']);
+        } catch (e) {
+          console.log('未初始化百度统计')
+        }
         topay()
       } else {
         return console.log('暂无数据')

+ 1 - 0
src/web/templates/big-member/wx/page_customer.html

@@ -118,6 +118,7 @@
         })
     })
 </script>
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

+ 4 - 4
src/web/templates/common/baiducc.html

@@ -18,12 +18,12 @@ if(is_weixin()){
     // ip或者以jianyu360.cn结尾的使用测试环境百度统计
     if (patterns.ip.test(host) || patterns.testServer.test(host)) {
         // 测试环境
-        hm.src = "https://hm.baidu.com/hm.js?76824641601c0cc52743ac46041455b6";
+        hm.src = "https://hm.baidu.com/hm.js?52c42de35032567eb9d7a24a43c84bda";
     } else {
         // 正式环境
         hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
     }
-    var s = document.getElementsByTagName("script")[0]; 
+    var s = document.getElementsByTagName("script")[0];
     s.parentNode.insertBefore(hm, s);
 })();
 
@@ -74,7 +74,7 @@ function grafana_statistics(advName){
                     type: "get",
                     url: "/front/grafanaStatistics?advName=" + i
                 })
-            } 
+            }
         }
     }
 }
@@ -82,4 +82,4 @@ function grafana_statistics(advName){
 <script>
   // 将版本号存至本地缓存,供vue单页面程序获取
   localStorage.setItem('jyVersion-to-vue', {{Msg "seo" "version"}})
-</script>
+</script>

+ 1 - 1
src/web/templates/demo-member/demo_action.html

@@ -178,7 +178,7 @@
         testServer: /jianyu360\.cn$/g
     }
     if (patterns.ip.test(host) || patterns.testServer.test(host)) {
-        hm.src = "https://hm.baidu.com/hm.js?76824641601c0cc52743ac46041455b6";
+        hm.src = "https://hm.baidu.com/hm.js?52c42de35032567eb9d7a24a43c84bda";
     } else {
         hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
     }

+ 8 - 0
src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -262,6 +262,14 @@
     <script src="{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}"></script>
     <script>
         haslogin({{.T.logid}})
+        function baiduEvent(name) {
+          try {
+            console.log(name, 'name')
+            _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+          } catch (e) {
+            console.log('未初始化百度统计')
+          }
+        }
     </script>
     <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/buyerClass.js'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/select-list-pc.js?v={{Msg "seo" "version"}}'></script>

+ 13 - 3
src/web/templates/pc/biddetail_rec.html

@@ -435,7 +435,15 @@ function isWechat() {
         标讯收藏
       </span>
       <script>
-        // var activeTags = []; // 已选的自定义标签数据
+        // 列表页收藏点击事件 百度统计
+        function collectBaiduEvent() {
+          try {
+            _hmt.push(['_trackEvent', '超级订阅-pc', 'click', '详情页标讯收藏按钮']);
+            console.log(_hmt,'_hmt')
+          } catch (e) {
+            console.log('未初始化百度统计')
+          }
+        }
         // 查询是否已收藏
         $.ajax({
           type:'post',
@@ -459,7 +467,8 @@ function isWechat() {
           }
         })
         // 收藏事件
-        $('#bidCollect').click(function() {
+        $('#bidCollect').off('click').bind('click',function() {
+          collectBaiduEvent()
           var top = (parseInt($(this).position().top) + 30 ) + 'px';
           var bids = [{bid: {{.T.obj._id}}}]
           collBidAction('C',bids,function(r) {
@@ -472,7 +481,8 @@ function isWechat() {
           })
         })
         // 取消收藏事件
-        $('#bidCollected').click(function() {
+        $('#bidCollected').off('click').bind('click',function() {
+          collectBaiduEvent()
           var bids = [{bid: {{.T.obj._id}}}]
           collBidAction('R',bids,function(r) {
             if (r.data) {

+ 4 - 4
src/web/templates/pc/entsearchindex.html

@@ -147,7 +147,7 @@
                         </div>
                         <div class="selector-card-content flex mini-select">
                             <div class="select-title">中标区域</div>
-                            <el-select v-model="filterState.biddingArea" @change="zbFilterChange" clearable placeholder="中标区域">
+                            <el-select v-model="filterState.biddingArea" @change="zbFilterChange('中标区域')" clearable placeholder="中标区域">
                                 <el-option
                                     v-for="item in zblyFilterOption.zbAreaOptions"
                                     :key="item.value"
@@ -156,7 +156,7 @@
                                 </el-option>
                             </el-select>
                             <div class="select-title">单位类型</div>
-                            <el-select v-model="filterState.entClass" @change="zbFilterChange" clearable placeholder="单位类型">
+                            <el-select v-model="filterState.entClass" @change="zbFilterChange('单位类型')" clearable placeholder="单位类型">
                                 <el-option
                                     v-for="item in zblyFilterOption.dwlxOptions"
                                     :key="item.value"
@@ -165,7 +165,7 @@
                                 </el-option>
                             </el-select>
                             <div class="select-title">联系方式</div>
-                            <el-select v-model="filterState.entContact" @change="zbFilterChange" clearable placeholder="联系方式">
+                            <el-select v-model="filterState.entContact" @change="zbFilterChange('联系方式')" clearable placeholder="联系方式">
                                 <el-option
                                     v-for="item in zblyFilterOption.lxfsOptions"
                                     :key="item.value"
@@ -221,7 +221,7 @@
                             </div>
                             <div @click.stop.prevent class="list-item-mask" v-if="item.showMask">
                                 <p>${ buttonText }会员,查看更多搜索结果</p>
-                                <button class="j-t-button confirm active" @click="openVipPage">
+                                <button class="j-t-button confirm active" @click="openVipPage('more')">
                                     去${ buttonText }
                                 </button>
                             </div>

+ 10 - 7
src/web/templates/pc/supsearch.html

@@ -607,7 +607,6 @@ $(function(){
     $('.buyclass .buyclass-all').addClass('active')
   }
   // 回显模板里返回的其他筛选条件
-  console.log(buyerTelVal,winnerTelVal, '666')
   if (buyerTelVal){
     var text = buyerTelVal == 'y' ? '有联系方式' : '无联系方式'
     $('.custom-input[name="buyertel"]').attr('data-value', buyerTelVal).val(text)
@@ -1151,7 +1150,7 @@ $(function(){
         </div>
         <div class="dialog-content">开通超级订阅,搜索招标采购项目更精准,300万+投标人都在用!</div>
         <div class="dialog-footer clearfix">
-          <a href="/front/subscribe.html" class="dialog-btn confirm-btn">去开通</a>
+          <a href="javascript:;" class="dialog-btn confirm-btn">去开通</a>
           <a href="javascript:;" class="dialog-btn default-btn">取消</a>
         </div>
       </div>
@@ -1165,7 +1164,7 @@ $(function(){
         </div>
         <div class="dialog-content">您的标讯收藏上限为100条,请升级为会员服务。</div>
         <div class="dialog-footer clearfix">
-          <a href="/front/subscribe.html" class="dialog-btn confirm-btn">去升级</a>
+          <a href="javascript:;" class="dialog-btn confirm-btn">去升级</a>
           <a href="javascript:;" class="dialog-btn default-btn">取消</a>
         </div>
       </div>
@@ -1273,7 +1272,7 @@ $(function(){
   function buyClassFn() {
     $('.buyclass-all').click(function() {
       if (!vipState) {
-        openVipDialog()
+        openVipDialog('采购单位类型')
         return
       }
       $(this).addClass('active').siblings('.buyclass-content').find('.buy-list').removeClass('active')
@@ -1282,7 +1281,7 @@ $(function(){
     // 采购单位类型子分类点击事件
     $('.buyclass-content .buy-list:not(.buy-list-parent)').click(function() {
       if (!vipState) {
-        openVipDialog()
+        openVipDialog('采购单位类型')
         return
       }
       $(this).toggleClass('active').parents('.buyclass').children('.buyclass-all').removeClass('active')
@@ -1303,6 +1302,10 @@ $(function(){
     })
     // 采购单位类型大分类点击事件
     $('.buyclass-content .buy-list.buy-list-parent').click(function() {
+      if (!vipState) {
+        openVipDialog('采购单位类型')
+        return
+      }
       $(this).toggleClass('active').parents('.buyclass').children('.buyclass-all').removeClass('active')
       if ($(this).hasClass('active')) {
         $(this).siblings('.buy-list').addClass('active')
@@ -1335,8 +1338,9 @@ $(function(){
   })
   // 其他筛选条件
   $('.custom-select').off('click').bind('click',function(e) {
+    var eventText = $(this).parent().siblings('span').html()
     if (!vipState) {
-      openVipDialog()
+      openVipDialog(eventText)
       return
     }
     e.stopPropagation()
@@ -1436,7 +1440,6 @@ $(function(){
 
   // 查询标讯是否收藏
   getBidIsColl()
-
 })
 
 var activeTags = []; //选中的自定义标签 作为全局变量使用

+ 3 - 2
src/web/templates/weixin/commonPay/checkout.html

@@ -118,7 +118,7 @@
                     </div>
                 </div>
             {{end}}
-            
+
         </div>
     </div>
     <div class="j-footer j-button-group">
@@ -410,6 +410,7 @@
         checkout.init()
     })
 </script>
+{{include "/common/baiducc.html"}}
 </body>
 
-</html>
+</html>

+ 1 - 0
src/web/templates/weixin/commonPay/transferAccounts.html

@@ -267,6 +267,7 @@
         $(".weui-uploader__input-box").show();
     }
 </script>
+{{include "/common/baiducc.html"}}
 </body>
 
 </html>

+ 1 - 0
src/web/templates/weixin/commonPay/transferAccountsResult.html

@@ -51,5 +51,6 @@
         {{end}}
     </div>
 </div>
+{{include "/common/baiducc.html"}}
 </body>
 </html>

+ 4 - 3
src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -16,8 +16,9 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}3">
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/coupon/css/pay-order-template.css?v={{Msg "seo" "version"}}' />
     <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
+    {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
-    
+
 </head>
 <body>
 <style>
@@ -883,7 +884,7 @@
         window.location.href = "/front/staticPage/wx-serviceterms.html";
     }
     /* vue 卡券部分代码 start */
-    var coupon = new Vue({ 
+    var coupon = new Vue({
       el: '#coupon-vue',
       data: function () {
         return {
@@ -908,7 +909,7 @@
     },
     mounted () {
       this.init()
-    }, 
+    },
     methods: {
         // 更新价格相关
         updatePrice: function (after, before) {

+ 9 - 8
src/web/templates/weixin/historypush.html

@@ -589,11 +589,12 @@
                 </p>
             </div>
         </div> -->
-        <van-dropdown-menu style="width: auto;overflow-x: auto;">
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" id="showDatePicker" @open="open" @close="close">
-                <date-component type="only-picker" :key="setTimer.datetimer" ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
+
+           <van-dropdown-menu style="width: auto;overflow-x: auto;">
+            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open('时间')" @close="close">
+                <date-component type="only-picker"  :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
             </van-dropdown-item>
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="areaItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="areaItem" @open="open('地区')" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="areaText">地区</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -604,7 +605,7 @@
                 <area-component :key="setTimer.areatimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="industryItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="industryItem" @open="open('行业')" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="industryText">行业</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -615,7 +616,7 @@
                 <industry-component :key="setTimer.industrytimer" ref="industryCom" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="cateItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false"  ref="cateItem" @open="open('采购单位')" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="cateText">采购单位</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -626,7 +627,7 @@
                 <cate-component :key="setTimer.catetimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectcatelist="selectCateList"></cate-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="关键词" ref="keywordItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="关键词" ref="keywordItem" @open="open('关键词')" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="keywordText">关键词</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -637,7 +638,7 @@
                 <keyword-component :key="setTimer.keytimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectkeywordlist="selectKeyWordList"></keyword-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="公告类型" ref="noticeItem" @open="open" @close="close">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="公告类型" ref="noticeItem" @open="open('公告类型')" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="noticeText">公告类型</span>
                     <span v-if="!screenShow" class="rootstyletitle">

+ 3 - 3
src/web/templates/weixin/search/tabSearch.html

@@ -637,7 +637,7 @@
                                 </div>
                                 <div class="pop-bottom" v-if="isWaitBuy">
                                     <van-button type="default" @click="resetCondition">再想一想</van-button>
-                                    <van-button type="primary" @click="goUpBuyPage">去开通</van-button>
+                                    <van-button type="primary" @click="goUpBuyPage(false)">去开通</van-button>
                                 </div>
                             </div>
                         </div>
@@ -681,7 +681,7 @@
                                 <div class="img-empty"></div>
                                 <span>未搜索到符合条件的企业</span>
                             </div>
-                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员,查看更多搜索结果</div>
+                            <div class="up-button" @click="goUpBuyPage('企业搜索底部-去升级')" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员,查看更多搜索结果</div>
                             <div class="ent-more-tip" v-if="false">
                                 <i class="j-icon base-icon icon-up-allow"></i>
                                 <span>上拉查看更多搜索结果</span>
@@ -777,7 +777,7 @@
                         </div>
                         <div class="pop-bottom" v-if="isWaitBuy">
                             <van-button type="default" @click="resetCondition">再想一想</van-button>
-                            <van-button type="primary" @click="goUpBuyPage">去开通</van-button>
+                            <van-button type="primary" @click="goUpBuyPage(false)">去开通</van-button>
                         </div>
                     </div>
                 </div>