diff --git a/app/globals.css b/app/globals.css
index e5958fe..e8814cc 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -122,7 +122,7 @@ body{
}
.adm-jumbo-tabs-tab-active{
color:#fff!important;
- font-weight: bold;
+ /* font-weight: bold; */
}
.adm-jumbo-tabs-tab-description{
background: none;
@@ -146,6 +146,10 @@ body{
.adm-floating-panel-header{
background-color: #07050A!important;
}
+.adm-floating-panel-header .adm-floating-panel-bar{
+ background-color: #ffffff!important;
+ width: 30px!important;
+}
.adm-tab-bar .adm-tab-bar-item-icon{
height:32px;
}
diff --git a/app/index.css b/app/index.css
index 766d953..3ecf41f 100644
--- a/app/index.css
+++ b/app/index.css
@@ -10,7 +10,7 @@
color: #a0a0a0;
} */
.custom-tabs .adm-tabs .adm-tabs-tab {
- font-weight: bold;
+ /* font-weight: bold; */
font-size: 24px;
}
diff --git a/app/messageDetail/page.js b/app/messageDetail/page.js
index fd7a858..78135b2 100644
--- a/app/messageDetail/page.js
+++ b/app/messageDetail/page.js
@@ -172,11 +172,11 @@ export default function MessageDetail({}) {
const onSend = useCallback(
async (message, lastId, oldArr) => {
if (message == "") {
- Toast.show({
- icon: "error",
- content: "不可发送空内容",
- position: "top",
- });
+ // Toast.show({
+ // icon: "error",
+ // content: "不可发送空内容",
+ // position: "top",
+ // });
return;
}
diff --git a/app/my/page.js b/app/my/page.js
index 9d9920d..06f87f4 100644
--- a/app/my/page.js
+++ b/app/my/page.js
@@ -106,7 +106,7 @@ const My = () => {
style={{ "--size": "76px", "--border-radius": "50%" }}
/>
-
{userInfo.name}
+
{userInfo.name}
{
+ getData(currentKey, 0).then((res) => {
setData(res);
});
}
@@ -48,7 +45,7 @@ export default function Relationship() {
async function loadMore(key) {
const append = await getData(key, offset);
setData((val) => [...val, ...append]);
- setHasMore(append.length > 0);
+ // setHasMore(append.length > 0);
}
const getData = async (key, currentOffset) => {
// api/account_relation/list_is_followed
@@ -67,8 +64,8 @@ export default function Relationship() {
}
if (!followIds.data.list.length) return [];
const followsMids = followIds.data.list.map((item) => item.obj_mid);
- const streamers = await requireAPI("POST", `/api/streamer/${
- key == "follow" ? "list_ext_by_mids" : "list_others_by_mids"
+ const streamers = await requireAPI("POST", `/api${
+ key == "follow" ? "/streamer/list_ext_by_mids" : "/account/list_others_by_mids"
}`, {
body: { mids: followsMids, offset: 0, limit: 12 },
}, true);
@@ -87,6 +84,7 @@ export default function Relationship() {
}));
setOffset(streamers.data.offset);
+ setHasMore(streamers.data.more)
return [...followsDataList];
// setMore(temData.data.more);
};
diff --git a/app/my/setting/editPassword/page.js b/app/my/setting/editPassword/page.js
index 43ef9b0..86c82c0 100644
--- a/app/my/setting/editPassword/page.js
+++ b/app/my/setting/editPassword/page.js
@@ -140,6 +140,7 @@ export default function EditPassword() {
console.error(error);
}
};
+
return (
@@ -222,10 +223,10 @@ export default function EditPassword() {
setNewPassword(value)}
value={newPassword}
+ type="password"
+ autoComplete="off"
style={{
"--placeholder-color": "#FFFFFF80",
"--font-size": "16px",
@@ -239,8 +240,10 @@ export default function EditPassword() {
setConfirmPassword(value)}
+ onChange={(value) => setConfirmPassword(value)}
value={confirmPassword}
+ type="password"
+ autoComplete="off"
style={{
"--placeholder-color": "#FFFFFF80",
"--font-size": "16px",
@@ -253,7 +256,7 @@ export default function EditPassword() {
shape="rounded"
size="middle"
block
- // onClick={handleSubmit}
+ onClick={handleUpdatePassword}
style={{ "--background-color": "#FF669E", color: "#FFFFFF" }}
>
确认修改
diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js
index f531be0..7a2bb44 100644
--- a/app/profile/[mid]/page.js
+++ b/app/profile/[mid]/page.js
@@ -333,10 +333,10 @@ export default function PersonSpace() {
)}
{streamerInfo?.streamer_ext?.bio && (
-
+
个性签名|
- {streamerInfo?.streamer_ext?.bio}
-
+
{streamerInfo?.streamer_ext?.bio}
+
)}
@@ -470,6 +470,12 @@ export default function PersonSpace() {
>
{isFollow ? "已关注" : "关注"}
+
handleFollow(isFollow, Number(mid), setIsFollow)}
+ >
+ 私聊
+
setVisible(true)}
diff --git a/app/space/[id]/page.js b/app/space/[id]/page.js
index 085e344..a92d4b9 100644
--- a/app/space/[id]/page.js
+++ b/app/space/[id]/page.js
@@ -194,8 +194,9 @@ export default function PersonSpace() {
ct: streamerInfo?.streamer_ext?.ct,
user_id: streamerInfo?.streamer_ext?.user_id,
name: streamerInfo?.streamer_ext?.name,
+ visitor_role:streamerInfo?.visitor_role,
avatar:
- streamerInfo?.streamer_ext?.cover?.images[0]?.urls[0],
+ streamerInfo?.streamer_ext?.avatar?.images[0]?.urls[0],
})
)
)
@@ -221,7 +222,7 @@ export default function PersonSpace() {
src={streamerInfo?.streamer_ext?.avatar?.images[0]?.urls[0]}
/>
-
+
{streamerInfo?.streamer_ext?.name}
@@ -398,14 +399,14 @@ export default function PersonSpace() {
>
)}
- {!postList.length && !loading && (
+ {/* {!postList.length && !loading && (
- )}
+ )} */}
{postList.map((item, index) => (
-
+ )}
{maskVisible.type == "weChat" && (
0 ? (
- {dataList?.map((item) => (
- -
-
-
- ))}
- - router.push("/search")}>
-
navigation.navigate("Stream")}
- // onClick={}
- className="w-full h-52"
- >
-
- {/*
+ {dataList?.map((item) => (
+
-
+
+
+ ))}
+
- router.push("/search")}>
+
navigation.navigate("Stream")}
+ // onClick={}
+ className="w-full h-52"
+ >
+
+ {/*
*/}
-
-
- 发现更多
-
-
- 缘分就在不经意间
-
-
- {/*
+
+ 发现更多
+
+
+ 缘分就在不经意间
+
+
+ {/* */}
+
-
-
-
+
+
) : (
{
{data?.streamer_ext?.name}
- {data.visitor_role === 3 && (
- -
- 创建者
-
- )}
{data?.admission_price !== 0 && (
-
付费
)}
+ {data.visitor_role === 3 && (
+ -
+ 创建者
+
+ )}
diff --git a/app/space/person_space_introduce/[mid]/page.js b/app/space/person_space_introduce/[mid]/page.js
index 89fa12e..bb51772 100644
--- a/app/space/person_space_introduce/[mid]/page.js
+++ b/app/space/person_space_introduce/[mid]/page.js
@@ -1,18 +1,19 @@
"use client";
import React, { useEffect, useState, useRef } from "react";
-import { Image, ImageViewer, Dialog } from "antd-mobile";
-import { useRouter, useParams, redirect } from "next/navigation";
+import { Image, ImageViewer, Dialog, Toast } from "antd-mobile";
+import { useRouter, useParams } from "next/navigation";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faAngleLeft,
faAngleRight,
faClose,
- faSave,
+ // faSave,
} from "@fortawesome/free-solid-svg-icons";
import AddWeChat from "@/components/AddWeChat";
import { getStreamerInfo } from "@/api/space";
import baseRequest from "@/utils/baseRequest";
+import requireAPI from "@/utils/requireAPI"
export default function PersonSpaceIntroduce() {
const base = baseRequest();
const router = useRouter();
@@ -70,13 +71,13 @@ export default function PersonSpaceIntroduce() {
您的浏览器不支持 Video 标签。
-
-
+
*/}
),
bodyStyle: {
@@ -104,7 +105,7 @@ export default function PersonSpaceIntroduce() {
});
return;
}
- redirect("/space/" + mid);
+ router.push("/space/" + mid);
} catch (error) {
console.error(error);
}
diff --git a/app/space/setting/page.js b/app/space/setting/page.js
index 782ff25..d189cd9 100644
--- a/app/space/setting/page.js
+++ b/app/space/setting/page.js
@@ -129,7 +129,7 @@ export default function Setting() {
style={{ "--size": "52px", "--border-radius": "50%" }}
/>
-
{streamerInfo?.name}
+
{streamerInfo?.name}
-
)}
- -
+ {streamerInfo?.visitor_role != 3 &&
-
退出空间
-
+ }
diff --git a/components/AddWeChat/index.js b/components/AddWeChat/index.js
index 021a162..3db6d5d 100644
--- a/components/AddWeChat/index.js
+++ b/components/AddWeChat/index.js
@@ -162,7 +162,7 @@ export default function AddWeChat({
)}
- {!streamerDetailData?.is_unlock_wechat && streamerDetailData?.wechat_order_status === 2 && (
+ {(!streamerDetailData?.is_unlock_wechat || streamerDetailData?.wechat_order_status === 2) && (
@@ -90,7 +91,7 @@ export default function PaySpacePost({
: "/icons/money_gold.png"
}
/>
- {data.price / 100}元
+ {data.price / 100}元
{!data.is_zone_moment_unlocked ? (
@@ -142,10 +143,10 @@ export default function PaySpacePost({
/>
- {status === 0 && (
+ {is_ironfan_visible && (
空间内任何消费满{data.ironfanship_price}元即可成为铁粉
diff --git a/components/Photos/index.js b/components/Photos/index.js
index 7fb22d1..aaa2822 100644
--- a/components/Photos/index.js
+++ b/components/Photos/index.js
@@ -3,7 +3,7 @@
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 { faAngleUp, faClose} from "@fortawesome/free-solid-svg-icons";
import { saveFile } from "@/utils/tools/handleFuns";
import { useRouter } from "next/navigation";
import baseRequest from "@/utils/baseRequest";
@@ -95,13 +95,13 @@ export default function Photos({ isUnlocked, mediaAmount, media, type, data }) {
您的浏览器不支持 Video 标签。
- saveFile(video.mp4)}
>
-
+ */}
),
bodyStyle: {
diff --git a/components/PostItem/index.js b/components/PostItem/index.js
index 7fa3186..4a0bb9b 100644
--- a/components/PostItem/index.js
+++ b/components/PostItem/index.js
@@ -9,6 +9,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleRight } from "@fortawesome/free-solid-svg-icons";
import { handleFollow, thumbsUp } from "@/api/public";
import { get } from "@/utils/storeInfo";
+import { Inter } from "next/font/google";
+const inter = Inter({ subsets: ["latin"] });
export default function PostItem({
type,
follow,
@@ -84,7 +86,7 @@ export default function PostItem({
className="flex justify-between items-center"
onClick={() => handleFollow(isFollow, data?.mid, setIsFollow)}
>
- {data.streamer_ext?.name}
+ {data.streamer_ext?.name}
{type == "post" && (
{isFollow ? "已关注" : "关注"}
@@ -93,28 +95,37 @@ export default function PostItem({
{!data?.is_zone_moment_unlocked ? (
- <>
+
- >
+
) : (
)}
{!(
@@ -144,6 +155,7 @@ export default function PostItem({
type={data.is_ironfan_visible ? "ironFan" : "superFan"}
price={data.price / 100}
status={data.is_ironfanship_unlocked}
+ is_ironfan_visible={data.is_ironfan_visible==1}
ironfanship_price={data.ironfanship_price / 100}
is_zone_moment_unlocked={data.is_zone_moment_unlocked}
data={data}
@@ -202,7 +214,7 @@ export default function PostItem({
? `${
getDays === 0 ? "今日" : "new" === 1 ? "昨日" : "前天"
}`
- : date.getMonth() + 1 + "月" + date.getDate() + "日"}
+ : date.getMonth() + 1 + "-" + date.getDate()}
{(date.getHours() > 9
diff --git a/utils/tools/handleFuns.js b/utils/tools/handleFuns.js
index 16abe9c..5463ff7 100644
--- a/utils/tools/handleFuns.js
+++ b/utils/tools/handleFuns.js
@@ -1,5 +1,5 @@
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faClose, faSave } from "@fortawesome/free-solid-svg-icons";
+import { faClose} from "@fortawesome/free-solid-svg-icons";
import { Dialog,Toast } from "antd-mobile";
import html2canvas from "html2canvas";
import {checkRole} from "../auth"
@@ -30,13 +30,13 @@ export const handleShowVideos = (video) => {
您的浏览器不支持 Video 标签。
-
-
+ */}
),
bodyStyle: {