From 4b5781959fad597de178f3d85a848b4aec61abc4 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 4 Dec 2024 14:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/login/page.js                                | 16 +++++++++++++++-
 .../components/AlreadyAddWechat/index.jsx        |  8 ++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/login/page.js b/app/login/page.js
index 5da505f..59bd4d2 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);
     }
   };
@@ -437,6 +443,7 @@ function Login({ handleLogin }) {
               </span>
             </div>
             <LoginBtn
+              isLoading={isLoading}
               loginInfo={loginInfo}
               setLoginInfo={setLoginInfo}
               handleSubmit={handleSubmit}
@@ -450,7 +457,13 @@ function Login({ handleLogin }) {
   );
 }
 
-const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => {
+const LoginBtn = ({
+  loginInfo,
+  setLoginInfo,
+  type,
+  handleSubmit,
+  isLoading,
+}) => {
   const router = useRouter();
   useEffect(() => {}, []);
   return (
@@ -493,6 +506,7 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => {
       <Button
         shape="rounded"
         size="middle"
+        loading={isLoading}
         block
         onClick={() => handleSubmit(type)}
         style={{
diff --git a/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx b/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx
index e27565b..e629206 100644
--- a/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx
+++ b/app/my/wechatWaitingToAdd/components/AlreadyAddWechat/index.jsx
@@ -8,7 +8,6 @@ export default function AlreadyAddWechat({ zid, currentIndex }) {
   const [offset, setOffset] = useState(0);
   const [more, setMore] = useState(1);
   const [data, setData] = useState([]);
-  const [modalVisible, setModalVisible] = useState(false);
   const getData = async () => {
     if (zid === undefined || !more || currentIndex != 0) return;
     try {
@@ -85,13 +84,9 @@ export default function AlreadyAddWechat({ zid, currentIndex }) {
         </div>
         <div
           onClick={() => {
-            setModalVisible(!modalVisible);
             Modal.show({
               content: (
-                <div
-                  onClick={() => setModalVisible(false)}
-                  className="flex-1 justify-center items-center bg-[#00000080]"
-                >
+                <div className="flex-1 justify-center items-center bg-[#000000]">
                   <div className="p-4 rounded-2xl bg-[#1E1C29] items-center">
                     {item.consumer_wechat ? (
                       <div className="flex flex-col w-full">
@@ -180,6 +175,7 @@ export default function AlreadyAddWechat({ zid, currentIndex }) {
                   </div>
                 </div>
               ),
+              destroyOnHide: true,
               closeOnMaskClick: true,
               bodyStyle: {
                 background: "none",