bugfix: follow btn

mlogclub · Nov 9, 2024 · 3af0314 · 3af0314
1 parent 7a53863
commit 3af0314
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/site/src/components/FollowBtn.vue b/site/src/components/FollowBtn.vue
@@ -18,34 +18,37 @@ const props = defineProps({
     type: Number,
     required: true,
   },
-  followed: {
-    type: Boolean,
-    default: false,
-  },
 });
 const emits = defineEmits(["onFollowed"]);
+
+const { data: followed } = await useAsyncData(`followed:${props.userId}`, () =>
+  useMyFetch(`/api/fans/isfollowed?userId=${props.userId}`)
+);
+
 async function follow() {
   if (!userStore.isLogin) {
     useMsgSignIn();
     return;
   }
   try {
-    if (props.followed) {
+    if (followed.value) {
       await useHttpPostForm("/api/fans/unfollow", {
         body: {
           userId: props.userId,
         },
       });
+      followed.value = false;
       emits("onFollowed", props.userId, false);
-      useMsgSuccess("取消关注成功");
+      // useMsgSuccess("取消关注成功");
     } else {
       await useHttpPostForm("/api/fans/follow", {
         body: {
           userId: props.userId,
         },
       });
+      followed.value = true;
       emits("onFollowed", props.userId, true);
-      useMsgSuccess("关注成功");
+      // useMsgSuccess("关注成功");
     }
   } catch (e) {
     useMsgError(e.message || e);

diff --git a/site/src/components/UserProfile.vue b/site/src/components/UserProfile.vue
@@ -35,8 +35,6 @@
         <follow-btn
           v-if="!currentUser || currentUser.id !== localUser.id"
           :user-id="localUser.id"
-          :followed="followed"
-          @onFollowed="onFollowed"
         />
       </div>
     </div>
@@ -70,10 +68,6 @@ const backgroundImage = computed(() => {
   return defaultUserBg;
 });
 
-const { data: followed } = await useAsyncData("followed", () =>
-  useMyFetch(`/api/fans/isfollowed?userId=${localUser.value.id}`)
-);
-
 async function uploadBackground(e) {
   const files = e.target.files;
   if (files.length <= 0) {
@@ -102,10 +96,6 @@ async function uploadBackground(e) {
     console.error(e);
   }
 }
-
-function onFollowed(userId, _followed) {
-  followed.value = _followed;
-}
 </script>
 
 <style lang="scss" scoped>

diff --git a/site/src/composables/http.js b/site/src/composables/http.js
@@ -36,7 +36,12 @@ export function useMyFetch(url, options = {}) {
           return;
         }
         if (data.value.success) {
-          resolve(data.value.data);
+          // TODO 这里如果数据是空，那么返回一个空对象
+          if (data.value.data === null || data.value.data === undefined) {
+            resolve(data.value.data || {});
+          } else {
+            resolve(data.value.data);
+          }
         } else {
           reject(data.value);
         }