diff --git a/components/AddWeChat/index.js b/components/AddWeChat/index.js
index b4ec7ab..444a7c0 100644
--- a/components/AddWeChat/index.js
+++ b/components/AddWeChat/index.js
@@ -17,7 +17,6 @@ export default function AddWeChat({
}) {
const [isMoneyEnough, setIsMoneyEnough] = useState(true);
//是否已经解锁微信
- const [isWechatUnlocked, setIsWechatUnlocked] = useState(false);
const [streamerDetailData, setStreamerDetailData] = useState(null);
const [wechat, setWechat] = useState();
const router = useRouter();
@@ -31,13 +30,13 @@ export default function AddWeChat({
}, [streamerData]);
useEffect(() => {
console.log("avatar",avatar)
- if (!streamerDetailData && !streamerDetailData?.is_unlock_wechat) return;
+ if (!streamerDetailData || !streamerDetailData?.is_unlock_wechat) return;
require("POST", "/api/vas/query_wechat", {
body: {
uid: streamerMid,
},
}).then(res=>{
- setWechat(res.data.wechat_contact)
+ setWechat(res.data?.wechat_contact)
})
}, [streamerDetailData]);
diff --git a/components/Photos/index.js b/components/Photos/index.js
index b824233..b902567 100644
--- a/components/Photos/index.js
+++ b/components/Photos/index.js
@@ -1,7 +1,7 @@
"use client";
import React, { useEffect, useRef, useState } from "react";
-import { Image, ImageViewer, Dialog } from "antd-mobile";
+import { Image, ImageViewer, Dialog, Swiper } from "antd-mobile";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleUp, faClose, faSave } from "@fortawesome/free-solid-svg-icons";
@@ -10,27 +10,44 @@ const tabItems = [
{ key: "follow", title: "关注" },
];
-export default function Photos({ media }) {
+export default function Photos({ isUnlocked, mediaAmount, media }) {
const [seeAllPhotos, setSeeAllPhotos] = useState(false);
const [currentPhotos, setCurrentPhotos] = useState([]);
const [photos, setPhotos] = useState([]);
useEffect(() => {
if (media) {
- let imgArr = media.images.map(item=>({type:"img",url:item.urls?.[0]}))
- let videoArr = media.videos.map(item=>({type:"video",url:item.cover_urls?.[0],mp4:item.urls?.[0]}))
- let arr=[...imgArr,...videoArr]
+ let imgArr = media.images.map((item) => ({
+ type: "img",
+ url: item.urls?.[0],
+ }));
+ let videoArr = media.videos.map((item) => ({
+ type: "video",
+ url: item.cover_urls?.[0],
+ mp4: item.urls?.[0],
+ }));
+ let arr = [...imgArr, ...videoArr];
let newPhotos = [...arr];
- setPhotos(arr);
- if (arr.length > 9) {
+
+ if (mediaAmount && !isUnlocked) {
+ newPhotos = Array(mediaAmount)
+ .fill(null)
+ .map((item, index) => {
+ return newPhotos[index]
+ ? newPhotos[index]
+ : { url: newPhotos[0]?.url, type: "hid" };
+ });
+ }
+ setPhotos(newPhotos);
+ if (newPhotos.length > 9) {
newPhotos = newPhotos.slice(0, 9);
}
+ console.log("newPhotos", newPhotos);
setCurrentPhotos(newPhotos);
}
-
}, [media]);
const showPhotos = (photos, index) => {
ImageViewer.Multi.show({
- images: photos.map((item) => item.url),
+ images: photos.map((item) => item?.url),
defaultIndex: index,
});
};
@@ -55,12 +72,10 @@ export default function Photos({ media }) {
height="100%"
controls
className="w-screen h-[70vh] rounded-lg object-contain"
- poster={video.url}
+ poster={video?.url}
+ autoPlay={true}
>
-
+
您的浏览器不支持 Video 标签。
@@ -69,7 +84,7 @@ export default function Photos({ media }) {
key="closeBtn"
// onClick={handleSeeAllPhotos}
>
-
+