修复和改善功能
This commit is contained in:
parent
d7d0a33b8b
commit
25452fc21f
|
@ -19,7 +19,6 @@ body{
|
|||
}
|
||||
} */
|
||||
.text-ellipsis {
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
|
|
@ -39,7 +39,7 @@ export default function RootLayout({ children }) {
|
|||
{withAuth(<Provider store={store}>{children}</Provider>)}
|
||||
{/* <Provider store={store}>{children}</Provider> */}
|
||||
</main>
|
||||
<footer className="fixed left-0 w-screen bg-black" style={{top:"calc(100vh - 57px)"}}>
|
||||
<footer className="fixed bottom-0 left-0 w-screen bg-black">
|
||||
<div>
|
||||
<BottomNav />
|
||||
</div>
|
||||
|
|
|
@ -352,7 +352,7 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => {
|
|||
}, []);
|
||||
return (
|
||||
<div className="mt-16">
|
||||
<div className="flex items-center">
|
||||
<div className="flex items-center justify-center">
|
||||
<Checkbox
|
||||
value={loginInfo?.checked}
|
||||
onChange={(value) => setLoginInfo({ ...loginInfo, checked: value })}
|
||||
|
|
|
@ -157,7 +157,11 @@ export default function EditPassword() {
|
|||
{/* 内容 */}
|
||||
<div className="pt-32 px-4">
|
||||
<p className="text-3xl text-white font-medium">
|
||||
{searchParams.get("is_enabled") == "0" ? "设置密码" : "修改密码"}
|
||||
{searchParams.get("is_enabled") == "0"
|
||||
? "设置密码"
|
||||
: mobilePhone == "0"
|
||||
? "修改密码"
|
||||
: "重置密码"}
|
||||
</p>
|
||||
<p className="text-base text-white mb-10">请牢记密码</p>
|
||||
<div className="border-2 border-[#2c2b2f] rounded-2xl p-4">
|
||||
|
@ -165,7 +169,7 @@ export default function EditPassword() {
|
|||
<p className="text-base text-white mr-4">+{regionCode}</p>
|
||||
<Input
|
||||
placeholder="请输入手机号"
|
||||
disabled={mobilePhone}
|
||||
disabled={mobilePhone && searchParams.get("is_enabled") == "0"}
|
||||
type="number"
|
||||
maxLength={11}
|
||||
onChange={(value) => {
|
||||
|
@ -173,7 +177,10 @@ export default function EditPassword() {
|
|||
setMobilePhone(value);
|
||||
}}
|
||||
value={mobilePhone}
|
||||
style={{ "--color": "#FFFFFF", "--font-size": "16px","--placeholder-color": "#FFFFFF80", }}
|
||||
style={{
|
||||
"--font-size": "16px",
|
||||
"--placeholder-color": "#FFFFFF80",
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{searchParams.get("is_enabled") == "0" ? null : (
|
||||
|
@ -252,12 +259,14 @@ export default function EditPassword() {
|
|||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
onClick={() => router.push(`/`)}
|
||||
className="fixed bottom-6 w-full text-[#FF669E] text-xs text-center"
|
||||
>
|
||||
跳过,稍后设置
|
||||
</div>
|
||||
{searchParams.get("is_enabled") == "0" && (
|
||||
<div
|
||||
onClick={() => router.push(`/`)}
|
||||
className="fixed bottom-6 w-full text-[#FF669E] text-xs text-center"
|
||||
>
|
||||
跳过,稍后设置
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -46,7 +46,7 @@ export default function Home() {
|
|||
// 获取屏幕高度
|
||||
// const scrollHeight = 600;
|
||||
useEffect(() => {
|
||||
setScrollHeight(window.innerHeight - 57);
|
||||
setScrollHeight(window.innerHeight);
|
||||
// getData(0)
|
||||
}, []);
|
||||
const childrenFunc = () => {
|
||||
|
|
|
@ -342,7 +342,7 @@ export default function PersonSpace() {
|
|||
</div>
|
||||
<Divider />
|
||||
<div>
|
||||
<div onClick={() => router.push("/space/" + mid)}>
|
||||
<div onClick={() => router.push(spaceData?.visitor_role === 4?`/space/person_space_introduce/${mid}`:`/space/${mid}`)}>
|
||||
<div className="flex justify-between items-center mb-2">
|
||||
<span className="font-bold text-base">空间动态</span>
|
||||
<div className="h-4 text-xs text-[#ffffff88]">
|
||||
|
|
|
@ -60,7 +60,7 @@ export default function Setting() {
|
|||
bold: true,
|
||||
style: { color: "#fff" },
|
||||
onClick: () => {
|
||||
Dialog?.close();
|
||||
Dialog?.clear();
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
|
@ -109,7 +109,8 @@ export default function PaySpacePost({
|
|||
</span>
|
||||
)}
|
||||
<Image
|
||||
height={14}
|
||||
height={12}
|
||||
fit="contain"
|
||||
placeholder=""
|
||||
className="ml-2"
|
||||
src={
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
"use client";
|
||||
|
||||
import React, { createElement, useEffect, useRef, useState } from "react";
|
||||
import { Image, ImageViewer, Dialog, Toast } from "antd-mobile";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { Image, ImageViewer, Dialog } from "antd-mobile";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faAngleUp, faClose, faSave } from "@fortawesome/free-solid-svg-icons";
|
||||
import { saveFile } from "@/utils/tools/handleFuns";
|
||||
import { useRouter } from "next/navigation";
|
||||
const tabItems = [
|
||||
{ key: "commend", title: "推荐" },
|
||||
{ key: "follow", title: "关注" },
|
||||
];
|
||||
|
||||
export default function Photos({ isUnlocked, mediaAmount, media }) {
|
||||
const [seeAllPhotos, setSeeAllPhotos] = useState(false);
|
||||
|
@ -166,12 +162,6 @@ export default function Photos({ isUnlocked, mediaAmount, media }) {
|
|||
getContainer:mediaDom,
|
||||
renderFooter: () => renderFooter(true,mediaDom),
|
||||
});
|
||||
|
||||
// Toast.show({
|
||||
// icon: "fail",
|
||||
// content: "此视频未解锁,无法观看",
|
||||
// position: "top",
|
||||
// });
|
||||
return;
|
||||
}
|
||||
handleShowVideo(item);
|
||||
|
@ -181,7 +171,7 @@ export default function Photos({ isUnlocked, mediaAmount, media }) {
|
|||
}}
|
||||
>
|
||||
{
|
||||
<div className="overflow-hidden rounded h-full min-h-40">
|
||||
<div className="overflow-hidden rounded h-full min-h-[24vw] max-h-80">
|
||||
<Image
|
||||
// lazy={true}
|
||||
placeholder={
|
||||
|
|
|
@ -98,19 +98,22 @@ export default function PostItem({
|
|||
dangerouslySetInnerHTML={{
|
||||
__html: findLinksInText(data.text),
|
||||
}}
|
||||
className={`mb-2 mt-2 ${!isOpenText ? "text-ellipsis" : ""}`}
|
||||
style={{
|
||||
WebkitLineClamp: 7,
|
||||
}}
|
||||
className={`mb-2 mt-2 ${!isOpenText ? "text-ellipsis-7" : ""}`}
|
||||
// style={{
|
||||
// WebkitLineClamp: data?.text_visible_range < 999?data?.text_visible_range:7,
|
||||
// }}
|
||||
></pre>
|
||||
</>
|
||||
) : (
|
||||
<div>
|
||||
<pre
|
||||
className="mb-2 mt-2"
|
||||
className={`mb-2 mt-2 ${!isOpenText ? "text-ellipsis-7" : ""}`}
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: findLinksInText(data.text),
|
||||
}}
|
||||
style={{
|
||||
WebkitLineClamp: data?.text_visible_range < 999?data?.text_visible_range:7,
|
||||
}}
|
||||
></pre>
|
||||
</div>
|
||||
)}
|
||||
|
|
Loading…
Reference in New Issue