diff --git a/api/public.js b/api/public.js index 2057ac0..92cc6b3 100644 --- a/api/public.js +++ b/api/public.js @@ -1,9 +1,9 @@ -import { get } from "@/utils/storeInfo"; +import { get, clear } from "@/utils/storeInfo"; import requireAPI from "@/utils/requireAPI"; import { Toast } from "antd-mobile"; import { JSEncrypt } from "jsencrypt"; import baseRequest from "@/utils/baseRequest"; -//关注和取关功能 +//退出登录 export const handleLogout = async () => { const account = get("account"); try { @@ -20,6 +20,7 @@ export const handleLogout = async () => { }); return; } + clear(); } catch (error) { // console.error(error); } diff --git a/app/login/page.js b/app/login/page.js index f129623..1509965 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -380,7 +380,9 @@ function Login({ handleLogin }) {
- router.push(`/my/setting/editPassword?forgetPassword=true`) + router.push( + `/my/setting/editPassword?forgetPassword=true&phone=${loginInfo.mobilePhone}` + ) } className="text-[#FF669E] text-xs mt-2 text-right" > diff --git a/app/my/page.js b/app/my/page.js index 35bbee8..d2cf46e 100644 --- a/app/my/page.js +++ b/app/my/page.js @@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons"; -import { Avatar, Image, Toast } from "antd-mobile"; +import { Avatar, Image, Toast, Space } from "antd-mobile"; import { useRouter, useSearchParams } from "next/navigation"; import { get } from "@/utils/storeInfo"; import requireAPI from "@/utils/requireAPI"; @@ -16,6 +16,7 @@ const My = () => { // setUserInfo(userInfo); getData(userInfo); } + console.log("userInfo", userInfo); // getData(userInfo); }, []); const getData = async (oldUserInfo) => { @@ -94,7 +95,27 @@ const My = () => { style={{ "--size": "76px", "--border-radius": "50%" }} />
-

{userInfo.name}

+ +

+ {userInfo.name} +

+ {userInfo?.is_a_member === 1 && ( + + )} +
{ style={{ "--size": "76px", "--border-radius": "50%" }} />
-

{userInfo.name}

+ +

+ {userInfo.name} +

+ {userInfo?.is_a_member === 1 && ( + + )} +
{ // const mobile_phone = get("mobile_phone"); // console.log("mobile_phone",mobile_phone) @@ -212,6 +214,8 @@ export default function EditPassword() { 验证码

setVeriCode("")} placeholder="请输入验证码" onChange={(value) => setVeriCode(value)} value={veriCode} @@ -241,11 +245,12 @@ export default function EditPassword() { 新密码

setNewPassword(value)} value={newPassword} type="password" - autoComplete="off" style={{ "--placeholder-color": "#FFFFFF80", "--font-size": "16px", diff --git a/app/search/page.js b/app/search/page.js index f0c0242..1bb75b0 100644 --- a/app/search/page.js +++ b/app/search/page.js @@ -10,6 +10,7 @@ import { Popup, Radio, Picker, + Space, } from "antd-mobile"; import { useRouter } from "next/navigation"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; @@ -368,7 +369,6 @@ export default function Search() { delete currentFilterValue.comprehensiveUsed; delete currentFilterValue.priceUsed; querryParams = currentFilterValue; - console.log("querryParams", querryParams); try { const data = await requireAPI("POST", "/api/streamer/filter", { body: { ...querryParams }, @@ -547,7 +547,9 @@ export default function Search() { }} > + +

综合筛选

+
+ { + setIsFilterVisible({ + zone_admission_price: false, + comprehensive: false, + }); + setCurrentFiltersChangeValue(filtersValue); + }} + /> +
+
{filters.map((item, index) => (
+ +

价格筛选

+
+ { + setIsFilterVisible({ + zone_admission_price: false, + comprehensive: false, + }); + setCurrentFiltersChangeValue(filtersValue); + }} + /> +
+
{priceFilters.map((item, index) => (
{ const hasToken = await get("token"); - // console.log("hasToken", hasToken); - if(pathname.includes("wxpay_h5")){ - return + if (pathname.includes("wxpay_h5")) { + return; } if (hasToken) { const currentIsLogin = await checkAuth();