From b6c212569ed45cf3936fd3bcc23e3fd78e404130 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 2 Aug 2024 22:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=98=E5=9C=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=92=8C=E6=96=B0=E7=9A=84=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/space.js | 1 + app/login/page.js | 45 +++++++++++++-- app/my/relationship/page.js | 1 + app/page.js | 15 ++++- app/profile/[mid]/page.js | 43 ++++++++------ app/space/[id]/page.js | 2 +- app/space/setting/page.js | 6 +- app/space/setting/spaceRefund/page.jsx | 4 +- components/Photos/index.js | 9 +-- components/PostItem/index.js | 23 ++++++-- components/StreamerNavigator/index.js | 77 ++++++++++++++++++++++++++ components/WithAuth/index.js | 8 ++- store/actions.js | 4 ++ store/reducers.js | 3 + utils/requireAPI.js | 2 +- utils/upload.js | 4 +- 16 files changed, 203 insertions(+), 44 deletions(-) create mode 100644 components/StreamerNavigator/index.js diff --git a/api/space.js b/api/space.js index 18ec8a7..2512194 100644 --- a/api/space.js +++ b/api/space.js @@ -1,6 +1,7 @@ import requireAPI from "@/utils/requireAPI"; import {Toast} from "antd-mobile" export const getStreamerInfo = async (mid) => { + try { const data = await requireAPI("POST", "/api/zone/list_by_mid", { body: { diff --git a/app/login/page.js b/app/login/page.js index 77aba1c..62291f8 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -35,6 +35,7 @@ function Login({ handleLogin }) { const [veriCode, setVeriCode] = useState(""); const [isCounting, setIsCounting] = useState(false); const [seconds, setSeconds] = useState(60); + const [deviceType, setDeviceType] = useState(""); const [loginInfo, setLoginInfo] = useState({ mobilePhone: "", regionCode: "86", @@ -44,6 +45,15 @@ function Login({ handleLogin }) { const router = useRouter(); const swiperRef = useRef(null); useEffect(() => { + const userAgent = navigator.userAgent; + //区分设备类型 + if (/Android/i.test(userAgent)) { + setDeviceType("Android"); + } else if (/iPhone|iPad|iPod/i.test(userAgent)) { + setDeviceType("ios"); + } else { + setDeviceType("pc"); + } handleLogin({ isSignin: false, userToken: null }); signOut(); removeUserInfo(); @@ -154,7 +164,7 @@ function Login({ handleLogin }) { handleLogin({ isSignin: true, userToken: data.data.token }); router.push( - (!data?.data?.is_enabled && type != "password") + !data?.data?.is_enabled && type != "password" ? "/my/setting/editPassword?is_enabled=" + data?.data?.is_enabled : "/" ); @@ -206,7 +216,9 @@ function Login({ handleLogin }) { }; return (
-
+
router.push(`/my/setting/editPassword?forgetPassword=true`)} + onClick={() => + router.push(`/my/setting/editPassword?forgetPassword=true`) + } className="w-full text-[#FF669E] text-xs mt-2 text-right" > 忘记密码？ @@ -364,6 +378,7 @@ function Login({ handleLogin }) {
+ {deviceType == "ios" && }
); } @@ -389,7 +404,9 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => { 我已阅读并同意 - router.push(`/webView/${encodeURIComponent("/doc/useragreement")}`) + router.push( + `/webView/${encodeURIComponent("/doc/useragreement")}` + ) } className="text-[#FF669E] text-xs" > @@ -398,7 +415,9 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => { 、 - router.push(`/webView/${encodeURIComponent("/doc/privatypolicy")}`) + router.push( + `/webView/${encodeURIComponent("/doc/privatypolicy")}` + ) } className="text-[#FF669E] text-xs" > @@ -416,6 +435,22 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => { > 登录 + +
+ ); +}; + +const BottomBox = () => { + const router = useRouter(); + return ( +
+
+
+

铁粉空间APP可以下载啦～

+

立即下载APP体验更好的服务～

+
+
router.push("https://tiefen.fun")}>下载APP
+
); }; diff --git a/app/my/relationship/page.js b/app/my/relationship/page.js index 09a7da2..5999666 100644 --- a/app/my/relationship/page.js +++ b/app/my/relationship/page.js @@ -139,6 +139,7 @@ export default function Relationship() { router.push("/profile/"+item.mid)} />

{item.name}

diff --git a/app/page.js b/app/page.js index 1d50e63..6d237ec 100644 --- a/app/page.js +++ b/app/page.js @@ -24,6 +24,10 @@ import PostItemSkeleton from "@/components/skeletons/PostItemSkeleton"; import Link from "next/link"; import requireAPI from "@/utils/requireAPI"; import Empty from "@/components/Empty"; +import {get} from "@/utils/storeInfo" +import {useSearchParams} from "next/navigation" +import StreamerNavigator from "@/components/StreamerNavigator"; +import { checkAuth } from "@/utils/auth"; const variables = { "@active-line-color": "#f00", // 将主题色改为红色 }; @@ -37,9 +41,10 @@ const tabItems = [ export default function Home() { const recommPostRef = useRef(); const followPostRef = useRef(); + const searchParams = useSearchParams(); const swiperRef = useRef(null); const [activeIndex, setActiveIndex] = useState(0); - const [data, setData] = useState([]); + const [visible, setVisible] = useState(false); const [scrollHeight, setScrollHeight] = useState(0); // 获取屏幕高度 @@ -47,6 +52,11 @@ export default function Home() { useEffect(() => { setScrollHeight(window.innerHeight); // getData(0) + checkAuth().then(res=>{ + if(res && get("inviter")){ + setVisible(true) + } + }) }, []); const childrenFunc = () => { if (!activeIndex) { @@ -115,6 +125,7 @@ export default function Home() { >
+ ); } @@ -300,4 +311,4 @@ const FollowPostList = forwardRef(({ scrollHeight }, ref) => { {/* */} ); -}); +}); \ No newline at end of file diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js index 51cb00f..f3d1b78 100644 --- a/app/profile/[mid]/page.js +++ b/app/profile/[mid]/page.js @@ -333,10 +333,7 @@ export default function PersonSpace() { )} {streamerInfo?.streamer_ext?.bio && ( -
- 个性签名｜ - {streamerInfo?.streamer_ext?.bio} -
+
个性签名｜{streamerInfo?.streamer_ext?.bio}
)} @@ -370,7 +367,7 @@ export default function PersonSpace() {
- {spaceData?.previews?.images?.map((item, index) => ( + {spaceData?.previews?.images?.slice(0,4).map((item, index) => (
(
  • -
    - {item?.link_name}： - {item?.nickname} +
    + {item?.link_name}：{item?.nickname}
    -
    +
    { copy(item.url); }} > - - 复制 + /> */} + + 复制
    - - 前往 + /> */} + + 前往
    • diff --git a/app/space/[id]/page.js b/app/space/[id]/page.js index 7f7aaf1..a0dae6b 100644 --- a/app/space/[id]/page.js +++ b/app/space/[id]/page.js @@ -18,7 +18,7 @@ import PostItem from "@/components/PostItem"; import PostItemSkeleton from "@/components/skeletons/PostItemSkeleton"; import requireAPI from "@/utils/requireAPI"; import AddWeChat from "@/components/AddWeChat"; -import SeeTiefen from "@/components/SeeTiefen"; +import SeeTiefen from "@/components/StreamerNavigator"; import DefaultMask from "@/components/DefaultMask"; import { getSpaceData, getStreamerInfo } from "@/api/space"; import baseRequest from "@/utils/baseRequest"; diff --git a/app/space/setting/page.js b/app/space/setting/page.js index 9ad12fd..cd988ed 100644 --- a/app/space/setting/page.js +++ b/app/space/setting/page.js @@ -10,6 +10,7 @@ import { faCalendar, } from "@fortawesome/free-solid-svg-icons"; import { getSpaceData } from "@/api/space"; +import requireAPI from "@/utils/requireAPI"; export default function Setting() { const router = useRouter(); const searchParams = useSearchParams(); @@ -79,8 +80,9 @@ export default function Setting() { return `${year}/${month}/${day}`; }, []); const handleExitSpace = async () => { + try { - const _data = await requireAPI("POST", "/api/account_relation/count", { + const _data = await requireAPI("POST", "/api/zone/exit", { body: { zid: streamerInfo?.id, }, @@ -98,7 +100,7 @@ export default function Setting() { content: "退出空间成功", position: "top", }); - setTimeout(() => redirect("/"), 500); + setTimeout(() => router.replace("/"), 500); } catch (error) { console.error(error); } diff --git a/app/space/setting/spaceRefund/page.jsx b/app/space/setting/spaceRefund/page.jsx index c21dc83..63f434d 100644 --- a/app/space/setting/spaceRefund/page.jsx +++ b/app/space/setting/spaceRefund/page.jsx @@ -1,6 +1,6 @@ "use client"; import React, { useState, useEffect } from "react"; -import { redirect, useRouter, useSearchParams } from "next/navigation"; +import { useRouter, useSearchParams } from "next/navigation"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; import { TextArea, Divider, Button, Toast,DotLoading,Input } from "antd-mobile"; @@ -73,7 +73,7 @@ export default function SpaceRefund() { content: "提交成功，请关注原支付渠道通知", position: "top", }); - redirect("/"); + router.replace("/"); } catch (error) { console.error(error); } finally { diff --git a/components/Photos/index.js b/components/Photos/index.js index d575edb..4212b9e 100644 --- a/components/Photos/index.js +++ b/components/Photos/index.js @@ -27,14 +27,15 @@ export default function Photos({ isUnlocked,mediaVisibleRange, mediaAmount, medi let arr = [...imgArr, ...videoArr]; let newPhotos = [...arr]; if (mediaAmount && !isUnlocked) { + console.log("newPhotos",newPhotos) newPhotos = Array(mediaAmount) .fill(null) .map((item, index) => { return newPhotos[index] && mediaVisibleRange ? newPhotos[index] - : { url: newPhotos[0]?.url, type: "hid" }; + : { mp4:newPhotos[0]?.type==="video", url: newPhotos[0]?.url, type: "hid" }; }); - console.log("newPhotos",newPhotos) + } setPhotos(newPhotos); if (newPhotos.length > 9) { @@ -89,7 +90,7 @@ export default function Photos({ isUnlocked,mediaVisibleRange, mediaAmount, medi controls className="w-screen h-[70vh] rounded-lg object-contain" poster={video?.url} - autoPlay={true} + // autoPlay={true} > 您的浏览器不支持 Video 标签。 @@ -203,7 +204,7 @@ export default function Photos({ isUnlocked,mediaVisibleRange, mediaAmount, medi />
    } - {item?.type == "video" && ( + {item?.mp4 && (
    { + if (time === 0) return "今日"; + if (time === 1) return "昨日"; + return `${time}日前`; + }, []); return (
    {type == "space" && data?.is_headed === 1 && ( @@ -74,6 +78,7 @@ export default function PostItem({ src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL + "/images/top_post.png"} width={76} className="mb-2" + /> )}
    @@ -188,7 +193,7 @@ export default function PostItem({ router.push("/space/person_space_introduce/" + data.mid) } > - {data.is_active_within_a_week ? ( + {data.streamer_ext.is_active_within_a_week ? ( <> - {data.days_elapsed_since_the_last_zones_update < 7 && + {/* {data.streamer_ext.days_elapsed_since_the_last_zones_update < 7 && `空间${ - data.days_elapsed_since_the_last_zones_update === 0 + data.streamer_ext.days_elapsed_since_the_last_zones_update === 0 ? "今日" : "new" === 1 ? "昨日" : "new" === 2 ? "前天" - : data.days_elapsed_since_the_last_zones_update + + : data.streamer_ext.days_elapsed_since_the_last_zones_update + "天前" }有更新`} + 空间 */} + {formatZoneUpdateTime( + data?.streamer_ext + ?.days_elapsed_since_the_last_zones_update + )} + 有更新 { + getStreamerInfo(mid).then(res=>{ + setStreamerInfo(res); + }) + },[]) + const handleCloseMask = ()=>{ + remove("inviter") + setVisible(false) + } + return ( + +
    +
    +
    + +
    +
    +

    + {streamerInfo?.streamer_ext?.name} +

    +
    + +
    +
    +

    + {streamerInfo?.streamer_ext?.bio} +

    +
    { + handleCloseMask(); + router.push("/profile/"+streamerInfo?.mid); + } + : () => { + handleCloseMask(); + router.push("/space/person_space_introduce/"+streamerInfo?.mid); + } + } + className="w-full p-2 mt-4 text-base rounded-full bg-[#FF669E] text-center" + > + {streamerInfo?.streamer_ext?.zones?.length === 0 ? "查看主页" : "查看空间"} +
    +
    +
    +
    +
    +     + ); +} diff --git a/components/WithAuth/index.js b/components/WithAuth/index.js index 7d4c9a6..a9b4e88 100644 --- a/components/WithAuth/index.js +++ b/components/WithAuth/index.js @@ -3,13 +3,16 @@ import { useRouter, usePathname, useSearchParams } from "next/navigation"; import { useEffect } from "react"; import { get } from "@/utils/storeInfo"; import { Toast } from "antd-mobile"; +import {save} from "@/utils/storeInfo" export default function WithAuth(WrappedComponent) { const router = useRouter(); const pathname = usePathname(); const searchParams = useSearchParams(); useEffect(() => { - + if(searchParams.get("inviter")){ + save("inviter",Number(searchParams.get("inviter"))) + } if(!pathname.includes("webView") && !pathname.includes("login") ){ checkLogin(); } @@ -32,6 +35,7 @@ export default function WithAuth(WrappedComponent) { }); router.push("/login"); }else{ + if(pathname.includes("login")){ router.replace("/") } @@ -42,4 +46,4 @@ export default function WithAuth(WrappedComponent) { } }; return WrappedComponent; -} +} \ No newline at end of file diff --git a/store/actions.js b/store/actions.js index f649044..73b65f7 100644 --- a/store/actions.js +++ b/store/actions.js @@ -3,5 +3,9 @@ export const handleLogin = (data) => ({ type: 'HANDLOGIN', data }); +export const handleSaveRecommendMid = (data) => ({ + type: 'HANDLESAVERECOMMENMID', + data +}); \ No newline at end of file diff --git a/store/reducers.js b/store/reducers.js index 7e40d48..5acc233 100644 --- a/store/reducers.js +++ b/store/reducers.js @@ -6,6 +6,7 @@ const initialState = { authInfo: { isSignin: false, userToken: null, + recommendMid:null }, }; let text = (data) => { @@ -15,6 +16,8 @@ const reducer = (state = initialState, action) => { switch (action.type) { case "HANDLOGIN": return { ...state, authInfo: action.data }; + case "HANDLESAVERECOMMENMID": + return { ...state, recommendMid: action.data }; default: return state; } diff --git a/utils/requireAPI.js b/utils/requireAPI.js index 6441d6d..3518df0 100644 --- a/utils/requireAPI.js +++ b/utils/requireAPI.js @@ -24,7 +24,7 @@ export default function customFetch(method, url, options = {}, mid) { newBody.mid = mid; } const body = JSON.stringify({ ...base, ...newBody }); - // console.log("newBody", body,url); + console.log("newBody", body,url); // 合并选项 const mergedOptions = { ...defaultOptions, body }; diff --git a/utils/upload.js b/utils/upload.js index e925a15..a16cc6f 100644 --- a/utils/upload.js +++ b/utils/upload.js @@ -179,7 +179,7 @@ export async function uploadImage(asset) { }); return; } - return data.data.ret_item; + return data.data.ret_item.id; } else { Toast.show({ content: "上传图片失败", @@ -289,7 +289,7 @@ export async function multiUploadImage(assets) { await Promise.all( assets.map(async (asset) => { const id = await uploadImage(asset.src); - debugger; + // debugger; ids.image_ids.push(id); }) );