feat:到期付费用户处理

entity/user.go

@@ -315,6 +315,8 @@ func CheckCapitalResources(menu *JYMenu, wd *WorkDesktopMenu, b bool) (title, co
 			}
 
 		}
+		//
+		usable = capitalBool && permissionBool
 	}
 	//无权限--免费用户||不符合条件的付费用户
 	if !b || defaultPopup {
@@ -330,8 +332,8 @@ func CheckCapitalResources(menu *JYMenu, wd *WorkDesktopMenu, b bool) (title, co
 			openType = ConfigJson.DefaultPopup[menu.PowerIds].OpenType
 		}
 	}
-	//自定义弹窗
-	if customPopup && !usable {
+	//没有配置弹窗信息  --》自定义弹窗
+	if customPopup {
 		title = menu.AdditionalInfo.Title
 		content = menu.AdditionalInfo.Content
 		confirmUrl = menu.AdditionalInfo.ConfirmUrl
@@ -340,7 +342,5 @@ func CheckCapitalResources(menu *JYMenu, wd *WorkDesktopMenu, b bool) (title, co
 		appType = menu.AdditionalInfo.AppType
 		openType = menu.AdditionalInfo.OpenType
 	}
-	//
-	usable = capitalBool && permissionBool
 	return
 }