From 9265fe5db5a866fde8c0fd06a172f82fea482071 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 12 Mar 2025 17:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/found/page.js                          | 15 ++++++----
 app/messageDetail/page.js                  | 32 ++++++++++++++++----
 app/my/relationship/page.js                |  2 ++
 app/space/page.js                          | 11 +++++--
 components/InfiniteScrollContent/index.jsx | 34 ++++++++++++----------
 5 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/app/found/page.js b/app/found/page.js
index 3f23271..7ac5da8 100644
--- a/app/found/page.js
+++ b/app/found/page.js
@@ -39,7 +39,7 @@ export default function Found() {
   const [activeIndex, setActiveIndex] = useState(0);
   const [account, setAccount] = useState(null);
   const [scrollHeight, setScrollHeight] = useState(0);
-
+  const [loading, setLoading] = useState(false);
   // useEffect(() => {
   //   const info = get("account");
   //   console.log("info",info)
@@ -48,11 +48,14 @@ export default function Found() {
   //   }
   // }, []
   // )
-  const childrenFunc = () => {
+  const childrenFunc = async () => {
+    setLoading(true);
     if (!activeIndex) {
-      recommPostRef.current?.doRefresh();
+      await recommPostRef.current?.doRefresh();
+      setLoading(false);
     } else {
-      followPostRef.current?.doRefresh();
+      await followPostRef.current?.doRefresh();
+      setLoading(false);
     }
   };
   useEffect(() => {
@@ -119,7 +122,9 @@ export default function Found() {
           </Swiper.Item>
         </Swiper>
         <div
-          className={`fixed bottom-[50px] right-4 z-[50] w-10 h-10 flex items-center justify-center bg-[#1d1d1d71] rounded-full`}
+          className={`fixed bottom-[50px] right-4 z-[50] w-10 h-10 flex items-center justify-center bg-[#1d1d1d71] rounded-full ${
+            loading ? "animate-spin" : ""
+          }`}
           style={{ zIndex: 999 }}
         >
           <FontAwesomeIcon
diff --git a/app/messageDetail/page.js b/app/messageDetail/page.js
index d489f66..d485f99 100644
--- a/app/messageDetail/page.js
+++ b/app/messageDetail/page.js
@@ -28,6 +28,7 @@ export default function MessageDetail({}) {
   const [userInfo, setUserInfo] = useState(null);
   const [newMessage, setNewMessage] = useState("");
   const [loading, setLoading] = useState(false);
+  const [sendding, setSendding] = useState(false);
   const [offset, setOffset] = useState(0);
   const [more, setMore] = useState(1);
   const scrollBox = useRef();
@@ -212,6 +213,7 @@ export default function MessageDetail({}) {
       //查询历史记录的时候后移一位，防止记录重复
       setOffset((prev) => prev + 1);
       //请求接口发送私信
+      setSendding(true);
       try {
         const data = await requireAPI(
           "POST",
@@ -224,6 +226,7 @@ export default function MessageDetail({}) {
             },
           }
         );
+        setSendding(false);
         if (data.ret === -1) {
           Toast.show({
             icon: "error",
@@ -240,6 +243,7 @@ export default function MessageDetail({}) {
         });
       } catch (error) {
         // console.error(error);
+        setSendding(false);
       }
       // //每次发送都缓存信息到本地
       // addArr(`${selfData.mid}_to_${params.mid}_messages`, messages);
@@ -415,11 +419,16 @@ export default function MessageDetail({}) {
             <div className="my-2">
               <p>触发按钮：</p>
               <ul className="grid grid-cols-2 gap-2 mt-2">
-                {btns.map((item) => {
+                {btns.map((item, index) => {
                   return (
                     <li
+                      key={index}
                       onClick={() => {
-                        onSend(item, oldMessages[0]?.id || -1, oldMessages);
+                        onSend(
+                          item,
+                          oldMessages[0]?.id || -1,
+                          oldMessages.list
+                        );
                       }}
                       className="bg-[#3333331A] rounded text-center  px-4 py-1"
                     >
@@ -549,9 +558,22 @@ export default function MessageDetail({}) {
             <Button
               size="middle"
               block
-              onClick={() =>
-                onSend(newMessage, oldMessages[0]?.id || -1, oldMessages)
-              }
+              disabled={sendding}
+              onClick={() => {
+                if (newMessage.includes("|")) {
+                  Toast.show({
+                    icon: "fail",
+                    content: "消息不能包含｜",
+                    position: "top",
+                  });
+                  return;
+                }
+                onSend(
+                  newMessage,
+                  oldMessages.list[0]?.id || -1,
+                  oldMessages.list
+                );
+              }}
               style={{
                 "--background-color": "#FF669E",
                 "--border-radius": "10px",
diff --git a/app/my/relationship/page.js b/app/my/relationship/page.js
index c059c76..e639eb2 100644
--- a/app/my/relationship/page.js
+++ b/app/my/relationship/page.js
@@ -181,6 +181,7 @@ export default function Relationship() {
                   hasMore={hasMore}
                   isEmpty={data.length == 0}
                   showNoMore={data.length === 0}
+                  type="friendship"
                 />
               </InfiniteScroll>
             </List>
@@ -238,6 +239,7 @@ export default function Relationship() {
                   hasMore={hasMore}
                   isEmpty={data.length == 0}
                   showNoMore={data.length === 0}
+                  type="friendship"
                 />
               </InfiniteScroll>
             </List>
diff --git a/app/space/page.js b/app/space/page.js
index 96ddee3..264c67e 100644
--- a/app/space/page.js
+++ b/app/space/page.js
@@ -321,6 +321,8 @@ const SpacesList = forwardRef(({ scrollHeight }, ref) => {
           hasMore={hasMore}
           isEmpty={spacesList.length == 0}
           showNoMore={spacesList.length === 0}
+          zoneEmpty={true}
+          type="nospace"
         />
       </InfiniteScroll>
     </div>
@@ -434,7 +436,12 @@ const SpacePostList = forwardRef(({ scrollHeight }, ref) => {
         )}
         {spacePostList?.map((item, index) => (
           <List.Item key={item.id + "_" + index} className="!p-0">
-            <PostItem type="post" data={item} date={new Date(item.ct * 1000)} />
+            <PostItem
+              type="post"
+              showFollow={false}
+              data={item}
+              date={new Date(item.ct * 1000)}
+            />
           </List.Item>
         ))}
         {!spacePostList?.length && (
@@ -442,7 +449,7 @@ const SpacePostList = forwardRef(({ scrollHeight }, ref) => {
             className={`flex flex-col items-center justify-center h-screen`}
             style={{ height: `calc(100vh - 133px)` }}
           >
-            <Empty type="nodata" />
+            <Empty type="nospace" />
           </div>
         )}
       </List>
diff --git a/components/InfiniteScrollContent/index.jsx b/components/InfiniteScrollContent/index.jsx
index 179ea64..a5dfcbe 100644
--- a/components/InfiniteScrollContent/index.jsx
+++ b/components/InfiniteScrollContent/index.jsx
@@ -8,6 +8,8 @@ export default function InfiniteScrollContent({
   hasMore = 0,
   isEmpty,
   showNoMore = true,
+  zoneEmpty = false,
+  type = "nodata",
 }) {
   const router = useRouter();
   return (
@@ -24,21 +26,23 @@ export default function InfiniteScrollContent({
           className={`flex flex-col items-center mt-28`}
           // style={{ height: `${scrollHeight}px` }}
         >
-          <Empty type="nodata" />
-          <div className="text-white">
-            <p
-              onClick={() => router.push("/search")}
-              className="text-base font-medium flex items-center justify-center bg-[#FFFFFF1A] mt-2 rounded-full w-[190px] h-[46px]"
-            >
-              搜索空间
-            </p>
-            <p
-              onClick={() => router.push("/found")}
-              className="text-base font-medium flex items-center justify-center bg-[#FFFFFF1A] mt-2 rounded-full w-[190px] h-[46px]"
-            >
-              查看推荐
-            </p>
-          </div>
+          <Empty type={type} />
+          {zoneEmpty && (
+            <div className="text-white">
+              <p
+                onClick={() => router.push("/search")}
+                className="text-base font-medium flex items-center justify-center bg-[#FFFFFF1A] mt-2 rounded-full w-[190px] h-[46px]"
+              >
+                搜索空间
+              </p>
+              <p
+                onClick={() => router.push("/found")}
+                className="text-base font-medium flex items-center justify-center bg-[#FFFFFF1A] mt-2 rounded-full w-[190px] h-[46px]"
+              >
+                查看推荐
+              </p>
+            </div>
+          )}
         </div>
       )}
     </>