From fbd945032ee8717adc093f9adf5720b280f73461 Mon Sep 17 00:00:00 2001 From: jueweijue Date: Sun, 24 Nov 2024 22:13:27 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BC=B9=E7=AA=97=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/space/person_space_introduce/[mid]/page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/space/person_space_introduce/[mid]/page.js b/app/space/person_space_introduce/[mid]/page.js index 1c39d8c..88e0e7a 100644 --- a/app/space/person_space_introduce/[mid]/page.js +++ b/app/space/person_space_introduce/[mid]/page.js @@ -252,7 +252,7 @@ export default function PersonSpaceIntroduce() { handler.current = Dialog.confirm({ header: "提醒", content: - "本空间内容为达人创建并维护，属于虚拟服务，不可退款，且空间内存在部分内容需要另外付费，请再次确认是否付费加入", + "本空间内容为达人创建并维护，属于虚拟服务，不可退款，请再次确认是否付费加入", bodyStyle: { maxHeight: "none", width: "80vw", From d471e6e7bf14c187eb58d3ee26d10c8f1f1661bc Mon Sep 17 00:00:00 2001 From: al Date: Wed, 27 Nov 2024 17:41:55 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/editUserProfile/selectUserProfileItem/page.js | 3 --- app/my/setting/aboutUs/page.js | 3 --- app/profile/[mid]/page.js | 3 --- 3 files changed, 9 deletions(-) diff --git a/app/my/editUserProfile/selectUserProfileItem/page.js b/app/my/editUserProfile/selectUserProfileItem/page.js index 95d2c5a..52326a8 100644 --- a/app/my/editUserProfile/selectUserProfileItem/page.js +++ b/app/my/editUserProfile/selectUserProfileItem/page.js @@ -107,9 +107,6 @@ export default function SelectUserProfileItem() { style={{ maxWidth: "12px" }} size="xl" className=" ml-2" - onClick={() => { - router.push("my/editUserProfile/editUserName"); - }} /> diff --git a/app/my/setting/aboutUs/page.js b/app/my/setting/aboutUs/page.js index 516747d..b425522 100644 --- a/app/my/setting/aboutUs/page.js +++ b/app/my/setting/aboutUs/page.js @@ -82,9 +82,6 @@ export default function AboutUs() { style={{ maxWidth: "12px" }} size="sm" className="h-4 text-gray-300" - onClick={() => { - router.back(); - }} /> diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js index 1994224..d589345 100644 --- a/app/profile/[mid]/page.js +++ b/app/profile/[mid]/page.js @@ -422,9 +422,6 @@ export default function PersonSpace() { size="xl" style={{ maxWidth: "12px" }} className="h-4" - onClick={() => { - router.back(); - }} /> From 88347182e1e789ee79a7a835f5e9bef22fbedfa0 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 29 Nov 2024 16:28:53 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=85=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BE=AE=E4=BF=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx b/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx index 44c104a..e27565b 100644 --- a/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx +++ b/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx @@ -93,7 +93,7 @@ export default function AlreadyAddWechat({ zid, currentIndex }) { className="flex-1 justify-center items-center bg-[#00000080]" >
- {!item.consumer_wechat ? ( + {item.consumer_wechat ? (
Date: Wed, 4 Dec 2024 16:42:33 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/login/page.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/login/page.js b/app/login/page.js index 5da505f..4b23a28 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -35,6 +35,7 @@ function Login({ handleLogin }) { const [activeIndex, setActiveIndex] = useState(0); const [veriCode, setVeriCode] = useState(""); const [isCounting, setIsCounting] = useState(false); + const [isLoading, setIsLoading] = useState(false); const [seconds, setSeconds] = useState(60); const [deviceType, setDeviceType] = useState(""); const [loginInfo, setLoginInfo] = useState({ @@ -145,6 +146,7 @@ function Login({ handleLogin }) { ...body, veri_code: veriCode, }; + setIsLoading(true); try { const data = await requireAPI( "POST", @@ -155,7 +157,9 @@ function Login({ handleLogin }) { body, } ); + if (data.ret === -1) { + setIsLoading(false); Toast.show({ icon: "fail", content: data.msg, @@ -172,12 +176,14 @@ function Login({ handleLogin }) { } else { save("firstLogin", 0); } + setIsLoading(false); router.push( !data?.data?.is_enabled && type != "password" ? "/my/setting/editPassword?is_enabled=" + data?.data?.is_enabled : "/" ); } catch (error) { + setIsLoading(false); // console.error(error); } }; @@ -349,6 +355,7 @@ function Login({ handleLogin }) {
{ +const LoginBtn = ({ + loginInfo, + setLoginInfo, + type, + handleSubmit, + isLoading, +}) => { const router = useRouter(); useEffect(() => {}, []); return ( @@ -493,6 +507,7 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => {