From 7de541fa74d28ef5afe8775861e85633e639cc6b Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 31 Jul 2024 15:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/my/page.js                |  2 +-
 app/page.js                   |  2 +-
 components/AddWeChat/index.js | 32 +++++++++++++++++++++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/my/page.js b/app/my/page.js
index 700312e..ff6eacb 100644
--- a/app/my/page.js
+++ b/app/my/page.js
@@ -353,7 +353,7 @@ const My = () => {
                 src={"/icons/32DP/toScreen.png"}
                 placeholder=""
               />
-              <span className="text-base">添到主屏幕</span>
+              <span className="text-base">添加到主屏幕</span>
             </div>
             <FontAwesomeIcon
               icon={faAngleRight}
diff --git a/app/page.js b/app/page.js
index ba25fbf..1d50e63 100644
--- a/app/page.js
+++ b/app/page.js
@@ -102,7 +102,7 @@ export default function Home() {
           )}
         </Swiper.Item>
         <Swiper.Item>
-          {activeIndex && (
+          {!!activeIndex && (
             <FollowPostList scrollHeight={scrollHeight} ref={followPostRef} />
           )}
         </Swiper.Item>
diff --git a/components/AddWeChat/index.js b/components/AddWeChat/index.js
index befb655..6938a26 100644
--- a/components/AddWeChat/index.js
+++ b/components/AddWeChat/index.js
@@ -8,6 +8,7 @@ import { useRouter } from "next/navigation";
 import { getStreamerDetailInfo } from "@/api/space";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCopy } from "@fortawesome/free-solid-svg-icons";
+import clipboard from "copy-to-clipboard";
 export default function AddWeChat({
   visible,
   closeMask,
@@ -112,7 +113,7 @@ export default function AddWeChat({
             //提交微信函数
             const submitWechat = async (order_id) => {
               //提交用户微信和备注
-              
+
               try {
                 const submitWechatData = await requireAPI(
                   "POST",
@@ -141,23 +142,32 @@ export default function AddWeChat({
             //用户未解锁微信情况：先支付，再提交用户微信和备注
             if (streamerDetailData.is_unlock_wechat === 1) {
               //用户已解锁微信情况：直接提交用户微信和备注
-              console.log("ccccc",streamerDetailData,streamerData.wechat_order_id)
+              console.log(
+                "ccccc",
+                streamerDetailData,
+                streamerData.wechat_order_id
+              );
               await submitWechat(streamerDetailData.wechat_order_id);
               setStreamerDetailData({
                 ...streamerDetailData,
                 wechat_order_status: 3,
               });
             } else {
+              console.log(
+                "xxxx",
+                streamerDetailData,
+                streamerData.wechat_order_id
+              );
               const order_id = await payCoin();
               if (!order_id) return;
-              
+
               await submitWechat(order_id);
               //展示解锁成功界面
               // setIsWechatUnlocked(true);
               setStreamerDetailData({
                 ...streamerDetailData,
-                // wechat_order_status: 3,
-                wechat_order_status:1
+                wechat_order_status: 3,
+                is_unlock_wechat: 1,
               });
               return;
             }
@@ -179,7 +189,7 @@ export default function AddWeChat({
             setStreamerDetailData({
               ...streamerDetailData,
               wechat_order_status: 3,
-              wechat_order_status:1
+              is_unlock_wechat: 1,
             });
           }
 
@@ -226,6 +236,14 @@ export default function AddWeChat({
                             // size="sm"
                             color="#ffffff"
                             className="ml-2"
+                            onClick={() => {
+                              clipboard(wechat);
+                              Toast.show({
+                                icon: "success",
+                                content: "已复制到剪贴板",
+                                position: "top",
+                              });
+                            }}
                           />
                         )}
                       </div>
@@ -238,7 +256,7 @@ export default function AddWeChat({
                         streamerDetailData?.wechat_order_status === 2) && (
                         <div
                           className="bg-primary px-4 py-2 rounded-full flex items-center justify-center"
-                          onClick={()=>unlockWechat()}
+                          onClick={() => unlockWechat()}
                         >
                           {!streamerDetailData?.is_unlock_wechat && (
                             <span className="text-[16px] whitespace-nowrap">