浏览代码

Merge branch 'dev_v4.10.9_wh' of qmx/jy into feature/v4.10.9

王浩 3 月之前
父节点
当前提交
b4af9816ba
共有 1 个文件被更改,包括 10 次插入10 次删除
  1. 10 10
      src/jfw/front/shorturl.go

+ 10 - 10
src/jfw/front/shorturl.go

@@ -447,14 +447,14 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 	}
 	userPower := jy.GetBigVipUserBaseMsg(s.Session(), *config.Middleground)
 	var (
-		isEntnicheNew bool = userPower.EntIsNew                                                           //新版超级订阅
-		isOldVip      bool = false                                                                        //新购超级订阅不能查看拟建项目详情页
-		isVip         bool = userPower.VipStatus > 0                                                      //超级订阅
-		isMember      bool = userPower.Status > 0                                                         //大会员
-		isEntniche    bool = userPower.EntnicheStatus > 0                                                 //商机管理
-		privatedata   bool = userPower.PrivateGD                                                          //广东移动DICT 用户
-		isEntService  bool = userPower.Data.Ent.PowerSource > 0 && userPower.Data.Entniche.IsEntPower > 0 //商机管理服务
-		newCanRead         = false
+		isEntnicheNew = userPower.EntIsNew                                                           //新版超级订阅
+		isOldVip      = false                                                                        //新购超级订阅不能查看拟建项目详情页
+		isVip         = userPower.VipStatus > 0                                                      //超级订阅
+		isMember      = userPower.Status > 0                                                         //大会员
+		isEntniche    = userPower.EntnicheStatus > 0                                                 //商机管理
+		privatedata   = userPower.PrivateGD                                                          //广东移动DICT 用户
+		isEntService  = userPower.Data.Ent.PowerSource > 0 && userPower.Data.Entniche.IsEntPower > 0 //商机管理服务
+		newCanRead    = false
 	)
 	if res != nil && len(*res) > 0 {
 		if isVip && util.Int64All((*res)["l_vip_starttime"]) < util.Int64All(config.Sysconfig["contextOldVipLimit"]) {
@@ -1077,7 +1077,7 @@ func (s *Short) Qr(t, id string) error {
 		param += "&industry=" + industry
 	}
 	///article/bdprivate/BXXXX 详情页
-	if strings.HasPrefix(id, "B") {
+	if strings.Contains(s.Refer(), "bdprivate") {
 		bdprivateId := encrypt.CommonEncodeArticle("content", encrypt.CommonDecodeArticle("bdprivate", id)[0])
 		if bdprivateId != "" {
 			id = bdprivateId
@@ -1492,7 +1492,7 @@ func baseInfo(obj map[string]interface{}) string {
 		if obj["winnerMap"] != nil {
 			info += ",中标单位:"
 			i := 0
-			for k, _ := range *util.ObjToMap(obj["winnerMap"]) {
+			for k := range *util.ObjToMap(obj["winnerMap"]) {
 				i++
 				info += k
 				if i != len(*util.ObjToMap(obj["winnerMap"])) {