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

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

@@ -121,7 +121,7 @@ var vNode = {
             pieChart: null,
             userInfo: {
               isFree: false,
-              vipStatus: false,
+              vipStatus: 0,
               viper: false,
               entniche: false
             },
@@ -131,7 +131,8 @@ var vNode = {
               provin: 0,
               visited: false,
               surplus: 0
-            } // 超级订阅用户画像浏览
+            }, // 超级订阅用户画像浏览
+            freeTrial: false // 免费用户是否访问过当前画像
         }
     },
     computed: {
@@ -172,8 +173,12 @@ var vNode = {
           var isFreeAuth = info.isFree && info.freeBuyerPort > 0
           var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
           var isMember = this.power.indexOf(5)  !== -1
+          // 超级订阅用户是否访问过该画像
+          var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus === 0 && this.usageInfo.visited
+          // 免费用户是否查看过该画像
+          var freeTrial = info.isFree && info.freeBuyerPort < 0 && this.freeTrial
           // 免费用户无体验次数的、超级订阅用户无剩余次数的、没有大会员浏览权限的 显示遮罩
-          return !isFreeAuth && !isVipAuth && !isMember // power == 5
+          return !isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial
         },
         // 展示免费用户体验
         getfreeBuyerPort:function(){
@@ -499,6 +504,10 @@ var vNode = {
                 if(res.error_code == 0) {
                   if(res.data && Object.keys(res.data).length > 0) {
                       that.chartLoading = false;
+                      // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
+                      if (res.data.onTrial) {
+                        that.freeTrial = res.data.onTrial
+                      }
                       that.initChartData('', res.data)
                   } else {
                     // that.getSectionChartData('a')

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">
@@ -287,7 +287,7 @@
                 : '至今'}</span>
             </div>
           </div>
-          <div class="jy-empty" v-show="allNot">
+          <div class="jy-empty" v-show="allNot && !getStatus">
             <div class="jy-empty-img"></div>
             <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
           </div>

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/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -156,7 +156,7 @@
               </div>
               <div class="static-scope">数据统计范围：${statistics.start || '-'}-${statistics.end}</div>
             </div>
-            <div class="jy-empty" v-show="allNot">
+            <div class="jy-empty" v-show="allNot && !getStatus">
                 <div class="jy-empty-img"></div>
                 <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
             </div>

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

@@ -574,6 +574,8 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          ent_portrait_contacts: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          ent_portrait_changeList: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
           ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
           buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
@@ -597,9 +599,7 @@
           member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
-        var titleMap = {
-            ent_portrait_freeuser: '欢迎体验企业中标分析'
-        }
+
         // 提示语
         var infoText = ''
         for (var key in tipMap) {
@@ -619,7 +619,7 @@
             }
             this.moduleShow.position = true
           }
-          
+
           if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
             var r = infoText.match(/\【(.+?)\】/g)
             titleText = '欢迎体验' + r[0].replace('【','').replace('】','')
@@ -636,7 +636,9 @@
 
           // 标题
           var titleMap = {
-              ent_portrait_freeuser: '欢迎体验企业中标分析'
+              ent_portrait_freeuser: '欢迎体验企业中标分析',
+              ent_portrait_contacts: '欢迎体验剑鱼大会员',
+              ent_portrait_changeList: '欢迎体验剑鱼大会员',
           }
           for (var key in titleMap) {
               if (source.indexOf(key) !== -1) {
@@ -666,7 +668,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)

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

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/big-member/js/public_big.js

@@ -0,0 +1,266 @@
+if (!pageUserInfo) {
+     window.pageUserInfo = {
+        memberStatus: 0,
+        memberTrial: false,
+        logid: ''
+    }
+}
+// 修改底部横幅广告
+if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
+    $('.footer-banner').show()
+} else {
+    $('.footer-banner').hide()
+    $(".subpage-button").each(function () {
+        var nType = $(this).text().trim()
+        if (nType === '立即体验') {
+            $(this).text('立即使用')
+        }
+        if (nType === '点此购买') {
+            $(this).remove()
+        }
+    })
+}
+if (pageUserInfo.memberTrial) {
+    $('.footer-banner').hide()
+}
+/* 数字动画 */
+function filpNumber () {
+    var NArr = [120,5600,3100,4500,104]
+    NArr.map(function (v, i) {
+        var demo = new CountUp('flip-number-' + (i + 1), 0, v, 0,2,{
+            useEasing: false,
+            useGrouping: false
+        });
+        if (!demo.error) {
+            demo.start();
+        } else {
+            console.warn(demo.error);
+        }
+    })
+}
+$(function () {
+    try {
+        try {
+            var injectLogic = logic
+            logic = function (data, num) {
+                if (data.result === 'ok') {
+                    location.reload()
+                }
+                injectLogic(data, num)
+            }
+            haslogin(pageUserInfo.logid);
+        } catch (e) {}
+    } catch (err) {}
+
+    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'
+        },
+    }
+
+    // 页面按钮
+    $(".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 dKey = $(this).attr('data-source')
+        var typeKey = pKey || hKey || dKey
+        typeKey = typeKey.trim()
+        nType = nType.trim()
+        try {
+            _hmt.push(['_trackEvent', sourceMap[typeKey].source, 'click', nType]);
+        } catch (e) {
+            console.log('未初始化百度统计')
+        }
+        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
+            }
+            default: {
+                // 咨询客服
+                $(this).addClass('open-customer')
+                if (!openCustomDig) {
+                    zc('frame_status', function(data) {
+                        console.log(data, 'click')
+                        openCustomDig = data === 'expand'
+                    })
+                }
+                break
+            }
+        }
+    })
+
+    // 底部横幅立即体验
+    $(".footer-banner area").on('click', function () {
+        if (!loginflag) {
+            openLoginDig()
+            return
+        }
+        vm.isNeedSubmit('member_freeuser',function(){
+            vm.showSuccess = true
+        })
+    })
+
+    var isCloseFooterBanner = false
+
+    $(".right-side-item.open-customer").attr("id", "go-customer-3")
+    $(".icon-close-box").on('click',function () {
+        $(this).parent().hide()
+        isCloseFooterBanner = true
+    })
+    function windowScrollFn () {
+
+        // 底部横幅固定
+        if (!isCloseFooterBanner) {
+            var footerBannerDom = $(".footer-banner[data-sticky]")
+            var footerBannerChangeDom = $(".footer-banner[data-sticky-change]")
+            footerBannerChangeDom.css("transform", 'translateX(-' + $(window).scrollLeft() + 'px)')
+            if ($(window).scrollTop() + $(window).height() < footerBannerDom.offset().top) {
+                footerBannerChangeDom.show()
+            } else {
+                footerBannerChangeDom.hide()
+            }
+        }
+        // 数字滚动
+        var numberBox = $(".show-number-box")
+        if (numberBox) {
+            var numberBoxH = numberBox.offset().top
+            if ($(window).scrollTop() + $(window).height()  >= numberBoxH) {
+                if (!numberBox.attr('data-show-an')) {
+                    numberBox.attr('data-show-an','true')
+                    filpNumber()
+                }
+            } else {
+                numberBox.removeAttr('data-show-an')
+            }
+        }
+    }
+
+    /******* 获取url参数（正则）********/
+    function getParam(name) {
+        var search = document.location.search;
+        // alert(search);
+        var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+        var matcher = pattern.exec(search);
+        var items = null;
+        if (null != matcher) {
+            try {
+                items = decodeURIComponent(decodeURIComponent(matcher[1]));
+            } catch (e) {
+                try {
+                    items = decodeURIComponent(matcher[1]);
+                } catch (e) {
+                    items = matcher[1];
+                }
+            }
+        }
+        return items;
+    };
+    $(window).scroll(windowScrollFn)
+    window.scrollTo($(window).scrollLeft(), $(window).scrollTop())
+    windowScrollFn()
+});

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

@@ -131,7 +131,8 @@ var vNode = {
               provin: 0,
               visited: false,
               surplus: 0
-            } // 超级订阅用户画像浏览
+            }, // 超级订阅用户画像浏览
+            freeTrial: false // 免费用户是否访问过当前画像
         }
     },
     computed: {
@@ -172,8 +173,12 @@ var vNode = {
           var isFreeAuth = info.isFree && info.freeBuyerPort > 0
           var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
           var isMember = this.power.indexOf(5)  !== -1
+          // 超级订阅用户是否访问过该画像
+          var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus === 0 && this.usageInfo.visited
+          // 免费用户是否查看过该画像
+          var freeTrial = info.isFree && info.freeBuyerPort < 0 && this.freeTrial
           // 免费用户无体验次数的、超级订阅用户无剩余次数的、没有大会员浏览权限的 显示遮罩
-          return !isFreeAuth && !isVipAuth && !isMember // power == 5
+          return !isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial
         },
         // 展示免费用户体验
         getfreeBuyerPort:function(){
@@ -492,6 +497,10 @@ var vNode = {
                   that.reqCount++;
                   if(res.data && Object.keys(res.data).length > 0) {
                       that.chartLoading = false;
+                      // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
+                      if (res.data.onTrial) {
+                        that.freeTrial = res.data.onTrial
+                      }
                       that.initChartData('', res.data)
                   } else {
                     // that.getSectionChartData('a')

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,17 +763,15 @@
   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;
 }
 
 .buy_btn .j-button-now {
-  /* width: 2.4rem; */
   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-size: 100% 100%;
   color: #fff;
 }
@@ -786,19 +788,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 +808,7 @@
 }
 
 .kefu .kefu_main .kefu_text {
-  color: #FB483D;
+  color: rgba(255, 255, 255, 1);
   font-size: 0.24rem;
 }
 

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 () { })
+      // }
     }
   }
 }

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/css/dev2/newBidSearch.css

@@ -496,6 +496,7 @@
 }
 .file-count-tip .file-count{
   color: #2CB7CA;
+  font-style: normal;
 }
 .file-icon-help{
   margin-left: 8px;
@@ -536,9 +537,15 @@
   border: 0;
   box-sizing: border-box;
 }
-.custom-cancel-btn{
+.custom-cancel-btn,
+.custom-cancel-btn:hover,
+.custom-cancel-btn:focus{
   width: 132px;
   height: 34px;
+  background-color: #fff;
+  border: 1px solid #DCDFE6;
+  color: #686868;
+  font-style: 16px;
 }
 .custom-alert .el-message-box__btns button:nth-child(2){
   margin-left: 32px;

src/web/staticres/frontRouter/pc/seeBuyerHistory/css/index-pc.css

@@ -211,4 +211,47 @@
     color: #FFFFFF;
     margin-top: 32px;
     cursor: pointer;
+}
+.custom-dialog{
+  border-radius: 8px;
+}
+.custom-dialog .el-button--primary,
+.custom-dialog .el-button--primary:hover,
+.custom-dialog .el-button--primary:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #2CB7CA;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #fff;
+  border: 0;
+}
+.custom-dialog .el-dialog__header{
+  padding: 0;
+}
+.custom-dialog .el-dialog__body{
+  padding: 32px;
+  color: #686868;
+  font-size: 14px;
+  line-height: 22px;
+  text-align: justify;
+}
+.custom-dialog .el-dialog__body i{
+  color: #2CB7CA;
+}
+.custom-dialog .el-button--default,
+.custom-dialog .el-button--default:hover,
+.custom-dialog .el-button--default:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #fff;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #686868;
+  border: 1px solid #DCDFE6;
+}
+.custom-dialog .el-dialog__footer{
+  padding-bottom: 32px;
 }

src/web/staticres/frontRouter/pc/seeBuyerHistory/js/index-pc.js

@@ -1,131 +1,153 @@
 function getShortName (comName) {
-    var areaMap = chinaMapJSON || []
-    var shortname = comName
-    // 1. 循环省份城市进行替换
-    areaMap.forEach(function (item) {
-        var p = item.name.replace(/[省市]/, '')
-        if (shortname.indexOf(p) !== -1) {
-        shortname = shortname.replace(item.name, '').replace(p, '')
-        console.log(p + ' -> \'\'')
-        }
-        item.city.forEach(function (iitem) {
-        var c = iitem.name.replace(/[省市]/, '')
-        if (shortname.indexOf(c) !== -1) {
-            shortname = shortname.replace(iitem.name, '').replace(c, '')
-            console.log(c + ' -> \'\'')
+  var areaMap = chinaMapJSON || []
+  var shortname = comName
+  // 1. 循环省份城市进行替换
+  areaMap.forEach(function (item) {
+    var p = item.name.replace(/[省市]/, '')
+    if (shortname.indexOf(p) !== -1) {
+      shortname = shortname.replace(item.name, '').replace(p, '')
+      console.log(p + ' -> \'\'')
+    }
+    item.city.forEach(function (iitem) {
+      var c = iitem.name.replace(/[省市]/, '')
+      if (shortname.indexOf(c) !== -1) {
+        shortname = shortname.replace(iitem.name, '').replace(c, '')
+        console.log(c + ' -> \'\'')
+      }
+      iitem.area.forEach(function (iiitem) {
+        if (shortname.indexOf(iiitem) !== -1) {
+          shortname = shortname.replace(iiitem, '')
+          console.log(iiitem + ' -> \'\'')
         }
-        iitem.area.forEach(function (iiitem) {
-            if (shortname.indexOf(iiitem) !== -1) {
-            shortname = shortname.replace(iiitem, '')
-            console.log(iiitem + ' -> \'\'')
-            }
-        })
-        })
+      })
     })
-    var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
-    var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
-    if (shortname.length < 4) {
-        shortname = shortname.slice(0, 4)
-    }
-    return shortname
+  })
+  var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
+  var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
+  if (shortname.length < 4) {
+    shortname = shortname.slice(0, 4)
+  }
+  return shortname
 }
 var vm = new Vue({
-    el: '.see-container',
-    delimiters: ['{', '}'],
-    data () {
-        return {
-            working: false,
-            empty: false,
-            dateVal: '',
-            years: '',
-            months: '',
-            points: [],
-            statusEnum: ['存续', '吊销', '注销', '撤销'],
-            statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
-            seeList: {
-                pageNum: 1, // 当前页
-                pageSize: 10, // 每页多少条数据
-                total: 0, // 总页数
-                list: [] // 返回的数据
-            }
+  el: '.see-container',
+  delimiters: ['{', '}'],
+  data () {
+    return {
+      working: false,
+      empty: false,
+      dateVal: '',
+      years: '',
+      months: '',
+      points: {},
+      statusEnum: ['存续', '吊销', '注销', '撤销'],
+      statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
+      seeList: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 每页多少条数据
+        total: 0, // 总页数
+        list: [] // 返回的数据
+      },
+      tipDialog: false
+    }
+  },
+  computed: {
+    dialogBtnText: function() {
+      if (this.points.provin == -1) {
+        return '联系客服'
+      } else {
+        return '前往升级'
+      }
+    }
+  },
+  created () {
+    this.years = new Date().getFullYear()
+    this.months = parseInt(new Date().getMonth() + 1)
+    this.dateVal = new Date()
+    this.subPoint()
+    this.subRecord()
+  },
+  methods: {
+    showTip () {
+      this.tipDialog = true
+    },
+    goHandle (item) {
+      if (item == '前往升级') {
+        window.open('/swordfish/page_big_pc/free/svip/buy?type=upgrade')
+        this.tipDialog = false
+      } else {
+        $('.open-customer').unbind('click').trigger('click')
+        this.tipDialog = false
+      }
+    },
+    subPoint () {
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: '',
+        dataType: 'json'
+      }).done(res => {
+        if (res.error_code == 0) {
+          this.points = res.data
         }
+      })
     },
-    created() {
-        this.years = new Date().getFullYear()
-        this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = new Date()
-        this.subPoint()
-        this.subRecord()
+    getDatas () {
+      return {
+        year: this.years,
+        month: this.months,
+        pageSize: this.seeList.pageSize,
+        pageNum: this.seeList.pageNum - 1,
+        p_type: 1
+      }
     },
-    methods: {
-        subPoint() {
-            $.ajax({
-              url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
-              type: 'POST',
-              contentType: 'application/x-www-form-urlencoded',
-              data: '',
-              dataType: 'json'
-            }).done(res => {
-              if (res.error_code == 0) {
-                this.points = res.data
-              }
-            })
-        },
-        getDatas() {
+    subRecord () {
+      this.working = true
+      this.empty = false
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/record',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: this.getDatas(),
+        dataType: 'json'
+      }).done(res => {
+        var _this = this
+        if (res.error_code === 0) {
+          this.working = false
+          this.empty = true
+          if (res.data.total) {
+            this.seeList.total = res.data.total
+          }
+          if (!res.data.list) {
+            res.data.list = []
+          }
+          this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
             return {
-                year: this.years,
-                month: this.months,
-                pageSize: this.seeList.pageSize,
-                pageNum: this.seeList.pageNum - 1,
-                p_type:1
+              name: v.name,
+              province: v.province,
+              city: v.city,
+              buyerclass: v.buyerclass,
+              checked: false
             }
-        },
-        subRecord() {
-            this.working = true
-            this.empty = false
-            $.ajax({
-                url: '/bigmember/portrait/subVipPortrait/record',
-                type: 'POST',
-                contentType: 'application/x-www-form-urlencoded',
-                data: this.getDatas(),
-                dataType: 'json'
-            }).done(res => {
-                var _this = this
-                if (res.error_code === 0) {
-                    this.working = false
-                    this.empty = true
-                    if (res.data.total) {
-                        this.seeList.total = res.data.total
-                    }
-                    if (!res.data.list){
-                        res.data.list=[]
-                    }
-                    this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
-                        return {
-                            name: v.name,
-                            province: v.province,
-                            city: v.city,
-                            buyerclass: v.buyerclass,
-                            checked: false
-                        }
-                    }))
-                }
-            })
-        },
-        onPageChange(page) {
-            this.seeList.pageNum = page
-            this.seeList.list = []
-            this.subRecord()
-        },
-        dateHandler(val) {
-            this.years = val.getFullYear()
-            this.months = val.getMonth() + 1
-            this.seeList.pageNum = 1
-            this.seeList.list = []
-            this.subRecord()
-        },
-        detailed(ids) {
-            window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
+          }))
         }
+      })
+    },
+    onPageChange (page) {
+      this.seeList.pageNum = page
+      this.seeList.list = []
+      this.subRecord()
+    },
+    dateHandler (val) {
+      this.years = val.getFullYear()
+      this.months = val.getMonth() + 1
+      this.seeList.pageNum = 1
+      this.seeList.list = []
+      this.subRecord()
+    },
+    detailed (ids) {
+      window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
     }
+  }
 })

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/staticres/js/superSearch.js

@@ -234,6 +234,7 @@ function getNewBids(pnum){
 				$(".nbnext").removeClass("disabled");
       }
       searchInnerVue.listState.total = Math.ceil(r.count/50)
+      searchInnerVue.checkPageNumAdd1()
 			appendDatas(r.list,false,true);
 		}else{
 			submitflag=true;
@@ -276,6 +277,7 @@ function getNewBiddings(){
       // 计算总页码
       if (currentPage == 1) {
         searchInnerVue.listState.total = Math.ceil(r.count/50)
+        searchInnerVue.checkPageNumAdd1()
       }
 			$(".tabContainer").show();
 			//$(".pagination").show();
@@ -975,6 +977,7 @@ function searchOnsubmit(clickpaging){
       LimitClass.prevNoLimitFlag = false;
       // 重新分页
       searchInnerVue.listState.total = r.totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}else{
 			LimitClass.prevNoLimitFlag = true;
       LimitClass.limitFlag = false;
@@ -1080,6 +1083,7 @@ function afterAjaxReq(r){
     secondList= r.secondList;
     // vue 重置总页数
     searchInnerVue.listState.total = totalPage
+    searchInnerVue.checkPageNumAdd1()
 	}
 	if(secondFlag==""&&typeof(totalPage) != "undefined" && currentPage == 1){
 		if (r.totalPage==1){
@@ -1089,9 +1093,11 @@ function afterAjaxReq(r){
       }
       // vue 重置总页数
       searchInnerVue.listState.total = totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}else{
       totalPage = r.totalPage;
       searchInnerVue.listState.total = totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}
 	}
 }
@@ -1297,18 +1303,20 @@ function collectClick() {
 }
 
 function openBigMemberDialog (str, content) {
-	$('.auth-dialog').show()
-	$('.auth-dialog .dialog-title').text('您暂无使用权限')
-	$('.auth-dialog .dialog-content').html(content ||  '开通大会员,查看更多招标项目,畅享商机不受限!')
-	$('.auth-dialog .default-btn').click(function () {
-		$('.auth-dialog').hide(300)
-	})
-	$('.auth-dialog .confirm-btn').text('免费体验')
-	$('.auth-dialog .confirm-btn').off('click').bind('click',function () {
-		var advName = '招标搜索' + str + '-去开通'
-		baiduEvent(advName) // 点击去开通事件 百度统计
-		// window.open('/swordfish/page_big_pc/free/svip/buy')
-	})
+  $('.auth-dialog').show()
+  $('.auth-dialog .dialog-title').text('您暂无使用权限')
+  $('.auth-dialog .dialog-content').html(content ||  '开通大会员,查看更多招标项目,畅享商机不受限!')
+  $('.auth-dialog .default-btn').click(function () {
+    $('.auth-dialog').hide(300)
+  })
+  $('.auth-dialog .confirm-btn').text('免费体验')
+  $('.auth-dialog .confirm-btn').off('click').bind('click',function () {
+    var advName = '招标搜索' + str + '-去开通'
+    baiduEvent(advName) // 点击去开通事件 百度统计
+    $('.auth-dialog').hide(300)
+    vm.dialogTitle = '免费用户查看超过500条招标搜索结果'
+    vm.isNeedSubmit('jylab_see500_plus', function () {})
+  })
 }
 
 // 开通提醒弹框

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)()
         })
@@ -793,354 +796,13 @@
             toggleContent.bind(this)()
         })
     })
-</script>
-<script>
     var pageUserInfo = {
         memberStatus: {{.T.member_status}} || 0,
-        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.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()
-    }
-    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]
-        NArr.map(function (v, i) {
-            var demo = new CountUp('flip-number-' + (i + 1), 0, v, 0,2,{
-                useEasing: false,
-                useGrouping: false
-            });
-            if (!demo.error) {
-                demo.start();
-            } else {
-                console.error(demo.error);
-            }
-        })
+        memberTrial: {{.T.member_trial}} || false,
+        logid: {{.T.logid}}
     }
-    $(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) {}
-
-        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 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('未初始化百度统计')
-            }
-        })
-        $("#go-customer-2").on('click', function () {
-            $.get('/front/pc/sobot?t=' + new Date().getTime() + '&q=底部立即咨询2')
-            try {
-                _hmt.push(['_trackEvent','客服', 'click', '底部立即咨询']);
-            } 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)
-            }
-
-            sessionStorage.setItem('pc_big_buy_type', $(this).attr('data-go-buy'))
-            // 未登录，则登录
-            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()
-            }
-        })
-
-        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;
-            }
-
-            // 未购买过,判断是否绑定了手机号
-        }
-
-        $(".right-side-item.open-customer").attr("id", "go-customer-3")
-        $(".icon-close-box").on('click',function () {
-            $(this).parent().hide()
-            isCloseFooterBanner = true
-        })
-        function windowScrollFn () {
-
-            // 底部横幅固定
-            if (!isCloseFooterBanner) {
-                var footerBannerDom = $(".footer-banner[data-sticky]")
-                var footerBannerChangeDom = $(".footer-banner[data-sticky-change]")
-                footerBannerChangeDom.css("transform", 'translateX(-' + $(window).scrollLeft() + 'px)')
-                if ($(window).scrollTop() + $(window).height() < footerBannerDom.offset().top) {
-                    footerBannerChangeDom.show()
-                } else {
-                    footerBannerChangeDom.hide()
-                }
-            }
-            // 数字滚动
-            var numberBox = $(".show-number-box")
-            var numberBoxH = numberBox.offset().top
-            if ($(window).scrollTop() + $(window).height()  >= numberBoxH) {
-                if (!numberBox.attr('data-show-an')) {
-                    numberBox.attr('data-show-an','true')
-                    filpNumber()
-                }
-            } else {
-                numberBox.removeAttr('data-show-an')
-            }
-        }
-
-        /******* 获取url参数（正则）********/
-        function getParam(name) {
-          var search = document.location.search;
-          // alert(search);
-          var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
-          var matcher = pattern.exec(search);
-          var items = null;
-          if (null != matcher) {
-              try {
-                  items = decodeURIComponent(decodeURIComponent(matcher[1]));
-              } catch (e) {
-                  try {
-                      items = decodeURIComponent(matcher[1]);
-                  } catch (e) {
-                      items = matcher[1];
-                  }
-              }
-          }
-          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()
-    });
 </script>
+<script src='{{Msg "seo" "cdn"}}/big-member/js/public_big.js?v={{Msg "seo" "version"}}'></script>
 <!--S-百度统计-->
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}

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

@@ -21,203 +21,115 @@
             #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%;
+          }
+          .action_out div {
+              width: 100%;
+          }
+          .j-main img {
+              width: 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="exper_fun('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,26 +140,23 @@
                 </div>
             </div>
         </div>
-        <div class="j-footer" v-show="isCantrial">
-            <div class="j-button-group">
-                        <!-- <div class="j-button-practice" @click="exper_fun()">
-                            <div data-need-bind-phone>免费试用</div>
-                        </div> -->
-                <div class="buy_btn" v-show="onlyBuy">
+        <div class="j-footer " v-show="isCantrial" style="background-color: #1A1A2A">
+            <div class="j-button-group btbt">
+                <div class="buy_btn" v-if="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">
-                            <div class="j-button-nowly j-btn" @click="linkBuy('sj',6)">
-                                <div data-need-bind-phone>立即购买</div>
-                            </div>
-                        </div>
+                <div class="buy_btn" v-else>
+                    <div class="j-button-nowly j-btn" @click="linkBuy('sj',6)">
+                        <div data-need-bind-phone>立即购买</div>
                     </div>
                 </div>
+            </div>
+        </div>
     </div>
     <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"> </script>
     <script src="//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js"> </script>
@@ -273,73 +182,9 @@
         delimiters: ['${', '}'],
         el: '#v-commit',
         data: {
-            onlyBuy:true,
-            isCantrial:false,
+            onlyBuy: true,
+            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 +205,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:'推送数据',
@@ -404,8 +234,8 @@
             ]
         },
         created () {
-            this.getVipMeal()
             this.getAnchor()
+            this.getVipMeal()
         },
         computed: {
             version () {
@@ -433,15 +263,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
                     }
                 })
@@ -488,7 +321,7 @@
             exper_fun:function () {
                 this.setStatistics('免费体验')
                 // location.href = '/demo-member/demo_action.html'
-                location.href = '/weixin/frontPage/bigmember/free/perfect_info?origin=member_freeuse&mid=' + utils.getParam('mid')
+                location.href = '/weixin/frontPage/bigmember/free/perfect_info?origin=member_freeuser&mid=' + utils.getParam('mid')
             },
             // 咨询客服
             consult:function(){

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

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

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

@@ -170,7 +170,7 @@
               </div>
               <div class="static-scope">数据统计范围：${statistics.start || '-'}-${statistics.end}</div>
           </div>
-          <div class="jy-empty" v-show="allNot">
+          <div class="jy-empty" v-show="allNot && !getStatus">
             <div class="jy-empty-img"></div>
             <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
           </div>

src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html

@@ -1,113 +1,125 @@
-
 <html lang="zh-cn">
-	<head>
-		<title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
-		<meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}"/>
-		<meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}"/>
-		<meta name="renderer" content="webkit">
-		<meta content="telephone=no" name="format-detection"/>
-        <meta content="历史查看记录" theme="light" name="enable-header"/>
-		{{include "/common/pnc.html"}}
-		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+<head>
+  <title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
+  <meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}" />
+  <meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}" />
+  <meta name="renderer" content="webkit">
+  <meta content="telephone=no" name="format-detection" />
+  <meta content="历史查看记录" theme="light" name="enable-header" />
+  {{include "/common/pnc.html"}}
+  <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
-	</head>
+  <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
+  <script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 
-	<body>
-	{{include "/common/pchead.html"}}
-    <div class="dialog" style="display: none" onclick="closeDialog()">
-        <div class="alertDiv">
-            <div class="content">
-                每购买1个省,每月可查看<i>5个</i>采购单位画像,<i>上限<br>为80个</i>,每月1号上月余额清零重新计算。
-            </div>
-            <div class="iKnowBtn">我知道了</div>
+  <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
+</head>
+
+<body>
+  {{include "/common/pchead.html"}}
+
+  <section class="see-container" v-cloak>
+    <div class="see-header flex w">
+      <div class="l-tabs flex">
+        <h3 class="tab-title">采购单位画像记录</h3>
+        <div class="tips">
+          当月已使用：<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
         </div>
+        <div class="tip" style="cursor: pointer;" @click="showTip"></div>
+      </div>
+      <div class="l-tabs r-tabs">
+        <span class="r-word">选择月份</span>
+        <el-date-picker class="date-class" v-model="dateVal" type="month" format="yyyy年MM月" @change="dateHandler"
+          placeholder="请选择月份" :clearable="false" :editable="false">
+        </el-date-picker>
+        <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
+      </div>
     </div>
-	<section class="see-container" v-cloak >
-        <div class="see-header flex w">
-            <div class="l-tabs flex">
-                <h3 class="tab-title">采购单位画像记录</h3>
-                <div class="tips">
-                    当月已使用：<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
-                </div>
-                <div class="tip" @click="showTip"></div>
-            </div>
-            <div class="l-tabs r-tabs">
-                <span class="r-word">选择月份</span>
-                <el-date-picker
-                    class="date-class"
-                    v-model="dateVal"
-                    type="month"
-                    format="yyyy年MM月"
-                    @change="dateHandler"
-                    placeholder="请选择月份"
-                    :clearable="false"
-                    :editable="false">
-                </el-date-picker>
-                <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
-            </div>
-        </div>
-        <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
-            <div class="lists flex" v-for="item in seeList.list" :key="item._id">
-                <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>
-                </div>
-            </div>
-            <div class="el-pagination-container" v-show="seeList.total">
-                <el-pagination
-                    background
-                    layout="prev, pager, next, ->"
-                    :hide-on-single-page="true"
-                    :current-page="seeList.pageNum"
-                    :page-size="seeList.pageSize"
-                    :total="seeList.total"
-                    @current-change="onPageChange"
-                ></el-pagination>
+    <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
+      <div class="lists flex" v-for="item in seeList.list" :key="item._id">
+        <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 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 class="no-data" v-if="working"><el-image src="/images/working.gif"></el-image><div class="tip-text"><p>剑鱼标讯正在努力工作中...</p></div></div>
-        <div class="no-data" v-if="seeList.list == 0 && empty"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
-    </section>
+      </div>
+      <div class="el-pagination-container" v-show="seeList.total">
+        <el-pagination background layout="prev, pager, next, ->" :hide-on-single-page="true"
+          :current-page="seeList.pageNum" :page-size="seeList.pageSize" :total="seeList.total"
+          @current-change="onPageChange"></el-pagination>
+      </div>
+    </div>
+    <div class="no-data" v-if="working">
+      <el-image src="/images/working.gif"></el-image>
+      <div class="tip-text">
+        <p>剑鱼标讯正在努力工作中...</p>
+      </div>
+    </div>
+    <div class="no-data" v-if="seeList.list == 0 && empty">
+      <el-image src="/images/pc_12.png"></el-image>
+      <div class="tip-text">
+        <p>暂无数据</p>
+      </div>
+    </div>
+    <el-dialog
+      :visible.sync="tipDialog"
+      :show-close="false"
+      custom-class="custom-dialog"
+      width="380"
+      center>
+      <div>
+        每购买1个省,每月可查看<i>5个</i>采购单位画像，<i>上限为80个</i>，您当前订阅了
+        <span v-if="points.provin == -1">全国，查看机会已经消耗完毕，如需要更多服务，请前往联系客服。</span>
+        <span v-else>{points.provin}个省，如需查看更多，前往订阅更多省份。</span>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="tipDialog = false">取 消</el-button>
+        <el-button type="primary" @click.stop="goHandle(dialogBtnText)">{dialogBtnText}</el-button>
+      </div>
+    </el-dialog>
+  </section>
 
-    {{include "/common/pcbottom.html"}}
-    {{include "/common/baiducc.html"}}
+  {{include "/common/pcbottom.html"}}
+  {{include "/common/baiducc.html"}}
 
-    <script>
-        haslogin({{.T.logid}})
-        function baiduEvent(name) {
-          try {
-            console.log(name, 'name')
-            _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
-          } catch (e) {
-            console.log('未初始化百度统计')
-          }
-        }
-    </script>
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
-    <script>
-        function closeDialog(){
-            $(".dialog").css("display","none")
-        }
-        function showTip(){
-            $(".dialog").css("display","unset")
-        }
-    </script>
+  <script>
+    haslogin({{.T.logid}})
+
+    function baiduEvent(name) {
+      try {
+        console.log(name, 'name')
+        _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
+    }
+  </script>
+  <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    function closeDialog() {
+      $(".dialog").css("display", "none")
+    }
+
+    function showTip() {
+      $(".dialog").css("display", "unset")
+    }
+  </script>
+  <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>
-

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

@@ -608,6 +608,8 @@
       getTipStr () {
         var source = this.ajaxParams.source
         var tipMap = {
+          ent_portrait_contacts: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
+          ent_portrait_changeList: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           article_attach_freeuser: '请留下联系方式，立即免费体验【附件下载】1次，招标文件/采购清单一键下载，商机更完整！',
           ent_portrait_freeuser: '请留下联系方式，立即免费体验【企业中标分析】1次，多维度可视化分析竞争对手！',
           buyer_portrait_freeuser: '请留下联系方式，立即免费体验【采购单位全景分析】1次，帮你全面洞察采购单位，开发新客户！',
@@ -631,9 +633,7 @@
           member_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！'
         }
-        var titleMap = {
-            ent_portrait_freeuser: '欢迎体验企业中标分析'
-        }
+
         // 提示语
         var infoText = ''
         for (var key in tipMap) {
@@ -669,7 +669,9 @@
 
           // 标题
           var titleMap = {
-              ent_portrait_freeuser: '欢迎体验企业中标分析'
+              ent_portrait_freeuser: '欢迎体验企业中标分析',
+              ent_portrait_contacts: '欢迎体验剑鱼大会员',
+              ent_portrait_changeList: '欢迎体验剑鱼大会员',
           }
           for (var key in titleMap) {
               if (source.indexOf(key) !== -1) {
@@ -707,7 +709,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)

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">
@@ -275,7 +275,7 @@
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
                     </div>
                 </div>
-                <div class="jy-empty" v-show="allNot">
+                <div class="jy-empty" v-show="allNot && !getStatus">
                   <div class="jy-empty-img"></div>
                   <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
                 </div>

src/web/templates/pc/biddetail_rec.html

@@ -824,11 +824,11 @@
           <span class="slogan-btn more-btn">了解更多></span>
         </span>
 				</div>
-<!--				<div id="tab1">-->
-<!--					<div class="com-detail">-->
-<!--						{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}-->
-<!--					</div>-->
-<!--				</div>-->
+				<div id="tab1">
+					<div class="com-detail">
+						{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}
+					</div>
+				</div>
 			</div>
 			{{end}}
 			{{if .T.obj.projectinfo.attachments}}
@@ -864,7 +864,7 @@
           <span style="font-weight: 400;font-size: 16px">附件下载</span>
           <span class="free-download">免费下载1次</span>
           <span class="super-vip-show" style="display:none;">
-            <span class="file-count-tip">本月剩余:<em class="file-count"></em>次</span>
+            <span class="file-count-tip">本月剩余:<i class="file-count"></i> 次</span>
             <img class="file-icon-help" src="/images/help-b.png" alt="">
             <span class="concat-kf open-customer">联系客服</span>
           </span>
@@ -1185,11 +1185,17 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			entniche = res.data.entniche
 			vip = res.data.vip
 			var subType = {{.T.obj.subtype}}
-			if (subType == '拟建' && !bidmember && !entniche && vip <=0){
-			// if (subType == '拟建' && entniche == false){
-				$('.mask-zz').show()
-			} else {
-				$('.mask-zz').hide()
+			// if (subType == '拟建' && !bidmember && !entniche && vip <=0){
+			// 	$('.mask-zz').show()
+			// } else {
+			// 	$('.mask-zz').hide()
+			// }
+			if(subType == '拟建' || subType == '采购意向'){
+				if (!bidmember && !entniche && vip <=0){
+					$('.mask-zz').show()
+				} else {
+					$('.mask-zz').hide()
+				}
 			}
 		}
 
@@ -3339,15 +3345,18 @@ function fromwhere(text){
             bidVue.$confirm('您本月查看机会已经消耗完毕，如需要更多服务，请前往联系客服。', {
               showClose:false,
               center: true,
-              confirmButtonText: '联系客服',
+              confirmButtonText: '取消',
               customClass: 'custom-alert',
               showCancelButton: true,
-              confirmButtonClass: 'custom-confirm-btn',
-              cancelButtonClass: 'custom-cancel-btn'
+              confirmButtonClass: 'custom-cancel-btn',
+              cancelButtonClass: 'custom-confirm-btn',
+              cancelButtonText: '联系客服'
             }).then(function(data){
+              
+            }).catch(function(){
               $('.open-customer').trigger('click')
               $('body').trigger('click')
-            }).catch(function(){});
+            });
           }
         } else {
           // 老超级订阅用户 提醒升级
@@ -3373,7 +3382,7 @@ function fromwhere(text){
           confirmButtonText: '我知道了',
           customClass: 'custom-alert',
           showCancelButton: true,
-          confirmButtonClass: 'custom-alert-btn'
+          confirmButtonClass: 'custom-confirm-btn'
         });
         return
       }
@@ -3423,6 +3432,7 @@ function fromwhere(text){
             $("#attach-list").css("display","").find(".download-list").html(html)
           }
 			$(".downs").click(function (){
+				checkBigStatus()
 				cjdyDownload()
 			})
 			// $(".downs").click(function (){
@@ -3468,7 +3478,7 @@ function fromwhere(text){
         center: true,
         confirmButtonText: '我知道了',
         customClass: 'custom-alert',
-        confirmButtonClass: 'custom-alert-btn'
+        confirmButtonClass: 'custom-confirm-btn'
       });
     })
     // 免费下载一次点击

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/pc/supsearch.html

@@ -281,6 +281,7 @@ function isPower () {
           vipState = true
         } else {
           vipState = false
+          adListInspect()
         }
         isOld = r.data.isOld
       }
@@ -748,40 +749,28 @@ $(function(){
 <script src="/js/superSearch.js?v={{Msg "seo" "version"}}"></script>
 <script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
 <script type="text/javascript">
-$.ajax({
-  type:'post',
-  url:'/publicapply/bidcoll/power?t=' + Date.now(),
-  success: function(res){
-    if (res.data) {
-      // res.data.entniche = false
-      // res.data.member = false
-      // res.data.vip = 0
-      if(!res.data.entniche && !res.data.member && res.data.vip <= 0) {
-        setTimeout(() => {
-          (window.slotbydup = window.slotbydup || []).push({
-              id: "u6603895",
-              container: "_t3di2018y5",
-              async: true
-          });
-        }, 1000)
-        setTimeout(() => {
-          (window.slotbydup = window.slotbydup || []).push({
-              id: "u6603895",
-              container: "_6omliqck79a",
-              async: true
-          });
-          var frames = document.getElementById("iframeu6603895_0");
-          // console.log(frames, 'frames')
+function adListInspect () {
+  setTimeout(() => {
+    (window.slotbydup = window.slotbydup || []).push({
+        id: "u6603895",
+        container: "_t3di2018y5",
+        async: true
+    });
+  }, 1000)
+  setTimeout(() => {
+    (window.slotbydup = window.slotbydup || []).push({
+        id: "u6603895",
+        container: "_6omliqck79a",
+        async: true
+    });
+    var frames = document.getElementById("iframeu6603895_0");
+    IframeOnClick.track(frames, function() {
+      jQuery(document).click();
+    });
+  }, 1000)
+  getAjaxAdv()
+}
 
-          IframeOnClick.track(frames, function() {
-                  jQuery(document).click();
-          });
-        }, 1000)
-        getAjaxAdv()
-      }
-    }
-  }
-})
 function getAjaxAdv () {
   $.ajax({
     type: 'POST',
@@ -1472,12 +1461,12 @@ var IframeOnClick = {
 			</div>
     </div> -->
     <!-- ${listState.total} ${listState.num} -->
-    <div class="el-pagination-container" v-show="showPage" style="width: 1200px;margin: 0 auto;">
+    <div class="el-pagination-container" ref="pagination" v-show="showPage" style="width: 1200px;margin: 0 auto;">
       <el-pagination
         background
         layout="prev, pager, next"
         :page-size="listState.size"
-        :current-page="listState.num"
+        :current-page.sync="listState.num"
         :page-count="listState.total"
         :hide-on-single-page="true"
         @current-change="onPageChange"
@@ -2165,33 +2154,71 @@ document.querySelector(".searchControl").oncopy = function(){
       return {
         showPage: true,
         listState: {
+          prevPageNum: 1,
           size: pageSize,
           num: currentPage,
           total: totalPage
+        },
+        powerInfo: {
+          entniche: false,
+          member: false,
+          vip: 0
         }
       }
     },
+    computed: {
+      vipState: function () {
+        var entniche = this.powerInfo.entniche
+        var member = this.powerInfo.member
+        var vip = this.powerInfo.vip
+        return entniche || member || vip > 0
+      }
+    },
     watch: {
-      'listState.num' (newVal) {
-        // console.log(newVal, '分页')
-      },
-      'listState.total' (newVal) {
-        // console.log(newVal, '总页码')
+      'listState.num' (newVal, oldVal) {
+        // console.log(JSON.stringify(this.listState))
       }
     },
+    created () {
+      this.getPower()
+    },
     mounted () {
       console.log('总页码：' + totalPage + ',当前页：' + currentPage + ',一页数量：' + pageSize + ',总条数：' + totalCount)
     },
     methods: {
+      getPower: function () {
+        var _this = this
+        $.ajax({
+          type:'post',
+          url:'/publicapply/bidcoll/power?t=' + Date.now(),
+          success: function(r){
+            if (r.data) {
+              _this.powerInfo.entniche = r.data.entniche
+              _this.powerInfo.member = r.data.member
+              _this.powerInfo.vip = r.data.vip
+
+              _this.checkPageNumAdd1()
+            }
+          }
+        })
+      },
+      checkPageNumAdd1: function () {
+        if (this.vipState) return
+        if (this.listState.total === 10) {
+          this.listState.total++
+        }
+      },
       onPageChange (p) {
+        // TODO 免费用户搜索结果查看大于11页时弹窗提示
+        if (!vipState && p > 10) {
+          openBigMemberDialog('招标搜索500条限制')
+          this.listState.num = this.listState.prevPageNum
+          return 
+        }
 
-	  	// TODO 免费用户搜索结果查看大于11页时弹窗提示
-	  	if (!vipState && p > 10) {
-	  		return openBigMemberDialog('招标搜索500条限制')
-	  	}
+        currentPage = this.listState.num
+        this.listState.prevPageNum = this.listState.num
 
-        currentPage = p
-        this.listState.num = p
         $(".tabContainer").hide();
         $(".working").show();
         $(window).scrollTop(0);

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