ソースを参照

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

zhangxinlei1996 3 年 前
コミット
b20fe9dadf
45 ファイル変更417 行追加632 行削除
  1. 1 0
      src/jfw/modules/app/src/main.go
  2. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/j-big-icons.css
  3. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/image/gold/zaixianshujudaochu.png
  4. 17 15
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  5. 4 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/main_root.js
  6. 6 2
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/main_root_data.js
  7. 2 2
      src/jfw/modules/app/src/web/templates/big-member/page_buy_commit.html
  8. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  9. 2 1
      src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html
  10. 3 1
      src/jfw/modules/bigmember/src/a/init.go
  11. 11 10
      src/jfw/modules/bigmember/src/entity/portrait.go
  12. 31 13
      src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go
  13. 1 1
      src/jfw/modules/common/src/qfw/util/jy/freeExperience.go
  14. 5 3
      src/jfw/modules/common/src/qfw/util/jy/subvipPortrait.go
  15. 1 0
      src/jfw/modules/publicapply/src/a/init.go
  16. 2 2
      src/jfw/modules/publicapply/src/attachmentdow/service/service.go
  17. 1 0
      src/jfw/modules/subscribepay/src/a/init.go
  18. 4 4
      src/jfw/modules/subscribepay/src/util/msgremind.go
  19. BIN
      src/web/staticres/big-member/image/landpage_new/item-btn.png
  20. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_02.jpg
  21. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_03.jpg
  22. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_04.jpg
  23. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_05.jpg
  24. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_06.jpg
  25. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_07-S.jpg
  26. BIN
      src/web/staticres/big-member/image/landpage_new/itemA_08.jpg
  27. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_01.jpg
  28. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_02.jpg
  29. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_03.jpg
  30. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_04.jpg
  31. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_05.jpg
  32. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_06.jpg
  33. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_07.jpg
  34. BIN
      src/web/staticres/big-member/image/landpage_new/itemB_08.jpg
  35. 22 18
      src/web/staticres/big-member/weixin/css/page_landingPage_new.css
  36. 17 15
      src/web/staticres/common-module/collection/js/ent_portrait.js
  37. 2 0
      src/web/staticres/css/subscribe_new.css
  38. 10 5
      src/web/staticres/js/pc-collect-user-info.js
  39. 176 276
      src/web/templates/big-member/pc/page_index.html
  40. 2 2
      src/web/templates/big-member/wx/page_buy_commit.html
  41. 82 252
      src/web/templates/big-member/wx/page_landingPage.html
  42. 5 5
      src/web/templates/big-member/wx/page_landingPage2.html
  43. 6 2
      src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html
  44. 2 1
      src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html
  45. 1 1
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

+ 1 - 0
src/jfw/modules/app/src/main.go

@@ -45,6 +45,7 @@ func main() {
 func initXweb() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	if redisSessionLockSize := util.IntAll(Sysconfig["redisSessionLockSize"]); redisSessionLockSize > 0 {
 		httpsession.RedisSessionLockSize = redisSessionLockSize
 	}

ファイルの差分が大きいため隠しています
+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/j-big-icons.css


BIN
src/jfw/modules/app/src/web/staticres/jyapp/big-member/image/gold/zaixianshujudaochu.png


+ 17 - 15
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -1176,21 +1176,23 @@ var vNode = {
     },
     // 高级分析设置
     goHighSet () {
-      var url = this.getProjectNewsUrl()
-      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
-      if (this.conf._4) {
-        sessionStorage.setItem('is-click-set', 1)
-        location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
-      } else {
-        this.$dialog.confirm({
-          className:'promatch',
-          title: '您暂无使用权限',
-          message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
-          showCancelButton: false,
-          confirmButtonColor: '#2cb7ca',
-          confirmButtonText: '我知道了'
-        }).then(function () {})
-      }
+      sessionStorage.setItem('is-click-set', 1)
+      location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId')
+      // var url = this.getProjectNewsUrl()
+      // var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
+      // if (this.conf._4) {
+      //   sessionStorage.setItem('is-click-set', 1)
+      //   location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+      // } else {
+      //   this.$dialog.confirm({
+      //     className:'promatch',
+      //     title: '您暂无使用权限',
+      //     message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
+      //     showCancelButton: false,
+      //     confirmButtonColor: '#2cb7ca',
+      //     confirmButtonText: '我知道了'
+      //   }).then(function () {})
+      // }
     },
     //免费赠送企业全景分析体验 去解锁
     goGiveAnalysis: function(){

+ 4 - 0
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
+                      }
                     }
                 })
             })

+ 6 - 2
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',

+ 2 - 2
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>

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

@@ -252,7 +252,7 @@
           </div>
           <!-- 免费用户采购单位全景分析提示 -->
           <div v-if="canFreeExp" style="margin-top: .24rem; " class="free-give">
-              <div class="go-text"> 免费赠送1次【企业中标信息】权益体验机会!</div>
+              <div class="go-text"> 免费赠送1次【企业中标分析】权益体验机会!</div>
               <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>
           </div>
           <div class="bg-white tab-card" v-if="conf._4 && !getStatus">

+ 2 - 1
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -666,7 +666,8 @@
           return false
         }
         var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;//中英文或加.的少数民族名字
-        return namereg.test(this.infoMap.name)
+        // return namereg.test(this.infoMap.name)
+        return this.infoMap.name
       },
       checkPhone () {
         return /^1[3|7|8]\d{9}$|^19[8-9]\d{8}$|^166\d{8}|^15[0-3|5-9]\d{8}|^14[5|7]\d{8}$/.test(this.infoMap.phone)

+ 3 - 1
src/jfw/modules/bigmember/src/a/init.go

@@ -1,14 +1,16 @@
 package a
 
 import (
+	"time"
+
 	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
-	"time"
 )
 
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	xweb.RootApp().BasePath = "/bigmember"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

+ 11 - 10
src/jfw/modules/bigmember/src/entity/portrait.go

@@ -39,30 +39,31 @@ func CreatePortraitManager(userid string, pageFlag string) (*Portrait, bool, err
 }
 
 //CreateSubVipPortraitManager 超级订阅权限校验
-func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, isWinner bool) (*Portrait, bool, error) {
+//int -1无权限 1有权限 2大会员次数 3使用
+func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, isWinner bool) (*Portrait, int, error) {
 	if userid == "" {
-		return nil, false, errors.New("未登录")
+		return nil, -1, errors.New("未登录")
 	}
 	if pageFlag == "" {
-		return nil, false, errors.New("未知请求")
+		return nil, -1, errors.New("未知请求")
 	}
 	if pageFlag != "entDetail" { //需要权限校验的接口
 		bigMsg := jy.GetBigVipUserBaseMsg(userid, db.Mysql, db.Mgo)
 		if bigMsg.VipStatus <= 0 || bigMsg.Vip_BuySet.Upgrade != 1 { //免费用户留资体验
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
-				return &Portrait{userid}, true, nil
-			}
-			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
-				return nil, false, errors.New("非法请求")
+				return &Portrait{userid}, 3, nil
 			}
-			return nil, false, nil
+			//if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
+			//	return nil, -1, errors.New("非法请求")
+			//}
+			return nil, -1, nil
 		} else { //超级订阅升级版-校验超级订阅画像浏览次数
 			if err := bigMsg.SubVipPortraitTimesCheck(db.Mysql, searchValue, isWinner); err != nil {
-				return nil, true, err
+				return nil, 2, err
 			}
 		}
 	}
-	return &Portrait{userid}, true, nil
+	return &Portrait{userid}, 1, nil
 }
 
 //获取企业基本信息

+ 31 - 13
src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -4,6 +4,7 @@ import (
 	. "api"
 	"db"
 	"entity"
+	"errors"
 	"fmt"
 	"github.com/go-xweb/xweb"
 	"log"
@@ -18,12 +19,13 @@ import (
 //超级订阅升级版画像接口
 type SubVipPortrait struct {
 	*xweb.Action
+	portraitUsage  xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`  //超级订阅升级版画像浏览详情
+	portraitRecord xweb.Mapper `xweb:"/portrait/subVipPortrait/record"` //超级订阅升级版画像浏览记录
+
 	subVipEntDetail     xweb.Mapper `xweb:"/portrait/subVipPortrait/entDetail"`    //企业基本信息
 	subVipPortrait      xweb.Mapper `xweb:"/portrait/subVipPortrait/winner"`       //超级订阅升级版查看画像
 	subVipWinnerNewMsg  xweb.Mapper `xweb:"/portrait/subVipPortrait/winnerNewMsg"` //超级订阅升级版查看最新项目动态
 	subVipNewMsgSelects xweb.Mapper `xweb:"/portrait/subVipPortrait/selects"`      //最新招标信息可筛选项
-	portraitUsage       xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`        //超级订阅升级版画像浏览详情
-	portraitRecord      xweb.Mapper `xweb:"/portrait/subVipPortrait/record"`       //超级订阅升级版画像浏览记录
 
 	buyerContacts xweb.Mapper `xweb:"/subVipPortrait/buyer/contacts"`  //采购项目联系方式
 	buyerSelects  xweb.Mapper `xweb:"/subVipPortrait/buyer/selects"`   //采购单位画像可筛选项
@@ -43,7 +45,6 @@ func (this *SubVipPortrait) SubVipEntDetail() {
 		if err != nil {
 			return nil, err
 		}
-
 		entInfo, err := cepm.GetEntInfo(entId)
 		if err != nil {
 			return nil, err
@@ -64,10 +65,13 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
@@ -108,10 +112,13 @@ func (this *SubVipPortrait) SubVipNewMsgSelects() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		_, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		pwp := &entity.PortraitScreen{Ent: entId}
 		return pwp.GetProjectSelectItems(true)
 	}()
@@ -129,7 +136,7 @@ func (this *SubVipPortrait) SubVipPortrait() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "entPortrait", entId, true)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "entPortrait", entId, true)
 		if err != nil {
 			return nil, err
 		}
@@ -141,8 +148,11 @@ func (this *SubVipPortrait) SubVipPortrait() {
 			Area:       this.GetString("area"),
 			ScopeClass: this.GetString("scopeClass"),
 			TimeRange:  this.GetString("timeRange"),
-			HasPower:   true,
+			HasPower:   power > 0,
 		})
+		if power == 3 {
+			rData["onTrial"] = true
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {
@@ -218,6 +228,8 @@ func (this *SubVipPortrait) PortraitRecord() {
 			for _, buyerName := range recordList {
 				if buyerDetail, ok := buyerDetailMap[buyerName]; ok && buyerDetail != nil {
 					infoList = append(infoList, buyerDetail)
+				} else {
+					infoList = append(infoList, map[string]interface{}{"name": buyerName})
 				}
 			}
 		}
@@ -244,7 +256,7 @@ func (this *SubVipPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_select", buyer, false)
+		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -267,7 +279,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, hasPower, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_newMsg", buyer, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -281,7 +293,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 				Area:       this.GetString("area"),
 				ScopeClass: this.GetString("scopeClass"),
 				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
+				HasPower:   power > 0,
 			},
 			PageNum:  pageNum,
 			PageSize: pageSize,
@@ -308,10 +320,13 @@ func (this *SubVipPortrait) BuyerContacts() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		rData, err := cepm.GetBuyerContactsMsg(buyerName)
 		if err != nil {
 			return nil, err
@@ -334,7 +349,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortraitNotCheckPower", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}
@@ -347,11 +362,14 @@ func (this *SubVipPortrait) BuyerPortrait() {
 			Area:       this.GetString("area"),
 			ScopeClass: this.GetString("scopeClass"),
 			TimeRange:  this.GetString("timeRange"),
-			HasPower:   power,
+			HasPower:   power > 0,
 		}, flag)
 		if err != nil {
 			return nil, err
 		}
+		if power == 3 {
+			rData["onTrial"] = true
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {

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

@@ -25,7 +25,7 @@ func FreeExperience(userId string) (int, int, int) {
 
 func Portraitexperience(userId, queryEnt string, isWinner bool) (eOk bool) {
 	i := redis.GetInt(PowerCacheDb, fmt.Sprintf("free_%s_portrait_%s", util.If(isWinner, "ent", "buyer").(string), userId))
-	if i > 1 {
+	if i >= 1 {
 		eOk = PortraitExperienceSet(userId, queryEnt, util.If(isWinner, "W", "B").(string))
 	} else if i == -1 {
 		eOk = PortraitExperienceUsing(userId, queryEnt)

+ 5 - 3
src/jfw/modules/common/src/qfw/util/jy/subvipPortrait.go

@@ -10,7 +10,8 @@ import (
 
 //超级订阅画像使用次数
 const (
-	OneAreaTimes              = 50
+	OneAreaTimes_Winner       = 50
+	OneAreaTimes_Buyer        = 5
 	PortraitWinnerRecordTimes = "subVipPortraitRecordTimes_%s_%d"
 	PortraitBuyerRecordTimes  = "subVipBuyerPortraitRecordTimes_%s_%d"
 
@@ -45,10 +46,11 @@ func (this *BigVipBaseMsg) SubVipPortraitUsage(mysql *mysql.Mysql, searchValue s
 	if this.VipStatus <= 0 {
 		return
 	}
+	num := qutil.If(isWinnerPortrait, OneAreaTimes_Winner, OneAreaTimes_Buyer).(int)
 	if this.Vip_BuySet.AreaCount == -1 {
-		fullCount = 16 * OneAreaTimes //全国全国行业
+		fullCount = 16 * num //全国全国行业
 	} else {
-		fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
+		fullCount = this.Vip_BuySet.AreaCount * num
 	}
 	//当月查看次数
 	usage = this.GetUsageNum(mysql, isWinnerPortrait)

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

@@ -10,6 +10,7 @@ import (
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	xweb.RootApp().BasePath = "/publicapply"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

+ 2 - 2
src/jfw/modules/publicapply/src/attachmentdow/service/service.go

@@ -65,9 +65,9 @@ func (u *Dow) Subdow() {
 				}
 				//下载后自增一次
 				defer func() {
-					//判断这个月是否下载过  下载过递增 没有下载过默认存储30d
+					//判断这个月是否下载过  下载过递增 没有下载过默认存储31d
 					if ss == 0 {
-						redis.Put(jy.PowerCacheDb, mon, 1, 60*60*24*30)
+						redis.Put(jy.PowerCacheDb, mon, 1, 60*60*24*31)
 					} else {
 						redis.Incr(jy.PowerCacheDb, mon)
 					}

+ 1 - 0
src/jfw/modules/subscribepay/src/a/init.go

@@ -13,6 +13,7 @@ import (
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	//xweb.RootApp().BasePath = "/subscribepay"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

+ 4 - 4
src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -153,7 +153,7 @@ func (m *msgRemind) BigMemberPaySuccess(orderId int, orderCode, userId, createTi
 		defer util.Catch()
 		log.Println("大会员支付成功以后,消息提醒处理", orderId, orderCode, userId, createTime)
 		m.unpaidOrders.Delete(orderId)
-		user, ok := MQFW.FindById("user", userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1,"l_vip_endtime":1}`)
+		user, ok := MQFW.FindById("user", userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1,"i_member_endtime":1}`)
 		if !ok || user == nil || len(*user) == 0 {
 			return
 		}
@@ -165,8 +165,8 @@ func (m *msgRemind) BigMemberPaySuccess(orderId int, orderCode, userId, createTi
 		log.Println("大会员支付成功,推送消息", userId, "s_m_openid", s_m_openid, "s_jpushid", s_jpushid, "s_opushid", s_opushid, "s_appponetype", s_appponetype)
 		wxPushOk := false
 		if isPushWx == 1 && s_m_openid != "" {
-			l_vip_endtime := (*user)["l_vip_endtime"]
-			expireTime := util.FormatDateWithObj(&l_vip_endtime, util.Date_Short_Layout)
+			i_member_endtime := (*user)["i_member_endtime"]
+			expireTime := util.FormatDateWithObj(&i_member_endtime, util.Date_Short_Layout)
 			PaySuccess_WTMCS.Reload()
 			wtmc := PaySuccess_WTMCS.Get(MessageConfig.WxTpl_PaySuccess.First.Value)
 			if wtmc != nil {
@@ -224,7 +224,7 @@ func (m *msgRemind) DistributionSuccess(orderId int, userId string, price int, p
 		defer util.Catch()
 		log.Println("分销成功以后,消息提醒处理", orderId, userId)
 		m.unpaidOrders.Delete(orderId)
-		user, ok := MQFW.FindById("user", userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1,"l_vip_endtime":1}`)
+		user, ok := MQFW.FindById("user", userId, `{"s_m_openid":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"i_ispush":1}`)
 		if !ok || user == nil || len(*user) == 0 {
 			return
 		}

BIN
src/web/staticres/big-member/image/landpage_new/item-btn.png


BIN
src/web/staticres/big-member/image/landpage_new/itemA_02.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_03.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_04.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_05.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_06.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_07-S.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemA_08.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_01.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_02.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_03.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_04.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_05.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_06.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_07.jpg


BIN
src/web/staticres/big-member/image/landpage_new/itemB_08.jpg


+ 22 - 18
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;
 }
 

+ 17 - 15
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -1162,21 +1162,23 @@ var vNode = {
     },
     // 高级分析设置
     goHighSet () {
-      var url = this.getProjectNewsUrl()
-      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
-      if (this.conf._4) {
-        sessionStorage.setItem('is-click-set', 1)
-        location.href = '/big/wx/page/free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
-      } else {
-        this.$dialog.confirm({
-          className: 'promatch',
-          title: '您暂无使用权限',
-          message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
-          showCancelButton: false,
-          confirmButtonColor: '#2cb7ca',
-          confirmButtonText: '我知道了'
-        }).then(function () { })
-      }
+      sessionStorage.setItem('is-click-set', 1)
+      location.href = '/big/wx/page/free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId')
+      // var url = this.getProjectNewsUrl()
+      // var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
+      // if (this.conf._4) {
+      //   sessionStorage.setItem('is-click-set', 1)
+      //   location.href = '/big/wx/page/free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+      // } else {
+      //   this.$dialog.confirm({
+      //     className: 'promatch',
+      //     title: '您暂无使用权限',
+      //     message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
+      //     showCancelButton: false,
+      //     confirmButtonColor: '#2cb7ca',
+      //     confirmButtonText: '我知道了'
+      //   }).then(function () { })
+      // }
     }
   }
 }

+ 2 - 0
src/web/staticres/css/subscribe_new.css

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

+ 10 - 5
src/web/staticres/js/pc-collect-user-info.js

@@ -395,7 +395,12 @@ var vm = new Vue({
           case 'article_attach_freeuser':
             text = '附件下载'
             break;
+          case 'member_freeuser': {
+            text = '我们会尽快联系您并预约演示时间,请耐心等待~<br>您将获得免费体验大会员全部功能!'
+            break;
+          }
         }
+
         return '恭喜您,成功解锁【' + text + '】权益1次。如需查看更多,请开通超级订阅,为您提供最新的商业情报,抢占先机。'
       } else {
         return '我们会尽快联系您并预约演示时间,请耐心等待~<br>您将获得免费体验大会员全部功能!'
@@ -411,7 +416,7 @@ var vm = new Vue({
             if (!dom.contains((e.target))) {
               that.showSearchResult = false
             }
-        } 
+        }
     })
   },
   beforeDestroy() {
@@ -532,18 +537,18 @@ var vm = new Vue({
       var params = {
         source: source,
         name: this.form.name,
-        phone: this.form.phone, 
+        phone: this.form.phone,
         mail: this.form.mail,
         // province: this.form.region[0],
         // city: this.form.region[1] ? this.form.region[1] : '',
         industry: this.form.industry.join('_'),
         // hireType: this.form.mold, // 受雇类型值
         company: this.form.companyName, // 公司名称
-        companyType: this.form.companyType.join(','), 
+        companyType: this.form.companyType.join(','),
         position: this.form.job == '其他' ? ('其他/' + this.form.otherJob) : this.form.job,
         // company_size: this.form.scale,
         workScope: this.form.business,
-        partnerNeeds: this.form.need, 
+        partnerNeeds: this.form.need,
         agree: this.form.agreeChecked,
         branch: this.form.branch.indexOf('总裁') > -1 || this.form.branch.indexOf('总经理') > -1 ?  '' : this.form.branch
       }
@@ -675,7 +680,7 @@ var vm = new Vue({
         return val
       }
     },
-    // 暂不提供 
+    // 暂不提供
     cancelForm: function() {
       this.showForm = false
       this.form.name = ''

+ 176 - 276
src/web/templates/big-member/pc/page_index.html

@@ -326,8 +326,8 @@
                             </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 class="subpage-button gold">立即体验</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="项目动态实时推送">
@@ -338,8 +338,8 @@
                             </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 class="subpage-button gold">立即体验</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="拓展渠道厂商客户">
@@ -350,8 +350,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                 </div>
@@ -401,8 +401,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="大数据多维度分析">
@@ -413,8 +413,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="企业全景分析">
@@ -425,8 +425,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="采购单位全景分析">
@@ -437,8 +437,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                 </div>
@@ -476,8 +476,8 @@
                             </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 class="subpage-button gold">了解更多</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                     <div class="video-content-group" name="情报监控">
@@ -488,8 +488,8 @@
                             </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 class="subpage-button gold">立即体验</div>
+                            <div class="subpage-button darkblue">点此购买</div>
                         </div>
                     </div>
                 </div>
@@ -506,7 +506,7 @@
                     <p>
                         全国全行业千万招标信息,按需订阅让你商机增长300%!
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-0"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">立即体验</div>
                 </div>
                 <div class="card-item">
                     <div class="icon-sprites" data-index="1"></div>
@@ -514,7 +514,7 @@
                     <p>
                         一键下载包括招标文件、报名表等相关文件资料。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-1"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">立即体验</div>
                 </div>
                 <div class="card-item">
                     <div class="icon-sprites" data-index="2"></div>
@@ -522,7 +522,7 @@
                     <p>
                         一键下载包括招标文件、报名表等相关文件资料。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-2"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">立即体验</div>
                 </div>
                 <div class="card-item">
                     <div class="icon-sprites" data-index="3"></div>
@@ -530,7 +530,7 @@
                     <p>
                         大数据帮你预测潜在的投标项目,为你找到更多新商机。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-3"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
 
                 <div class="card-item">
@@ -539,7 +539,7 @@
                     <p>
                         大数据、AI技术分析潜在投标企业和中标概率。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-4"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
                 <div class="card-item" style="padding: 28px 26px;">
                     <div class="icon-sprites" data-index="5"></div>
@@ -547,7 +547,7 @@
                     <p>
                         AI智能分析类似项目,帮助企业决策是否投标、投标报价金额。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-5"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
                 <div class="card-item">
                     <div class="icon-sprites" data-index="6"></div>
@@ -555,7 +555,7 @@
                     <p>
                         分析采购单位采购需求、供应商关系,帮助企业拓客。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-6"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
                 <div class="card-item" style="padding: 28px 26px;">
                     <div class="icon-sprites" data-index="7"></div>
@@ -563,7 +563,7 @@
                     <p>
                         360°全景透视,帮你第一时间了解对手,挖掘合作客户关系。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-7"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
 
                 <div class="card-item">
@@ -572,7 +572,7 @@
                     <p>
                         帮助厂商拓展客户和代理渠道,提供企业名录!
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-8"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
                 <div class="card-item">
                     <div class="icon-sprites" data-index="9"></div>
@@ -580,7 +580,7 @@
                     <p>
                         提供周报/月报/定制化报告分析,辅助做市场洞察。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-9"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">了解更多</div>
                 </div>
                 <div class="card-item" style="padding: 28px 12px;">
                     <div class="icon-sprites" data-index="10"></div>
@@ -588,7 +588,7 @@
                     <p>
                         帮你全方位监控并推送500个竞争对手的企业中标动态、工商变动信息。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-10"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">立即体验</div>
                 </div>
                 <div class="card-item" style="padding: 28px 8px;">
                     <div class="icon-sprites" data-index="11"></div>
@@ -596,7 +596,7 @@
                     <p>
                         支持用excel批量导出招标采购数据,可选择每日导出100条或200条。
                     </p>
-                    <div class="subpage-button sm gold" id="go-info-big-11"  data-go-buy-subscribe>立即体验</div>
+                    <div class="subpage-button sm gold">立即体验</div>
                 </div>
             </div>
         </div>
@@ -786,6 +786,9 @@
             $(".video-content-group video").trigger('pause')
             videoNode.find('video').trigger('play')
         }
+        $(".video-content-group video").hover(function () {
+            $(this).trigger('play')
+        })
         $(".toggle-item-content-group .title-info-group").on('click', function () {
             toggleContent.bind(this)()
         })
@@ -800,45 +803,23 @@
         memberTrial: {{.T.member_trial}} || false
     }
     // 修改底部横幅广告
-    if (pageUserInfo.memberStatus > 0) {
-        $(".footer-banner .w1200 img").attr('src', '/big-member/image/new_index/footer-banner.png')
-        $(".footer-banner .w1200 map area[data-free-week]").remove()
-    }
-    if (pageUserInfo.memberStatus > 0) {
-      $('.footer-banner').hide()
-      $("*[data-go-buy]").text('立即使用')
-      $('.click-button-box.free').hide()
+    if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
+        $('.footer-banner').show()
+    } else {
+        $('.footer-banner').hide()
+        $(".subpage-button").each(function () {
+            var nType = $(this).text()
+            if (nType === '立即体验') {
+                $(this).text('立即使用')
+            }
+            if (nType === '点此购买') {
+                $(this).remove()
+            }
+        })
     }
-    // 修改底部横幅广告
     if (pageUserInfo.memberTrial) {
-      $(".footer-banner .w1200 img").attr('src', '/big-member/image/new_index/banner-buy.png')
-      $(".footer-banner .w1200 map area[data-free-week]").remove()
+        $('.footer-banner').hide()
     }
-    if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
-      $('.footer-banner').show()
-    }
-    var canBindPhone = false
-    // 此时无法获取绑定状态和登陆状态,只能同步请求已保证跳转判断正常运行
-    $.ajax({
-        url: '/jypay/userMsg/query?t=' + new Date().getTime(),
-        type: 'POST',
-        async: true
-    }).done(function (r) {
-        try {
-            canBindPhone = r.data.bindPhone
-            if (canBindPhone) {
-              if (r.data.needMerge) {
-                $("#bidLogin").modal("hide")
-                typeof window.callBindPhoneSuccess === 'function' && window.callBindPhoneSuccess(true)
-              }
-                // sessionStorage.setItem('bind-phone', r.data.phone.trim())
-            }
-        } catch (e) {
-            console.log('获取状态失败: ', e)
-        }
-    }).fail(function () {
-      canBindPhone = true
-    })
     /* 数字动画 */
     function filpNumber () {
         var NArr = [120,5600,3100,4500,104]
@@ -855,227 +836,154 @@
         })
     }
     $(function () {
-        var source = getParam("source");
-        /*试用7天*/
-        $("area[data-free-week]").on('click',function () {
-          /*
-          $.get('/front/pc/sobot?t=' + new Date().getTime() + '&q=大会员-pc-试用7天');
-          var member_pc = getMemberSource(source);
-          try {
-            _hmt.push(['_trackEvent',member_pc, 'click', '试用7天']);
-          } catch (e) {
-            console.log('未初始化百度统计')
-          }
-            // 未登录,则登录
-            if (!loginflag) {
-                openLoginDig()
-                return
-            }
 
-              var buy_ontrial_href ='/big/pc/page/custom';
-              if(source!=null&&source!=undefined){
-                buy_ontrial_href+="?source="+source;//baidusem
-              }
-              location.href = buy_ontrial_href;
-            */
-            $(".click-button-box.free:eq(0)").trigger('click')
-        })
-        /* 功能演示 */
-        $(".click-button-box.free").on('mouseenter', function () {
-            // 原功能演示代码
-            // if ($('#iphoneX-box iframe').length < 1) {
-            //     $('#iphoneX-box').append('<iframe data-src="/demo-member/demo_action.html" src="/demo-member/demo_action.html" scrolling="no" frameborder="0"></iframe>')
-            // }
-        })
-        // 点击免费体验埋点
-        $('.click-button-box.free').each(function(i) {
-          $(this).unbind('click').click(function(){
-            if (!loginflag) {
-              openLoginDig()
-              return
-            }
-            $.get('/front/pc/sobot?t=' + new Date().getTime() + '&q=大会员-pc-免费体验');
-            var member_pc = getMemberSource(source);
-            try {
-              _hmt.push(['_trackEvent',member_pc, 'click', '免费体验']);
-            } catch (e) {
-              console.log('未初始化百度统计')
-            }
-            console.log(getParam('id'))
-            if (getParam('id')) {
-              try {
-                $.ajax({
-                  type: "POST",
-                  url: "/publicapply/drainage/bmt/" + getParam('id'),
-                  data: {
-                    p: 'ICRP' // 留资页面埋点大会员引导文案
-                  },
-                  success: function(r) {
-                    console.log(r)
-                  }
-                })
-              } catch (error) {
-                console.log(error)
-              }
-            }
-            // vm.dialogTitle = '请完善个人信息,立刻获得全部功能的产品试用'
-            vm.isNeedSubmit('member_freeuse',function(){
-              vm.showSuccess = true
-            })
-          })
-        })
         try {
-            var injectLogic = logic
-            logic = function (data, num) {
-                if (data.result === 'ok') {
-                  if (window.waitGoBuy) {
-                    sessionStorage.setItem('pc_big_buy_type', window.waitGoBuy)
-                  }
-                  location.reload()
-                }
-                injectLogic(data, num)
-            }
             haslogin({{.T.logid}});
-        } catch (e) {}
+        } catch (err) {}
 
-        if (document.referrer !== location.href) {
-            sessionStorage.removeItem('pc_big_buy_redirect')
+        var sourceMap = {
+            业务拓展分析: {
+                info: 'yw',
+                source: 'function_Business_analysis'
+            },
+            中标企业预测: {
+                info: 'zb',
+                source: 'function_bidwinning_forecast'
+            },
+            人工智能预测: {
+                info: 'zb',
+                source: 'function_bidwinning_forecast'
+            },
+            企业全景分析: {
+                info: 'qy',
+                source: 'function_ent_portrait'
+            },
+            企业情报监控: {
+                info: '',
+                source: 'member_company_control'
+            },
+            全网商机线索: {
+                info: '',
+                source: 'member_business_get'
+            },
+            商机获取: {
+                info: '',
+                source: 'member_business_get'
+            },
+            大数据多维度分析: {
+                info: 'tb',
+                source: 'function_market_analysis'
+            },
+            市场分析: {
+                info: 'tb',
+                source: 'function_market_analysis'
+            },
+            市场分析报告: {
+                info: 'tb',
+                source: 'function_market_analysis'
+            },
+            情报监控: {
+                info: '',
+                source: 'member_company_control'
+            },
+            投标决策分析: {
+                info: 'tb',
+                source: 'function_bidding_analysis'
+            },
+            拓展渠道厂商客户: {
+                info: 'tb',
+                source: 'function_Business_analysis'
+            },
+            招标附件下载: {
+                info: '',
+                source: 'member_attach'
+            },
+            数据导出服务: {
+                info: '',
+                source: 'member_data_export'
+            },
+            潜在项目预测: {
+                info: 'tb',
+                source: 'function_potential_project_forecast'
+            },
+            采购单位全景分析: {
+                info: 'tb',
+                source: 'function_buyer_portrait'
+            },
+            项目动态实时推送: {
+                info: '',
+                source: 'member_item_control'
+            },
+            项目进程实时监控: {
+                info: '',
+                source: 'member_item_control'
+            },
         }
-        var needRedirect = sessionStorage.getItem('pc_big_buy_redirect')
-        if (needRedirect && needRedirect == '1') {
-            history.pushState('#', null, '#')
-            setTimeout(toNextPage, 5)
-        }
-
-        var isCloseFooterBanner = false
-
-
-        var corrMap = [
-            '未知ID,联系开发检查',
-            '立即购买-顶部',
-            '购买【商机版】立享',
-            '购买【商机版】立享',
-            '购买【商机版】立享',
-            '购买【智慧版】立享',
-            '购买【智慧版】立享',
-            '购买【专家版】立享',
-            '购买【专家版】立享',
-            '购买【专家版】立享',
-            '购买【专家版】立享',
-            '购买【专家版】立享',
-            '立即购买-商机版',
-            '立即购买-智慧版',
-            '立即购买-专家版',
-            '立即购买-商机版',
-            '立即购买-智慧版',
-            '立即购买-专家版',
-            '立即购买-底部横幅',
-            '立即购买-底部横幅',
-        ]
 
-        // 购买跳转
-        $("#go-customer-1").on('click', function () {
-            $.get('/front/pc/sobot?t=' + new Date().getTime() + '&q=底部立即咨询1')
-            try {
-                _hmt.push(['_trackEvent','客服', 'click', '底部立即咨询']);
-            } catch (e) {
-                console.log('未初始化百度统计')
+        // 页面按钮
+        $(".subpage-button").on('click', function () {
+            var nType = $(this).text()
+            var pKey = $(this).parents('.video-content-group').attr('name')
+            var hKey = $(this).siblings('h5').text()
+            var typeKey = pKey || hKey
+            if (pageUserInfo.memberStatus > 0) {
+                nType = '立即使用'
             }
-        })
-        $("#go-customer-2").on('click', function () {
-            $.get('/front/pc/sobot?t=' + new Date().getTime() + '&q=底部立即咨询2')
             try {
-                _hmt.push(['_trackEvent','客服', 'click', '底部立即咨询']);
+                _hmt.push(['_trackEvent', sourceMap[typeKey].source, 'click', nType]);
             } catch (e) {
                 console.log('未初始化百度统计')
             }
-        })
-        $('*[data-go-buy]').on('click', function () {
-            var member_pc=getMemberSource(source);
-            var i = 0
-            var introduce = '';
-            try {
-                i = $(this).attr('id').split('go-buy-')[1] || 0
-                introduce = corrMap[i]
-                _hmt.push(['_trackEvent',member_pc, 'click', introduce]);
-            } catch (e) {
-                console.log('未初始化百度统计', e)
+            switch (nType) {
+                case '点此购买': {
+                    if (!loginflag) {
+                        openLoginDig()
+                        return
+                    }
+                    // 采购单位画像引流
+                    var paramsUnit = getParam('unit')
+                    var source = getParam('source')
+                    var buy_commit_href ='/big/pc/page/buy_commit?mid=' + getParam('id') + (paramsUnit ? ('&unit=' + paramsUnit): '');
+                    if(source!=null&&source!=undefined){
+                        //baidusem
+                        buy_commit_href+="&source="+source;
+                    }
+                    location.href = buy_commit_href;
+                    break
+                }
+                case '了解更多': {
+                    location.href = '/big/page/' + sourceMap[typeKey].info
+                    break
+                }
+                case '立即使用': {
+                    location.href = '/swordfish/page_big_pc'
+                    break
+                }
+                case '立即体验': {
+                    if (!loginflag) {
+                        openLoginDig()
+                        return
+                    }
+                    vm.isNeedSubmit(sourceMap[typeKey].source,function(){
+                        vm.showSuccess = true
+                    })
+                    break
+                }
             }
+        })
 
-            sessionStorage.setItem('pc_big_buy_type', $(this).attr('data-go-buy'))
-            // 未登录,则登录
+        // 底部横幅立即体验
+        $(".footer-banner area").on('click', function () {
             if (!loginflag) {
-                window.waitGoBuy = $(this).attr('data-go-buy')
-                sessionStorage.setItem('pc_big_buy_redirect', '1')
                 openLoginDig()
                 return
             }
-            // 采购单位画像引流
-            var paramsUnit = getParam('unit')
-            if (paramsUnit) {
-                $.ajax({
-                    type: 'POST',
-                    url: '/publicapply/drainage/buyerunit',
-                    data: JSON.stringify({
-                        mold: 'isCBBT',
-                        introduce: introduce,
-                        id: paramsUnit
-                    }),
-                    contentType: "application/json",
-                    dataType: "json",
-                    success: function (r) {
-                        toNextPage()
-                    },
-                    error: function (r) {
-                        toNextPage()
-                    }
-                })
-            }
-            // 判断是不是从有没有引流文案
-            if (getParam('id')) {
-              try {
-                $.ajax({
-                  type: "POST",
-                  url: "/publicapply/drainage/bmt/" + getParam('id'),
-                  success: function(r) {
-                    console.log(r,'rrrr')
-                    if (r.data) {
-                      toNextPage()
-                    }
-                  }
-                })
-              } catch (error) {
-                toNextPage()
-              }
-            } else {
-              toNextPage()
-            }
+            vm.isNeedSubmit('member_freeuser',function(){
+                vm.showSuccess = true
+            })
         })
 
-        function toNextPage () {
-            if (sessionStorage.getItem('pc_big_buy_redirect') && !canBindPhone) {
-                sessionStorage.removeItem('pc_big_buy_redirect')
-                var oldBuy = sessionStorage.getItem('pc_big_buy_type') || '2'
-                var oldSelector = '*[data-go-buy][data-go-buy="'+ oldBuy +'"]'
-                $(oldSelector).eq(0).attr('data-active-bind', 'true')
-               return openBindPhoneDig()
-            }
-            sessionStorage.removeItem('pc_big_buy_redirect')
-            if (pageUserInfo.memberStatus > 0) {
-                // 购买过
-                location.href = '/swordfish/page_big_pc'
-            } else {
-                // 采购单位画像引流
-                var paramsUnit = getParam('unit')
-                var buy_commit_href ='/big/pc/page/buy_commit?mid=' + getParam('id') + (paramsUnit ? ('&unit=' + paramsUnit): '');
-                if(source!=null&&source!=undefined){
-                  buy_commit_href+="&source="+source;//baidusem
-                }
-                location.href = buy_commit_href;
-            }
-
-            // 未购买过,判断是否绑定了手机号
-        }
+        var isCloseFooterBanner = false
 
         $(".right-side-item.open-customer").attr("id", "go-customer-3")
         $(".icon-close-box").on('click',function () {
@@ -1128,14 +1036,6 @@
           }
           return items;
         };
-        //获取百度统计事件分析的key
-        function getMemberSource(source){
-          var member_pc='大会员-pc'
-          if (source!=null){
-            member_pc=member_pc+"-"+source;
-          }
-          return member_pc
-        }
         $(window).scroll(windowScrollFn)
         window.scrollTo($(window).scrollLeft(), $(window).scrollTop())
         windowScrollFn()

+ 2 - 2
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>

+ 82 - 252
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
                     }
                 })

+ 5 - 5
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>

+ 6 - 2
src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html

@@ -60,8 +60,12 @@
                 <div class="r-conts flex">
                     <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>
                     <div class="line">
-                        <div class="cont-tips address"><i class="addr">所在地:</i><span>{item.province}</span><span>{item.city}</span></div>
-                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型:</i><span>{item.buyerclass}</span></div>
+                        <div class="cont-tips address"><i class="addr">所在地:</i>
+                            <span v-if="item.province">{item.province}</span>
+                            <span v-if="item.city">{item.city}</span>
+                            <span v-if="!(item.province && item.city)">--</span>
+                        </div>
+                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型:</i><span>{item.buyerclass || '--'}</span></div>
                     </div>
                 </div>
             </div>

+ 2 - 1
src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -707,7 +707,8 @@
           return false
         }
         var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;//中英文或加.的少数民族名字
-        return namereg.test(this.infoMap.name)
+        // return namereg.test(this.infoMap.name)
+        return this.infoMap.name
       },
       checkPhone () {
         return /^1[3|7|8]\d{9}$|^19[8-9]\d{8}$|^166\d{8}|^15[0-3|5-9]\d{8}|^14[5|7]\d{8}$/.test(this.infoMap.phone)

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

@@ -245,7 +245,7 @@
                 </div>
                 <!--免费用户体验-->
                 <div v-if="canFreeExp" class="freeExper">
-                    <p class="freeRemark">免费赠送1次【采购单位全景分析】权益体验机会!</p>
+                    <p class="freeRemark">免费赠送1次【企业中标分析】权益体验机会!</p>
                     <span @click="goExpAnalysis">去解锁</span>
                 </div>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus" data-cl-event="c_wx_open_buttionclick">

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません