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

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

@@ -357,13 +357,13 @@ var vNode = {
               console.log(res)
               setTimeout(function() {
                 // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-                location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+                location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
               }, 200)
             },
             error: function (error) {
               console.log(error)
               // location.href = '/jyapp/big/page/buy_commit?bid=' + _this.encryptId
-              location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+              location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
             }
           })
         },
@@ -1435,7 +1435,7 @@ var vNode = {
         },
         //免费赠送采购单位全景分析体验 去解锁
         goGiveAnalysis: function(){
-          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyerportrait_freeuser';
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=buyer_portrait_freeuser';
         },
         // 前往升级或联系客服
         goUpgradeOrConcat: function (item) {

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -574,6 +574,9 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
+          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
+          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
           article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
           article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
           member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
@@ -591,9 +594,8 @@
           app_analysis_follow_project: '请完善个人信息，辅助你做投标决策及报价参考！',
           app_analysis_follow_ent: '请完善个人信息，辅助你做投标决策及报价参考！',
           'jy-wxsearch-index-tap': '请留下联系方式，我们会尽快联系您体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
-          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
-          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
-          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
+          member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
         var titleMap = {
             ent_portrait_freeuser: '欢迎体验企业中标分析'
@@ -617,10 +619,14 @@
             }
             this.moduleShow.position = true
           }
-
+          
           if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
             var r = infoText.match(/\【(.+?)\】/g)
-             titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+            titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          } else if (source.indexOf('ent_portrait_') > -1) {
+            titleText = '欢迎体验企业中标分析'
+          } else if (source.indexOf('buyer_portrait_') > -1) {
+            titleText = '欢迎体验采购单位全景分析'
           } else{
             titleText = '欢迎体验剑鱼大会员'
           }

src/jfw/modules/publicapply/src/attachmentdow/service/service.go

@@ -65,7 +65,12 @@ func (u *Dow) Subdow() {
 				}
 				//下载后自增一次
 				defer func() {
-					redis.Incr(jy.PowerCacheDb, mon)
+					//判断这个月是否下载过  下载过递增 没有下载过默认存储31d
+					if ss == 0 {
+						redis.Put(jy.PowerCacheDb, mon, 1, 60*60*24*31)
+					} else {
+						redis.Incr(jy.PowerCacheDb, mon)
+					}
 					data := make(map[string]interface{})
 					data["p_userid"] = userid
 					data["p_infoId"] = infoId
@@ -74,7 +79,7 @@ func (u *Dow) Subdow() {
 					data["p_type"] = "超级订阅用户附件下载"
 					//存库记录
 					db.Mgo.Save("filehistroy", data)
-					log.Printf("超级订阅用户%s,%s月第%d次下载附件", userid, mon, ss)
+					log.Printf("超级订阅用户%s,%s月第%d次下载附件", userid, mon, ss+1)
 				}()
 			}
 		} else if !vipStatus.IsPayedUser() {

src/jfw/modules/subscribepay/src/entity/member.go

@@ -1,11 +1,11 @@
 package entity
 
 import (
-	"config"
 	"encoding/json"
 	"log"
 	qutil "qfw/util"
 	"qfw/util/jy"
+	"strconv"
 	"strings"
 	"time"
 	"util"
@@ -14,6 +14,32 @@ import (
 type memberStruct struct{}
 
 var MemberStruct memberStruct
+var Bigmember_serice map[int]map[int]int //权益 k:子id ; v：map[int]int{父id:年数量}
+
+func init() {
+	log.Println("初始化大会员权益")
+	//初始化用户权益
+	member_serice := map[int]map[int]int{}
+	if rdata := util.Mysql.SelectBySql(`SELECT id,s_name,i_pid,s_count_year FROM bigmember_service`); rdata != nil && len(*rdata) > 0 {
+		for _, v := range *rdata {
+			sid := qutil.IntAll(v["id"])
+			pid := qutil.IntAll(v["i_pid"])
+			count_year := qutil.IntAll(v["s_count_year"])
+			log.Println(pid, sid, count_year)
+			if pid != 0 {
+				member_serice[sid] = map[int]int{
+					pid: count_year,
+				}
+			} else {
+				member_serice[sid] = map[int]int{
+					sid: count_year,
+				}
+			}
+		}
+	}
+	Bigmember_serice = member_serice
+	log.Println("初始化大会员权益已结束")
+}
 
 //大会员支付完成回调方法
 func (m *memberStruct) PayCallBack(param *CallBackParam) bool {
@@ -97,36 +123,19 @@ func normal_member(level int, enddate time.Time, userId string) {
 	}
 	if serviceCode != "" {
 		for _, v := range strings.Split(serviceCode, ",") {
+			var s_serviceid = v
 			var frequency = 0
-			if level == 6 {
-				switch v {
-				case "15":
-					frequency = config.MemberConfig.Power.Formal_fwinner
-				case "12", "13", "14", "4": //企业情报监控/企业中标动态默认企业数量/企业全景分析  项目进度监控 默认关注项目数量
-					frequency = config.MemberConfig.Power.Business_enterprise
-				case "7": //潜在客户 默认关注客户数量
-					frequency = config.MemberConfig.Power.Business_project
-				case "17": //每日限量包
-					frequency = config.MemberConfig.Power.Business_package
-				}
-			} else {
-				switch v {
-				case "15":
-					frequency = config.MemberConfig.Power.Formal_fwinner
-				case "12", "13", "4": //企业情报监控/企业中标动态默认企业数量/企业全景分析
-					frequency = config.MemberConfig.Power.Formal_enterprise
-				case "14": //项目进度监控 默认关注项目数量
-					frequency = config.MemberConfig.Power.Formal_project
-				case "7": //潜在客户 默认关注客户数量
-					frequency = config.MemberConfig.Power.Formal_customer
-				case "18": //每日限量包
-					frequency = config.MemberConfig.Power.Formal_package
+			sid, _ := strconv.Atoi(v)
+			if Bigmember_serice[sid] != nil {
+				for k, v := range Bigmember_serice[sid] {
+					s_serviceid = strconv.Itoa(k)
+					frequency = v
 				}
 			}
 			if util.Mysql.CountBySql(`select count(*) from `+jy.BigmemberUserPowerTable+` where s_userid=? and s_serviceid=?`, userId, v) == 0 {
 				insert := map[string]interface{}{
 					"s_userid":     userId,
-					"s_serviceid":  v,
+					"s_serviceid":  s_serviceid,
 					"i_frequency":  frequency,
 					"l_starttime":  qutil.NowFormat(qutil.Date_Full_Layout),
 					"l_endtime":    qutil.FormatDate(&enddate, qutil.Date_Full_Layout),

src/web/staticres/big-member/js/unit_portrayal.js

@@ -354,13 +354,13 @@ var vNode = {
               console.log(res)
               setTimeout(function() {
                 // location.href = '/big/wx/page/buy_commit?bid=' + _this.encryptId
-                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+                location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
               }, 200)
             },
             error: function (error) {
               console.log(error)
               // location.href = '/big/wx/page/buy_commit?bid=' + _this.encryptId
-              location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg'
+              location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_getNewMsg_freeuser'
             }
           })
         },
@@ -1419,7 +1419,7 @@ var vNode = {
         },
         //免费赠送采购单位全景分析体验 去解锁
         goGiveAnalysis: function(){
-          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyerportrait_freeuser';
+          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=buyer_portrait_freeuser';
         },
         // 前往升级或联系客服
         goUpgradeOrConcat: function (item) {

src/web/staticres/common-module/collection/js/buyer-example.js

@@ -86,84 +86,84 @@ var buyerExample = {
         case 'item_1': {
           textMap.headText.top = '采购单位项目动态全面获取,'
           textMap.headText.bot = '帮助企业洞察采购需求，开发新客户！',
-          textMap.source = 'buyer_portrait_contacts'
+          textMap.source = 'buyer_portrait_contacts_freeuser'
           break
         }
           // 年度项目统计
         case 'item_2': {
           textMap.headText.top = '采购单位年度项目规模、增长趋势'
           textMap.headText.bot = '一目了然，快速分析市场！'
-          textMap.source = 'buyer_portrait_yearData'
+          textMap.source = 'buyer_portrait_yearData_freeuser'
           break
         }
           // 月度采购规模统计
         case 'item_3': {
           textMap.headText.top = '通过纵向对比近3年月度中标金额，'
           textMap.headText.bot = '快速分析行业月度采购趋势！'
-          textMap.source = 'buyer_portrait_monthData'
+          textMap.source = 'buyer_portrait_monthData_freeuser'
           break
         }
           // 采购规模分布
         case 'item_4': {
           textMap.headText.top = '全面了解采购单位的年度采购规划、'
           textMap.headText.bot = '项目预算，帮助投标人制定投标策略！'
-          textMap.source = 'buyer_portrait_moneyRange'
+          textMap.source = 'buyer_portrait_moneyRange_freeuser'
           break
         }
           // 各类招标方式占比
         case 'item_5': {
           textMap.headText.top = '洞察采购单位招标方式、数量、金额占比，'
           textMap.headText.bot = '综合了解采购单位，帮企业决策是否投标！'
-          textMap.source = 'buyer_portrait_bidtypeData'
+          textMap.source = 'buyer_portrait_bidtypeData_freeuser'
           break
         }
           // 各行业项目平均节支率
         case 'item_6': {
           textMap.headText.top = '分析行业项目的预算、中标价格差额比率，'
           textMap.headText.bot = '帮助企业核算采购项目的利润率！'
-          textMap.source = 'buyer_portrait_rate'
+          textMap.source = 'buyer_portrait_rate_freeuser'
           break
         }
           // 各行业项目规模占比
         case 'item_7': {
           textMap.headText.top = '通过行业采购项目的规模、数量、利润率，'
           textMap.headText.bot = '洞悉采购单位的采购状况！'
-          textMap.source = 'buyer_portrait_top12'
+          textMap.source = 'buyer_portrait_top12_freeuser'
           break
         }
           // 重点合作企业
         case 'item_8': {
           textMap.headText.top = '通过挖掘重点合作企业，直观了解采购单位'
           textMap.headText.bot = '与企业关系远近，辅助投标决策！'
-          textMap.source = 'buyer_portrait_topShow'
+          textMap.source = 'buyer_portrait_topShow_freeuser'
           break
         }
           // 合作企业注册资本分布
         case 'item_9': {
           textMap.headText.top = '通过分析合作企业注册资本、采购项目规模、'
           textMap.headText.bot = '利润率，全面洞察采购单位合作企业！'
-          textMap.source = 'buyer_portrait_withCapitalData'
+          textMap.source = 'buyer_portrait_withCapitalData_freeuser'
           break
         }
          // 合作企业年龄分布
         case 'item_10': {
           textMap.headText.top = '通过分析合作企业年龄、数量、规模分布情况，'
           textMap.headText.bot = '全面洞察采购单位合作企业！'
-          textMap.source = 'buyer_portrait_withEstablishData'
+          textMap.source = 'buyer_portrait_withEstablishData_freeuser'
           break
         }
         // 合作企业注册地分布
         case 'item_11': {
           textMap.headText.top = '通过分析合作企业的地址、数量、采购规模，'
           textMap.headText.bot = '了解采购单位营商环境，辅助投标决策！'
-          textMap.source = 'buyer_portrait_withAreaData'
+          textMap.source = 'buyer_portrait_withAreaData_freeuser'
           break
         }
         // 重点合作代理机构
         case 'item_12': {
           textMap.headText.top = '通过提供合作代理机构的名录、数量，全面洞察'
           textMap.headText.bot = '采购单位合作环境，辅助投标决策！'
-          textMap.source = 'buyer_portrait_topAgencyData'
+          textMap.source = 'buyer_portrait_topAgencyData_freeuser'
           break
         }
       }

src/web/staticres/css/subscribe_new.css

@@ -1008,6 +1008,8 @@
     top: -33px;
     left: 50%;
     transform: translateX(-50%);
+}
+.app-bottom-box map{
     cursor: pointer;
 }
 

src/web/staticres/js/login.js

@@ -350,7 +350,7 @@ var logic = function(data,num){
 		$("#bidLogin").modal("hide")
 		$("#bidcommunity").modal("hide")
 		clearInterval(loginfg);
-		loginflag = true;infoList
+		loginflag = true;
 		processpage(data.shareid,num);
 		//登录成功，停止轮询
 		LoginPolling.stop();

src/web/staticres/js/pc-collect-user-info.js

@@ -350,6 +350,9 @@ var vm = new Vue({
         agree: true,
       },
       sourceTitleMap: {
+        article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
+        ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
+        buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
         ent_portrait_: '请留下联系方式，我们会尽快联系您！体验企业画像分析，帮你透视企业！',
         buyer_portrait_: '请留下联系方式，我们会尽快联系您！体验采购单位画像分析，为你挖掘客户！',
         member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
@@ -358,9 +361,8 @@ var vm = new Vue({
         article_ent_portrait: '请留下联系方式，我们会尽快联系您！体验企业画像分析，帮你透视企业！',
         article_buyer_portrait: '请留下联系方式，我们会尽快联系您！体验采购单位画像分析，为你挖掘客户！',
         article_slogan: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
-        article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
-        ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
-        buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！'
+        member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+        function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
       }
     }
   },
@@ -426,10 +428,16 @@ var vm = new Vue({
         }
       }
       if (text) {
-        if (this.source.indexOf('_freeuser') > -1) {
+        if (this.source.indexOf('_freeuser') > -1 && text.indexOf('【') > -1) {
           var r = text.match(/\【(.+?)\】/g)
           this.dialogTitleTop = '欢迎体验' + r[0].replace('【','').replace('】','')
           this.dialogTitle = text
+        } else if (this.source.indexOf('ent_portrait_') > -1) {
+          this.dialogTitleTop = '欢迎体验企业中标分析'
+          this.dialogTitle = text
+        } else if (this.source.indexOf('buyer_portrait_') > -1) {
+          this.dialogTitleTop = '欢迎体验采购单位全景分析'
+          this.dialogTitle = text
         } else {
           this.dialogTitle = text
           this.dialogTitleTop = '欢迎体验剑鱼大会员'

src/web/templates/big-member/pc/page_index.html

@@ -191,11 +191,18 @@
             padding: 60px 46px;
             box-sizing: border-box;
         }
-        .toggle-item-content-group .video-group {
+        .toggle-item-content-group .video-group .video-content-group.active {
+            display: flex;
+        }
+        .toggle-item-content-group .video-group .video-content-group {
             display: flex;
             flex-direction: column;
             align-items: center;
             justify-content: center;
+            width: 100%;
+            display: none;
+        }
+        .toggle-item-content-group .video-group {
             width: 786px;
             padding-top: 52px;
             padding-bottom: 48px;
@@ -203,7 +210,14 @@
             box-shadow: 0px 0px 28px rgba(0, 0, 0, 0.16);
             border-radius: 12px;
             margin-left: -16px;
+            background: url(/big-member/image/new_big_index/item-bg.png) no-repeat;
+            background-size: cover;
         }
+        .video-box {
+            min-height: 345px;
+            cursor: pointer;
+        }
+        .video-box video,
         .video-box img {
             width: 684px;
         }
@@ -217,8 +231,14 @@
             align-items: center;
             justify-content: center;
         }
-        .info-group .item-info-group.active  {
-
+        .info-group .item-info-group + .item-info-group{
+            margin-top: 24px;
+        }
+        .info-group .item-info-group  .content-info-group {
+            display: none;
+        }
+        .info-group .item-info-group.active .content-info-group {
+                display: block;
         }
         .info-group .title-info-group::before{
             width: 158px;
@@ -227,12 +247,17 @@
             left: 38px;
             background: rgba(217, 233, 255, 0.33);
         }
+        .info-group .item-info-group .title-info-group::after {
+            transition: all 0.3s;
+        }
         .info-group .item-info-group.active .title-info-group::after {
             width: 40px;
             height: 40px;
             left: -8px;
         }
         .info-group .title-info-group{
+            width: 100%;
+            cursor: pointer;
             padding-left: 38px;
             font-size: 18px;
             color: #fff;
@@ -241,6 +266,12 @@
         .info-group .content-info-group {
             color: #fff;
         }
+        .swiper-bg {
+            background: url(/big-member/image/new_big_index/group-bg.png) no-repeat;
+            background-size: cover;
+            width: 100%;
+            padding-top: 60px;
+        }
     </style>
 </head>
 <body>
@@ -254,36 +285,212 @@
     </div>
     <div class="w-box" style="background-color: #EAEBF7">
         <div class="w1200">
-            <div class="title-box--new" style="padding: 41px 0 16px 0;">-  应用场景  -</div>
+            <div class="title-box--new" style="padding: 41px 0 16px 0;margin-bottom: 0">-  应用场景  -</div>
         </div>
+    </div>
+    <div class="w-box swiper-bg" style="padding-top: 20px">
         <div class="w1200">
             <div class="item-info-group top-center">
                 <div class="title-info-group">商机获取</div>
             </div>
             <div class="toggle-item-content-group">
                 <div class="info-group">
+                    <div class="item-info-group active">
+                        <div class="title-info-group">全网商机线索</div>
+                        <div class="content-info-group">
+                            <p>全国全行业7700万+条招标信息库、<br>4670万+企业库、200万+采购单位<br> 库，每日更新10万+商机；</p>
+                            <p>提供专属拟建项目、预告项目、潜在项目预测分析，提前锁定商机。</p>
+                        </div>
+                    </div>
+                    <div class="item-info-group">
+                        <div class="title-info-group">项目动态实时推送</div>
+                        <div class="content-info-group">
+                            <p>支持按地区、行业、关键词（可设置<br>300组）订阅，精准推送商机；</p>
+                            <p>支持邮件、APP推送，多种推送时间自<br>由选择。</p>
+                        </div>
+                    </div>
                     <div class="item-info-group">
-                        <div class="title-info-group">重点合作企业</div>
+                        <div class="title-info-group">拓展渠道厂商客户</div>
                         <div class="content-info-group">
-                            <p>按行业分析重点客户类型，综合评估采购单位的采<br>购项目类型，分析行业市场趋势，帮助发掘客户和<br>渠道；</p>
-                            <p>多维度交叉分析，提供重点客户、中标数量、平均<br>折扣率、合作日期，直观了解采购单位与企业关系<br>远近，辅助投标决策。</p>
+                            <p>智能推荐潜在客户/渠道商，辅助做业务线索支持；</p>
+                            <p>根据企业大数据库匹配企业注册工商资料、联系方式。</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="video-group">
+                    <div class="video-content-group active" name="全网商机线索">
+                        <div class="video-box">
+                            <video autoplay muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/全网商机线索.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>立即体验</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                    <div class="video-content-group" name="项目动态实时推送">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/项目动态实时推送.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>立即体验</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                    <div class="video-content-group" name="拓展渠道厂商客户">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/拓展渠道厂商.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
                         </div>
                     </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="w-box swiper-bg">
+        <div class="w1200">
+            <div class="item-info-group top-center">
+                <div class="title-info-group">辅助投标决策</div>
+            </div>
+            <div class="toggle-item-content-group">
+                <div class="info-group">
                     <div class="item-info-group active">
-                        <div class="title-info-group">重点合作企业</div>
+                        <div class="title-info-group">人工智能预测</div>
+                        <div class="content-info-group">
+                            <p>基于用户历史投标数据，精准分析智能预测未来可能参与竞标企业；</p>
+                            <p>大数据分析中标价格、折扣率，提供企业投标中标概率排名。</p>
+                        </div>
+                    </div>
+                    <div class="item-info-group">
+                        <div class="title-info-group">大数据多维度分析</div>
                         <div class="content-info-group">
-                            <p>按行业分析重点客户类型，综合评估采购单位的采<br>购项目类型，分析行业市场趋势，帮助发掘客户和<br>渠道；</p>
-                            <p>多维度交叉分析，提供重点客户、中标数量、平均<br>折扣率、合作日期，直观了解采购单位与企业关系<br>远近，辅助投标决策。</p>
+                            <p>采用BI可视化图表，多维度交叉分析类似项目的动态、中标金额、评标专家、项目折扣率，数据洞察一目了然。</p>
+                        </div>
+                    </div>
+                    <div class="item-info-group">
+                        <div class="title-info-group">企业全景分析</div>
+                        <div class="content-info-group">
+                            <p>构建企业多标签画像，提供企业项目动态、年度项目统计、重点客户等，深入挖掘合作客户及关系。</p>
+                        </div>
+                    </div>
+                    <div class="item-info-group">
+                        <div class="title-info-group">采购单位全景分析</div>
+                        <div class="content-info-group">
+                            <p>采购单位多维画像，提供采购单位的历史采购周期、规模等深入分析甲方采购需求；</p>
+                            <p>大数据交叉挖掘甲方与供应商关系，帮助企业拓展客户。</p>
                         </div>
                     </div>
                 </div>
                 <div class="video-group">
-                    <div class="video-box">
-                        <img src='{{Msg "seo" "cdn"}}/big-member/image/new_info/item-cg-2.png' alt="">
+                    <div class="video-content-group active" name="人工智能预测">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/中标企业预测.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                    <div class="video-content-group" name="大数据多维度分析">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/投标决策分析.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
                     </div>
-                    <div class="video-button-group">
-                        <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>立即体验</div>
-                        <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                    <div class="video-content-group" name="企业全景分析">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/企业画像.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                    <div class="video-content-group" name="采购单位全景分析">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/采购单位画像.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="w-box swiper-bg">
+        <div class="w1200">
+            <div class="item-info-group top-center">
+                <div class="title-info-group">市场分析洞察</div>
+            </div>
+            <div class="toggle-item-content-group">
+                <div class="info-group">
+                    <div class="item-info-group active">
+                        <div class="title-info-group">市场分析报告</div>
+                        <div class="content-info-group">
+                            <p>灵活的BI可视化报表，可自定义、实时动态获取关注行业的市场分析报告；</p>
+                            <p>多维度分析市场规模、地区行业市场趋势。</p>
+                        </div>
+                    </div>
+                    <div class="item-info-group">
+                        <div class="title-info-group">情报监控</div>
+                        <div class="content-info-group">
+                            <p>项目进度全程监控，时刻了解项目变化，推进业务进展；</p>
+                            <p>第一时间监控并推送企业中标动态、工商信息变动，企业情报一手掌握。</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="video-group">
+                    <div class="video-content-group active" name="市场分析报告">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/市场分析.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>了解更多</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
+                    </div>
+                    <div class="video-content-group" name="情报监控">
+                        <div class="video-box">
+                            <video muted width="100%" height="100%" loop poster='{{Msg "seo" "cdn"}}/big-member/image/new_big_index/video.png'>
+                                <source src='{{Msg "seo" "cdn"}}/big-member/video/new_big_index/情报监控.mp4' type="video/mp4">
+                                Your browser does not support the video tag.
+                            </video>
+                        </div>
+                        <div class="video-button-group">
+                            <div class="subpage-button gold " id="go-info-big-3"  data-go-buy-subscribe>立即体验</div>
+                            <div class="subpage-button darkblue " id="go-info-big-3"  data-go-buy-subscribe>点此购买</div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -568,6 +775,24 @@
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
 <script>
     $("img").on('dragstart',false)
+    $(function () {
+        function toggleContent () {
+            $(this).parent().siblings().removeClass('active')
+            $(this).parent().addClass('active')
+            var strKey = $(this).text()
+            var videoNode = $('.video-content-group[name="'+strKey+'"]')
+            videoNode.siblings().removeClass('active')
+            videoNode.addClass('active')
+            $(".video-content-group video").trigger('pause')
+            videoNode.find('video').trigger('play')
+        }
+        $(".toggle-item-content-group .title-info-group").on('click', function () {
+            toggleContent.bind(this)()
+        })
+        $(".toggle-item-content-group .title-info-group").hover(function () {
+            toggleContent.bind(this)()
+        })
+    })
 </script>
 <script>
     var pageUserInfo = {

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -608,6 +608,9 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
+          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
+          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
           article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
           article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
           member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
@@ -625,9 +628,8 @@
           wx_analysis_follow_project: '请完善个人信息，辅助你做投标决策及报价参考！',
           wx_analysis_follow_ent: '请完善个人信息，辅助你做投标决策及报价参考！',
           'jy-wxsearch-index-tap': '请留下联系方式，我们会尽快联系您体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
-          article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
-          ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
-          buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
+          member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
         var titleMap = {
             ent_portrait_freeuser: '欢迎体验企业中标分析'
@@ -651,11 +653,15 @@
             }
             this.moduleShow.position = true
           }
-         if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
-                var r = infoText.match(/\【(.+?)\】/g)
-                titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
+            var r = infoText.match(/\【(.+?)\】/g)
+            titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
+          }  else if (source.indexOf('ent_portrait_') > -1) {
+            titleText = '欢迎体验企业中标分析'
+          } else if (source.indexOf('buyer_portrait_') > -1) {
+            titleText = '欢迎体验采购单位全景分析'
           } else{
-                titleText = '欢迎体验剑鱼大会员'
+            titleText = '欢迎体验剑鱼大会员'
           }
         } else {
             titleText = '完善信息'
@@ -1155,6 +1161,36 @@
                       }
                     }
                   })
+                } else if (_this.ajaxParams.source.indexOf('_freeuser') > -1) {
+                  var source = _this.ajaxParams.source
+                  var text = ''
+                  switch (source) {
+                    case 'ent_portrait_freeuser':
+                      text = '企业中标分析'
+                      break;
+                    case 'buyer_portrait_freeuser':
+                      text = '采购单位全景分析'
+                      break;
+                    case 'article_attach_freeuser':
+                      text = '附件下载'
+                      break;
+                  }
+                  _this.$dialog.close()
+                  _this.$dialog.confirm({
+                    title: '提交成功',
+                    message: '恭喜您，成功解锁【' + text + '】权益1次。如需查看更多，请开通超级订阅，为您提供最新的商业情报，抢占先机。',
+                    className: 'ent-search-dialog max-54',
+                    overlayClass: 'z-2030',
+                    showCancelButton: false,
+                    getContainer: '.perfect-info-group',
+                    confirmButtonText: '我知道了',
+                  }).then(function () {
+                    sessionStorage.setItem('salesBackStatus', 'true')
+                    history.back()
+                  }).catch(function () {
+                    sessionStorage.setItem('salesBackStatus', 'true')
+                    history.back()
+                  })
                 } else {
                   _this.$dialog.close()
                   _this.$dialog.confirm({

src/web/templates/pc/biddetail_rec.html

@@ -1954,7 +1954,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			var t1top = 0;
 			if({{.T.obj.subtype}}!="拟建"&&{{.T.obj.subtype}}!="违规"){
 				offsetTop = $(".recoveryfat").offset().top;
-				t1top = $("#tab1").offset().top;
+				t1top = $(".tab1").offset().top;
 			}
 			if(t1top<=(scrollTop+65)&&t1top!=0){
 				if(scrollflag){
@@ -3233,7 +3233,30 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			}
 			return ""
 		}
-
+		//金额转化   金额：0-万元以下单位为元  ，万元以上至亿元以下单位为万元 ，亿元以上单位为亿元。保留 小数点后 2 位，不进行四舍五入。
+		function conversionMoeny(money){
+			var m = ""+money;
+			var m_arr = m.split(".")
+			var m_1 = m_arr[0]
+			var len_m1 = m_1.length;
+			if (len_m1 >= 9 ){
+				m = m_1.substring(0,len_m1-8) + "." + m_1.substring(len_m1-8,len_m1-6) + "亿元"
+			} else if (len_m1 >= 5) {
+				m =m_1.substring(0,len_m1-4) + "." + m_1.substring(len_m1-4,len_m1-2) + "万元"
+			} else {
+				if(m_arr.length == 1) {
+					return m + ".00元"
+				}
+				var m_2 = m_arr[1]
+				if (m_2.length > 1) {
+					m_2 = m_2.substring(0,2)
+				} else {
+					m_2 = m_2.substring(0,1) + "0"
+				}
+				m = m_1 + "." + m_2 + "元"
+			}
+			return m
+		}
 function fromwhere(text){
   var ad="pc_articel_";
   if (getinfotype(subtype)=="拟建项目"){

src/web/templates/pc/subscribe_new.html

@@ -247,7 +247,7 @@
 <div class="app-bottom-box">
     <img class="app-bottom-tobuy" src="{{Msg "seo" "cdn"}}/images/subscribe/sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map">
     <map name="image_map">
-        <area data-go-buy-subscribe coords="1553,95,1853,174" shape="rect">
+        <area data-go-buy-subscribe coords="776,48.5,927,90" shape="rect">
     </map>
 </div>
 
@@ -289,7 +289,7 @@
             //为购买点击跳转购买链接
             $("div*[data-go-buy-subscribe]").siblings().show()
             $("div*[data-go-buy-subscribe]").text('立即购买').on("click",function (){
-                window.location.href="/"
+                window.location.href="/swordfish/page_big_pc/free/svip/buy"
             })
             $(".app-bottom-box").show()
         }
@@ -297,6 +297,9 @@
     $("#myModal-01").on("hidden.bs.modal", function () {
         $(".public-nav").css({"padding-right":""});
     })
+    $("map[name='image_map'] area").on("click",function(){
+        window.location.href="/swordfish/page_big_pc/free/svip/buy";
+    })
     $(function () {
         ;(function animateUp(){
             var obj = $('.CfadeInUp');
@@ -373,7 +376,6 @@
                 if (!numberBox.attr('data-show-an')) {
                     numberBox.attr('data-show-an','true')
                     filpNumber()
-
                 }
             } else {
                 numberBox.removeAttr('data-show-an')