wishpal_ironfan
/
tiefen_space_h5
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into anln

This commit is contained in:
al 2024-08-13 12:37:38 +08:00
parent 117156c8be 239ddd82e3
commit ecef92f919
7 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/bill/layout.jsx
View File

@ -21,8 +21,6 @@ export default function BillLayout({ children }) {
icon={faAngleLeft}
size="xl"
onClick={() => {
pathname.split("/").length < 4?
router.push("/my/wallet"):
router.back();
}}
/>
@ -42,6 +40,7 @@ export default function BillLayout({ children }) {
: "text-[#FFFFFF80]"
}`}
href="recharge"
replace
>
充值
</Link>
@ -52,6 +51,7 @@ export default function BillLayout({ children }) {
: "text-[#FFFFFF80]"
}`}
href="cost"
replace
>
消费
</Link>
@ -62,6 +62,7 @@ export default function BillLayout({ children }) {
: "text-[#FFFFFF80]"
}`}
href="income"
replace
>
收益
</Link>
@ -72,6 +73,7 @@ export default function BillLayout({ children }) {
: "text-[#FFFFFF80]"
}`}
href="withdrawal"
replace
>
提现
</Link>
@ -80,7 +82,9 @@ export default function BillLayout({ children }) {
</div>
)}
{pathname.split("/").length >3 && <div className="mt-14 px-4 flex flex-1">{children}</div>}
{pathname.split("/").length > 3 && (
<div className="mt-14 px-4 flex flex-1">{children}</div>
)}
</section>
);
}

49
app/my/addToHome/page.js
View File

@ -15,40 +15,61 @@ export default function AddToHome() {
icon={faAngleLeft}
size="xl"
onClick={() => {
router.push("/my");
router.back();
}}
/>
</div>
<p className="text-base text-center leading-9">添加到主屏幕</p>
</div>
</div>
{/* 内容 */}
<div className="p-4 mt-14">
<div>
<p className="text-base font-bold">在浏览器中如何将铁粉空间添加到主屏幕</p>
<p className="text-xs text-[red]">注：请勿在当前页面点击[添加到主屏幕]</p>
<p className="text-xs my-2 text-[#ffffff69]">以IOS的“Safari”浏览器为例</p>
<p className="text-base font-bold">
在浏览器中如何将铁粉空间添加到主屏幕
</p>
<p className="text-xs text-[red]">
注：请勿在当前页面点击[添加到主屏幕]
</p>
<p className="text-xs my-2 text-[#ffffff69]">
以IOS的“Safari”浏览器为例
</p>
</div>
<div>
<p className="text-xs mt-4 mb-2">1.在浏览器中打开主界面，点击浏览器中的[分享]按钮。</p>
<p className="text-xs mt-4 mb-2">
1.在浏览器中打开主界面，点击浏览器中的[分享]按钮。
</p>
<div className="flex justify-center">
<Image
src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome1.png"}
<Image
src={
process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
"/images/addToHome1.png"
}
placeholder=""
className="w-[60%]"
/>
</div>
<p className="text-xs mt-4 mb-2">2.打开分享弹框后，点击[添加到主屏幕]。</p>
<p className="text-xs mt-4 mb-2">
2.打开分享弹框后，点击[添加到主屏幕]。
</p>
<div className="flex justify-center">
<Image
src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome2.png"}
<Image
src={
process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
"/images/addToHome2.png"
}
placeholder=""
className="w-[60%]"
/>
</div>
<p className="text-xs mt-4 mb-2">3.打开添加到主屏幕弹框后，点击[添加]按钮即可成功添加到主屏幕。</p>
<p className="text-xs mt-4 mb-2">
3.打开添加到主屏幕弹框后，点击[添加]按钮即可成功添加到主屏幕。
</p>
<div className="flex justify-center">
<Image
src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome3.png"}
<Image
src={
process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
"/images/addToHome3.png"
}
placeholder=""
className="w-[60%]"
/>

8
app/my/setting/editPassword/page.js
View File

@ -135,13 +135,11 @@ export default function EditPassword() {
}
Toast.show({
icon: "success",
content: "修改成功，请重新登录",
content: searchParams.get("is_enabled") == "0"?"密码设置成功":"密码修改成功",
position: "top",
});
if(searchParams.get("is_enabled") == "0"){
router.push("/")
}else{
router.push("/login");signOut()
}
} catch (error) {
console.error(error);
@ -273,9 +271,9 @@ export default function EditPassword() {
{searchParams.get("is_enabled") == "0" && (
<div
onClick={() => router.push(`/`)}
className="fixed bottom-6 w-full text-[#FF669E] text-xs text-center"
className="mt-4 w-full text-[#FFFFFF80] text-xs text-center"
>
跳过，稍后设置
跳过
</div>
)}
</div>

13
app/my/unlockedWechat/page.jsx
View File

@ -67,8 +67,14 @@ export default function UnlockedWechat() {
<ul className="p-4 overflow-y-auto scrollbarBox_hidden">
{data.map((item, index) => (
<li key={item.id + "_" + index}>
<div className="grid gap-2 items-center" style={{gridTemplateColumns:"calc(100% - 90px) 90px"}}>
<div className="grid w-full " style={{gridTemplateColumns:"3rem calc(100% - 3rem)"}}>
<div
className="grid gap-2 items-center"
style={{ gridTemplateColumns: "calc(100% - 90px) 90px" }}
>
<div
className="grid w-full "
style={{ gridTemplateColumns: "3rem calc(100% - 3rem)" }}
>
<Avatar
className="w-12 h-12 rounded-full"
src={item.account?.avatar?.images[0]?.urls[0]}
@ -115,8 +121,7 @@ export default function UnlockedWechat() {
avatar={currentStreamer.current?.account?.avatar?.images[0]?.urls[0]}
streamerData={{
streamer_ext: {
wechat_lock_type:
currentStreamer.current?.lock_type,
wechat_lock_type: currentStreamer.current?.lock_type,
},
}}
/>

7
app/my/wallet/page.js
View File

@ -134,13 +134,6 @@ export default function Wallet() {
<FontAwesomeIcon icon={faAngleRight} size="xl" />
</div>
<div
// onClick={() =>
// navigation.navigate("WebWithHeader", {
// title: "收支明细",
// uri: process.env.EXPO_PUBLIC_WEB_URL + "/bill/recharge",
// })
// }
onClick={() => {
router.push("/bill/recharge");
}}

4
app/space/page.js
View File

@ -225,8 +225,8 @@ export default function Space() {
</div>
) : (
<div
className={`flex flex-col items-center justify-center h-screen`}
// style={{ height: `${scrollHeight}px` }}
className={`flex flex-col items-center justify-center`}
style={{ height: `calc(100vh - 120px)` }}
>
<Empty type="nospace" />
<div className="flex flex-col mt-6">

2
components/Photos/index.js
View File

@ -300,7 +300,7 @@ export default function Photos({
photos.length > 9 &&
(!seeAllPhotos ? (
<div
className="absolute top-0 h-full flex justify-center items-center bg-[#33333348]"
className="absolute top-0 w-full h-full flex justify-center items-center bg-[#33333348]"
onClick={handleSeeAllPhotos}
>
<span className="text-2xl">+{currentPhotos.length}</span>