diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js
index 30cd25a..3100638 100644
--- a/app/profile/[mid]/page.js
+++ b/app/profile/[mid]/page.js
@@ -59,10 +59,12 @@ export default function PersonSpace() {
const photosArr = [
...data?.streamer_ext?.cover?.images?.map((item) => ({
url: item.urls[0],
+ id: item.id,
type: "video",
})),
...data?.streamer_ext?.album?.images.map((item) => ({
url: item.urls[0],
+ id: item.id,
type: "img",
})),
];
diff --git a/app/space/setting/collaboratorSetting/page.jsx b/app/space/setting/collaboratorSetting/page.jsx
index 4e8e59b..f94cf7e 100644
--- a/app/space/setting/collaboratorSetting/page.jsx
+++ b/app/space/setting/collaboratorSetting/page.jsx
@@ -27,6 +27,7 @@ import { useRouter, useSearchParams } from "next/navigation";
import OwnInput from "@/components/OwnInput";
import { get } from "@/utils/storeInfo";
import OwnIcon from "@/components/OwnIcon";
+import baseRequest from "@/utils/baseRequest";
export default function CollaboratorSetting() {
const [data, setData] = useState(null);
const [selfMid, setSelfMid] = useState();
diff --git a/components/CheckVip/index.jsx b/components/CheckVip/index.jsx
index 5b3fd89..694f9b4 100644
--- a/components/CheckVip/index.jsx
+++ b/components/CheckVip/index.jsx
@@ -1,7 +1,8 @@
"use client";
-import React, { useEffect } from "react";
+import React from "react";
import { Dialog } from "antd-mobile";
+import { checkRole } from "@/utils/auth";
// import { useRouter } from "next/navigation";
import baseRequest from "@/utils/baseRequest";
import { save } from "@/utils/storeInfo";
@@ -9,13 +10,8 @@ import { getUserInfo } from "@/api/public";
export default function CheckVip({ children, isVipToPassFun, router }) {
const base = baseRequest();
- useEffect(() => {}, []);
const handleCheck = async () => {
- //向服务器请求新的账号信息并保存到本地
- const account = await getUserInfo();
- save("account", JSON.stringify(account));
- const isVip = account?.is_a_member;
-
+ const isVip = await checkRole();
if (!isVip) {
const showMobal = Dialog.show({
title: "是否开通会员",
@@ -56,7 +52,6 @@ export default function CheckVip({ children, isVipToPassFun, router }) {
style: { color: "#fff" },
onClick: () => {
showMobal.close();
- console.log("showMobal", showMobal);
router.push(
`/webView/${encodeURIComponent(
`/vip?base=${encodeURIComponent(JSON.stringify(base))}`
diff --git a/components/ImagesMask/index.jsx b/components/ImagesMask/index.jsx
index 904c6fa..d7b24dc 100644
--- a/components/ImagesMask/index.jsx
+++ b/components/ImagesMask/index.jsx
@@ -21,7 +21,7 @@ import OwnImage from "../OwnImage";
import { saveImage } from "@/utils/tools/handleFuns";
import requireAPI from "@/utils/requireAPI";
import CheckVip from "@/components/CheckVip";
-function ImagesMask({}, ref) {
+function ImagesMask({ isEditing = false }, ref) {
const [visible, setVisible] = useState(false);
const [images, setImages] = useState([]);
const [data, setData] = useState(null);
@@ -32,6 +32,7 @@ function ImagesMask({}, ref) {
return (
-
getOriginImg(images[currentIndex]?.id)}
- router={router}
- >
-
- 原图
-
-
+ {!isEditing && (
+ <>
+
{
+ getOriginImg(images[currentIndex]?.id);
+ }}
+ router={router}
+ >
+
+ 原图
+
+
-
saveImage(images[currentIndex]?.url)}
- router={router}
- >
-
-
-
-
+
+ saveImage(images[currentIndex]?.url)
+ }
+ router={router}
+ >
+
+
+
+
+
+ )}
{
diff --git a/components/OwnIcon/index.jsx b/components/OwnIcon/index.jsx
index 3ffd0e6..420bf8a 100644
--- a/components/OwnIcon/index.jsx
+++ b/components/OwnIcon/index.jsx
@@ -13,7 +13,7 @@ export default function OwnIcon({
-
);
}
diff --git a/utils/auth.js b/utils/auth.js
index 73a60bf..698e970 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -1,6 +1,6 @@
import { setCookie, deleteCookie, getCookie } from "cookies-next";
import requireAPI from "./requireAPI";
-import { get } from "./storeInfo";
+import { get, save } from "./storeInfo";
export async function checkAuth() {
try {
const data = await requireAPI("POST", `/api/login/validate`);
@@ -24,9 +24,51 @@ export function signOut() {
deleteCookie("mid");
}
-export function checkRole() {
- const account = get("account");
- const role = account?.role;
- const isVip = account?.is_a_member;
- return role !== 0 && isVip === 1;
+export async function getUserInfo(mid) {
+ if (!mid) return;
+ try {
+ const data = await requireAPI("POST", `/api/account/list_by_mid`, {
+ body: { mid },
+ });
+ if (data.ret === 1) {
+ return data.data.account;
+ }
+ } catch (e) {
+ // console.log(e);
+ }
+}
+export async function getVipPrice() {
+ try {
+ const data = await requireAPI(
+ "POST",
+ `/api/vas/get_membership_product_list`
+ );
+ if (data.ret === -1) {
+ Toast.show({
+ icon: "fail",
+ content: data.msg,
+ position: "top",
+ });
+ return;
+ } else {
+ return data.data.product.real_price / 100;
+ }
+ } catch (e) {
+ // console.log(e);
+ }
+}
+
+export async function checkRole() {
+ const account = get("account");
+
+ const userInfo = await getUserInfo(account.mid);
+ if (userInfo) {
+ if (userInfo.is_a_member !== account) {
+ save("account", userInfo);
+ }
+ }
+
+ const role = userInfo?.role;
+ const isVip = userInfo?.is_a_member;
+ return role !== 0 || isVip === 1;
}
diff --git a/utils/tools/handleFuns.js b/utils/tools/handleFuns.js
index 4ef6eb7..3e16946 100644
--- a/utils/tools/handleFuns.js
+++ b/utils/tools/handleFuns.js
@@ -183,7 +183,7 @@ export const saveImage = async (url) => {
.catch((error) => console.log(error));
};
export const saveFile = async (href) => {
- const isVip = checkRole();
+ const isVip = await checkRole();
if (!isVip) {
// setIsVipModalVisible(true);
Toast.show({