Merge branch 'cygx_13.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -545,12 +545,12 @@ func (this *ActivityCoAntroller) Detail() {
 			activityInfo.IsShowSignUpDetail = true
 		}
 		//处理按钮是否展示问题
-		resp.Detail = services.ActivityButtonShow(activityInfo)
+		//resp.Detail = services.ActivityButtonShow(activityInfo)
 	} else {
 		//用户未登录(绑定登录信息)的时候也能展示 v12.2.1
 		if user.UserId == 0 {
 			resp.HasPermission = 1
-			resp.Detail = services.ActivityButtonShow(activityInfo)
+			//resp.Detail = services.ActivityButtonShow(activityInfo)
 		} else {
 			hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
 			if err != nil {
@@ -563,9 +563,9 @@ func (this *ActivityCoAntroller) Detail() {
 			resp.SellerName = sellerName
 			resp.SellerMobile = sellerMobile
 		}
-
 	}
-
+	//处理按钮是否展示问题
+	resp.Detail = services.ActivityButtonShow(activityInfo)
 	collectCount1, err := models.GetActivityVoiceCollectCount(uid, activityId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"

services/activity.go

@@ -585,8 +585,8 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	//如果用户开通了研选扣点包，但是没开通研选订阅，那么就拼接一个研选订阅的权限名称
 	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) && strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+		permissionStrZhengShi += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
-
 	//如果一个权限都没有就返回无权限
 	if permissionStr == "" {
 		return