Merge remote-tracking branch 'origin/dev4.6.2.4' into dev4.6.2.4

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

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

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

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

src/web/templates/pc/biddetail_rec.html

@@ -1954,7 +1954,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			var t1top = 0;
 			if({{.T.obj.subtype}}!="拟建"&&{{.T.obj.subtype}}!="违规"){
 				offsetTop = $(".recoveryfat").offset().top;
-				t1top = $("#tab1").offset().top;
+				t1top = $(".tab1").offset().top;
 			}
 			if(t1top<=(scrollTop+65)&&t1top!=0){
 				if(scrollflag){