Browse Source

Merge branch 'activity_msg' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

xingzai 1 year ago
parent
commit
66a0597630
1 changed files with 3 additions and 1 deletions
  1. 3 1
      controllers/activity.go

+ 3 - 1
controllers/activity.go

@@ -2710,12 +2710,14 @@ func (this *ActivityController) CheckAsk() {
 		resp.HasPermission = hasPermission
 		resp.SignupStatus = signupStatus
 	} else {
-		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
+		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
+		//hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "判断是否已申请过试用失败,Err:" + err.Error()
 			return
 		}
+		popupMsg = "暂无查看权限"
 		resp.PopupMsg = popupMsg
 		resp.HasPermission = hasPermission
 		resp.SellerName = sellerName