Browse Source

用户权限提示

hsun 2 years ago
parent
commit
ee6f5c51b0
2 changed files with 28 additions and 22 deletions
  1. 14 11
      controllers/micro_roadshow.go
  2. 14 11
      services/micro_roadshow.go

+ 14 - 11
controllers/micro_roadshow.go

@@ -80,24 +80,27 @@ func (this *MicroRoadShowController) List() {
 		au.SellerName = authInfo.SellerName
 		au.SellerMobile = authInfo.SellerMobile
 		au.HasPermission = authInfo.HasPermission
+		au.OperationMode = authInfo.OperationMode
 		if authInfo.HasPermission == 1 {
 			// 非宏观权限进一步判断是否有权限
 			if list[i].ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, list[i].ChartPermissionName) {
 				au.HasPermission = 2
 			}
 		}
-		if authInfo.HasPermission == 2 {
-			if list[i].Type == 1 {
-				au.PopupMsg = services.UserPermissionPopupMsgCallActivity
-			} else {
-				au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
-			}
-		}
-		if authInfo.HasPermission == 3 {
-			if list[i].Type == 1 {
-				au.PopupMsg = services.UserPermissionPopupMsgApplyActivity
+		// 无权限的弹框提示
+		if authInfo.HasPermission != 1 {
+			if au.OperationMode == services.UserPermissionOperationModeCall {
+				if list[i].Type == 1 {
+					au.PopupMsg = services.UserPermissionPopupMsgCallActivity
+				} else {
+					au.PopupMsg = services.UserPermissionPopupMsgCallMicroVideo
+				}
 			} else {
-				au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
+				if list[i].Type == 1 {
+					au.PopupMsg = services.UserPermissionPopupMsgApplyActivity
+				} else {
+					au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
+				}
 			}
 		}
 		list[i].AuthInfo = au

+ 14 - 11
services/micro_roadshow.go

@@ -293,24 +293,27 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 			au.SellerName = authInfo.SellerName
 			au.SellerMobile = authInfo.SellerMobile
 			au.HasPermission = authInfo.HasPermission
+			au.OperationMode = authInfo.OperationMode
 			if authInfo.HasPermission == 1 {
 				// 非宏观权限进一步判断是否有权限
 				if ad.AudioChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, ad.AudioChartPermissionName) {
 					au.HasPermission = 2
 				}
 			}
-			if authInfo.HasPermission == 2 {
-				if ad.AudioType == 1 {
-					au.PopupMsg = UserPermissionPopupMsgCallActivity
-				} else {
-					au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
-				}
-			}
-			if authInfo.HasPermission == 3 {
-				if ad.AudioType == 1 {
-					au.PopupMsg = UserPermissionPopupMsgApplyActivity
+			// 无权限的弹框提示
+			if authInfo.HasPermission != 1 {
+				if au.OperationMode == UserPermissionOperationModeCall {
+					if ad.AudioType == 1 {
+						au.PopupMsg = UserPermissionPopupMsgCallActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgCallMicroVideo
+					}
 				} else {
-					au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
+					if ad.AudioType == 1 {
+						au.PopupMsg = UserPermissionPopupMsgApplyActivity
+					} else {
+						au.PopupMsg = UserPermissionPopupMsgApplyMicroVideo
+					}
 				}
 			}
 			ad.AuthInfo = au