ソースを参照

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

zhangxinlei1996 4 年 前
コミット
1226b628ba

+ 6 - 5
src/jfw/front/entsearch.go

@@ -6,6 +6,7 @@ import (
 	"jfw/jylabutil"
 	"jfw/public"
 	"qfw/util"
+	"qfw/util/bidsearch"
 	"strconv"
 
 	"github.com/go-xweb/xweb"
@@ -88,15 +89,15 @@ func (e *Entsearch) Bidsearchforentindex() error {
 	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
 }
 func getSearchResult(searchvalue, area string, minprice, maxprice float64, currentPage int) (int, int, []map[string]interface{}) {
-	if currentPage > pc_maxPageNum {
-		currentPage = pc_maxPageNum
+	if currentPage > bidsearch.SearchMaxPageNum_PC {
+		currentPage = bidsearch.SearchMaxPageNum_PC
 	}
-	count, list := jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, `"projectname","jgtime","zbtime","bidamount","list","sourceinfoid"`, currentPage, pc_pageSize, true)
-	limitCount := pc_pageSize * pc_maxPageNum
+	count, list := jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, `"projectname","jgtime","zbtime","bidamount","list","sourceinfoid"`, currentPage, bidsearch.SearchPageSize_PC, true)
+	limitCount := bidsearch.SearchPageSize_PC * bidsearch.SearchMaxPageNum_PC
 	if count > limitCount {
 		count = limitCount
 	}
-	totalPage := (count + pc_pageSize - 1) / pc_pageSize
+	totalPage := (count + bidsearch.SearchPageSize_PC - 1) / bidsearch.SearchPageSize_PC
 	for _, v := range list {
 		if v["bidamount"] != nil {
 			v["bidamount"] = fmt.Sprintf("%.2f", v["bidamount"])

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

@@ -104,14 +104,12 @@ var vNode = {
             svip: false, // 判断是否是超级订阅的企业画像
             digshow: false, // 判断是否是超级订阅会员
             overlayShow: true, // 弹窗遮罩是否显示
-            isfree: false, // 是否是免费用户
             isVip: false, // 只是超级订阅
             bidcollPowerInfo: {
                 vip: 0,
                 text: '开通',
                 btntext: '去开通'
-            }, // 判断是否是超级订阅升级版
-            rootPower: {}
+            }
         }
     },
     created: function () {
@@ -151,7 +149,6 @@ var vNode = {
     watch: {
         tabActiveName: function (newVal, oldVal) {
             var _this = this
-            console.log(newVal)
             if (newVal == '2') {
                 this.$nextTick(function () {
                     if (_this.gotTab2) {
@@ -175,30 +172,19 @@ var vNode = {
                             console.log('获取企业中标动态...')
                         }
                         _this.gotTab2 = true
-                        if(_this.conf._4 || _this.conf._13) {
-                            _this.digshow = false
-                        } else {
-                            _this.digshow = true
-                        }
-                        if(_this.rootPower.entniche) {
-                            if(!_this.rootPower.member && _this.rootPower.vip <= 0) {
-                                _this.getEntPortrait(function () {
-                                    _this.initChartsData()
-                                })
-                                _this.gotTab2 = true
-                                _this.digshow = true
-                            }
-                        }
                     }
                 });
             }
         },
     },
     computed: {
+        // 3个权限有1个就为true(取反为3个权限1个都没有)
+        hasOnePower: function () {
+            return this.conf._4 || this.conf._12 || this.conf._13
+        },
         setShow: function() {
-            if(this.digshow&&this.tabActiveName=='2') {
-                return true
-            }
+            // 必须在tab2,并且三个权限都没有,就用显示
+            return this.tabActiveName == '2' && !this.hasOnePower
         }
     },
     methods: {
@@ -223,7 +209,6 @@ var vNode = {
             if (e === 'cancel') {
                 this.tabActiveName = '1'
                 done(false)
-                this.digshow = true
                 this.overlayShow = true
             } else if (e === 'confirm') {
                 try {
@@ -301,9 +286,16 @@ var vNode = {
                 this.loading = this.showLoading()
             }
 
+            var urls = ''
+            if (this.isVip) {
+                urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+            } else {
+                urls = '/bigmember/portrait/winner/getNewMsg'
+            }
+
             $.ajax({
                 type: 'POST',
-                url: '/bigmember/portrait/winner/getNewMsg',
+                url: urls,
                 data: data,
                 success: function (res) {
                     if (res.error_code == 0) {
@@ -433,78 +425,48 @@ var vNode = {
                         if (res.data) {
                             _this.powerInfo = res.data
                         }
-                        if (res.data && $.isArray(res.data.power) && res.data.memberStatus > 0) {
+                        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) {
+                            if (res.data.viper) {
+                                _this.isVip = true
+                            }
+                            if (power.indexOf(4) != -1 || res.data.viper) {
                                 // 获取企业画像信息-4
                                 _this.conf._4 = true
                             }
-                            if (power.indexOf(13) != -1) {
+                            if (power.indexOf(13) != -1 || res.data.viper) {
                                 // 获取企业中标动态-13
                                 _this.conf._13 = true
-                            } else {
-                                _this.digshow = true
-                                _this.entInfo.followSearchFinish = true
-                                _this.entInfo.entExist = false
                             }
                             if (power.indexOf(12) != -1) {
                                 // 获取企业情报历史记录-12
                                 _this.conf._12 = true
-                            } else {
-                                _this.conf._12 = false
                             }
-                            if (_this.conf._4 || _this.conf._13) {
-                                _this.singleTab = false
-                                _this.digshow = false
+                            // follow的权限:4.12.13只要有一个就可以
+                            if (res.data.memberStatus > 0 && (power.indexOf(4) != -1||power.indexOf(12) != -1||power.indexOf(13) != -1)) {
+                                _this.getEntFollowState()
                             } else {
-                                // 如果不是超级订阅会员,点击中标信息显示提示弹窗
-                                if (!res.data.viper) {
-                                    _this.digshow = true
-                                } else {
-                                    _this.digshow = false
-                                }
+                                _this.entInfo.followSearchFinish = true
+                                _this.entInfo.entExist = false
                             }
                             _this.singleTab = false
                         }
-                        // 如果不是大会员。判断是否是超级订阅会员,不是显示弹窗
-                        if (res.data.memberStatus <= 0) {
-                            _this.singleTab = false
-                            if(res.data.vipStatus>0) {
-                                // res.data.viper = true
-                                if (!res.data.viper) {
-                                    _this.digshow = true
-                                    _this.bidcollPowerInfo.text = '升级'
-                                    _this.bidcollPowerInfo.btntext = '去升级'
-                                    _this.bidcollPowerInfo.vip = 1
-                                } else {
-                                    _this.isVip = true
-                                    _this.conf._4 = true
-                                    _this.digshow = false
-                                }
-                            } else {
-                                _this.digshow = true
+                        
+                        if (res.data.vipStatus > 0) {
+                            if (!res.data.viper) {
+                                _this.bidcollPowerInfo.text = '升级'
+                                _this.bidcollPowerInfo.btntext = '去升级'
+                                _this.bidcollPowerInfo.vip = 1
                             }
-                            _this.entInfo.followSearchFinish = true
-                            _this.entInfo.entExist = 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 () {
-                    _this.getUserRoot()
                     if (_this.loading) {
                         _this.loading.clear()
                     }
@@ -514,32 +476,6 @@ var vNode = {
                 }
             })
         },
-        // 判断是否是免费用户
-        getUserRoot: function() {
-            let _this = this
-            $.ajax({
-              url: '/publicapply/bidcoll/power',
-              type: 'POST',
-              success: function(res) {
-                _this.rootPower = res.data
-                // 如果不是超级订阅会员,获取免费用户关键词
-                if(res.data.member || res.data.entniche || res.data.vip > 0) {
-                    _this.isfree = false
-                } else {
-                    _this.singleTab = false
-                    _this.digshow = true
-                    _this.isfree = true
-                }
-                // 如果只是商机管理用户,不能看企业画像中标信息
-                if(res.data.entniche) {
-                    if(!res.data.member && res.data.vip <= 0) {
-                        _this.singleTab = false
-                        _this.digshow = true
-                    }
-                }
-              }
-            })
-          },
         // 修改企业关注状态
         changeFollowStateRequest: function () {
             var _this = this

+ 21 - 18
src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -150,6 +150,11 @@ var SuperSearch = {
     if(this.repeatExec){
       return;
     }
+    if (isReload && vMainSearchComponent) {
+      sessionStorage.removeItem('superSearch_newQueryParams')
+      sessionStorage.removeItem('superSearch_newQueryParams_components')
+      vMainSearchComponent.resetInitStatus()
+    }
     this.repeatExec = true;
     setTimeout(function(){
       SuperSearch.repeatExec = false;
@@ -888,6 +893,10 @@ var SuperSearch = {
     // 安卓获取高度异常临时处理方式
     setTimeout(function () {
       var isMaxHeight = $(".app-layout-content-b").height()  - $(".selected-export-box").height()
+      var defaultHeight = nowClientHeight - $(".app-layout-header").height()- $(".selected-export-box").height()
+      if (isMaxHeight < defaultHeight) {
+        isMaxHeight = defaultHeight
+      }
       $("#supersearchPage .app-layout-content-b #wrapper").css({height: isMaxHeight, 'overflow-y': 'auto'})
       $(".loading_").hide();
       $("#supersearchPage #working").addClass("hidden");
@@ -950,20 +959,19 @@ var SuperSearch = {
         });
       }
     });
-    }, 350)
-
-    //判断是否是table  (2.7.5table只显示20条数据)
-    if(!sessionStorage.superSearch_showType){
-      if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-        SuperSearch.isTable(false);
-      }else{
-        SuperSearch.isTable(true);
+      //判断是否是table  (2.7.5table只显示20条数据)
+      if(!sessionStorage.superSearch_showType){
+        if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
+          SuperSearch.isTable(false);
+        }else{
+          SuperSearch.isTable(true);
+        }
       }
-    }
-    if(!hasNextPage){
-      SuperSearch.noMoreData();
-      return;
-    }
+      if(!hasNextPage){
+        SuperSearch.noMoreData();
+        return;
+      }
+    }, 10)
   },
   clearSessionStorage: function(){
     if(!sessionStorage){
@@ -1253,11 +1261,6 @@ var SuperSearch = {
     // SuperSearch.reqParam.buyerclass = filter_buyerclass.join(',')
     SuperSearch.noMoreCache = false;
     SuperSearch.requesting = true;
-    if (nw !== 'mainSearchQuery') {
-      if (vMainSearchComponent) {
-        vMainSearchComponent.resetInitStatus()
-      }
-    }
     if(nw=="N"){
       SuperSearch.reqParam.selectType ="title";
       $(".newdialog .sub-search-title").find("li").removeClass("active");

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

@@ -246,8 +246,8 @@
             </van-tab>
             <van-tab name="2" v-if="!singleTab">
                 <template #title>
-                    <span :class="{bidinfo:digshow==true}">中标信息</span>
-                    <span v-if="digshow" class="bid_upgrade">升级</span>
+                    <span :class="{bidinfo:!hasOnePower}">中标信息</span>
+                    <span v-if="!hasOnePower" class="bid_upgrade">升级</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4">
                     <div class="card-row zb-info">

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

@@ -26,7 +26,7 @@
   <div class="j-container">
     {{include "/big-member/header.html"}}
     <div class="j-main collection" id="myCollection" v-cloak ref="main">
-      <div class="j-container" v-if="listState.list.length!==0">
+      <div class="j-container" id="date-picker-other-box" v-if="listState.list.length!==0">
         <div class="j-main">
           <div class="search-container van-fade-an" ref="searchContainer">
             <div class="listaction">

+ 5 - 4
src/jfw/modules/bigmember/src/service/portrait/entPortraitAction.go

@@ -15,10 +15,11 @@ type EntPortrait struct {
 	entDetail       xweb.Mapper `xweb:"/portrait/ent/detail"`               //企业基本信息
 	subVipEntDetail xweb.Mapper `xweb:"/portrait/subVipPortrait/entDetail"` //企业基本信息
 	//新画像接口
-	winnerContacts xweb.Mapper `xweb:"/portrait/winner/contacts"`       //历史项目联系方式 dev4.0pc端新增接口
-	winnerNewMsg   xweb.Mapper `xweb:"/portrait/winner/getNewMsg"`      //最新项目动态(需购买项目进度监控)
-	winnerPortrait xweb.Mapper `xweb:"/portrait/winner/getData"`        //最新项目动态
-	subVipPortrait xweb.Mapper `xweb:"/portrait/subVipPortrait/winner"` //升级版超级订阅查看画像
+	winnerContacts     xweb.Mapper `xweb:"/portrait/winner/contacts"`             //历史项目联系方式 dev4.0pc端新增接口
+	winnerNewMsg       xweb.Mapper `xweb:"/portrait/winner/getNewMsg"`            //最新项目动态(需购买项目进度监控)
+	winnerPortrait     xweb.Mapper `xweb:"/portrait/winner/getData"`              //最新项目动态
+	subVipPortrait     xweb.Mapper `xweb:"/portrait/subVipPortrait/winner"`       //升级版超级订阅查看画像
+	subVipWinnerNewMsg xweb.Mapper `xweb:"/portrait/subVipPortrait/winnerNewMsg"` //升级版超级订阅查看最新项目动态
 
 	//新采购单位画像
 	buyerNewMsg   xweb.Mapper `xweb:"/portrait/buyer/getNewMsg"` //最新项目动态

+ 49 - 0
src/jfw/modules/bigmember/src/service/portrait/portraitActionNew.go

@@ -110,6 +110,55 @@ func (this *EntPortrait) WinnerPortrait() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
+//超级订阅升级版查看最新中标动态
+func (this *EntPortrait) SubVipWinnerNewMsg() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	rData, errMsg := func() (interface{}, error) {
+		cepm, err := entity.CreatePortraitManager(userId, "entNewMsg")
+		if err != nil {
+			return nil, err
+		}
+		entId := util.DecodeId(this.GetString("entId"))
+		count, _ := this.GetInt("count")
+
+		pageNum, _ := this.GetInteger("pageNum")
+		limit, _ := this.GetInteger("pageSize")
+		if limit == 0 {
+			limit = 3
+		}
+		var start = 0
+		if pageNum > 0 {
+			start = (pageNum - 1) * limit
+		}
+
+		if pageSign := this.GetString("pageSign"); pageSign != "" { //more:4-23条;max:24-50条(移动端)
+			if pageSign == "more" {
+				start = 3
+				limit = 20
+			} else if pageSign == "max" {
+				start = 20 + 3
+				limit = entity.PortraitNewMegsLimit - start
+			}
+		}
+
+		rData, err := cepm.GetWinnerNewMsg(entId, start, limit)
+		if err != nil {
+			return nil, err
+		}
+		if count == 0 {
+			count = cepm.GetWinnerNewCount(entId)
+		}
+		return map[string]interface{}{
+			"list":  rData,
+			"count": count,
+		}, nil
+	}()
+	if errMsg != nil {
+		log.Printf("%s SubVipWinnerNewMsg获取企业最新中标信息出错:%s\n", userId, errMsg.Error())
+	}
+	this.ServeJson(NewResult(rData, errMsg))
+}
+
 //超级订阅升级版查看企业画像
 func (this *EntPortrait) SubVipPortrait() {
 	userId := qutil.ObjToString(this.GetSession("userId"))

+ 1 - 1
src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -166,7 +166,7 @@ func (this *BigVipBaseMsg) CheckBigVipBackPower(reqFlag string) (pass bool) {
 	if reqFlag == "entDetail" { //企业基本信息接口 无权限控制
 		return true
 	}
-	if this.Viper && (reqFlag == "entPortrait" || reqFlag == "entDetail") {
+	if this.Viper && (reqFlag == "entPortrait" || reqFlag == "entDetail" || reqFlag == "entNewMsg") {
 		return true
 	}
 	return this.checkPower(reqFlag, BackService)

+ 5 - 3
src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -36,7 +36,7 @@ const (
 	entSearchCacheKey = "entSearchIndexCache"
 
 	index, itype = "qyxy", "qyxy"
-	entQuery     = `{"query":{"bool":{"must":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date"]}`
+	entQuery     = `{"query":{"bool":{"must":[%s],"must_not":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date"]}`
 )
 
 var (
@@ -130,6 +130,8 @@ func (es *EnterpriseSearch) isEmptySearch() bool {
 //返回字段 企业名称、企业状态、法人、注册资本、地址、企业id、企业简称
 func (es *EnterpriseSearch) GetQuerySql() string {
 	musts := make([]string, 0, 0)
+	//仅展示统一社会信用代码以9开头数据
+	must_not := []string{`{"constant_score": {"filter": {"missing": {"field": "credit_no"}}}}`}
 	//输入查询
 	if es.Match != "" { //或关系 仅需满足一个
 		//可简写 {"bool":{"should":[{"match_phrase":{"ent_ikname":"李智"}},{"multi_match":{"query":"李智","type":"phrase","fields":["stock_name","employee_name","legal_person","bid_purchasing","bid_projectname"]}}],"minimum_should_match":1}}
@@ -204,7 +206,7 @@ func (es *EnterpriseSearch) GetQuerySql() string {
 	if es.EntContact != "" && es.IsVip {
 		musts = append(musts, fmt.Sprintf(`{"term":{"bid_contracttype":"%s"}}`, es.EntContact))
 	}
-	return fmt.Sprintf(entQuery, strings.Join(musts, ","))
+	return fmt.Sprintf(entQuery, strings.Join(musts, ","), strings.Join(must_not, ","))
 }
 
 //DoQuery 根据EnterpriseSearch参数进行企业相关查询
@@ -279,7 +281,7 @@ func GetEntIndexShow() (list *[]map[string]interface{}) {
 			return
 		}
 	}
-	sql := fmt.Sprintf(entQuery, fmt.Sprintf(`{"terms":{"_id":["%s"]}}`, strings.Join(config.Config.DefaultEntList, "\",\"")))
+	sql := fmt.Sprintf(entQuery, fmt.Sprintf(`{"terms":{"_id":["%s"]}}`, strings.Join(config.Config.DefaultEntList, "\",\"")), "")
 	sql = sql[:len(sql)-1] + fmt.Sprintf(`,"from":%d,"size":%d}"`, 0, 50)
 	listTmp := elastic.Get(index, itype, sql)
 	if listTmp != nil && len(*listTmp) > 0 {

+ 5 - 5
src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -159,8 +159,8 @@ func (p *DataExportPay) CreateOrder() {
 		download_url := util.GetExcelFilePath(ordercode)
 		go func() {
 			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, config.Config.Elasticsearch, id, qutil.If(data_spec == "高级字段包", "2", "1").(string), data_count)
-			list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, qutil.If(data_spec == "高级字段包", "2", "1").(string))
-			if err == nil {
+			if err == nil && list != nil && len(*list) > 0 {
+				list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, qutil.If(data_spec == "高级字段包", "2", "1").(string))
 				err = util.CreateDataExportExcelFile(list, data_spec == "高级字段包", config.ExConf.ExcelReadyPath+download_url)
 			}
 			if err != nil {
@@ -266,9 +266,9 @@ func (this *DataExportPay) VipDailyDataExport() {
 		go func() {
 			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, config.Config.Elasticsearch, selectId, "2", selectCount)
 			url := util.GetExcelFilePath(pay.GetOrderCode(selectId))
-			if err == nil {
-				log.Println("开始创建excel")
-				err = util.CreateDataExportExcelFile(list, true, config.ExConf.ExcelPayedPath+url)
+			if err == nil && list != nil && len(*list) > 0 {
+				list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, "2")
+				err = util.CreateDataExportExcelFile(list, true, config.ExConf.ExcelPayedPath+url) //创建excel文件
 			}
 			if err != nil {
 				errMeg := fmt.Sprintf("数据导出每日限量包异常\n用户id:%s\n数据导出筛选id:%s\n异常信息:%v:", userId, selectId, err)

+ 5 - 5
src/jfw/modules/weixin/src/config.json

@@ -16,11 +16,11 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "http://web-ws.jydev.jianyu360.com",
-    "appid":"wx5b1c6e7cc4dac0e4",
-    "appsecret":"b026103ffebd2291b3edb7a269612112",
+    "webdomain": "http://web-zxl.jydev.jianyu360.com",
+    "appid":"wxdedd73f450993685",
+    "appsecret":"d55898fde0b7887e5fe4660bd2494700",
     "apptoken": "top2022top2022",
-    "proxysess": "http://web-ws.jydev.jianyu360.com/front/sess/%s",
+    "proxysess": "http://web-zxl.jydev.jianyu360.com/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯,所有功能完全免费,\n和传统的会员制说再见!\n\n<a href='%s'>点击这里</a>设置关键词,或直接回复“订阅 关键词”,如“订阅 教学设备”,您将随时随地接收招标信息!\n\n剑鱼标讯,让投标无限可能!",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",
@@ -113,7 +113,7 @@
 	},
 	"reply":[
         {
-        		"text":"Hi~欢迎关注剑鱼标讯!\n\n每日更新10万+招标采购信息,\n定制项目监控,实时跟踪全部销售线索,\n已帮助数百万用户获取全网商机!\n\n点击这里<a href='%s'>免费订阅</a>,帮你抓住每个业务机会!\n\n<a href='%s'>【超级订阅重磅升级】</a>\n● 招标动态第一时间推送!\n●直接对接项目联系人!\n● 大容量300组关键词订阅!\n● 每日可查看2000条招标采购信息!\n● 搜索全国七千万企业信息,查看企业画像,\n● 全国企业随手查,竞争实力尽展示!",
+        		"text":"Hi~欢迎关注剑鱼标讯!\n\n每日更新10万+招标采购信息,\n定制项目监控,实时跟踪全部销售线索,\n已帮助数百万用户获取全网商机!\n\n点击这里<a href='%s'>免费订阅</a>,帮你抓住每个业务机会!\n\n<a href='%s'>【超级订阅重磅升级】</a>\n● 招标动态第一时间精准推送\n●直接对接项目联系人\n● 大容量300组关键词订阅\n● 项目一键分类收藏,重要信息不遗漏!\n● 全国七千万企业随手查,竞争实力全面洞察!",
 			"href":["keysetIndex","viphomepage_new"]
         }
 	],

+ 0 - 981
src/web/staticres/big-member/js/echarts_option.js

@@ -1,981 +0,0 @@
-// 中国地图配置项
-var mapSettings = {
-    chartSettings:{
-        positionJsonLink: "/jyapp/big-member/js/china.json",
-        beforeRegisterMapOnce (map) {
-            return map
-        },
-        beforeRegisterMap (map) {
-            return map
-        },
-        label:{
-            show:true,
-            fontSize:9
-        },
-        selectedMode:false, // 去掉省份小圆点
-        itemStyle:{
-            normal:{
-                borderColor:'#F06326',
-                areaColor: '#FFFFFF'
-            }
-        },
-        // zoom:0.95, // 缩放比例
-    },
-    chartExtend: {
-        tooltip: {
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {            // 坐标轴指示器,坐标轴触发有效
-                type: 'shadow',        // 默认为直线,可选为:'line' | 'shadow'
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                },
-                z: 3
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[8,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter:function(params,ticket, callback){
-                if(params.data == null){
-                    return params.name+':0'
-                }else{
-                    return params.name+':'+ params.value
-                }
-            }
-        },
-        grid:{
-            height: '280px',
-            containLabel: true
-        },
-        legend:{ // 隐藏图标上方小方块及文字
-            selectedMode: false,
-            textStyle:{
-                color:'transparent'
-            },
-            itemWidth:0,
-            itemHeight:0,
-        },
-        silent:false, // 禁用鼠标点击、滑过事件
-        series: {
-            showLegendSymbol:false,
-            selectedMode:false,
-        },
-        graphic:[
-            {
-                type:'group',
-                bottom: 54,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'市场分布数量',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            },
-            {
-                type: 'rect',
-                z: 101,
-                left: 0,
-                bottom: 34,
-                shape: {
-                    width: 84,
-                    height: 14
-                },
-                style: {
-                    stroke: '#FB483D',
-                    fill: 'transparent',
-                    lineWidth: 0.5
-                }
-            },
-            rectGroup(0,'#F06326'),
-            rectGroup(14,'#F48A5D'),
-            rectGroup(28,'#FFB366'),
-            rectGroup(42,'#FFCF9F'),
-            rectGroup(56,'#FFE7CF'),
-            rectGroup(70,'#FFF4EB'),
-            {
-                type:'group',
-                width: 84,
-                bottom: 20,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'100',
-                        font: '10px Microsoft YaHei'
-                    }
-                },
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'right',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'0',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            }
-        ],
-        visualMap: {
-            show:false,
-            inRange:{                             //定义 在选中范围中 的视觉元素
-                color: ['#FFF4EB','#FFE7CF', '#FFCF9F','#FFB366','#F48A5D', '#F06326'],
-            },
-            outOfRange:{
-                color: ['#F06326'],
-            },
-        },
-    },
-    chart: null
-}
-// 月报本月项目规模分布
-var mapSettings2 = {
-    chartSettings:{
-        positionJsonLink: "/jyapp/big-member/js/china.json",
-        beforeRegisterMapOnce (map) {
-            return map
-        },
-        beforeRegisterMap (map) {
-            return map
-        },
-        label:{
-            show:true,
-            fontSize:9
-        },
-        selectedMode:false,
-        itemStyle:{
-            normal:{
-                borderColor:'#F06326',
-                areaColor: '#FFFFFF'
-            }
-        },
-    },
-    chartExtend: {
-        tooltip: {
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow', 
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                },
-                z: 3
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[8,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter:function(params,ticket, callback){
-                if(params.data == null){
-                    return params.name + ':0'
-                }else{
-                    return params.name + ':'+ params.value
-                }
-            }
-        },
-        grid:{
-            height: '280px',
-            containLabel: true
-        },
-        legend:{
-            selectedMode: false,
-            textStyle:{
-                color:'transparent'
-            },
-            itemWidth:0,
-            itemHeight:0,
-        },
-        silent:false,
-        series: {
-            showLegendSymbol:false,
-            selectedMode:false,
-        },
-        graphic:[
-            {
-                type:'group',
-                bottom: 54,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'单位:万元',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            },
-            {
-                type: 'rect',
-                z: 101,
-                left: 0,
-                bottom: 34,
-                shape: {
-                    width: 84,
-                    height: 14
-                },
-                style: {
-                    stroke: '#FB483D',
-                    fill: 'transparent',
-                    lineWidth: 0.5
-                }
-            },
-            rectGroup(0,'#F06326'),
-            rectGroup(14,'#F48A5D'),
-            rectGroup(28,'#FFB366'),
-            rectGroup(42,'#FFCF9F'),
-            rectGroup(56,'#FFE7CF'),
-            rectGroup(70,'#FFF4EB'),
-            {
-                type:'group',
-                width: 84,
-                bottom: 20,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'100',
-                        font: '10px Microsoft YaHei'
-                    }
-                },
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'right',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'0',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            }
-        ],
-        visualMap: {
-            show:false,
-            inRange:{
-                color: ['#FFF4EB','#FFE7CF', '#FFCF9F','#FFB366','#F48A5D', '#F06326'],
-            },
-            outOfRange:{
-                color: ['#F06326'],
-            },
-        },
-    },
-    chart: null
-}
-// 月报本月中标企业注册地分布
-var mapSettings3 = {
-    chartSettings:{
-        positionJsonLink: "/jyapp/big-member/js/china.json",
-        beforeRegisterMapOnce (map) {
-            return map
-        },
-        beforeRegisterMap (map) {
-            return map
-        },
-        label:{
-            show:true,
-            fontSize:9
-        },
-        selectedMode:false,
-        itemStyle:{
-            normal:{
-                borderColor:'#F06326',
-                areaColor: '#FFFFFF'
-            }
-        },
-    },
-    chartExtend: {
-        tooltip: {
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow', 
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                },
-                z: 3
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[8,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter:function(params,ticket, callback){
-                if(params.data == null){
-                    return params.name + ':0'
-                }else{
-                    return params.name + ':'+ params.value
-                }
-            }
-        },
-        grid:{
-            height: '280px',
-            containLabel: true
-        },
-        legend:{
-            selectedMode: false,
-            textStyle:{
-                color:'transparent'
-            },
-            itemWidth:0,
-            itemHeight:0,
-        },
-        silent:false,
-        series: {
-            showLegendSymbol:false,
-            selectedMode:false,
-        },
-        graphic:[
-            {
-                type:'group',
-                bottom: 54,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'单位:个',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            },
-            {
-                type: 'rect',
-                z: 101,
-                left: 0,
-                bottom: 34,
-                shape: {
-                    width: 84,
-                    height: 14
-                },
-                style: {
-                    stroke: '#FB483D',
-                    fill: 'transparent',
-                    lineWidth: 0.5
-                }
-            },
-            rectGroup(0,'#F06326'),
-            rectGroup(14,'#F48A5D'),
-            rectGroup(28,'#FFB366'),
-            rectGroup(42,'#FFCF9F'),
-            rectGroup(56,'#FFE7CF'),
-            rectGroup(70,'#FFF4EB'),
-            {
-                type:'group',
-                width: 84,
-                bottom: 20,
-                children:[
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'left',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'100',
-                        font: '10px Microsoft YaHei'
-                    }
-                },
-                {
-                    type: 'text',
-                    z: 100,
-                    left: 'right',
-                    top: 'middle',
-                    style: {
-                        fill: '#333',
-                        text:'0',
-                        font: '10px Microsoft YaHei'
-                    }
-                }]
-            }
-        ],
-        visualMap: {
-            show:false,
-            inRange:{
-                color: ['#FFF4EB','#FFE7CF', '#FFCF9F','#FFB366','#F48A5D', '#F06326'],
-            },
-            outOfRange:{
-                color: ['#F06326'],
-            },
-        },
-    },
-    chart: null
-}
-// 中国地图例graphic配置函数
-function rectGroup(left,color) { 
-    return {
-        type: 'rect',
-        z: 100,
-        left: left,
-        bottom: 34,
-        shape: {
-            width: 14,
-            height: 14
-        },
-        style: {
-            fill: color
-        }
-    }
-}
-//  投标决策分析页面:预算分布、中标金额、折扣率分布三个图表配置项(只配置相同部分,不同部分在页面里单独配置)
-var barChart = {
-    chartSettings: {},
-    chartExtend:{
-        grid:{
-            left:4,
-            x:0,
-            y:20,
-            x2:0,
-            bottom:20
-        },
-        xAxis:{
-            axisLabel:{
-                interval: 0, // 强制显示x轴所有刻度
-                fontSize: 10
-            }
-        },
-        yAxis(item){
-            item[0].splitLine = {
-                lineStyle:{
-                    type: 'dashed',  // y轴背景虚线
-                    width: 0.5
-                }
-            }
-            item[0].axisLabel = {
-                margin:2,
-                fontSize: 10
-            }
-            item[1].splitLine = {
-                show:false
-            }
-            item[1].axisLabel = {
-                show:false,
-                fontSize: 10
-            }
-            return item;
-        },
-        tooltip: {
-            trigger: 'axis',
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow',
-                shadowStyle: {},
-                z: 3
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[7,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08);transform: translate3d(0,0,0)',
-            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++) {
-                    if( i == 0) {
-                        tip = params[i].value == 0 ? '' : tip + params[i].seriesName + ':' + params[i].value + '个' + '<br/>';
-                    }else if(i == 1){
-                        if (params[i].value != 0 || params[i].value != '0.00') {
-                            if (params[i].seriesName === '平均折扣率') {
-                                tip = tip + params[i].seriesName + ':' + params[i].value + '%' + '<br/>';
-                            } else {
-                                tip = tip + params[i].seriesName + ':' + params[i].value + '万元' + '<br/>';
-                            }
-                        } else {
-                            tip = tip
-                        }
-                        
-                    }
-                }
-                return tip;
-            }
-        },
-        legend: {
-            show:false,
-            orient: 'horizontal',
-            icon:'circle',
-            bottom:20,
-            align:'left',
-            itemWidth: 8,
-            itemHeight: 8,
-            itemGap:20,
-            textStyle:{
-                fontSize:11,
-                rich:{
-                    a:{
-                        fontSize:16,
-                        verticalAlign:'top',
-                        align:'center',
-                        padding:[0,15,28,0]
-                    },
-                    b:{
-                        fontSize:14,
-                        align:'center',
-                        padding:[0,15,0,0],
-                        lineHeight:25
-                    }
-                }
-            },
-            formatter: function (name) {
-                var wnYuan = ['金额', '项目金额', '项目规划', '项目总预算', '项目总规模']
-                var ge = ['数量', '项目数量']
-                if (wnYuan.indexOf(name) !== -1) {
-                    name += '(万元)'
-                } else if (ge.indexOf(name) !== -1) {
-                    name += '(个)'
-                }
-                return name;
-            },
-        },
-        series: {
-            barWidth: 20,
-            smooth:false,
-            symbol:'none',
-            lineStyle: {
-                width: 0,
-                color: 'rgba(0, 0, 0, 0)' // 线的颜色是透明的
-            },
-        },
-        
-    },
-}
-
-// 平均折扣率配置
-var multiBarChart = {
-    chartSettings: {
-        showLine: ['平均折扣率'],
-    },
-    chartExtend:{
-        grid:{
-            x:12,
-            y:20,
-            x2:12,
-        },
-        yAxis: {
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    type: 'dashed',  // y轴背景虚线
-                    width: 0.5
-                }
-            },
-            axisLabel:{
-                fontSize:10
-            },
-        },
-        xAxis: {
-            axisLabel:{
-                fontSize:10
-            }
-        },
-        tooltip: {
-            trigger: 'axis',
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow',
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                }
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding: [8,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter: function(params){
-                var tip = '';
-                for (var i = 0; i < params.length; i++) {
-                    if( i< 4) {
-                        tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '<br/>';
-                    }else {
-                        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.substring(0,params[0].name.lastIndexOf('年')) + ' - ' + '</div>'
-                return tip;
-            },
-        },
-        legend: {
-            orient: 'horizontal',
-            bottom:20,
-            icon:'circle',
-            itemWidth: 8,
-            itemHeight: 8,
-            padding:[0,6],
-            data:['日期', '0~5%', '5~10%','10~30%','30~100%','平均折扣率'],
-            textStyle:{
-                fontSize:11
-            }
-        },
-        series: {
-            smooth:false,
-        },
-        color:['#05A6F3','#0BD991','#FF9F40','#8E6DF2','#F1D090']
-    },
-}
-
-var mBarChart = {
-    dataEmpty: true,
-    chartSettings: {},
-    chartExtend:{
-        grid:{
-            x:14,
-            y:20,
-            x2:14
-        },
-        tooltip: {
-            trigger: 'axis',
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow',
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                }
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[8,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            z: 3
-        },
-        legend: {
-            orient: 'horizontal',
-            icon:'circle',
-            bottom:10,
-            left: 'center',
-            itemWidth: 8,
-            itemHeight: 8,
-            itemGap:10,
-            textStyle:{
-                fontSize:11
-            }
-        },
-        yAxis: {
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    type: 'dashed',
-                    width: 0.5,
-                    color:'rgba(0, 0, 0, 0.08)'
-                }
-            },
-            axisLabel:{
-                fontSize:10
-            },
-        },
-        xAxis: {
-            axisLabel:{
-                fontSize:10
-            }
-        },
-        series: {
-            barWidth: 20,
-            type:'bar'
-        },
-        color:['#9C72F4','#6B78E8','#05A6F3','#2ABED1','#0BD991','#C0C4CC','#B8D4F9','#444A7A','#F1D090','#B8D4F9','#C09BFC','#104EA3','#21CED2','#FFB901','#7BBFE5','#82E9D6','#62B8FF','#7E56EE','#B3E3E7','#8591FF','#96C3D8','#3774E8','#CDCEFE','#6BBEF4','#6E55B4','#2B82FE','#FF9A01','#01C290','#BAE1A8','#EB97D8']
-    },
-}
-
-
-// 月报 (本月项目规模)
-var barChart2 = {
-    chartExtend:{
-        grid:{
-            left:4,
-            x:0,
-            y:20,
-            x2:12,
-        },
-        xAxis: {
-            axisLabel:{
-                fontSize:10
-            }
-        },
-        yAxis(item){
-            var maxCountList = vNode.data.curMonthScaleData.rows.map(v =>{
-                return v['项目规模']
-            })
-            var maxPriceList = vNode.data.curMonthScaleData.rows.map(v =>{
-                return v['环比增长率(%)-右纵轴']
-            })
-            var maxCount = Math.ceil(Math.max.apply(null,maxCountList)).toString();
-            var maxPrice = Math.ceil(Math.max.apply(null,maxPriceList)).toString();
-            var minRight = Math.ceil(Math.min.apply(null,maxPriceList)).toString();
-            maxCount = Math.ceil(maxCount / (Math.pow(10,maxCount.length -1))) * Math.pow(10,maxCount.length -1);
-            maxPrice = Math.ceil(maxPrice / (Math.pow(10,maxPrice.length -1))) * Math.pow(10,maxPrice.length -1);
-            if(minRight.indexOf('-') > -1) {
-                minRight = '-'  + Math.ceil(minRight.replace('-','') / (Math.pow(10,minRight.replace('-','').length -1))) * Math.pow(10,minRight.replace('-','').length -1)
-            } else {
-                minRight = 0;
-            }
-            item[0].min = 0;
-            item[1].min = minRight;
-            item[0].max = maxCount;
-            item[0].interval = Math.ceil(maxCount / 5);
-            item[1].max = maxPrice;
-            item[1].interval = Math.ceil((maxPrice - minRight) / 5);
-            item[0].splitLine = {
-                lineStyle:{
-                    type: 'dashed',
-                    width: 0.5
-                }
-            }
-            item[1].splitLine = {
-                show:false,
-                lineStyle:{
-                    type: 'dashed',
-                    width: 0.5
-                }
-            },
-            item[1].axisLabel = {
-                show: true,
-                fontSize: 10
-            },
-            item[0].axisLabel = {
-                margin:2,
-                fontSize: 10,
-                formatter: function(value, index){
-                    return value.toString().replace(/,/,'');
-                }
-            }
-            return item;
-        },
-        tooltip: {
-            trigger: 'axis',
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {        
-                type: 'shadow', 
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                }
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[7,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter:function(params){
-                return formatterTip(params)
-            }
-        },
-        legend: {
-            show: true,
-            orient: 'horizontal',
-            icon:'circle',
-            bottom:20,
-            align:'left',
-            itemWidth: 8,
-            itemHeight: 8,
-            itemGap:20,
-            textStyle:{
-                fontSize:11,
-                rich:{
-                    a:{
-                        fontSize:16,
-                        verticalAlign:'top',
-                        align:'center',
-                        padding:[0,15,28,0]
-                    },
-                    b:{
-                        fontSize:14,
-                        align:'center',
-                        padding:[0,15,0,0],
-                        lineHeight:25
-                    }
-                }
-            },
-            formatter: function (name) {
-                if(name == '项目规模') {
-                    name = name + '(万元)'
-                }
-                return name;
-            },
-            data:["项目规模","环比增长率(%)-右纵轴"],
-        },
-        series: {
-            barWidth: 20,
-            smooth:false,
-        },
-        color:['#05A6F3', '#FF9F40']
-    },
-}
-// 月报 (本月中标企业中标项目数量分布)
-var barChart3 = {
-    chartExtend:{
-        grid:{
-            x:8,
-            y:20,
-            x2:12,
-        },
-        xAxis: {
-            axisLabel: {
-                fontSize: 10,
-                formatter: function (val) {
-                    return val + '个';
-                }
-            }
-        },
-        yAxis(item){
-            var maxCountList = vNode.data.curWinEntCountData.rows.map(v =>{
-                return v['企业数量']
-            })
-            var maxPriceList = vNode.data.curWinEntCountData.rows.map(v =>{
-                return v['累计占比(%)-右纵轴']
-            })
-            var maxCount = Math.ceil(Math.max.apply(null,maxCountList)).toString();
-            var maxPrice = Math.ceil(Math.max.apply(null,maxPriceList)).toString();
-            maxCount = Math.ceil(maxCount / (Math.pow(10,maxCount.length -1))) * Math.pow(10,maxCount.length -1);
-            maxPrice = Math.ceil(maxPrice / (Math.pow(10,maxPrice.length -1))) * Math.pow(10,maxPrice.length -1);
-            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);
-            item[0].splitLine = {
-                lineStyle:{
-                    type: 'dashed',
-                    width: 0.5
-                }
-            }
-            item[1].splitLine = {
-                show:false,
-                lineStyle:{
-                    type: 'dashed',
-                    width: 0.5
-                }
-            },
-            item[1].axisLabel = {
-                show: true,
-                fontSize: 10
-            },
-            item[0].axisLabel = {
-                margin:2,
-                fontSize: 10,
-                formatter: function(value, index){
-                    return value.toString().replace(/,/,'');
-                }
-            }
-            return item;
-        },
-        tooltip: {
-            trigger: 'axis',
-            confine: true,
-            backgroundColor:'#fff',
-            axisPointer: {
-                type: 'shadow',
-                shadowStyle:{
-                    color:'rgba(5,166,243,0.1)'
-                }
-            },
-            textStyle:{
-                color:'#171826',
-                fontSize:12
-            },
-            padding:[7,12],
-            extraCssText:'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
-            formatter:function(params){
-                return formatterTip(params)
-            }
-        },
-        legend: {
-            show: true,
-            orient: 'horizontal',
-            icon:'circle',
-            bottom:20,
-            align:'left',
-            itemWidth: 8,
-            itemHeight: 8,
-            itemGap:20,
-            textStyle:{
-                fontSize:11,
-                rich:{
-                    a:{
-                        fontSize:16,
-                        verticalAlign:'top',
-                        align:'center',
-                        padding:[0,15,28,0]
-                    },
-                    b:{
-                        fontSize:14,
-                        align:'center',
-                        padding:[0,15,0,0],
-                        lineHeight:25
-                    }
-                }
-            },
-            formatter: function (name) {
-                if(name == '企业数量') {
-                    name = name + '(个)'
-                }
-                return name;
-            },
-            data:["企业数量","累计占比(%)-右纵轴"],
-        },
-        series: {
-            barWidth: 20,
-            smooth:false
-        },
-        color:['#05A6F3', '#FF9F40']
-    },
-}
-// 修改tooltip展示效果函数
-function formatterTip(params) {
-    var tip = '';
-    for (var i = 0; i < params.length; i++) {//这里是自己定义样式, params[i].marker 表示是否显示左边的那个小圆圈
-        params[i].value == undefined ? params[i].value = 0 : params[i].value;
-        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].seriesName === '项目数量' || params[i].seriesName === '企业数量') {
-            tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '个' + '<br/>';
-        }else if(params[i].seriesName === '环比增长率(%)-右纵轴' || params[i].seriesName === '累计占比(%)-右纵轴'){
-            tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '%' + '<br/>';
-        } else {
-            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;
-}

+ 38 - 103
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -102,14 +102,12 @@ var vNode = {
             svip: false, // 判断是否是超级订阅的企业画像
             digshow: false, // 判断是否是超级订阅会员
             overlayShow: true, // 弹窗遮罩是否显示
-            isfree: false, // 是否是免费用户
             isVip: false, // 只是超级订阅
             bidcollPowerInfo: {
                 vip: 0,
                 text: '开通',
                 btntext: '去开通'
-            }, // 判断是否是超级订阅升级版
-            rootPower: {}
+            }
         }
     },
     created: function () {
@@ -173,30 +171,19 @@ var vNode = {
                             console.log('获取企业中标动态...')
                         }
                         _this.gotTab2 = true
-                        if(_this.conf._4 || _this.conf._13) {
-                            _this.digshow = false
-                        } else {
-                            _this.digshow = true
-                        }
-                        if(_this.rootPower.entniche) {
-                            if(!_this.rootPower.member && _this.rootPower.vip <= 0) {
-                                _this.getEntPortrait(function () {
-                                    _this.initChartsData()
-                                })
-                                _this.gotTab2 = true
-                                _this.digshow = true
-                            }
-                        }
                     }
                 });
             }
         },
     },
     computed: {
+        // 3个权限有1个就为true(取反为3个权限1个都没有)
+        hasOnePower: function () {
+            return this.conf._4 || this.conf._12 || this.conf._13
+        },
         setShow: function() {
-            if(this.digshow&&this.tabActiveName=='2') {
-                return true
-            }
+            // 必须在tab2,并且三个权限都没有,就用显示
+            return this.tabActiveName == '2' && !this.hasOnePower
         }
     },
     methods: {
@@ -221,7 +208,6 @@ var vNode = {
             if (e === 'cancel') {
                 this.tabActiveName = '1'
                 done(false)
-                this.digshow = true
                 this.overlayShow = true
             } else if (e === 'confirm') {
                 var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
@@ -300,9 +286,16 @@ var vNode = {
                 this.loading = this.showLoading()
             }
 
+            var urls = ''
+            if (this.isVip) {
+                urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+            } else {
+                urls = '/bigmember/portrait/winner/getNewMsg'
+            }
+
             $.ajax({
                 type: 'POST',
-                url: '/bigmember/portrait/winner/getNewMsg',
+                url: urls,
                 data: data,
                 success: function (res) {
                     if (res.error_code == 0) {
@@ -432,73 +425,48 @@ var vNode = {
                         if (res.data) {
                             _this.powerInfo = res.data
                         }
-                        if (res.data && $.isArray(res.data.power) && res.data.memberStatus > 0) {
+                        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) {
+                            if (res.data.viper) {
+                                _this.isVip = true
+                            }
+                            if (power.indexOf(4) != -1 || res.data.viper) {
                                 // 获取企业画像信息-4
                                 _this.conf._4 = true
                             }
-                            if (power.indexOf(13) != -1) {
+                            if (power.indexOf(13) != -1 || res.data.viper) {
                                 // 获取企业中标动态-13
                                 _this.conf._13 = true
+                            }
+                            if (power.indexOf(12) != -1) {
+                                // 获取企业情报历史记录-12
+                                _this.conf._12 = true
+                            }
+                            // follow的权限:4.12.13只要有一个就可以
+                            if (res.data.memberStatus > 0 && (power.indexOf(4) != -1||power.indexOf(12) != -1||power.indexOf(13) != -1)) {
+                                _this.getEntFollowState()
                             } else {
-                                _this.digshow = true
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
                             }
-                            if (_this.conf._4 || _this.conf._13) {
-                                _this.singleTab = false
-                                _this.digshow = false
-                            } else {
-                                // 如果不是超级订阅会员,点击中标信息显示提示弹窗
-                                if (!res.data.viper) {
-                                    _this.digshow = true
-                                } else {
-                                    _this.digshow = false
-                                }
-                            }
                             _this.singleTab = false
                         }
-                        // 如果不是大会员。判断是否是超级订阅会员,不是显示弹窗
-                        if (res.data.memberStatus <= 0) {
-                            _this.singleTab = false
-                            if(res.data.vipStatus>0) {
-                                if (!res.data.viper) {
-                                    _this.digshow = true
-                                    _this.bidcollPowerInfo.text = '升级'
-                                    _this.bidcollPowerInfo.btntext = '去升级'
-                                    _this.bidcollPowerInfo.vip = 1
-                                } else {
-                                    _this.isVip = true
-                                    _this.conf._4 = true
-                                    _this.digshow = false
-                                }
-                            } else {
-                                _this.digshow = true
+                        
+                        if (res.data.vipStatus > 0) {
+                            if (!res.data.viper) {
+                                _this.bidcollPowerInfo.text = '升级'
+                                _this.bidcollPowerInfo.btntext = '去升级'
+                                _this.bidcollPowerInfo.vip = 1
                             }
-                            _this.entInfo.followSearchFinish = true
-                            _this.entInfo.entExist = false
-                        } 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 () {
-                    _this.getUserRoot()
                     if (_this.loading) {
                         _this.loading.clear()
                     }
@@ -508,32 +476,6 @@ var vNode = {
                 }
             })
         },
-        // 判断是否是免费用户
-        getUserRoot: function() {
-            let _this = this
-            $.ajax({
-              url: '/publicapply/bidcoll/power',
-              type: 'POST',
-              success: function(res) {
-                  _this.rootPower = res.data
-                // 如果不是超级订阅会员,获取免费用户关键词
-                if(res.data.member || res.data.entniche || res.data.vip > 0) {
-                    _this.isfree = false
-                } else {
-                    _this.singleTab = false
-                    _this.digshow = true
-                    _this.isfree = true
-                }
-                // 如果只是商机管理用户,不能看企业画像中标信息
-                if(res.data.entniche) {
-                    if(!res.data.member && res.data.vip <= 0) {
-                        _this.singleTab = false
-                        _this.digshow = true
-                    }
-                }
-              }
-            })
-        },
         // 修改企业关注状态
         changeFollowStateRequest: function () {
             var _this = this
@@ -962,17 +904,10 @@ var vNode = {
         },
         // 去公告详情页
         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
+            if (item.id) {
+                var href = '/article/content/' + item.id + '.html'
+                location.href = href
             }
         },
         savePageState: function () {

+ 5 - 2
src/web/staticres/common-module/collection/js/money-mobile.js

@@ -215,12 +215,15 @@ var moneyComponent = {
         item.selected = !item.selected
       }
     },
-    resetSelected () {
+    resetSelected (type) {
       this.selectTags.forEach(v => (v.selected = false))
       this.inputSelected = false
+      if (type) {
+        this.selectTags = this.tags
+      }
     },
     resetAll:function() {
-      this.resetSelected()
+      this.resetSelected(true)
       let params = {
         name: 'select-tag',
         data: ''

+ 3 - 0
src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -884,6 +884,9 @@ var vMainSearchComponent = new Vue({
             if (String(tempMoney[1]).length) {
               this.conditionStrMap.maxprice = tempMoney[1]
             }
+          } else {
+            this.conditionStrMap.minprice = ''
+            this.conditionStrMap.maxprice = ''
           }
           break
         }

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

@@ -46,7 +46,7 @@ var vm = new Vue({
                 buyerclass: [],
                 buyerclassObj: {}, // buyerclass原始选中数据
                 buyerPhone: 0, // 采购单位联系方式
-                bidPhone: 0, // 中标企业联系方式
+                winnerPhone: 0, // 中标企业联系方式
             },
             listState: {
                 listType: 'line', // line/table
@@ -140,8 +140,8 @@ var vm = new Vue({
                 label: this.filterState.tags.join(','),
                 selectTime: this.filterState.selectTime,
                 buyerclass: this.filterState.buyerclass.join(','),
-                buyPhone: this.filterState.buyPhone ? this.filterState.buyPhone : 0,
-                bidPhone: this.filterState.bidPhone ? this.filterState.bidPhone : 0
+                buyerPhone: this.filterState.buyerPhone ? this.filterState.buyerPhone : 0,
+                winnerPhone: this.filterState.winnerPhone ? this.filterState.winnerPhone : 0
             }
             this.listState.loading = true
             this.listState.loaded = false
@@ -273,8 +273,8 @@ var vm = new Vue({
                     label: this.filterState.tags.join(','),
                     selectTime: this.filterState.selectTime,
                     buyerclass: this.filterState.buyerclass.join(','),
-                    buyPhone: this.filterState.buyPhone ? this.filterState.buyPhone : 0,
-                    bidPhone: this.filterState.bidPhone ? this.filterState.bidPhone : 0
+                    buyerPhone: this.filterState.buyerPhone ? this.filterState.buyerPhone : 0,
+                    winnerPhone: this.filterState.winnerPhone ? this.filterState.winnerPhone : 0
                 }
             } else {
                 data = {

+ 10 - 7
src/web/staticres/js/wxSupersearch.js

@@ -136,6 +136,11 @@ var SuperSearch = {
     if(!isReload){
       this.recoveryPage();
     }
+    if (isReload && vMainSearchComponent) {
+      sessionStorage.removeItem('superSearch_newQueryParams')
+      sessionStorage.removeItem('superSearch_newQueryParams_components')
+      vMainSearchComponent.resetInitStatus()
+    }
     //loadTipMsg加载历史记录和我的订阅
     this.loadTipMsg();
     this.clearSessionStorage();
@@ -860,6 +865,10 @@ var SuperSearch = {
     // 安卓获取高度异常临时处理方式
     setTimeout(function () {
       var isMaxHeight = $(".app-layout-content-b").height()  - $(".selected-export-box").height()
+      var defaultHeight = nowClientHeight - $(".app-layout-header").height()- $(".selected-export-box").height()
+      if (isMaxHeight < defaultHeight) {
+        isMaxHeight = defaultHeight
+      }
       $("#supersearchPage .app-layout-content-b #wrapper").css({height: isMaxHeight, 'overflow-y': 'auto'})
       $(".loading_").hide();
       $("#supersearchPage #working").addClass("hidden");
@@ -918,7 +927,7 @@ var SuperSearch = {
           });
         }
       });
-    }, 350)
+    }, 10)
 
     //判断是否是table  (2.7.5table只显示20条数据)
     if(!sessionStorage.superSearch_showType){
@@ -1222,12 +1231,6 @@ var SuperSearch = {
     // SuperSearch.reqParam.buyerclass = filter_buyerclass.join(',')
     SuperSearch.noMoreCache = false;
     SuperSearch.requesting = true;
-    if (nw !== 'mainSearchQuery') {
-      if (vMainSearchComponent) {
-        vMainSearchComponent.resetInitStatus()
-      }
-    }
-
     if(nw=="N"){
       SuperSearch.reqParam.selectType ="title";
       $(".newdialog .sub-search-title").find("li").removeClass("active");

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

@@ -109,7 +109,7 @@
                             </el-option>
                         </el-select>
                         <div class="select-title">中标企业联系方式</div>
-                        <el-select v-model="filterState.bidPhone" @change="otherFilterChange" placeholder="中标企业联系方式">
+                        <el-select v-model="filterState.winnerPhone" @change="otherFilterChange" placeholder="中标企业联系方式">
                             <el-option
                                 v-for="item in buyerPhoneOptions"
                                 :key="item.value"

+ 2 - 2
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -252,8 +252,8 @@
             </van-tab>
             <van-tab name="2" v-if="!singleTab">
                 <template #title>
-                    <span :class="{bidinfo:digshow==true}">中标信息</span>
-                    <span v-if="digshow" class="bid_upgrade">升级</span>
+                    <span :class="{bidinfo:!hasOnePower}">中标信息</span>
+                    <span v-if="!hasOnePower" class="bid_upgrade">升级</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4">
                     <div class="card-row zb-info">

+ 1 - 1
src/web/templates/frontRouter/wx/collection/sess/index.html

@@ -34,7 +34,7 @@
   <div class="j-container">
     {{include "/big-member/header.html"}}
     <div class="j-main collection" id="myCollection" v-cloak ref="main">
-      <div class="j-container" v-if="listState.list.length!==0">
+      <div class="j-container" id="date-picker-other-box" v-if="listState.list.length!==0">
         <div class="j-main">
           <div class="search-container van-fade-an" ref="searchContainer">
             <div class="listaction">

+ 3 - 3
src/web/templates/weixin/historypush.html

@@ -911,9 +911,9 @@
           }
 
           new FastClick(document.body);
-          $("#normal_set").click(function () {
-            tokeysetForFree()
-          });
+          //$("#normal_set").click(function () {
+          //  tokeysetForFree()
+          //});
           // TODO 缺陷疑问
           $(".wx_header_right .sub_manager").click(function () {
               if (!isVipSub) {