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

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/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/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">

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

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

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
+				return &Portrait{userid}, 3, nil
 			}
 			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
-				return nil, false, errors.New("非法请求")
+				return nil, -1, errors.New("非法请求")
 			}
-			return nil, false, nil
+			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

@@ -129,7 +129,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 +141,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 {
@@ -267,7 +270,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_newMsg", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -281,7 +284,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,
@@ -347,11 +350,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/subscribepay/src/util/msgremind.go

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

src/web/staticres/common-module/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/templates/frontRouter/wx/bigmember/free/perfect_info.html

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

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