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/main_root.js

@@ -196,7 +196,11 @@ var vNode = {
                         }
                         s.isHigh = true
                     } else {
+                      if (power.indexOf(18) !== -1) {
+                        s.isHigh = true
+                      } else {
                         s.isHigh = false
+                      }
                     }
                 })
             })

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

@@ -13,12 +13,15 @@
     13.企业中标动态
     14.项目进度监控
     15.中标企业预测
-
+    17.18.结构化数据
     专家版(1): [1,3,4,5,6,7,8,9,10,11,12,13,14,15],
     智慧版(2): [1,3,4,5,6,9,11,12,13,14,15],
     商机版(3): [1,3,13,14],
     试用版(4)7天: [1,3,4,5,6,7,8,9,10(不含月报),11,12,13,14,15],
     自定义版(5): [1]
+    商机版2.0: [1,3,4,5,9,12,13,14,17],
+    专家版2.0: [1,3,4,5,6,7,8,9,10,12,13,14,15,18],
+
 */
 var staticData = [
     {
@@ -185,8 +188,9 @@ var staticData = [
                 b_content:'根据为您推送的招标项目信息，提供每月的市场（含细分市场）、采购单位、中标单位等多维度分析报告，助您掌握市场发展趋势。'
             },
             {
-                id:'',
+                id:18,
                 b_class:'isgray',
+                url: '/jyapp/front/dataExport/toSieve?source=app_kongkim',
                 dis_url:'javascript:;',
                 b_gray_icon:'icon-gray-zaixianshujudaochu',
                 b_gold_icon:'icon-gold-zaixianshujudaochu',

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

@@ -116,7 +116,7 @@
                     <!-- 产品服务清单 -->
                     <div class="proservice">
                         <div class="proserve_header">
-                            <span class="serve_title">产品服务清单</span>
+                            <span class="serve_title">服务包含</span>
                         </div>
                         <div class="serve_list">
                             <van-cell-group>
@@ -155,7 +155,7 @@
                         <div class="statement">
                             <van-checkbox class="iconSize" icon-size="18px" v-model="checked" checked-color="#2ABED1"></van-checkbox>
                             <p class="state">
-                                <span>我已阅读，并同意</span>
+                                <span>我已阅读，理解并接受</span>
                                 <a href="/jyapp/front/staticPage/dataExport_serviceterms.html" @click="setStatus()" class="link highlight-text">《剑鱼标讯线上购买与服务条款》</a>
                             </p>
                         </div>

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/weixin/css/page_landingPage_new.css

@@ -76,14 +76,16 @@
 /* 图片左右滑动*/
 .big_scroll {
   width: 100%;
-  margin-top: 0.48rem;
+  /*margin-top: 0.48rem;*/
   padding: 0 0.32rem;
   overflow-x: scroll;
+  margin-top: 0.18rem;
 }
 
 .big_scroll .big_ul {
   display: flex;
-  width: 44.1rem;
+  /*width: 44.1rem;*/
+  width: 19.1rem;
 }
 
 .big_scroll .big_ul .list_item {
@@ -92,7 +94,8 @@
 }
 
 .big_scroll .fiveimg {
-  width: 31.5rem;
+  width: 38.5rem;
+  /*width: 31.5rem;*/
 }
 .big_scroll .fourimg {
   width: 24.8rem;
@@ -102,7 +105,7 @@
   padding-top:0.8rem;
   width: 100%;
   height: 11.38rem;
-  background: url("/big-member/image/landpage_new/head_bg.png") no-repeat;
+  /*background: url("/big-member/image/landpage_new/head_bg.png") no-repeat;*/
   background-size: 100% 100%;
 }
 
@@ -335,13 +338,14 @@
 
 /*辅助你做投标决策 */
 .bid_decision {
-  margin-top: 0.96rem;
+  /*margin-top: 0.96rem;*/
   padding-top: 0.8rem;
   width: 100%;
-  height: 16.08rem;
-  background: url("/big-member/image/landpage_new/head_bg.png") no-repeat;
+  height: 10.08rem;
+  /*height: 16.08rem;*/
+  background:  url("/big-member/image/landpage_new/itemA_04.jpg") no-repeat;
   background-size: 100% 100%;
-  border-radius: 0.48rem;
+  /*border-radius: 0.48rem;*/
 }
 
 .bid_decision .bid_title_out{
@@ -759,7 +763,7 @@
   flex: 1;
   height: 0.8rem;
   margin-right: -0.2rem;
-  background: url("/big-member/image/landpage_new/seven_bg.png?v=1") no-repeat center center;
+  /*background: url("/big-member/image/landpage_new/seven_bg.png?v=1") no-repeat center center;*/
   background-size: 100% 100%;
   color: #fff;
 }
@@ -769,7 +773,7 @@
   flex: 1;
   height: 0.8rem;
   margin-right: 0.1rem;
-  background: url("/big-member/image/landpage_new/buy_bg.png?v=1") no-repeat center center;
+  /*background: url("/big-member/image/landpage_new/buy_bg.png?v=1") no-repeat center center;*/
   background-size: 100% 100%;
   color: #fff;
 }
@@ -786,19 +790,19 @@
 
 .kefu {
   position: fixed;
-  bottom: 1.68rem;
-  right: 0.24rem;
-  width: 0.96rem;
-  height: 0.96rem;
+  bottom: 2.68rem;
+  right: -0.2rem;
+  width: 1.46rem;
+  height: 0.58rem;
 }
 
 .kefu .kefu_main {
   position: relative;
-  padding: 0.2rem 0.2rem;
+  padding: 0.15rem 0.2rem;
   width: 100%;
   height: 100%;
-  background: #fff;
-  border-radius: 50%;
+  background: rgba(255, 165, 115, 1);
+  border-radius: 0.29rem 0 0 0.29rem;
   border: 1px solid rgba(0, 0, 0, 0.05);
   box-sizing: border-box;
   /* 大阴影/下方 */
@@ -806,7 +810,7 @@
 }
 
 .kefu .kefu_main .kefu_text {
-  color: #FB483D;
+  color: rgba(255, 255, 255, 1);
   font-size: 0.24rem;
 }
 

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/wx/page_buy_commit.html

@@ -113,7 +113,7 @@
                     <!-- 产品服务清单 -->
                     <div class="proservice">
                         <div class="proserve_header">
-                            <span class="serve_title">产品服务清单</span>
+                            <span class="serve_title">服务包含</span>
                         </div>
                         <div class="serve_list">
                             <van-cell-group>
@@ -152,7 +152,7 @@
                         <div class="statement">
                             <van-checkbox class="iconSize" icon-size="18px" v-model="checked" checked-color="#2ABED1"></van-checkbox>
                             <p class="state">
-                                <span>我已阅读，并同意</span>
+                                <span>我已阅读，理解并接受</span>
                                 <a href="/front/staticPage/wx-serviceterms.html" @click="setStatus()" class="link highlight-text">《剑鱼标讯线上购买与服务条款》</a>
                             </p>
                         </div>

src/web/templates/big-member/wx/page_landingPage.html

@@ -21,203 +21,109 @@
             #zc__sdk__sys__btn {
                 display: none;
             }
+           .action_out{
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+            }
+          .j-container .btbt{
+               background: url("{{Msg "seo" "cdn"}}/big-member/image/landpage_new/item-btn.png");
+              background-size: 100% 100%;
+          }
         </style>
     </head>
 <body>
     <div class="j-container"  id="v-commit">
         {{include "/big-member/header.html"}}
         <div class="j-main">
-            <div class="new_action">
+            <!-- 全网商机获取 -->
+            <div class="new_action" style="padding-top: 0">
                 <div class="action_out">
-                    <div>
+                    <div >
                         <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_01.jpg'>
+                    </div >
+                    <div style="margin-top:-0.01rem">
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_02.jpg'>
                     </div>
-                    <div class="action_title" data-text="大会员">
-                        大会员
-                    </div>
-                </div>
-            </div>
-            <!-- 辅助你做投标决策 -->
-            <div class="bid_decision" id="jc">
-                <div class="bid_title_out">
-                    <div class="bid_title" data-text="辅助你做投标决策">
-                        辅助你做投标决策
+                    <div style="margin-top:-0.01rem">
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_03.jpg'>
                     </div>
-                </div>
-                <div class="sale_label">
-                    <div class="sale_label_1 new_pro">分析潜在投标企业，辅助投标决策。</div>
-                </div>
-                <div class="bid_ul">
-                    <div class="bid_list" v-for="item in this.$data.toubiao">
-                        <span class="j-icon icon-gold-duihao"></span>
-                        <div class="li_text">${item}</div>
-                    </div>
-                </div>
-                <div class="offer_title">
-                    辅助投标策略及报价参考
-                </div>
-                <div class="provide_main">
-                    <div class="provide_what">
-                        <div class="provide_text">提供</div>
-                        <div class="provide_ul">
-                            <div class="pro_li" v-for="item in this.$data.offer">${item}</div>
+                    <div class="bid_decision" id="jc" style=" margin-top: -0.01rem">
+                        <div class="big_scroll" >
+                            <ul class="big_ul"  >
+                                <li class="list_item" v-for="item in shangjiImg">
+                                    <img :src="item + version" alt="" height="100%" >
+                                </li>
+                            </ul>
                         </div>
                     </div>
-                </div>
-                <div class="big_scroll">
-                    <ul class="big_ul">
-                        <li class="list_item" v-for="item in this.$data.shangjiImg">
-                            <img :src="item + version" alt="">
-                        </li>
-                    </ul>
-                </div>
-                <div class="btn_zh" id="btn_zh" @click="linkBuy('zh', 3)">
-                    <img data-need-bind-phone src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/btn_zh_buy.png' alt="" class="btn_zh_img" id="btn_zh_img">
+<!--                    <div>-->
+<!--                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_04.jpg'>-->
+<!--                    </div>-->
                 </div>
             </div>
-            <!-- · 帮助你分析洞察市场 · -->
-            <div class="insight" id="fx">
-                <div class="insight_title">· 帮助你分析洞察市场 ·</div>
-                <div class="sale_label">
-                    <div class="sale_label_1">帮助你分析竞争对手</div>
-                </div>
-                <div class="competitor_ul">
-                    <div class="com_list" v-for="item in this.$data.competitor">
-                        <span class="j-icon icon-gold-duihao"></span>
-                        <div class="li_text">${item}</div>
+
+            <!-- · 辅助投标决策 · -->
+            <div class="insight" id="fx" style=" margin-top: 14.8rem">
+                <div  class="action_out">
+                    <div>
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_05.jpg'>
                     </div>
-                </div>
-                <div class="big_scroll">
-                    <ul class="big_ul fiveimg">
-                        <li class="list_item" v-for="item in this.$data.toubiaoImg">
-                            <img :src="item + version" alt="">
-                        </li>
-                    </ul>
-                </div>
-                <div class="sale_label">
-                    <div class="sale_label_1 cover_label">帮助你监控竞争对手</div>
-                    <div class="sale_label_2">帮你全方位监控500个竞争对手</div>
-                </div>
-                <div class="provide_main">
-                    <div class="provide_what">
-                        <div class="provide_text">为你推送</div>
-                        <div class="provide_ul">
-                            <div class="pro_li" v-for="item in this.$data.pushcom">${item}</div>
-                        </div>
+                    <div style="margin-top: -0.01rem">
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_06.jpg'>
                     </div>
-                </div>
-                <div class="sale_label" id="unit">
-                    <div class="sale_label_1 pro_label">快速、全面地了解陌生的采购单位</div>
-                </div>
-                <div class="big_scroll">
-                    <ul class="big_ul fiveimg">
-                        <li class="list_item" v-for="item in this.$data.shichagImg">
-                            <img :src="item + version" alt="">
-                        </li>
-                    </ul>
-                </div>
-                <div class="foryou">
-                    <div class="help_analysis">
-                        <div class="help_left">
-                            帮你分析<br/>采购单位
-                        </div>
-                        <div class="help_right">
-                            <span>重点供应商</span><span>采购预算和采购方式</span><span>中标企业的行业分布</span>
-                        </div>
+                    <div style="margin-top: -0.01rem">
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_07-S.jpg'>
                     </div>
-                    <div class="help_provide">
-                        <div class="help_left">
-                            为你提供<br/>采购单位
-                        </div>
-                        <div class="help_right">
-                            <span>年度项目统计</span><span>供应商关系远近画像</span>
-                        </div>
+                    <div class="big_scroll"   style="margin-top: -6.82rem;">
+                        <ul class="big_ul fiveimg">
+                            <li class="list_item" v-for="item in toubiaoImg">
+                                <img :src="item + version" alt="">
+                            </li>
+                        </ul>
                     </div>
                 </div>
-                <div class="btn_zj" id="btn_zj" @click="linkBuy('zj', 4)">
-                    <img data-need-bind-phone src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/btn_zj_buy.png' alt="" class="btn_zj_img" id="btn_zj_img">
-                </div>
             </div>
-            <!-- 帮助厂商拓展客户和代理渠道 -->
-            <div class="bid_decision" id="qz">
-                <div class="bid_title_out">
-                    <div class="bid_title" data-text="帮助厂商拓展客户和代理渠道">
-                        帮助厂商拓展客户和代理渠道
-                    </div>
+            <!-- 市场分析洞察 -->
+            <div class="bid_decision" id="qz" style="margin-top:0.09rem">
+                <div>
+                    <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemA_08.jpg'>
                 </div>
-                <div class="sale_label">
-                    <div class="sale_label_1 new_pro">拓展潜在客户</div>
+                <div>
+                    <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_01.jpg'>
                 </div>
-                <div class="bid_ul">
-                    <div class="bid_list" v-for="item in this.$data.tuozhan">
-                        <span class="j-icon icon-gold-duihao"></span>
-                        <div class="li_text">${item}</div>
-                    </div>
+                <div>
+                    <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_02.jpg'>
                 </div>
-                <div class="big_scroll">
+                <div class="big_scroll" style="margin-top:-7rem">
                     <ul class="big_ul fourimg">
                         <li class="list_item" v-for="item in this.$data.shichangImg">
                             <img :src="item + version" alt="">
                         </li>
                     </ul>
                 </div>
-                <div class="sale_label">
-                    <div class="sale_label_1 new_agent">拓展潜在代理渠道</div>
-                </div>
-                <div class="bid_ul">
-                    <div class="bid_list" v-for="item in this.$data.daili">
-                        <span class="j-icon icon-gold-duihao"></span>
-                        <div class="li_text">${item}</div>
-                    </div>
-                </div>
-                <div class="buy_big" id="buy_big" @click="linkBuy('sj', 5)">
-                    <button data-need-bind-phone class="big_btn" id="big_btn">购买大会员</button>
-                </div>
             </div>
-            <!-- 剑鱼大会员 -->
-            <div class="jy_bigvip">
-                <div class="bigvip_title">
-                    · 剑鱼大会员 ·
+            <!-- 全场景赋能 -->
+            <div class="new_action" style="margin-top: 6rem" >
+                <div>
+                    <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_03.jpg'>
                 </div>
-                <div class="bigvip_label">
-                    三大版本满足企业不同需求
+                <div>
+                    <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_04.jpg'>
                 </div>
-                <div class="bigvip_meal">
-                    <div class="meals meal_sj">
-                        <button class="viewdetail" @click="linkContrast()">
-                            了解详情
-                        </button>
-                    </div>
-                    <div class="meals meal_zh">
-                        <button class="viewdetail" @click="linkContrast()">
-                            了解详情
-                        </button>
-                    </div>
-                    <div class="meals meal_zj">
-                        <button class="viewdetail" @click="linkContrast()">
-                            了解详情
-                        </button>
-                    </div>
+                <div class="btn_buy" id="btn_buy" @click="linkBuy('sj', 1)"  style="background-color:#1A1A2A;margin-top: -0.01rem; ">
+                    <img data-need-bind-phone src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_05.jpg' alt="" class="btn_buy_img" id="btn_buy_img" >
                 </div>
             </div>
-            <!-- 招标大数据服务平台 -->
-            <div class="paltform">
-                <div class="paltform_main">
-                    <div class="paltform_title">
-                        剑鱼标讯，专业的<br/>招标大数据服务平台
-                    </div>
-                    <div class="data_ul">
-                        <div class="data_list" v-for="item in this.$data.dataList">
-                            <div class="list_left">
-                                ${item.text}
-                            </div>
-                            <div class="list_right" :style="item.width">
-                                <img :src="item.imgs" alt="" class="list_right_img">
-                            </div>
-                        </div>
+            <!-- 为什么选择 -->
+            <div class="insight" id="sj" style=" margin-top: 6.5rem">
+                <div  class="action_out">
+                    <div>
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_06.jpg'>
                     </div>
-                    <div class="com_show">
-                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/datanum/item06.png' alt="" class="com_show_img">
+                    <div>
+                        <img src='{{Msg "seo" "cdn"}}/big-member/image/landpage_new/itemB_07.jpg' style="margin-top: -0.01rem">
                     </div>
                 </div>
             </div>
@@ -228,17 +134,17 @@
                 </div>
             </div>
         </div>
-        <div class="j-footer" v-show="isCantrial">
-            <div class="j-button-group">
+        <div class="j-footer " v-show="isCantrial" style="padding: 0.7rem 0;background-color: #1A1A2A">
+            <div class="j-button-group btbt">
                         <!-- <div class="j-button-practice" @click="exper_fun()">
                             <div data-need-bind-phone>免费试用</div>
                         </div> -->
                 <div class="buy_btn" v-show="onlyBuy">
                       <div class="sevendays j-btn" @click="exper_fun()">
-                          <div data-need-bind-phone>免费试用</div>
+                          <div data-need-bind-phone  style="color: #FAE7CA">立即体验</div>
                       </div>
-                      <div class="j-button-now j-btn" @click="linkBuy('sj',6)">
-                          <div data-need-bind-phone>立即购买</div>
+                      <div class="j-button-now j-btn" @click="linkBuy('sj',6)" >
+                          <div data-need-bind-phone style="color: #1A1A2A">点击购买</div>
                       </div>
                 </div>
                 <div class="buy_btn" v-show="!onlyBuy">
@@ -274,72 +180,8 @@
         el: '#v-commit',
         data: {
             onlyBuy:true,
-            isCantrial:false,
+            isCantrial:true,
             cantodo:[
-                {
-                    title:'帮你',
-                    label:'抢先获取销售机会',
-                    list: [
-                        '潜在项目抢先知，比拟建更超前。',
-                        '每日10万商机，全国全覆盖，行业全覆盖。',
-                        '项目进程实时监控'
-                    ]
-                },
-                {
-                    title:'辅助你',
-                    label:'做投标决策',
-                    list: [
-                        '潜在投标人/竞争对手分析',
-                        '预算/报价分析',
-                        '采购单位分析',
-                        '专家分析'
-                    ]
-                },
-                {
-                    title:'帮助你',
-                    label:'分析洞察市场',
-                    list: [
-                        '帮助你分析竞争对手',
-                        '帮助你监控竞争对手',
-                        '快速、全面地了解陌生的采购单位。'
-                    ]
-                },
-                {
-                    title:'帮助厂商',
-                    label:'拓展客户和代理渠道',
-                    list: [
-                        '拓展潜在客户',
-                        '拓展潜在代理渠道'
-                    ]
-                }
-            ],
-            coverList:[
-                '全国 5600万+ 条招标信息',
-                '4500万+ 企业库',
-                '104万+ 采购单位库',
-                '每日更新10万+招标信息',
-                '提供采购方联系方式',
-                '支持按采购单位、企业名称、关键词等搜索项目信息。',
-                '支持按地区、行业、关键词订阅，最多可设置300组。'
-            ],
-            toubiao:[
-                '预测项目的潜在投标企业',
-                '预测潜在投标企业的中标概率',
-                '透视潜在投标企业的全景画像'
-            ],
-            offer:[
-                '类似项目评标专家频次排名',
-                '类似项目中标金额',
-                '类似项目预算',
-                '类似项目折扣率',
-                '类似项目区域热度'
-            ],
-            pushcom:[
-                '企业中标动态',
-                '董监高变动信息',
-                '股东及投资比例变动信息',
-                '注册资本变动信息',
-                '企业地址变动信息等'
             ],
             shangjiImg:[
                 config.cdnHost + '/big-member/image/landpage_new/shangjiImg/itemA1.png',
@@ -360,21 +202,6 @@
                 config.cdnHost + '/big-member/image/landpage_new/shichangImg/itemC3.png',
                 config.cdnHost + '/big-member/image/landpage_new/shichangImg/itemC4.png',
             ],
-            competitor:[
-                '分析竞争对手的重点客户',
-                '洞察竞争对手与其客户关系的紧密度',
-                '分析竞争对手的市场覆盖区域',
-                '提供竞争对手的中标项目统计'
-            ],
-            tuozhan:[
-                '帮你挖掘出潜在客户，帮助厂商完善客户数据库。',
-                '采购单位全景展示，帮助厂商快速、全面了解陌生的采购单位。'
-            ],
-            daili:[
-                '帮助厂商预测项目的中标企业是谁',
-                '提供企业的联系方式',
-                '提供企业的工商资料，辅助厂商评估企业实力。'
-            ],
             dataList:[
                 {
                     text:'推送数据',
@@ -433,15 +260,18 @@
                     url:'/bigmember/use/isAdd',
                     data:{},
                     success:function(res) {
-                        if (res.data.memberStatus > 0){
-                            _this.onlyBuy = false
-                        } else {
-                            if (res.data.is_member_trial) {
+                        if (res && res.data) {
+                            if (res.data.memberStatus > 0){
                                 _this.onlyBuy = false
                             } else {
-                                _this.onlyBuy = true
+                                if (res.data.is_member_trial) {
+                                    _this.onlyBuy = false
+                                } else {
+                                    _this.onlyBuy = true
+                                }
                             }
                         }
+
                         _this.isCantrial = true
                     }
                 })

src/web/templates/big-member/wx/page_landingPage2.html

@@ -318,11 +318,11 @@
                           <div data-need-bind-phone>立即购买</div>
                       </div>
                 </div>
-                <div class="buy_btn" v-show="!onlyBuy">
-                            <div class="j-button-nowly j-btn" @click="linkBuy('sj',6)">
-                                <div data-need-bind-phone>立即购买</div>
-                            </div>
-                        </div>
+<!--                <div class="buy_btn" v-show="!onlyBuy">-->
+<!--                            <div class="j-button-nowly j-btn" @click="linkBuy('sj',6)">-->
+<!--                                <div data-need-bind-phone>立即购买</div>-->
+<!--                            </div>-->
+<!--                        </div>-->
                     </div>
                 </div>
             </div>

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){

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')