Merge branch 'laboratory' into anln
This commit is contained in:
al
commit
4f6c890380
|
|
@ -29,6 +29,16 @@ footer{
|
|||
--background-end-rgb: 0, 0, 0;
|
||||
}
|
||||
} */
|
||||
* {
|
||||
-webkit-user-select: none; /* Safari */
|
||||
-moz-user-select: none; /* Firefox */
|
||||
-ms-user-select: none; /* IE/Edge */
|
||||
user-select: none; /* 标准语法 */
|
||||
}
|
||||
img{
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@media only screen and (min-device-width: 320px) and (max-device-width: 1024px) {
|
||||
select:focus, textarea:focus, input:focus {
|
||||
font-size: 16px !important;
|
||||
|
|
@ -245,7 +255,7 @@ footer{
|
|||
.adm-floating-panel .adm-floating-panel-content {
|
||||
flex: 1;
|
||||
overflow-y: scroll;
|
||||
background: rgb(7 5 10/ var(--tw-bg-opacity));
|
||||
background: rgb(7 5 10/ var(--tw-bg-opacity))!important;
|
||||
}
|
||||
|
||||
.adm-list>div>div>div>div{
|
||||
|
|
|
|||
|
|
@ -33,6 +33,31 @@ const metadata = {
|
|||
// };
|
||||
export default function RootLayout({ children }) {
|
||||
const pathname = usePathname();
|
||||
useEffect(() => {
|
||||
// 禁止双指放大
|
||||
window.onload = function () {
|
||||
document.addEventListener("touchstart", function (event) {
|
||||
if (event.touches.length > 1) {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
var lastTouchEnd = 0;
|
||||
document.addEventListener(
|
||||
"touchend",
|
||||
function (event) {
|
||||
var now = new Date().getTime();
|
||||
if (now - lastTouchEnd <= 300) {
|
||||
event.preventDefault();
|
||||
}
|
||||
lastTouchEnd = now;
|
||||
},
|
||||
false
|
||||
);
|
||||
document.addEventListener("gesturestart", function (event) {
|
||||
event.preventDefault();
|
||||
});
|
||||
};
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
const timer = setTimeout(() => {
|
||||
window.scrollTo({
|
||||
|
|
@ -42,7 +67,7 @@ export default function RootLayout({ children }) {
|
|||
});
|
||||
clearTimeout(timer);
|
||||
}, 100);
|
||||
},[pathname])
|
||||
}, [pathname]);
|
||||
return (
|
||||
<html
|
||||
lang="zh-CN"
|
||||
|
|
@ -79,6 +104,7 @@ export default function RootLayout({ children }) {
|
|||
name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui,viewport-fit=cover"
|
||||
/>
|
||||
|
||||
<meta name="apple-touch-fullscreen" content="yes" />
|
||||
{/* <!-- 网站开启对 web app 程序的支持 具体表现为去除浏览器地址栏和底部导航栏 ：先保存为桌面书签，然后通过书签打开即可生效--> */}
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
|
|
|
|||
|
|
@ -9,45 +9,48 @@ import React, {
|
|||
} from "react";
|
||||
import { Mask, Image } from "antd-mobile";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faAngleLeft, faAngleRight } from "@fortawesome/free-solid-svg-icons";
|
||||
import {
|
||||
faAngleLeft,
|
||||
faAngleRight,
|
||||
faDownload,
|
||||
} from "@fortawesome/free-solid-svg-icons";
|
||||
import { createRoot } from "react-dom/client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import baseRequest from "@/utils/baseRequest";
|
||||
const root = createRoot(document?.getElementById("maskDomBox"));
|
||||
function ImagesMask({}, ref) {
|
||||
const [currentIndex, setCurrentIndex] = useState(0);
|
||||
const [visible, setVisible] = useState(false);
|
||||
const [images, setImages] = useState([]);
|
||||
const [data, setData] = useState(null);
|
||||
const scrollRef = useRef(null);
|
||||
const defaultIndex = useRef(null);
|
||||
const router = useRouter();
|
||||
useEffect(() => {
|
||||
root.render(
|
||||
<div>
|
||||
<ImagesMaskContaint
|
||||
images={images}
|
||||
visible={visible}
|
||||
currentIndex={currentIndex}
|
||||
ref={scrollRef}
|
||||
setCurrentIndex={setCurrentIndex}
|
||||
setVisible={setVisible}
|
||||
setImages={setImages}
|
||||
router={router}
|
||||
data={data}
|
||||
defaultIndex={defaultIndex.current}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
// root.render(<div>xxxx</div>);
|
||||
}, [visible]);
|
||||
useEffect(() => {
|
||||
if (scrollRef.current) {
|
||||
setTimeout(() => {
|
||||
scrollRef.current.scrollLeft = 414 * currentIndex;
|
||||
}, 200);
|
||||
}
|
||||
}, [currentIndex]);
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
show: (arr, index) => {
|
||||
setCurrentIndex(index);
|
||||
show: (arr, index, data) => {
|
||||
defaultIndex.current = index;
|
||||
setImages(arr);
|
||||
setVisible(old=>{
|
||||
console.log(arr, index,old)
|
||||
return !old
|
||||
setData(data);
|
||||
setVisible((old) => {
|
||||
// console.log(arr, index, old);
|
||||
return !old;
|
||||
});
|
||||
|
||||
// Mask.show
|
||||
|
|
@ -60,66 +63,203 @@ function ImagesMask({}, ref) {
|
|||
}
|
||||
|
||||
const ImagesMaskContaint = forwardRef(
|
||||
({ visible, images, currentIndex,setCurrentIndex,setVisible,setImages }, ref) => {
|
||||
const [distance, setDistance] = useState(0);
|
||||
const getDistance = (e) => {
|
||||
e.stopPropagation();
|
||||
const distance = ref.current.scrollLeft;
|
||||
setDistance(distance);
|
||||
};
|
||||
const handleMoveImages = (e, index) => {
|
||||
e.stopPropagation();
|
||||
// console.log("distance",distance)
|
||||
if (
|
||||
distance > window.innerWidth * currentIndex &&
|
||||
distance < window.innerWidth + window.innerWidth * currentIndex
|
||||
) {
|
||||
setCurrentIndex(Math.ceil(distance / 414));
|
||||
} else if (distance < window.innerWidth * currentIndex) {
|
||||
setCurrentIndex(Math.ceil(distance / 414) - 1);
|
||||
(
|
||||
{ visible, images, setVisible, setImages, router, data, defaultIndex = 0 },
|
||||
ref
|
||||
) => {
|
||||
const [currentIndex, setCurrentIndex] = useState(0);
|
||||
const [direction, setDirection] = useState("left");
|
||||
const [initialX, setInitialX] = useState(0);
|
||||
const [xOffset, setXOffset] = useState(0);
|
||||
const [active, setActive] = useState(false);
|
||||
const base = baseRequest();
|
||||
const directionX = useRef(0);
|
||||
// const getDistance = (e) => {
|
||||
// e.stopPropagation();
|
||||
// const distance = ref.current.scrollLeft;
|
||||
// setDistance(distance);
|
||||
// };
|
||||
useEffect(() => {
|
||||
// setCurrentIndex(defaultIndex);
|
||||
// test3(defaultIndex - 1, "left");
|
||||
if (defaultIndex) {
|
||||
test3(defaultIndex - 1, "left");
|
||||
}
|
||||
}, [defaultIndex]);
|
||||
useEffect(() => {
|
||||
if (ref.current) {
|
||||
ref.current.style.transform = `translateX(${
|
||||
-window.innerWidth * currentIndex
|
||||
}px)`;
|
||||
}
|
||||
}, [currentIndex]);
|
||||
const test1 = (e) => {
|
||||
setInitialX(e.touches[0].clientX - (!currentIndex ? 0 : xOffset));
|
||||
if (e.touches.length === 1) {
|
||||
// 单点触摸
|
||||
setActive(true);
|
||||
}
|
||||
};
|
||||
const test2 = (e) => {
|
||||
if (active) {
|
||||
let X = e.touches[0].clientX - initialX;
|
||||
setDirection(
|
||||
directionX.current > e.touches[0].clientX ? "left" : "right"
|
||||
);
|
||||
ref.current.style.transform = "translateX(" + X + "px)";
|
||||
directionX.current = e.touches[0].clientX;
|
||||
}
|
||||
};
|
||||
const test3 = (index, currentDirection) => {
|
||||
setActive(false);
|
||||
let cxOffset = window.innerWidth;
|
||||
if (currentDirection == "left") {
|
||||
if (index < images.length - 1) {
|
||||
setCurrentIndex(index + 1);
|
||||
} else {
|
||||
ref.current.style.transform = `translateX(${-cxOffset * index}px)`;
|
||||
}
|
||||
} else {
|
||||
if (index > 0) {
|
||||
setCurrentIndex(index - 1);
|
||||
} else {
|
||||
ref.current.style.transform = `translateX(${-cxOffset * index}px)`;
|
||||
}
|
||||
}
|
||||
// setInitialX(currentX);
|
||||
setInitialX(-cxOffset * (index + (currentDirection == "left" ? 1 : -1)));
|
||||
if (currentDirection == "left" && index > images.length - 2) return;
|
||||
setXOffset(-cxOffset * (index + (currentDirection == "left" ? 1 : -1)));
|
||||
};
|
||||
function downloadImage(url) {
|
||||
let randomNum = "";
|
||||
for (let i = 0; i < 10; i++) {
|
||||
randomNum += Math.floor(Math.random() * 10);
|
||||
}
|
||||
fetch(url)
|
||||
.then((res) => res.blob())
|
||||
.then((blob) => {
|
||||
var a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(blob);
|
||||
a.download = randomNum + ".jpg";
|
||||
a.click();
|
||||
});
|
||||
}
|
||||
return (
|
||||
<div>
|
||||
<Mask
|
||||
visible={visible}
|
||||
className="z-[1002] h-screen flex justify-center items-center"
|
||||
onMaskClick={() => {
|
||||
setVisible(false), setImages([]), setCurrentIndex(null);
|
||||
// root.unmount();
|
||||
}}
|
||||
color="#000000d9"
|
||||
>
|
||||
<div className="relative">
|
||||
<div className="text-center mb-2">
|
||||
{images[currentIndex]?.type != "hid" && (
|
||||
<div
|
||||
onClick={() => downloadImage(images[currentIndex]?.url)}
|
||||
className="z-50 flex justify-center items-center w-[38px] h-[38px] bg-[#ffffff1a] text-[#fff] rounded-full absolute top-[12px] left-[12px]"
|
||||
>
|
||||
<FontAwesomeIcon icon={faDownload} size="xl" />
|
||||
</div>
|
||||
)}
|
||||
<div className="text-center mb-2 leading-[54px]">
|
||||
{currentIndex + 1}/{images.length}
|
||||
</div>
|
||||
<div ref={ref} id="imagesScrollBox" className="flex overflow-auto scrollbarBoxX">
|
||||
<div
|
||||
className="flex justify-start items-center"
|
||||
style={{ height: "calc(100vh - 174px)" }}
|
||||
onClick={() => {
|
||||
setVisible(false), setImages([]), setCurrentIndex(null);
|
||||
// root.unmount();
|
||||
}}
|
||||
>
|
||||
<div
|
||||
ref={ref}
|
||||
id="imagesScrollBox"
|
||||
className="flex justify-center items-center transition-transform duration-300 h-full"
|
||||
draggable={true}
|
||||
onTouchStart={test1}
|
||||
onTouchMove={test2}
|
||||
onTouchEnd={() => test3(currentIndex, direction)}
|
||||
>
|
||||
{images.map((item, index) => {
|
||||
return (
|
||||
<img
|
||||
<div
|
||||
key={index}
|
||||
src={item}
|
||||
// onTouchMove={(e) => handleMoveImages(e, index)}
|
||||
onTouchMove={getDistance}
|
||||
onTouchEnd={(e) => handleMoveImages(e, index)}
|
||||
onClick={() => {
|
||||
setVisible(false), setImages([]), setCurrentIndex(0);
|
||||
className="flex-none w-screen relative h-full"
|
||||
>
|
||||
{/* <img
|
||||
src={item.url}
|
||||
className="h-full m-auto"
|
||||
style={{
|
||||
filter: item.type == "hid" ? "blur(10px)" : "none",
|
||||
}}
|
||||
/> */}
|
||||
<Image
|
||||
className="h-full m-auto"
|
||||
src={item.url}
|
||||
style={{
|
||||
filter: item.type == "hid" ? "blur(10px)" : "none",
|
||||
}}
|
||||
height={"100%"}
|
||||
fit="contain"
|
||||
placeholder={
|
||||
<div className="w-full h-full min-h-96 bg-[#1d1d1d] rounded"></div>
|
||||
}
|
||||
/>
|
||||
|
||||
<div className="absolute top-1/2 left-1/2 -ml-[100px] -mt-[14px]">
|
||||
{item.type == "hid" && (
|
||||
<div className="flex justify-center">
|
||||
<div
|
||||
className="rounded-full text-sm h-max w-max px-4 py-1 bg-primary"
|
||||
onClick={() => {
|
||||
router.push(
|
||||
"/webView/" +
|
||||
encodeURIComponent(
|
||||
"/zone/pay/" +
|
||||
data?.zid +
|
||||
"/h5_zone_moment/" +
|
||||
data?.id +
|
||||
"?base=" +
|
||||
encodeURIComponent(JSON.stringify(base))
|
||||
)
|
||||
);
|
||||
}}
|
||||
>
|
||||
此内容暂未解锁，立即解锁
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<div className="flex justify-between items-center w-screen absolute top-1/2 px-4 pointer-events-none">
|
||||
</div>
|
||||
<div
|
||||
className="w-9 h-9 flex items-center justify-center bg-[#FFFFFF1A] rounded-full float-left pointer-events-auto"
|
||||
className="flex justify-between items-center w-screen absolute top-1/2 px-4 pointer-events-none"
|
||||
style={{
|
||||
marginTop: "calc(-50vh + 118px)",
|
||||
height: "calc(100vh - 174px)",
|
||||
visibility: images.length > 1 ? "visible" : "hidden",
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="w-12 h-full flex items-center justify-center rounded-full float-left pointer-events-auto"
|
||||
onClick={() => {
|
||||
setCurrentIndex((old) => (old > 0 ? old - 1 : old));
|
||||
test3(currentIndex, "right");
|
||||
}}
|
||||
>
|
||||
<FontAwesomeIcon icon={faAngleLeft} size="xl" />
|
||||
</div>
|
||||
<div
|
||||
className="w-9 h-9 flex items-center justify-center bg-[#FFFFFF1A] rounded-full float-left pointer-events-auto"
|
||||
className="w-12 h-full flex items-center justify-center rounded-full float-left pointer-events-auto"
|
||||
onClick={() => {
|
||||
setCurrentIndex((old) =>
|
||||
old < images.length - 1 ? old + 1 : old
|
||||
);
|
||||
test3(currentIndex, "left");
|
||||
}}
|
||||
>
|
||||
<FontAwesomeIcon icon={faAngleRight} size="xl" />
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import { useRouter } from "next/navigation";
|
|||
import baseRequest from "@/utils/baseRequest";
|
||||
import { handleShowVideo } from "@/utils/tools/handleFuns";
|
||||
// import dynamic from 'next/dynamic'
|
||||
// import ImagesMask from "@/components/ImagesMask";
|
||||
import ImagesMask from "@/components/ImagesMask";
|
||||
// const ImagesMask = dynamic(() =>
|
||||
// import('@/components/ImagesMask'), { ssr: false }
|
||||
// )
|
||||
|
|
@ -84,15 +84,15 @@ export default function Photos({
|
|||
}, []);
|
||||
const showPhotos = (photos, index) => {
|
||||
currentIndex.current = index;
|
||||
const interval = setInterval(() => {
|
||||
const bodyBox = document.getElementsByClassName("photos-bodyBox")[0];
|
||||
if (bodyBox) {
|
||||
bodyBox.firstChild.lastChild.style.transform = `translateX(-${
|
||||
currentIndex.current * (window.innerWidth + 16)
|
||||
}px)`;
|
||||
// console.log(bodyBox.firstChild.lastChild.style.transform);
|
||||
}
|
||||
}, 400);
|
||||
// const interval = setInterval(() => {
|
||||
// const bodyBox = document.getElementsByClassName("photos-bodyBox")[0];
|
||||
// if (bodyBox) {
|
||||
// bodyBox.firstChild.lastChild.style.transform = `translateX(-${
|
||||
// currentIndex.current * (window.innerWidth + 16)
|
||||
// }px)`;
|
||||
// // console.log(bodyBox.firstChild.lastChild.style.transform);
|
||||
// }
|
||||
// }, 400);
|
||||
|
||||
// 添加左右切换按钮
|
||||
// const btns = document.createElement("div");
|
||||
|
|
@ -129,65 +129,62 @@ export default function Photos({
|
|||
// });
|
||||
// btns.append(btnL, btnR);
|
||||
// handleShowImages(index, photos, btns,interval);
|
||||
handleShowImages(index, photos, interval);
|
||||
// handleShowImages(index, photos, interval);
|
||||
|
||||
// setVisible(true)
|
||||
// console.log(imagesMaskRef.current);
|
||||
// imagesMaskRef.current.show(
|
||||
// photos.map((item) => item?.url),
|
||||
// index
|
||||
// );
|
||||
console.log(imagesMaskRef.current, photos);
|
||||
imagesMaskRef.current.show(photos, index, data);
|
||||
};
|
||||
const handleShowImages = (index, photos, interval) => {
|
||||
const mediaDom = document.createElement("div");
|
||||
mediaDom.style.width = "100vw";
|
||||
document.body.appendChild(mediaDom);
|
||||
mediaDom.className = `${
|
||||
photos[index]?.type == "hid" ? "mediaDom photos-body" : "mediaDom"
|
||||
}`;
|
||||
// mediaDom.appendChild(btns);
|
||||
document.body.style.overflow = "hidden";
|
||||
ImageViewer.clear();
|
||||
ImageViewer.Multi.show({
|
||||
images: photos.map((item) => item?.url),
|
||||
defaultIndex: index,
|
||||
renderFooter: (image, index) => {
|
||||
return renderFooter(photos[index]?.type == "hid", mediaDom);
|
||||
},
|
||||
// const handleShowImages = (index, photos, interval) => {
|
||||
// const mediaDom = document.createElement("div");
|
||||
// mediaDom.style.width = "100vw";
|
||||
// document.body.appendChild(mediaDom);
|
||||
// mediaDom.className = `${
|
||||
// photos[index]?.type == "hid" ? "mediaDom photos-body" : "mediaDom"
|
||||
// }`;
|
||||
// // mediaDom.appendChild(btns);
|
||||
// document.body.style.overflow = "hidden";
|
||||
// ImageViewer.clear();
|
||||
// ImageViewer.Multi.show({
|
||||
// images: photos.map((item) => item?.url),
|
||||
// defaultIndex: index,
|
||||
// renderFooter: (image, index) => {
|
||||
// return renderFooter(photos[index]?.type == "hid", mediaDom);
|
||||
// },
|
||||
|
||||
getContainer: mediaDom,
|
||||
onIndexChange: (index) => {
|
||||
currentIndex.current = index;
|
||||
mediaDom.className = `${
|
||||
photos[index]?.type == "hid" ? "mediaDom photos-body" : "mediaDom"
|
||||
}`;
|
||||
const leftBtn = document.getElementsByClassName(
|
||||
"imagesBtnsControllerLeft"
|
||||
)[0];
|
||||
const rightBtn = document.getElementsByClassName(
|
||||
"imagesBtnsControllerRight"
|
||||
)[0];
|
||||
if (leftBtn && rightBtn) {
|
||||
if (!index) {
|
||||
leftBtn.style.opacity = 0.5;
|
||||
rightBtn.style.opacity = 1;
|
||||
} else if (index == currentPhotos.length - 1) {
|
||||
leftBtn.style.opacity = 1;
|
||||
rightBtn.style.opacity = 0.5;
|
||||
} else {
|
||||
leftBtn.style.opacity = 1;
|
||||
rightBtn.style.opacity = 1;
|
||||
}
|
||||
}
|
||||
},
|
||||
afterClose: () => {
|
||||
mediaDom.remove();
|
||||
clearInterval(interval);
|
||||
document.body.style.overflow = "auto";
|
||||
},
|
||||
classNames: { body: "photos-bodyBox" },
|
||||
});
|
||||
};
|
||||
// getContainer: mediaDom,
|
||||
// onIndexChange: (index) => {
|
||||
// currentIndex.current = index;
|
||||
// mediaDom.className = `${
|
||||
// photos[index]?.type == "hid" ? "mediaDom photos-body" : "mediaDom"
|
||||
// }`;
|
||||
// const leftBtn = document.getElementsByClassName(
|
||||
// "imagesBtnsControllerLeft"
|
||||
// )[0];
|
||||
// const rightBtn = document.getElementsByClassName(
|
||||
// "imagesBtnsControllerRight"
|
||||
// )[0];
|
||||
// if (leftBtn && rightBtn) {
|
||||
// if (!index) {
|
||||
// leftBtn.style.opacity = 0.5;
|
||||
// rightBtn.style.opacity = 1;
|
||||
// } else if (index == currentPhotos.length - 1) {
|
||||
// leftBtn.style.opacity = 1;
|
||||
// rightBtn.style.opacity = 0.5;
|
||||
// } else {
|
||||
// leftBtn.style.opacity = 1;
|
||||
// rightBtn.style.opacity = 1;
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
// afterClose: () => {
|
||||
// mediaDom.remove();
|
||||
// clearInterval(interval);
|
||||
// document.body.style.overflow = "auto";
|
||||
// },
|
||||
// classNames: { body: "photos-bodyBox" },
|
||||
// });
|
||||
// };
|
||||
const handleSeeAllPhotos = (e) => {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
|
|
@ -343,7 +340,7 @@ export default function Photos({
|
|||
);
|
||||
})}
|
||||
</div>
|
||||
{/* <ImagesMask ref={imagesMaskRef} /> */}
|
||||
<ImagesMask ref={imagesMaskRef} />
|
||||
{/* <Viewer
|
||||
visible={visible}
|
||||
onClose={() => { setVisible(false); } }
|
||||
|
|
|
|||
Loading…
Reference in New Issue