Merge remote-tracking branch 'origin/dev4.6.2.4' 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/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/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)