Merge branch 'main' into staging

src/store/modules/user.ts

@@ -116,8 +116,7 @@ function handleUserInfo(userType: rolesType, userInfo: Record<string, any>) {
       realName = userInfo.realName
       phone = userInfo.phone
       subjectId = userInfo.subjectId
-      // userInfo.userVip?.vipType === 'NOT_VIP' || !userInfo.userVip?.vipType ||
-      isVip = userInfo.userVip ? false : userInfo.userVip?.vipType === "NOT_VIP" || !userInfo.userVip?.vipType ? true : false
+      isVip = userInfo.userVip ? (userInfo.userVip?.vipType === "NOT_VIP" || !userInfo.userVip?.vipType ? true : false) : false
    } else {
       avatar = userInfo.avatar
       username = userInfo.nickname