fix: 修复一些bug

xh-polaris · Sep 16, 2023 · 56c937e · 56c937e
1 parent 2de93c8
commit 56c937e
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 94 deletions.
diff --git a/src/apis/comment/comment.ts b/src/apis/comment/comment.ts
@@ -38,7 +38,7 @@ export async function getComments(req: GetCommentsReq) {
           reject(res);
         }
         const data = res.data as GetCommentsResp;
-        data.comments.forEach((comment) => {
+        data.comments?.forEach((comment) => {
           comment.user.avatarUrl += PictureStyle.thumbnail;
         });
         resolve(data);

diff --git a/src/apis/moment/moment.ts b/src/apis/moment/moment.ts
@@ -72,7 +72,7 @@ export async function getMomentPreviews(req: GetMomentPreviewsReq) {
           reject(res);
         }
         const data = res.data as GetMomentPreviewsResp;
-        data.moments.forEach((moment) => {
+        data.moments?.forEach((moment) => {
           moment.photos[0] += PictureStyle.thumbnail;
           moment.user.avatarUrl += PictureStyle.thumbnail;
         });

diff --git a/src/apis/post/post.ts b/src/apis/post/post.ts
@@ -31,7 +31,7 @@ export async function getPostPreviews(req: GetPostPreviewsReq) {
           ...data,
           posts: []
         };
-        data.posts.forEach((post) => {
+        data.posts?.forEach((post) => {
           if (!post.user) return;
           if (post.coverUrl) {
             post.coverUrl += PictureStyle.thumbnail;

diff --git a/src/pages/cat/photos.vue b/src/pages/cat/photos.vue
@@ -97,10 +97,9 @@ let getCatImageReq = reactive<GetImageByCatReq>({
 let number = 0;
 
 const getCatImageHandler = () => {
-  console.log("here");
   if (!noMore.value)
     getCatImage(getCatImageReq).then((res) => {
-      for (let i = 0; i < res.images.length; i++) {
+      for (let i = 0; i < res.images?.length; i++) {
         let imageUrl = reactive<ImageInfo>({
           id: res.images[i].id,
           url: res.images[i].url,
@@ -118,10 +117,9 @@ const getCatImageHandler = () => {
         });
         imgUrlList.push(imageUrl);
       }
-      let arr = Object.keys(res.images);
       //获取得到的images的长度用以判断是否还有尚未加载的照片
-      number += arr.length;
-      if (number === 0 || imgUrlList[number - 1].id === getCatImageReq.prevId) {
+      number += res.images?.length;
+      if (!number || imgUrlList[number - 1].id === getCatImageReq.prevId) {
         noMore.value = true;
       } else getCatImageReq.prevId = imgUrlList[number - 1].id;
     });

diff --git a/src/pages/community/Masonry.vue b/src/pages/community/Masonry.vue
@@ -154,7 +154,7 @@ const addBatch = async () => {
     });
     getComments({ scope: "moment", page: 0, id: moments[i].id }).then((res) => {
       momentData.comments += res.total;
-      for (let i = 0; i < res.comments.length; i++) {
+      for (let i = 0; i < res.comments?.length; i++) {
         // eslint-disable-next-line no-prototype-builtins
         if (res.comments[i].hasOwnProperty("comments"))
           momentData.comments += res.comments[i].comments;

diff --git a/src/pages/community/MasonryFrame.vue b/src/pages/community/MasonryFrame.vue
@@ -22,17 +22,15 @@ const props = withDefaults(defineProps<Props>(), {
 const page = ref<number>(0); //每往下翻页一次page加1直到没有内容
 
 const isInitialized = ref(false);
-const getPreviews = ref<() => Promise<Moment[]>>();
-if (props.search === "default") {
-  getPreviews.value = async () => {
-    return (
-      await getMomentPreviews({
-        page: page.value++,
-        communityId: uni.getStorageSync(StorageKeys.CommunityId)
-      })
-    ).moments;
-  };
-} else if (props.search === "search") {
+const getPreviews = ref<() => Promise<Moment[]>>(async () => {
+  return (
+    await getMomentPreviews({
+      page: page.value++,
+      communityId: uni.getStorageSync(StorageKeys.CommunityId)
+    })
+  ).moments;
+});
+if (props.search === "search") {
   getPreviews.value = async () => {
     return (
       await searchMomentPreviews({

diff --git a/src/pages/moment/moment.vue b/src/pages/moment/moment.vue
@@ -1,5 +1,5 @@
 <template>
-  <TopBar has-go-back="true">
+  <TopBar :has-go-back="true">
     <template #center>动态详情</template>
   </TopBar>
   <view class="reply-mask" @click="leaveReply()" />
@@ -41,7 +41,7 @@
             :key="index"
             :mode="chooseImageMode(moment.data.photos.length)"
             :src="item"
-            @click="onClickImage(index, moment.data.photos)"
+            @click="onClickImage(String(index), moment.data.photos)"
           />
           <view
             v-if="moment.data.photos.length > 9"
@@ -65,11 +65,11 @@
           {{ moment.likeData.count }} 位喵友觉得很赞
         </view>
       </view>
-      <view v-if="comments.data.length === 0" class="commentNum"> 评论</view>
+      <view v-if="!comments.data.length" class="commentNum"> 评论</view>
       <view v-else class="commentNum">
         评论 {{ comments.data.length + comments.replyNumber }}
       </view>
-      <view v-if="comments.data.length === 0">
+      <view v-if="!comments.data.length">
         <view class="nomore">这里还没有评论，快发布第一条评论吧！</view>
       </view>
       <CommentBox
@@ -83,22 +83,6 @@
         @local-do-like="asyncCommentDoLike(index)"
       />
       <view :style="'padding-bottom:' + wcbHeight.toString() + 'px'"></view>
-      <!--      <view class="out-write-comment-box">-->
-      <!--        <write-comment-box-->
-      <!--          v-model:placeholder-text="placeholderText"-->
-      <!--          :focus="newCommentFocus"-->
-      <!--          :like-data="moment.likeData"-->
-      <!--          :new-comment-req="newCommentReq"-->
-      <!--          @update-text="-->
-      <!--            (newText) => {-->
-      <!--              newCommentReq.text = newText;-->
-      <!--            }-->
-      <!--          "-->
-      <!--          @do-like="asyncDoLike"-->
-      <!--          @after-create-comment="init"-->
-      <!--          @after-blur="afterBlur"-->
-      <!--        />-->
-      <!--      </view>-->
     </view>
   </view>
   <WriteCommentBox
@@ -179,6 +163,7 @@ import Reply from "@/pages/moment/Reply.vue";
 import WriteCommentBox from "@/pages/moment/WriteCommentBox.vue";
 import CommentBox from "@/pages/moment/CommentBox.vue";
 import { Pages } from "@/utils/url";
+import NodeInfo = UniNamespace.NodeInfo;
 
 const props = defineProps<{
   id: string;
@@ -247,10 +232,12 @@ const isShowDeleteDialogue = ref(false);
 
 let catName = ref("");
 
-function onClickCatBox(id: string) {
-  uni.navigateTo({
-    url: `${Pages.Cat}?id=${id}`
-  });
+function onClickCatBox(id?: string) {
+  if (id) {
+    uni.navigateTo({
+      url: `${Pages.Cat}?id=${id}`
+    });
+  }
 }
 
 const getData = async () => {
@@ -298,14 +285,14 @@ const localGetCommentsData = async () => {
     page: page
   }).then((res) => {
     comments.replyNumber = 0;
-    for (let i = 0; i < res.data.length; i++) {
+    for (let i = 0; i < res.data?.length; i++) {
       comments.data.push(res.data[i]);
       comments.likeData.push(res.likeData[i]);
       comments.replyNumber += res.data[i].comments ? res.data[i].comments : 0;
     }
     isCommentsLoaded = true;
     page += 1;
-    if (res.data.length < 10) allCommentsLoaded = true;
+    if (res.data?.length < 10) allCommentsLoaded = true;
   });
 };
 
@@ -418,16 +405,6 @@ const init = async () => {
 
 const wcbHeight = ref(81);
 
-onMounted(() => {
-  const query = uni.createSelectorQuery();
-  const dom = query.select(".out-write-comment-box >>> .write-comment-box");
-  dom
-    .boundingClientRect((data) => {
-      wcbHeight.value = data.height;
-    })
-    .exec();
-});
-
 uni.onKeyboardHeightChange((res) => {
   keyboardHeight.value = res.height;
 });

diff --git a/src/pages/moment/utils.ts b/src/pages/moment/utils.ts
@@ -43,7 +43,7 @@ export const localDoLike = async (req: DoLikeReq) => {
 export const getCommentsData = async (req: GetCommentsReq) => {
   const commentsTemp = (await getComments(req)).comments;
   const likeDataTemp = [];
-  if (commentsTemp.length > 0) {
+  if (commentsTemp?.length > 0) {
     for (let i = 0; i < commentsTemp.length; i++) {
       likeDataTemp.push(
         await getLikeData({

diff --git a/src/pages/post/post.vue b/src/pages/post/post.vue
@@ -63,22 +63,6 @@
         @local-do-like="asyncCommentDoLike(index)"
       />
       <view :style="'padding-bottom:' + wcbHeight.toString() + 'px'"></view>
-      <!--    <view class="out-write-comment-box">-->
-      <!--      <write-comment-box-->
-      <!--        v-model:placeholder-text="placeholderText"-->
-      <!--        :focus="newCommentFocus"-->
-      <!--        :like-data="post.likeData"-->
-      <!--        :new-comment-req="newCommentReq"-->
-      <!--        @update-text="-->
-      <!--          (newText) => {-->
-      <!--            newCommentReq.text = newText;-->
-      <!--          }-->
-      <!--        "-->
-      <!--        @do-like="asyncDoLike"-->
-      <!--        @after-create-comment="init"-->
-      <!--        @after-blur="afterBlur"-->
-      <!--      />-->
-      <!--    </view>-->
     </view>
   </view>
   <write-comment-box
@@ -154,6 +138,7 @@ import { GetCountReq } from "@/apis/like/like-interface";
 import WriteCommentBox from "@/pages/moment/WriteCommentBox.vue";
 import CommentBox from "@/pages/moment/CommentBox.vue";
 import { onClickImage } from "@/pages/post/utils";
+import { Pages } from "@/utils/url";
 
 const props = defineProps<{
   id: string;
@@ -259,14 +244,14 @@ const localGetCommentsData = async () => {
     page: page
   }).then((res) => {
     comments.replyNumber = 0;
-    for (let i = 0; i < res.data.length; i++) {
+    for (let i = 0; i < res.data?.length; i++) {
       comments.data.push(res.data[i]);
       comments.likeData.push(res.likeData[i]);
       comments.replyNumber += res.data[i].comments ? res.data[i].comments : 0;
     }
     isCommentsLoaded = true;
     page += 1;
-    if (res.data.length < 10) allCommentsLoaded = true;
+    if (res.data?.length < 10) allCommentsLoaded = true;
   });
 };
 
@@ -344,7 +329,7 @@ const deleteThisPost = () => {
   }).then(
     () => {
       uni.reLaunch({
-        url: "/pages/world/world"
+        url: Pages.World
       });
     },
     (reason) => {
@@ -374,16 +359,6 @@ const init = async () => {
 
 const wcbHeight = ref(81);
 
-onMounted(() => {
-  const query = uni.createSelectorQuery();
-  const dom = query.select(".out-write-comment-box >>> .write-comment-box");
-  dom
-    .boundingClientRect((data) => {
-      wcbHeight.value = data.height;
-    })
-    .exec();
-});
-
 onLoad(() => {
   init();
 });

diff --git a/src/pages/profile/my-publish/my-masonry.vue b/src/pages/profile/my-publish/my-masonry.vue
@@ -85,6 +85,7 @@ import { displayTime } from "@/utils/time";
 import { onClickMoment } from "./utils";
 import { doLike, getCount, getUserLikes } from "@/apis/like/like";
 import { getComments } from "@/apis/comment/comment";
+import { StorageKeys } from "@/utils/const";
 
 interface Props {
   type?: string;
@@ -157,7 +158,7 @@ const addTile = (tileIndex: number, side: string) => {
 };
 const addBatch = async () => {
   momentsInBatch = [];
-  myUserId.value = uni.getStorageSync("userId");
+  myUserId.value = uni.getStorageSync(StorageKeys.UserId);
   if (props.type === "liked") {
     if (isLikedLoaded.value === false) {
       let targetUser = props.userId;
@@ -170,7 +171,11 @@ const addBatch = async () => {
       ).likes;
       isLikedLoaded.value = true;
     }
+    // 塞入五条消息
     for (let i = 0; i < 5; i++) {
+      if (!LikedList?.length) {
+        continue;
+      }
       await getMomentDetail({
         momentId: LikedList[LikedLoaded].targetId
       })
@@ -193,7 +198,7 @@ const addBatch = async () => {
           getComments({ scope: "moment", page: 0, id: res.moment.id }).then(
             (res2) => {
               momentData.comments += res2.total;
-              for (let i = 0; i < res2.comments.length; i++) {
+              for (let i = 0; i < res2.comments?.length; i++) {
                 momentData.comments += res2.comments[i].comments;
               }
             }
@@ -215,19 +220,19 @@ const addBatch = async () => {
     if (props.type === "my") {
       const res = await getMomentPreviews({
         page: page,
-        communityId: uni.getStorageSync("communityId"),
+        communityId: uni.getStorageSync(StorageKeys.CommunityId),
         onlyUserId: myUserId.value
       });
       moments = res.moments;
     } else {
       const res = await getMomentPreviews({
         page: page,
-        communityId: uni.getStorageSync("communityId"),
+        communityId: uni.getStorageSync(StorageKeys.CommunityId),
         onlyUserId: props.userId
       });
       moments = res.moments;
     }
-    for (let i = 0; i < moments.length; i++) {
+    for (let i = 0; i < moments?.length; i++) {
       let momentData = reactive<MomentData>({
         id: moments[i].id,
         createAt: moments[i].createAt,
@@ -246,7 +251,7 @@ const addBatch = async () => {
       getComments({ scope: "moment", page: 0, id: moments[i].id }).then(
         (res) => {
           momentData.comments += res.total;
-          for (let i = 0; i < res.comments.length; i++) {
+          for (let i = 0; i < res.comments?.length; i++) {
             momentData.comments += res.comments[i].comments;
           }
         }

diff --git a/src/pages/profile/my-publish/my-posts.vue b/src/pages/profile/my-publish/my-posts.vue
@@ -11,7 +11,7 @@
               {{ post.text }}
             </view>
             <view v-if="post.tags" class="tags">
-              <template v-if="post.tags.length > 4">
+              <template v-if="post.tags?.length > 4">
                 <view class="tag">
                   {{ post.tags[0] }}
                 </view>

diff --git a/src/pages/profile/personal-info/personal-info.vue b/src/pages/profile/personal-info/personal-info.vue
@@ -105,7 +105,7 @@ onReady(() => {
   uni.hideLoading();
 });
 onBeforeUnmount(() => {
-  if (!followInfo.followed === followInfo.originFollow) {
+  if (Boolean(followInfo.followed) !== Boolean(followInfo.originFollow)) {
     doLike({
       targetId: userInfo.id,
       targetType: 6