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/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
 	}

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

@@ -164,6 +164,10 @@
                 level_map.set(2, smart);
                 level_map.set(3, niche);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员子账号");
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))

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

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
 }
 
 //获取企业基本信息

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 {

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)

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

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

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
 		}

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1965,7 +1965,9 @@ var vm = new Vue({
         2: '智慧版',
         3: '商机版',
         4: '试用版',
-        5: '自定义'
+        5: '自定义',
+        6: '商机版2.0',
+        7: '专家版2.0'
       }
 
       var levelInfo = {

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

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>
@@ -803,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()
-    }
-    if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
-      $('.footer-banner').show()
+        $('.footer-banner').hide()
     }
-    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]
@@ -858,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 needRedirect = sessionStorage.getItem('pc_big_buy_redirect')
-        if (needRedirect && needRedirect == '1') {
-            history.pushState('#', null, '#')
-            setTimeout(toNextPage, 5)
+        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 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 () {
@@ -1131,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()

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>

src/web/templates/pc/myOrder.html

@@ -636,7 +636,13 @@
                 },
                 '自定义': {
                   icon: '/order/image/zizhanghao1.png'
-                }
+                },
+                '专家版2.0': {
+                  icon: '/order/image/zizhanghao1.png'
+                },
+                '商机版2.0': {
+                  icon: '/order/image/zizhanghao2.png'
+                },
               }
             },
             '大会员-招标文件解读': {

src/web/templates/pc/subAccount_orderDetail.html

@@ -155,13 +155,15 @@
                     level_map.set(2, "智慧版");
                     level_map.set(3, "商机版");
                     level_map.set(5, "自定义");
+                    level_map.set(6, "商机版2.0");
+                    level_map.set(7, "专家版2.0");
 
                     if (r.data.create_time) {
                         $(".order_time").text(r.data.create_time.replace("-", ".").replace("-", "."));
                     }
 
                     $(".price").text("￥ " + formatMoney(r.data.order_money / 100) + "元");
-
+    
                     $(".level").text(level_map.get(r.data.level));
                     $(".cycle").text(r.data.cycle);
                     var member_endtime = "-";

src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -161,6 +161,8 @@
                 level_map.set(2, "智慧版");
                 level_map.set(3, "商机版");
                 level_map.set(5, "自定义");
+                level_map.set(6, "商机版2.0");
+                level_map.set(7, "专家版2.0");
                 $(".o-name").text("大会员补充包");
                 $(".order-img > img").attr("src", "/order/image/buchongbao.png")
                 var member_endtime = "-" ;

src/web/templates/weixin/member/subAccountDetail.html

@@ -168,6 +168,10 @@
                 level_map.set(2, smart);
                 level_map.set(3, niche);
                 level_map.set(5, custom);
+                niche.set("level","商机版2.0")
+                level_map.set(6, niche);
+                expert.set("level","专家版2.0")
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员子账号");
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))