diff --git a/src/apis/like/like-interface.ts b/src/apis/like/like-interface.ts
index ce9a18e8..6328507f 100644
--- a/src/apis/like/like-interface.ts
+++ b/src/apis/like/like-interface.ts
@@ -1,4 +1,4 @@
-import { TargetType } from "@/apis/schemas";
+import { Comment, Moment, Post, TargetType, User } from "@/apis/schemas";
 
 export interface DoLikeReq {
   targetId: string;
@@ -33,18 +33,22 @@ export interface GetCountResp {
   count: number;
 }
 
-export interface GetUserLikesReq {
+export interface GetLikeContentsReq {
   userId?: string;
   targetType: TargetType;
+  lastToken?: string;
+  limit?: number;
+  backward?: boolean;
+  page?: number;
 }
 
-export interface GetUserLikesResp {
+export interface GetLikeContentsResp {
   code: number;
-  likes: Like[];
   msg: string;
-}
-
-export interface Like {
-  associatedId: string;
-  targetId: string;
+  posts: Post[];
+  moments: Moment[];
+  users: User[];
+  comments: Comment[];
+  total: number;
+  token: string;
 }
diff --git a/src/apis/like/like.ts b/src/apis/like/like.ts
index 4df56c4c..d4dd1f48 100644
--- a/src/apis/like/like.ts
+++ b/src/apis/like/like.ts
@@ -5,8 +5,8 @@ import {
   GetCountResp,
   GetUserLikedReq,
   GetUserLikedResp,
-  GetUserLikesReq,
-  GetUserLikesResp
+  GetLikeContentsReq,
+  GetLikeContentsResp
 } from "@/apis/like/like-interface";
 
 /**
@@ -75,22 +75,17 @@ export async function getCount(req: GetCountReq) {
   });
 }
 
-/**
- * @description
- * 获取点赞内容
- * @param req
- */
-export async function getUserLikes(req: GetUserLikesReq) {
-  return await new Promise<GetUserLikesResp>((resolve, reject) => {
+export async function getLikeContents(req: GetLikeContentsReq) {
+  return await new Promise<GetLikeContentsResp>((resolve, reject) => {
     uni.request({
-      url: "/like/get_user_likes",
+      url: "/like/get_user_like_contents",
       data: req,
       method: "GET",
       success(res: UniNamespace.RequestSuccessCallbackResult) {
         if (res.statusCode !== 200) {
           reject(res);
         }
-        const data = res.data as GetUserLikesResp;
+        const data = res.data as GetLikeContentsResp;
         resolve(data);
       }
     });
diff --git a/src/apis/moment/moment.ts b/src/apis/moment/moment.ts
index 87a3b3ad..0ceaa383 100644
--- a/src/apis/moment/moment.ts
+++ b/src/apis/moment/moment.ts
@@ -45,7 +45,6 @@ export async function newMoment(req: NewMomentReq): Promise<NewMomentResp> {
       method: "POST",
       success(res: UniNamespace.RequestSuccessCallbackResult) {
         if (res.statusCode !== 200) {
-          console.log("here", res);
           reject(res);
         }
         const data = res.data as NewMomentResp;
diff --git a/src/apis/plan/plan-interfaces.ts b/src/apis/plan/plan-interfaces.ts
index 8a97dd82..419fd413 100644
--- a/src/apis/plan/plan-interfaces.ts
+++ b/src/apis/plan/plan-interfaces.ts
@@ -1,4 +1,4 @@
-import { Plan, PlanType, User } from "../schemas";
+import { Plan, PlanPreview, PlanType, User } from "../schemas";
 
 export interface DeletePlanReq {
   planId: string;
@@ -70,27 +70,24 @@ export interface GetUserFishResp {
 export interface DonateFishReq {
   fish?: number;
   planId?: string;
-  [property: string]: any;
 }
 
 export interface GetUserDonateCountReq {
   userId?: string;
-  [property: string]: any;
 }
 export interface GetUserDonateCountResp {
-  total: string;
-  [property: string]: any;
+  total: number;
 }
 
 export interface ListDonateByUserReq {
-  limit: 999;
-  page: 0;
-  [property: string]: any;
+  page?: number;
+  lastToken?: string;
+  limit?: number;
+  userId?: string;
 }
 
 export interface ListDonateByUserResp {
   total: number;
   token: string;
-  planPreviews: object;
-  [property: string]: any;
+  planPreviews: PlanPreview[];
 }
diff --git a/src/apis/plan/plan.ts b/src/apis/plan/plan.ts
index 5340be1e..119601ec 100644
--- a/src/apis/plan/plan.ts
+++ b/src/apis/plan/plan.ts
@@ -6,6 +6,7 @@ import {
   GetPlanPreviewsReq,
   GetPlanPreviewsResp,
   GetUserDonateCountReq,
+  GetUserDonateCountResp,
   GetUserFishReq,
   GetUserFishResp,
   ListDonateByUserReq,
@@ -135,7 +136,7 @@ export async function donateFish(req: DonateFishReq) {
 }
 
 export async function getCountDonate(req: GetUserDonateCountReq) {
-  return await new Promise<GetUserDonateCountReq>((resolve, reject) => {
+  return await new Promise<GetUserDonateCountResp>((resolve, reject) => {
     uni.request({
       url: "/plan/count_donate_by_user",
       data: req,
@@ -144,14 +145,14 @@ export async function getCountDonate(req: GetUserDonateCountReq) {
         if (res.statusCode !== 200) {
           reject(res);
         }
-        const data = res.data as GetUserDonateCountReq;
+        const data = res.data as GetUserDonateCountResp;
         resolve(data);
       }
     });
   });
 }
 
-export async function list_donate_by_user(req: ListDonateByUserReq) {
+export async function ListDonateByUser(req: ListDonateByUserReq) {
   return await new Promise<ListDonateByUserResp>((resolve, reject) => {
     uni.request({
       url: "/plan/list_donate_by_user",
diff --git a/src/apis/schemas.ts b/src/apis/schemas.ts
index a6f3ceaf..a129cc4e 100644
--- a/src/apis/schemas.ts
+++ b/src/apis/schemas.ts
@@ -17,11 +17,10 @@ export interface User {
   id: string;
   nickname: string;
   avatarUrl: string;
-  motto: string;
-  article: number;
-  follower: number;
-  following: number;
-  enableDebug?: boolean;
+  motto?: string;
+  article?: number;
+  follower?: number;
+  following?: number;
 }
 
 export interface Auth {
@@ -178,13 +177,13 @@ export interface Plan {
   summary: string;
   [property: string]: any;
 }
-export interface planpreviews {
+export interface PlanPreview {
   id: string;
   name: string;
   catName: string;
   donateNum: number;
   donateTime: number;
-  [property: string]: any;
+  coverUrl: string;
 }
 export const enum TargetType {
   Post = 1,
diff --git a/src/components/BottomBar/BottomBarContent.vue b/src/components/BottomBar/BottomBarContent.vue
index 07a3f0a3..e3901945 100644
--- a/src/components/BottomBar/BottomBarContent.vue
+++ b/src/components/BottomBar/BottomBarContent.vue
@@ -101,7 +101,6 @@ const tabChange = (path: string) => {
   left: 0;
   bottom: 0;
   width: 100%;
-  z-index: 200;
   background: #fdfdfd;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
   height: 18vw;
diff --git a/src/components/SchoolSelectBar.vue b/src/components/SchoolSelectBar.vue
index f34dd245..5be2373c 100644
--- a/src/components/SchoolSelectBar.vue
+++ b/src/components/SchoolSelectBar.vue
@@ -14,8 +14,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
-import { Icons } from "@/utils/url";
-import { onClickSwitch } from "@/pages/community/utils";
+import { Icons, Pages } from "@/utils/url";
 import { listCommunity } from "@/apis/community/community";
 import { StorageKeys } from "@/utils/const";
 import { Community } from "@/apis/schemas";
@@ -55,6 +54,12 @@ async function getCampus() {
   }
 }
 
+const onClickSwitch = () => {
+  uni.navigateTo({
+    url: Pages.SchoolSelect
+  });
+};
+
 getCampus();
 </script>
 
diff --git a/src/pages/community/Carousel.vue b/src/pages/community/Carousel.vue
index 266967a1..186554b2 100644
--- a/src/pages/community/Carousel.vue
+++ b/src/pages/community/Carousel.vue
@@ -25,7 +25,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
 import { News } from "@/apis/schemas";
-import { onClickCarousel } from "@/pages/community/utils";
+import { onClickCarousel } from "@/pages/community/event";
 
 const props = defineProps<{
   contents: News[];
diff --git a/src/pages/community/Masonry.vue b/src/pages/community/Masonry.vue
index 880cd024..e2b71b2d 100644
--- a/src/pages/community/Masonry.vue
+++ b/src/pages/community/Masonry.vue
@@ -30,9 +30,7 @@
           </view>
 
           <view class="tile-info">
-            <view class="title">
-              {{ moment.title }}
-            </view>
+            <view class="title">{{ moment.title }}</view>
             <view class="other-info">
               <view class="user-info">
                 <template v-if="moment.user">
@@ -62,16 +60,17 @@
       </template>
     </view>
   </view>
-  <view v-if="isNoData" class="no-cat-here-frame">
-    <image :src="Pictures.NoCatHere" class="no-cat-here" />
+  <view v-if="isNoData">
+    <view class="no-cat-here-frame">
+      <image :src="Pictures.NoCatHere" class="no-cat-here" />
+    </view>
   </view>
-  <view v-else class="blue-background" />
 </template>
 
 <script lang="ts" setup>
 import { getCurrentInstance, onBeforeMount, reactive, ref } from "vue";
 import { Moment } from "@/apis/schemas";
-import { onClickMoment } from "@/pages/community/utils";
+import { onClickMoment } from "@/pages/community/event";
 import { onReachBottom } from "@dcloudio/uni-app";
 import { displayTime } from "@/utils/time";
 import { Pictures } from "@/utils/url";
@@ -355,7 +354,7 @@ $avatarWidth: calc(21 / 390 * 100vw);
 
 .no-cat-here-frame {
   width: 100vw;
-  margin-top: 20vh;
+  margin-top: 50rpx;
   display: flex;
   justify-content: center;
 
diff --git a/src/pages/community/MasonryFrame.vue b/src/pages/community/MasonryFrame.vue
deleted file mode 100644
index fd9195be..00000000
--- a/src/pages/community/MasonryFrame.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <Masonry v-if="isInitialized" :get-previews="getPreviews"></Masonry>
-</template>
-
-<script lang="ts" setup>
-import Masonry from "@/pages/community/Masonry.vue";
-import { getMomentPreviews } from "@/apis/moment/moment";
-import { ref } from "vue";
-import { StorageKeys } from "@/utils/const";
-import { GetMomentPreviewsReq } from "@/apis/moment/moment-components";
-import { getPrefetchData, PrefetchResp } from "@/apis/prefetch";
-
-interface Props {
-  keyword?: string;
-}
-const props = defineProps<Props>();
-
-let lastToken: string; // 每次记录上个token
-
-const isInitialized = ref(false);
-const communityId = uni.getStorageSync(StorageKeys.CommunityId);
-
-const fetch = async () => {
-  const req: GetMomentPreviewsReq = {
-    communityId: communityId
-  };
-  if (lastToken) {
-    req.lastToken = lastToken;
-  }
-  if (props.keyword) {
-    req.keyword = props.keyword;
-  }
-  const res = await getMomentPreviews(req);
-  lastToken = res.token;
-  return res.moments;
-};
-
-const getPreviews = async () => {
-  if (lastToken || props.keyword) {
-    return fetch();
-  }
-  let res: PrefetchResp;
-  try {
-    res = await getPrefetchData({ communityId: communityId });
-  } catch (reason) {
-    return fetch();
-  }
-  if (!res.firstMomentPreviewsResp?.moments) {
-    return fetch();
-  }
-  lastToken = res.firstMomentPreviewsResp.token;
-  const moments = res.firstMomentPreviewsResp.moments;
-  res.firstMomentPreviewsResp = undefined;
-  return moments;
-};
-
-isInitialized.value = true;
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/pages/community/community.vue b/src/pages/community/community.vue
index 9233c183..157e3bc0 100644
--- a/src/pages/community/community.vue
+++ b/src/pages/community/community.vue
@@ -28,7 +28,7 @@
     <view style="height: 4vw"></view>
 
     <view v-if="!isRefreshing">
-      <MasonryFrame></MasonryFrame>
+      <Masonry :get-previews="buildLoader()"></Masonry>
     </view>
 
     <view style="height: 18vw"></view>
@@ -53,7 +53,6 @@ import BottomBar from "@/components/BottomBar.vue";
 import { nextTick, reactive, ref } from "vue";
 import TopBar from "@/components/TopBar.vue";
 import SchoolSelectBar from "@/components/SchoolSelectBar.vue";
-import MasonryFrame from "@/pages/community/MasonryFrame.vue";
 import Cards from "@/pages/community/cards/cards.vue";
 import CarouselFrame from "@/pages/community/CarouselFrame.vue";
 import { onLoad, onPullDownRefresh, onReady, onShow } from "@dcloudio/uni-app";
@@ -61,6 +60,8 @@ import { StorageKeys } from "@/utils/const";
 import { needChooseCommunity } from "@/utils/init";
 import { Pages } from "@/utils/url";
 import ToastBoxWithShadow from "@/components/ToastBoxWithShadow.vue";
+import { buildLoader } from "@/pages/community/utils";
+import Masonry from "@/pages/community/Masonry.vue";
 const communityId = ref(uni.getStorageSync(StorageKeys.CommunityId));
 const cardList = reactive(["", "", "", "", "", ""]);
 
diff --git a/src/pages/community/event.ts b/src/pages/community/event.ts
index aa8f59bc..7f6d964e 100644
--- a/src/pages/community/event.ts
+++ b/src/pages/community/event.ts
@@ -1,7 +1,26 @@
 import { Pages } from "@/utils/url";
+import { News } from "@/apis/schemas";
 
 export function onClickMessage() {
   uni.navigateTo({
     url: Pages.Message
   });
 }
+
+export function onClickCarousel(c: News) {
+  if (c.type === "inner") {
+    uni.navigateTo({
+      url: c.linkUrl
+    });
+  } else if (c.type === "article") {
+    uni.navigateTo({
+      url: `${Pages.WebView}?url=${c.linkUrl}`
+    });
+  }
+}
+
+export function onClickMoment(id: string) {
+  uni.navigateTo({
+    url: `${Pages.Moment}?id=${id}`
+  });
+}
diff --git a/src/pages/community/utils.ts b/src/pages/community/utils.ts
index e54eff57..e6ae2117 100644
--- a/src/pages/community/utils.ts
+++ b/src/pages/community/utils.ts
@@ -1,26 +1,43 @@
-import { News } from "@/apis/schemas";
-import { Pages } from "@/utils/url";
+import { getMomentPreviews } from "@/apis/moment/moment";
+import { StorageKeys } from "@/utils/const";
+import { GetMomentPreviewsReq } from "@/apis/moment/moment-components";
+import { getPrefetchData, PrefetchResp } from "@/apis/prefetch";
 
-export function onClickCarousel(c: News) {
-  if (c.type === "inner") {
-    uni.navigateTo({
-      url: c.linkUrl
-    });
-  } else if (c.type === "article") {
-    uni.navigateTo({
-      url: `${Pages.WebView}?url=${c.linkUrl}`
-    });
-  }
-}
+export function buildLoader(keyword?: string) {
+  let lastToken: string; // 每次记录上个token
+  const communityId = uni.getStorageSync(StorageKeys.CommunityId);
 
-export function onClickMoment(id: string) {
-  uni.navigateTo({
-    url: `${Pages.Moment}?id=${id}`
-  });
-}
+  const fetch = async (keyword?: string) => {
+    const req: GetMomentPreviewsReq = {
+      communityId: communityId
+    };
+    if (lastToken) {
+      req.lastToken = lastToken;
+    }
+    if (keyword) {
+      req.keyword = keyword;
+    }
+    const res = await getMomentPreviews(req);
+    lastToken = res.token;
+    return res.moments;
+  };
 
-export function onClickSwitch() {
-  uni.navigateTo({
-    url: Pages.SchoolSelect
-  });
+  return async () => {
+    if (lastToken || keyword) {
+      return fetch();
+    }
+    let res: PrefetchResp;
+    try {
+      res = await getPrefetchData({ communityId: communityId });
+    } catch (reason) {
+      return fetch();
+    }
+    if (!res.firstMomentPreviewsResp?.moments) {
+      return fetch();
+    }
+    lastToken = res.firstMomentPreviewsResp.token;
+    const moments = res.firstMomentPreviewsResp.moments;
+    res.firstMomentPreviewsResp = undefined;
+    return moments;
+  };
 }
diff --git a/src/pages/plan/GoToMyPlans.vue b/src/pages/plan/GoToMyPlans.vue
index 5976a630..f4f0fcf8 100644
--- a/src/pages/plan/GoToMyPlans.vue
+++ b/src/pages/plan/GoToMyPlans.vue
@@ -7,14 +7,14 @@
 </template>
 
 <script setup lang="ts">
-import { Icons } from "@/utils/url";
+import { Icons, Pages } from "@/utils/url";
 import { ref } from "vue";
 const goToHelpedPlans = () => {
   uni.navigateTo({
-    url: "/pages/plan/helped-plans/helped-plans"
+    url: Pages.HelpedPlans
   });
 };
-import { getCountDonate, getUserFish } from "@/apis/plan/plan";
+import { getCountDonate } from "@/apis/plan/plan";
 const donateNum = ref(0);
 const getDonateCount = async () => {
   const data = await getCountDonate({});
diff --git a/src/pages/plan/PlanEntry.vue b/src/pages/plan/PlanEntry.vue
index e0e7dec1..cc53045c 100644
--- a/src/pages/plan/PlanEntry.vue
+++ b/src/pages/plan/PlanEntry.vue
@@ -43,16 +43,13 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
-import { Plan, PlanType } from "@/apis/schemas";
+import { Plan } from "@/apis/schemas";
 import { Icons } from "@/utils/url";
 import { planTypeMap, onClickPlan } from "@/pages/plan/utils";
-import BackgroundImage from "@/components/BackgroundImage.vue";
 
 const props = defineProps<{
   plan: Plan;
 }>();
-console.log(props.plan);
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/plan/helped-plans/HelpedCard.vue b/src/pages/plan/helped-plans/HelpedCard.vue
index b28070ba..224328ae 100644
--- a/src/pages/plan/helped-plans/HelpedCard.vue
+++ b/src/pages/plan/helped-plans/HelpedCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="card">
+  <view class="card" @click="onClick">
     <img :src="props.plan.coverUrl" class="image-cat" />
 
     <p class="title">
@@ -8,21 +8,26 @@
     </p>
     <p class="date">{{ displayTime(props.plan.donateTime) }}</p>
 
-    <div class="fish-count">
+    <view class="fish-count">
       <img :src="Icons.LittleFish" class="image-fish" />
       <p class="count">×{{ props.plan.donateNum }}</p>
-    </div>
-  </div>
+    </view>
+  </view>
 </template>
 
 <script setup lang="ts">
-import { Icons } from "@/utils/url";
-import { planpreviews } from "@/apis/schemas";
-import { displayTime } from "../../../utils/time";
+import { Icons, Pages } from "@/utils/url";
+import { PlanPreview } from "@/apis/schemas";
+import { displayTime } from "@/utils/time";
+
 const props = defineProps<{
-  plan: planpreviews;
+  plan: PlanPreview;
 }>();
-console.log(props.plan);
+const onClick = () => {
+  uni.navigateTo({
+    url: `${Pages.PlanDetails}?id=${props.plan.id}`
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/plan/helped-plans/helped-plans.vue b/src/pages/plan/helped-plans/helped-plans.vue
index df486c3f..883cc9ce 100644
--- a/src/pages/plan/helped-plans/helped-plans.vue
+++ b/src/pages/plan/helped-plans/helped-plans.vue
@@ -27,19 +27,22 @@
 import TopBar from "@/components/TopBar.vue";
 import HelpedCard from "@/pages/plan/helped-plans/HelpedCard.vue";
 //到时候background的min高度还要修
-import { list_donate_by_user } from "@/apis/plan/plan";
+import { ListDonateByUser } from "@/apis/plan/plan";
 import { ref } from "vue";
-import { planpreviews } from "@/apis/schemas";
+import { PlanPreview } from "@/apis/schemas";
 import { navBarHeight } from "@/utils/style";
+import { ListDonateByUserReq } from "@/apis/plan/plan-interfaces";
+import { onReachBottom } from "@dcloudio/uni-app";
 const styleStr = `min-height: calc(100vh - ${navBarHeight}px)`;
-console.log(styleStr);
-const plansRight = ref<planpreviews[]>([]);
-const plansLeft = ref<planpreviews[]>([]);
-const ListDonateByUser = async () => {
-  const res = await list_donate_by_user({
-    limit: 999,
-    page: 0
-  });
+const plansRight = ref<PlanPreview[]>([]);
+const plansLeft = ref<PlanPreview[]>([]);
+let page = 0;
+const load = async () => {
+  const req: ListDonateByUserReq = {
+    page
+  };
+  page++;
+  const res = await ListDonateByUser(req);
   for (let i = 0; i < res?.total; i = i + 2) {
     plansLeft.value.push(res.planPreviews[i]);
   }
@@ -47,7 +50,11 @@ const ListDonateByUser = async () => {
     plansRight.value.push(res.planPreviews[i]);
   }
 };
-ListDonateByUser();
+load();
+
+onReachBottom(() => {
+  load();
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/plan/plan-details/Cards.vue b/src/pages/plan/plan-details/Cards.vue
index 4588b7c4..44516b7b 100644
--- a/src/pages/plan/plan-details/Cards.vue
+++ b/src/pages/plan/plan-details/Cards.vue
@@ -32,9 +32,8 @@
     </div>
 
     <view class="time"
-      >募集时间： {{ displayTime(props.plan.startTime) }}-{{
-        displayTime(props.plan.endTime)
-      }}</view
+      >募集时间： {{ displayDate(props.plan.startTime) }} ~
+      {{ displayDate(props.plan.endTime) }}</view
     >
 
     <div class="dialog-box">
@@ -72,14 +71,12 @@
       >
     </view>
     <text class="card3-details">{{ plan.instruction }}</text>
-    <!--    <br />-->
-    <!--    <text class="card3-details">执行时间：{{ executionDetails.time }}</text>-->
-    <!--    <br />-->
-    <!--    <text class="card3-details">执行地点：{{ executionDetails.location }}</text>-->
-    <!--    <br />-->
-    <!--    <text class="card3-details">执行人员：{{ executionDetails.executor }}</text>-->
   </div>
-  <template v-if="props.plan.planState === PlanState.StateComplete">
+  <template
+    v-if="
+      props.plan.planState === PlanState.StateComplete && props.plan.imageUrls
+    "
+  >
     <div class="card4">
       <view>
         <text class="card4-title">任务返图</text>
@@ -92,37 +89,30 @@
       </view>
 
       <div class="pic-example">
-        <template v-if="props.plan.imageUrls !== null">
-          <img
-            :src="props.plan.imageUrls[nowPicIndex]"
-            class="task-pic"
-            @click="
-              onClickImage(
-                props.plan.imageUrls[nowPicIndex],
-                props.plan.imageUrls
-              )
-            "
-          />
-          <img
-            :src="Icons.Pic_Left"
-            class="pic-left"
-            @click="
-              nowPicIndex =
-                (nowPicIndex - 1 + props.plan.imageUrls.length) %
-                props.plan.imageUrls.length
-            "
-          />
-          <img
-            :src="Icons.Pic_Right"
-            class="pic-right"
-            @click="
-              nowPicIndex = (nowPicIndex + 1) % props.plan.imageUrls.length
-            "
-          />
-        </template>
-        <template v-else>
-          <img :src="Icons.Task_Pic" class="task-pic" />
-        </template>
+        <img
+          :src="props.plan.imageUrls[nowPicIndex]"
+          class="task-pic"
+          @click="
+            onClickImage(
+              props.plan.imageUrls[nowPicIndex],
+              props.plan.imageUrls
+            )
+          "
+        />
+        <img
+          :src="Icons.Pic_Left"
+          class="pic-left"
+          @click="
+            nowPicIndex =
+              (nowPicIndex - 1 + props.plan.imageUrls.length) %
+              props.plan.imageUrls.length
+          "
+        />
+        <img
+          :src="Icons.Pic_Right"
+          class="pic-right"
+          @click="nowPicIndex = (nowPicIndex + 1) % props.plan.imageUrls.length"
+        />
       </div>
     </div>
   </template>
@@ -150,40 +140,12 @@ import { Icons } from "@/utils/url";
 import { planTypeMap, planStateMap } from "@/pages/plan/utils";
 import { reactive, ref } from "vue";
 import { onClickImage } from "@/components/utils";
-import { displayTime } from "@/utils/time";
+import { displayDate, displayTime } from "@/utils/time";
 const props = defineProps<{
   plan: Plan;
 }>();
-console.log(props);
-
-const executionDetails = ref<{
-  time: string;
-  location: string;
-  executor: string;
-}>({
-  time: "1",
-  location: "2",
-  executor: "3"
-});
-
-const executionParse = (str: string) => {
-  const words = str.split("\n");
-  if (words.length === 3) {
-    executionDetails.value = {
-      time: words[0],
-      location: words[1],
-      executor: words[2]
-    };
-  }
-};
-
-const init = () => {
-  executionParse(props.plan.instruction);
-};
 
 const nowPicIndex = ref<number>(0);
-
-init();
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/plan/plan-details/plan-details.vue b/src/pages/plan/plan-details/plan-details.vue
index 70b1892e..bbed7abb 100644
--- a/src/pages/plan/plan-details/plan-details.vue
+++ b/src/pages/plan/plan-details/plan-details.vue
@@ -1,17 +1,17 @@
 <template>
-  <template v-if="!isRefreshing">
+  <template v-if="!isRefreshing && plan">
     <BackgroundImage
-      :url="plan?.coverUrl"
-      :urls="[plan?.coverUrl]"
+      :url="plan.coverUrl"
+      :urls="[plan.coverUrl]"
     ></BackgroundImage>
     <BackButton></BackButton>
     <view class="background">
-      <template v-if="isInited">
+      <template v-if="isInited && plan">
         <Cards :plan="plan"></Cards>
       </template>
       <view style="height: 20vw"></view>
     </view>
-    <template v-if="showDonatePanel">
+    <template v-if="showDonatePanel && plan">
       <DonatePanel
         :plan="plan"
         :my-fish="myFish"
@@ -37,7 +37,7 @@
       @close="closeToastBox"
     ></ToastBoxWithShadow>
   </template>
-  <template v-if="plan.maxFish > plan.nowFish">
+  <template v-if="plan?.maxFish > plan?.nowFish">
     <BottomBar @on-help-click="clickDonateButton"></BottomBar>
   </template>
 </template>
diff --git a/src/pages/plan/plan.vue b/src/pages/plan/plan.vue
index 791588a4..0440f104 100644
--- a/src/pages/plan/plan.vue
+++ b/src/pages/plan/plan.vue
@@ -8,26 +8,25 @@
         <image :src="Icons.Plan_Logo" class="plan-logo"></image>
       </template>
     </TopBar>
-    <template v-if="!isRefreshing">
-      <view
-        style="
-          display: flex;
-          z-index: 100;
-          padding-left: 2.5vw;
-          position: fixed;
-          width: 100vw;
-          height: 16vw;
-          align-items: center;
-          background-color: #f4f9ff;
-        "
-      >
-        <GoToMyPlans></GoToMyPlans>
-        <FishAmount></FishAmount>
-      </view>
-      <view style="height: 16vw"></view>
-      <PlanEntries></PlanEntries>
-      <view style="height: 20vw"></view>
-    </template>
+    <view
+      v-if="showHeader"
+      style="
+        display: flex;
+        z-index: 100;
+        padding-left: 2.5vw;
+        position: fixed;
+        width: 100vw;
+        height: 16vw;
+        align-items: center;
+        background-color: #f4f9ff;
+      "
+    >
+      <GoToMyPlans></GoToMyPlans>
+      <FishAmount></FishAmount>
+    </view>
+    <view style="height: 16vw"></view>
+    <PlanEntries v-if="showContent"></PlanEntries>
+    <view style="height: 20vw"></view>
   </view>
 
   <BottomBar id="plan"></BottomBar>
@@ -40,19 +39,22 @@ import TopBar from "@/components/TopBar.vue";
 
 import FishAmount from "@/pages/plan/FishAmount.vue";
 import PlanEntries from "@/pages/plan/PlanEntries.vue";
-import { nextTick, ref } from "vue";
-import { onPullDownRefresh } from "@dcloudio/uni-app";
+import { ref } from "vue";
+import { onPullDownRefresh, onShow } from "@dcloudio/uni-app";
 import { Icons } from "@/utils/url";
+import { refresh } from "@/utils/utils";
+
+const showHeader = ref(false);
+const showContent = ref(false);
+
+refresh(showContent);
+
+onShow(() => {
+  refresh(showHeader);
+});
 
-const isRefreshing = ref(false);
-function pageRefresh() {
-  isRefreshing.value = true;
-  nextTick(() => {
-    isRefreshing.value = false;
-  });
-}
 onPullDownRefresh(() => {
-  pageRefresh();
+  refresh(showContent);
   uni.stopPullDownRefresh();
 });
 </script>
diff --git a/src/pages/profile/my-publish/my-masonry.vue b/src/pages/profile/my-publish/my-masonry.vue
deleted file mode 100644
index 995bb147..00000000
--- a/src/pages/profile/my-publish/my-masonry.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-  <view class="masonry">
-    <view
-      v-for="i in 2"
-      :key="i"
-      :class="i === 1 ? 'column-left' : 'column-right'"
-    >
-      <template
-        v-for="moment in i === 1 ? leftMoments : rightMoments"
-        :key="moment.id"
-      >
-        <view class="tile" @click="onClickMoment(moment.id)">
-          <view class="img-frame">
-            <image
-              v-if="i === 1"
-              :src="moment.photos[0]"
-              class="img"
-              mode="widthFix"
-              @load.once="onLoadLeft"
-            />
-            <image
-              v-else
-              :src="moment.photos[0]"
-              class="img"
-              mode="widthFix"
-              @load.once="onLoadRight"
-            />
-          </view>
-
-          <view class="tile-info">
-            <view class="info">
-              <view class="title">{{ moment.title }}</view>
-              <view v-if="moment.user.id === myUserId && myUserId">
-                <view class="delete" @click.stop="onClickDelete(moment.id)">
-                  <image class="deletepic" src="/static/images/delete.png" />
-                </view>
-              </view>
-            </view>
-            <view class="other-info">
-              <view class="user-info">
-                <image :src="moment.user.avatarUrl" class="avatar" />
-                <view class="username font-md">
-                  {{ moment.user.nickname }}
-                </view>
-              </view>
-              <view class="time font-sm">
-                {{ displayTime(moment.createAt) }}
-              </view>
-            </view>
-            <view class="other-info">
-              <view v-if="moment.likeCount" class="font-sm"
-                >{{ moment.likeCount }}位喵友觉得很赞
-              </view>
-              <view v-if="moment.commentCount" class="comment font-sm"
-                >{{ moment.commentCount }}条回复</view
-              >
-            </view>
-          </view>
-        </view>
-      </template>
-    </view>
-  </view>
-  <view style="width: 100%; height: 40rpx"></view>
-  <view v-if="!leftMoments.length && !rightMoments.length" class="nomore">
-    <image :src="Pictures.NoMore" style="width: 200rpx; height: 186rpx" />
-  </view>
-  <view style="width: 100%; height: 200rpx"></view>
-</template>
-
-<script lang="ts" setup>
-import { getCurrentInstance, onBeforeMount, reactive, ref } from "vue";
-import {
-  deleteMoment,
-  getMomentDetail,
-  getMomentPreviews
-} from "@/apis/moment/moment";
-import { DeleteMomentReq } from "@/apis/moment/moment-components";
-import { Like } from "@/apis/like/like-interface";
-import { Moment } from "@/apis/schemas";
-import { onReachBottom } from "@dcloudio/uni-app";
-import { displayTime } from "@/utils/time";
-import { onClickMoment } from "./utils";
-import { doLike, getUserLikes } from "@/apis/like/like";
-import { StorageKeys } from "@/utils/const";
-import { Pictures } from "@/utils/url";
-
-interface Props {
-  type?: string;
-  userId?: string;
-  likeType?: string;
-}
-
-const props = defineProps<Props>();
-const deleteID = reactive<DeleteMomentReq>({ momentId: "" });
-const isNoData = ref(true);
-const isLikedLoaded = ref(false);
-let LikedLoaded = 0;
-let LikedList = reactive<Like[]>([]);
-let momentsInBatch: Moment[];
-let moments: Moment[];
-const leftMoments = reactive<Moment[]>([]);
-const rightMoments = reactive<Moment[]>([]);
-const myUserId = ref("");
-let leftHeight = 0;
-let rightHeight = 0;
-const isLeftTallerThanRight = () => {
-  return leftHeight > rightHeight;
-};
-let indexInBatch = 0;
-let batchLength: number;
-let batchFirstPartLength: number;
-const batchSecondPartDefaultLength = 4;
-let isNoMoreMoments = false;
-let loadedAmount = 0;
-let isBatchLoading = false;
-let page = 0; //每往下翻页一次page加1直到没有内容
-const instance = getCurrentInstance();
-const query = uni.createSelectorQuery().in(instance);
-let imgWidth = 160;
-let isFirstLoadImg = true;
-onReachBottom(() => {
-  if (!isBatchLoading && !isNoMoreMoments) {
-    isBatchLoading = true;
-    addBatch();
-  }
-});
-const onLoad = () => {
-  loadedAmount += 1;
-  // 加完上一步后，表示已经加载好了这一batch中多少moment的图片
-  // 所以对于没有firstPart而直接开始onLoad的，要预先讲loadedAmount设为-1，才能使得这里加完是0
-  if (loadedAmount >= batchFirstPartLength) {
-    if (loadedAmount < batchLength) {
-      addTile(indexInBatch, "either");
-      indexInBatch += 1;
-    } else {
-      loadedAmount = 0;
-      indexInBatch = 0;
-      isBatchLoading = false;
-    }
-  }
-};
-const addTile = (tileIndex: number, side: string) => {
-  const tile = momentsInBatch[tileIndex];
-  if (side === "left") {
-    leftMoments.push(tile);
-  } else if (side === "right") {
-    rightMoments.push(tile);
-  } else if (side === "either") {
-    if (isLeftTallerThanRight()) {
-      rightMoments.push(tile);
-    } else {
-      leftMoments.push(tile);
-    }
-  }
-};
-const addBatch = async () => {
-  momentsInBatch = [];
-  myUserId.value = uni.getStorageSync(StorageKeys.UserId);
-  if (props.type === "liked") {
-    if (isLikedLoaded.value === false) {
-      let targetUser = props.userId;
-      if (targetUser === undefined) targetUser = myUserId.value;
-      LikedList = (
-        await getUserLikes({
-          userId: targetUser,
-          targetType: 4
-        })
-      ).likes;
-      isLikedLoaded.value = true;
-    }
-    // 塞入五条消息
-    for (let i = 0; i < 5; i++) {
-      if (!LikedList?.length || !LikedList[LikedLoaded]?.targetId) {
-        continue;
-      }
-      await getMomentDetail({
-        momentId: LikedList[LikedLoaded].targetId
-      }).then((res) => {
-        let moment = reactive<Moment>(res.moment);
-        momentsInBatch.push(moment);
-        LikedLoaded++;
-      });
-      if (LikedLoaded >= LikedList.length) break;
-    }
-  } else {
-    if (props.type === "my") {
-      const res = await getMomentPreviews({
-        page: page,
-        communityId: uni.getStorageSync(StorageKeys.CommunityId),
-        onlyUserId: myUserId.value
-      });
-      moments = res.moments;
-    } else {
-      const res = await getMomentPreviews({
-        page: page,
-        communityId: uni.getStorageSync(StorageKeys.CommunityId),
-        onlyUserId: props.userId
-      });
-      moments = res.moments;
-    }
-    for (const moment of moments) {
-      let momentData = reactive<Moment>(moment);
-      momentsInBatch.push(momentData);
-    }
-  }
-
-  if (momentsInBatch.length > 0) {
-    isNoData.value = false;
-    page += 1;
-    batchLength = momentsInBatch.length;
-    if (batchSecondPartDefaultLength < batchLength) {
-      batchFirstPartLength = batchLength - batchSecondPartDefaultLength;
-      // batchSecondPartLength = batchSecondPartDefaultLength;
-      if (batchFirstPartLength % 2 !== 0) {
-        batchFirstPartLength -= 1;
-        // batchSecondPartLength += 1;
-      }
-      if (batchFirstPartLength > 0) {
-        for (let i = 0; i < batchFirstPartLength / 2; i++) {
-          addTile(indexInBatch, "left");
-          indexInBatch += 1;
-          addTile(indexInBatch, "right");
-          indexInBatch += 1;
-        }
-      } else {
-        loadedAmount = -1;
-        onLoad();
-      }
-    } else {
-      batchFirstPartLength = 0;
-      // batchSecondPartLength = batchLength;
-      loadedAmount = -1;
-      onLoad();
-    }
-  } else {
-    isNoMoreMoments = true;
-    isBatchLoading = false;
-  }
-};
-const onLoadLeft = (ev: Event) => {
-  const target = ev.target as HTMLImageElement;
-  if (isFirstLoadImg) {
-    isFirstLoadImg = false;
-    query.select(".img").boundingClientRect();
-    query.exec((res: any) => {
-      if (res.length != 0) {
-        imgWidth = res[0].width;
-      }
-    });
-  }
-  let height = (target.height / target.width) * imgWidth;
-  leftHeight = target.offsetTop + height;
-  onLoad();
-};
-const onLoadRight = (ev: Event) => {
-  const target = ev.target as HTMLImageElement;
-  if (isFirstLoadImg) {
-    isFirstLoadImg = false;
-    query.select(".img").boundingClientRect();
-    query.exec((res: any) => {
-      if (res.length != 0) {
-        imgWidth = res[0].width;
-      }
-    });
-  }
-  let height = (target.height / target.width) * imgWidth;
-  rightHeight = target.offsetTop + height;
-  onLoad();
-};
-onBeforeMount(() => {
-  isBatchLoading = true;
-  addBatch();
-});
-
-async function onClickDelete(id: string) {
-  deleteID.momentId = id;
-  uni.showModal({
-    title: "确认删除",
-    content: "是否删除该动态",
-    success: function (res) {
-      if (res.confirm) {
-        deleteMoment(deleteID).then((res) => {
-          uni.showToast({
-            title: res.msg
-          });
-        });
-        uni.reLaunch({
-          url: "/pages/profile/my-publish/my-publish?id=${userInfo.id}"
-        });
-      }
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-$sideMargin: calc(12 / 390 * 100vw);
-$horizontalGap: calc(8 / 390 * 100vw);
-$verticalGap: calc(10 / 390 * 100vw);
-$radius: calc(6 / 390 * 100vw);
-$titleFontSize: calc(12 / 390 * 100vw);
-$smallFontSize: calc(8 / 390 * 100vw);
-$avatarWidth: calc(21 / 390 * 100vw);
-@import "@/common/user-info.scss";
-.masonry {
-  background-color: #ffff;
-  display: flex;
-}
-
-.column-left {
-  width: calc(50vw - $sideMargin - $horizontalGap / 2);
-  margin-left: $sideMargin;
-  margin-right: calc($horizontalGap / 2);
-  height: fit-content;
-}
-
-.column-right {
-  width: calc(50vw - $sideMargin - $horizontalGap / 2);
-  margin-left: calc($horizontalGap / 2);
-  margin-right: $sideMargin;
-  height: fit-content;
-}
-
-.tile {
-  margin-bottom: calc($verticalGap - 2px);
-  box-shadow: 0 0 5px -1px rgba(0, 0, 0, 0.25);
-  border-radius: $radius;
-  font-family: sans-serif;
-
-  .img-frame {
-    max-height: calc((50vw - $sideMargin - $horizontalGap / 2) * 1.8);
-    overflow: hidden;
-
-    .img {
-      width: calc(50vw - $sideMargin - $horizontalGap / 2);
-      display: block;
-      border-radius: $radius $radius 0 0;
-      height: 1px;
-    }
-  }
-
-  .tile-info {
-    transform: translateY(-2px);
-    background-color: #ffffff;
-    border-radius: 0 0 $radius $radius;
-    font-size: $smallFontSize;
-    color: #696969;
-    font-weight: 500;
-    padding: calc(4 / 390 * 100vw) calc(12 / 390 * 100vw) calc(6 / 390 * 100vw);
-
-    .info {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .title {
-        font-size: 30rpx;
-        color: #000000;
-        line-height: calc ($titleFontSize * 1.5);
-        margin-top: calc(5 / 390 * 100vw);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      .delete {
-        display: flex;
-        align-items: center;
-
-        .deletepic {
-          height: 20rpx;
-          width: 20rpx;
-          margin-top: 15rpx;
-          margin-left: 50rpx;
-          margin-right: 10rpx;
-          float: left;
-        }
-      }
-    }
-
-    .other-info {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      color: #b8b8b8;
-
-      .time {
-        font-size: calc(6 / 390 * 150vw);
-        color: #939393;
-      }
-    }
-  }
-}
-
-.username {
-  max-width: calc(60 / 390 * 100vw);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.get-dom {
-  width: 1px;
-  height: 1px;
-}
-
-.nomore {
-  margin-top: 10rpx;
-  line-height: 20rpx;
-  text-align: center;
-}
-</style>
diff --git a/src/pages/profile/my-publish/my-posts.vue b/src/pages/profile/my-publish/my-posts.vue
index de2de0c8..1aab065d 100644
--- a/src/pages/profile/my-publish/my-posts.vue
+++ b/src/pages/profile/my-publish/my-posts.vue
@@ -47,35 +47,26 @@
           <view v-if="post.likes" class="font-sm"
             >{{ post.likes }}位喵友觉得很赞</view
           >
-          <view v-if="post.user.id === myUserId && myUserId">
-            <view class="delete" @click.stop="onClickDelete(post.id)">
-              <image :src="Icons.Delete" class="deletepic" />
-              <view class="font-sm">删除帖子</view>
-            </view>
-          </view>
         </view>
       </view>
     </template>
-    <view style="width: 100%; height: 40rpx"></view>
-    <view class="nomore">
+    <view v-if="!postsData.length" class="nomore">
       <image
         src="/static/images/nomore.png"
         style="width: 200rpx; height: 186rpx"
       />
     </view>
-    <view style="width: 100%; height: 200rpx"></view>
   </template>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
 import { deletePost, getPostPreviews } from "@/apis/post/post";
-import { DeletePostReq } from "@/apis/post/post-interfaces";
+import { DeletePostReq, GetPostPreviewsReq } from "@/apis/post/post-interfaces";
 import { onReachBottom } from "@dcloudio/uni-app";
 import { displayTime } from "@/utils/time";
 import { onClickPost } from "./utils";
 import { Post } from "@/apis/schemas";
-import { Icons, Pages } from "@/utils/url";
 
 interface Props {
   type?: string;
@@ -83,55 +74,33 @@ interface Props {
 }
 
 const props = defineProps<Props>();
-const deleteID = reactive<DeletePostReq>({ id: "" });
 let userId: string | undefined;
 let postsData = ref<Post[]>([]);
 let token: string;
 const myUserId = ref("");
+const hasMore = ref(true);
 const getPostPreviewsAsync = async () => {
+  if (!hasMore.value) {
+    return <Post[]>[];
+  }
   myUserId.value = uni.getStorageSync("userId");
   userId = props.userId;
-  if (props.type === "my") {
-    const res = await getPostPreviews({
-      paginationOption: {
-        lastToken: token
-      },
-      onlyUserId: myUserId.value
-    });
-    token = res.token;
-    return res.posts;
-  } else {
-    const res = await getPostPreviews({
-      paginationOption: {
-        lastToken: token
-      },
-      onlyUserId: userId
-    });
-    token = res.token;
-    return res.posts;
+  const req: GetPostPreviewsReq = {
+    onlyUserId: props.type === "my" ? myUserId.value : userId
+  };
+  if (token) {
+    req.paginationOption = {
+      lastToken: token
+    };
+  }
+  const res = await getPostPreviews(req);
+  if (res.token === token || res.total <= res.posts.length) {
+    hasMore.value = false;
   }
+  token = res.token;
+  return res.posts;
 };
 
-async function onClickDelete(id: string) {
-  deleteID.id = id;
-  uni.showModal({
-    title: "确认删除",
-    content: "是否删除该帖子",
-    success: function (res) {
-      if (res.confirm) {
-        deletePost(deleteID).then((res) => {
-          uni.showToast({
-            title: res.msg
-          });
-        });
-        uni.reLaunch({
-          url: Pages.MyPublish
-        });
-      }
-    }
-  });
-}
-
 async function createPostsDataBatch() {
   const posts = await getPostPreviewsAsync();
   postsData.value.push(...posts);
@@ -256,7 +225,8 @@ onReachBottom(() => {
 }
 
 .nomore {
-  margin-top: 10rpx;
+  background-color: #fafcff;
+  padding: 10rpx;
   font-size: 20rpx;
   line-height: 20rpx;
   text-align: center;
diff --git a/src/pages/profile/personal-info/personal-info.vue b/src/pages/profile/personal-info/personal-info.vue
index f7fc8add..2068a65a 100644
--- a/src/pages/profile/personal-info/personal-info.vue
+++ b/src/pages/profile/personal-info/personal-info.vue
@@ -8,11 +8,11 @@
   </view>
   <view class="com-item">
     <view class="line-info">
-      <view class="number">{{ userInfo.following }}</view>
+      <view class="number">{{ user.following }}</view>
       <view class="info">关注</view>
-      <view class="number">{{ userInfo.follower }}</view>
+      <view class="number">{{ user.follower }}</view>
       <view class="info">粉丝</view>
-      <view class="number">{{ userInfo.article }}</view>
+      <view class="number">{{ user.article }}</view>
       <view class="info">创作</view>
       <view v-if="!followInfo.followed">
         <view class="subscribe" @click="onClickFollow()">
@@ -38,6 +38,7 @@ import { onLoad, onPullDownRefresh, onReady, onShow } from "@dcloudio/uni-app";
 import UserPublished from "@/pages/profile/profile-components/userPublished.vue";
 import { Pictures } from "@/utils/url";
 import TopBar from "@/components/TopBar.vue";
+import UserInfo from "@/pages/profile/profile-components/userInfo.vue";
 
 const props = defineProps<{
   userId?: string;
@@ -52,7 +53,7 @@ const followInfo = reactive<FollowedInfo>({
   followed: true,
   originFollow: true
 });
-const userInfo = reactive<User>({
+const user = reactive<User>({
   id: "",
   nickname: "微信用户",
   avatarUrl: "https://static.xhpolaris.com/cat_world.jpg",
@@ -62,11 +63,14 @@ const userInfo = reactive<User>({
   following: 0
 });
 const onClickFollow = async () => {
+  if (!user.follower) {
+    user.follower = 0;
+  }
   if (followInfo.followed === true) {
-    userInfo.follower--;
+    user.follower--;
     followInfo.followed = false;
   } else {
-    userInfo.follower++;
+    user.follower++;
     followInfo.followed = true;
   }
 };
@@ -74,14 +78,14 @@ const refresh = async () => {
   const res = await getUserInfo({
     userId: props.userId
   });
-  userInfo.id = res.user.id;
-  userInfo.nickname = res.user.nickname;
-  userInfo.avatarUrl = res.user.avatarUrl;
-  userInfo.follower = res.user.follower || 0;
-  userInfo.following = res.user.following || 0;
-  userInfo.article = res.user.article;
+  user.id = res.user.id;
+  user.nickname = res.user.nickname;
+  user.avatarUrl = res.user.avatarUrl;
+  user.follower = res.user.follower || 0;
+  user.following = res.user.following || 0;
+  user.article = res.user.article;
   let commentLikeReq = {
-    targetId: userInfo.id,
+    targetId: user.id,
     targetType: 6
   };
   const userLiked = await getUserLiked(commentLikeReq);
@@ -107,7 +111,7 @@ onReady(() => {
 onBeforeUnmount(() => {
   if (Boolean(followInfo.followed) !== Boolean(followInfo.originFollow)) {
     doLike({
-      targetId: userInfo.id,
+      targetId: user.id,
       targetType: TargetType.User
     });
   }
diff --git a/src/pages/profile/profile-components/loader.ts b/src/pages/profile/profile-components/loader.ts
new file mode 100644
index 00000000..2da23ea6
--- /dev/null
+++ b/src/pages/profile/profile-components/loader.ts
@@ -0,0 +1,39 @@
+import { getLikeContents } from "@/apis/like/like";
+import { TargetType } from "@/apis/schemas";
+import { getMomentPreviews } from "@/apis/moment/moment";
+import { StorageKeys } from "@/utils/const";
+import { GetLikeContentsReq } from "@/apis/like/like-interface";
+import { GetMomentPreviewsReq } from "@/apis/moment/moment-components";
+
+export function buildLikingMomentLoader(userId?: string) {
+  let lastToken: string; // 每次记录上个token
+  const myUserId = uni.getStorageSync(StorageKeys.UserId);
+  return async () => {
+    const req: GetLikeContentsReq = {
+      userId: userId || myUserId,
+      targetType: TargetType.Moment
+    };
+    if (lastToken) {
+      req.lastToken = lastToken;
+    }
+    const res = await getLikeContents(req);
+    lastToken = res.token;
+    return res.moments;
+  };
+}
+
+export function buildPublishMomentLoader(userId?: string) {
+  let lastToken: string; // 每次记录上个token
+  const myUserId = uni.getStorageSync(StorageKeys.UserId);
+  return async () => {
+    const req: GetMomentPreviewsReq = {
+      onlyUserId: userId || myUserId
+    };
+    if (lastToken) {
+      req.lastToken = lastToken;
+    }
+    const res = await getMomentPreviews(req);
+    lastToken = res.token;
+    return res.moments;
+  };
+}
diff --git a/src/pages/profile/profile-components/userPublished.vue b/src/pages/profile/profile-components/userPublished.vue
index 2828aa12..7b31d69c 100644
--- a/src/pages/profile/profile-components/userPublished.vue
+++ b/src/pages/profile/profile-components/userPublished.vue
@@ -9,13 +9,17 @@
     </zzx-tabs>
     <view class="wrap tab">
       <view v-if="current === 0">
-        <MyMasonry :type="props.type" :user-id="props.userId"></MyMasonry>
+        <Masonry
+          :get-previews="buildPublishMomentLoader(props.userId)"
+        ></Masonry>
       </view>
-      <view v-if="current === 1">
+      <view v-else-if="current === 1">
         <MyPosts :type="props.type" :user-id="props.userId"></MyPosts>
       </view>
-      <view v-if="current === 2">
-        <MyMasonry :user-id="props.userId" type="liked"></MyMasonry>
+      <view v-else-if="current === 2">
+        <Masonry
+          :get-previews="buildLikingMomentLoader(props.userId)"
+        ></Masonry>
       </view>
     </view>
   </view>
@@ -23,17 +27,25 @@
 
 <script lang="ts" setup>
 import MyPosts from "@/pages/profile/my-publish/my-posts.vue";
-import MyMasonry from "@/pages/profile/my-publish/my-masonry.vue";
 import ZzxTabs from "@/components/third-party/zzx-tabs/zzx-tabs.vue";
 import { ref } from "vue";
+import {
+  buildLikingMomentLoader,
+  buildPublishMomentLoader
+} from "@/pages/profile/profile-components/loader";
+import Masonry from "@/pages/community/Masonry.vue";
+import { onReady } from "@dcloudio/uni-app";
 
 const props = defineProps<{
   type?: string;
   userId?: string;
 }>();
 const items = ["动态", "帖子", "喜欢"];
-let current = ref(0);
-
+let current = ref(-1);
+// 没这几行真不行
+onReady(() => {
+  current.value = 0;
+});
 function onClickItem(e: any) {
   if (current.value !== e.currentIndex) {
     current.value = e.currentIndex;
diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue
index f865b1f0..70ca3410 100644
--- a/src/pages/profile/profile.vue
+++ b/src/pages/profile/profile.vue
@@ -57,6 +57,7 @@
     </view>
   </view>
   <UserPublished type="my"></UserPublished>
+  <view style="width: 100%; height: 18vw"></view>
   <BottomBar id="profile"></BottomBar>
   <template v-if="enableDebug">
     <DebugPanel></DebugPanel>
@@ -93,7 +94,7 @@ const refresh = async () => {
   user.id = res.user.id;
   user.nickname = res.user.nickname;
   user.avatarUrl = res.user.avatarUrl;
-  user.motto;
+  user.motto = res.user.motto;
   user.article = res.user.article || 0;
   user.follower = res.user.follower || 0;
   user.following = res.user.following || 0;
@@ -114,9 +115,9 @@ const clickAppVersion = () => {
   clickedTimes.value++;
 };
 const accountInfo = uni.getAccountInfoSync();
-const appVersion = accountInfo.version
-  ? "version: " + accountInfo.version
-  : "version: 1.18.0";
+const appVersion = accountInfo.miniProgram.version
+  ? "version: " + accountInfo.miniProgram.version
+  : "version: 体验版";
 
 onShow(refresh);
 onPullDownRefresh(() => {
diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue
index 42c7fcba..0db9710b 100644
--- a/src/pages/search/search.vue
+++ b/src/pages/search/search.vue
@@ -83,7 +83,7 @@
         </template>
         <template v-else-if="current === 1">
           <!-- 动态 -->
-          <MasonryFrame :keyword="searchText"></MasonryFrame>
+          <Masonry :get-previews="buildLoader(searchText)"></Masonry>
         </template>
         <template v-else-if="current === 2">
           <!-- 图鉴 -->
@@ -97,13 +97,14 @@
 <script lang="ts" setup>
 import { computed, reactive, ref } from "vue";
 import WorldPosts from "@/pages/world/WorldPosts.vue";
-import MasonryFrame from "@/pages/community/MasonryFrame.vue";
 import SearchCats from "@/pages/search/SearchCats.vue";
 import ZzxTabs from "@/components/third-party/zzx-tabs/zzx-tabs.vue";
 import { Icons, Pages } from "@/utils/url";
 import TopBar from "@/components/TopBar.vue";
 import { StorageKeys } from "@/utils/const";
 import { onLoad } from "@dcloudio/uni-app";
+import { buildLoader } from "@/pages/community/utils";
+import Masonry from "@/pages/community/Masonry.vue";
 
 const items = ["帖子", "动态", "图鉴"];
 
diff --git a/src/static/images/task-pic.png b/src/static/images/task-pic.png
deleted file mode 100644
index 1b46685f..00000000
Binary files a/src/static/images/task-pic.png and /dev/null differ
diff --git a/src/utils/time.ts b/src/utils/time.ts
index 32ab5320..ff73b373 100644
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -1,19 +1,29 @@
 import moment from "moment";
 import "moment/dist/locale/zh-cn";
 
-export function displayTime(timeStamp: number) {
-  if (timeStamp < 1e11) {
-    timeStamp *= 1000; // 后端传回的时间戳是秒级的，需要乘以1000变为微秒级，因为JS的时间戳是微秒级的
+export function adaptTime(time: number) {
+  if (time > 1e11) {
+    return time;
   }
+  return time * 1e3;
+}
 
+export function displayTime(timestamp: number) {
+  timestamp = adaptTime(timestamp);
   const now = new Date().getTime();
-  if (now < timeStamp) {
-    timeStamp = now;
+  if (now < timestamp) {
+    timestamp = now;
   }
-  const time = moment(timeStamp);
+  const time = moment(timestamp);
   if (time.year() != moment(now).year()) {
     return time.format("YYYY-MM-DD");
   } else {
     return time.format("MM-DD");
   }
 }
+
+export function displayDate(timestamp: number, format = "YYYY-MM-DD") {
+  timestamp = adaptTime(timestamp);
+  const time = moment(timestamp);
+  return time.format(format);
+}
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 947234a0..1b316bd8 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -30,7 +30,6 @@ export const enum Icons {
   Frame = "/static/images/Frame.png",
   DialogBox = "/static/images/dialog-box.png",
   State_Frame = "/static/images/state-frame.png",
-  Task_Pic = "/static/images/task-pic.png",
   Pic_Left = "/static/images/pic-left.png",
   Pic_Right = "/static/images/pic-right.png",
   Button_Increment = "/static/images/button-increment.png",
@@ -61,5 +60,6 @@ export const enum Pages {
   MyPublish = "/pages/profile/my-publish/my-publish",
   Message = "/pages/message/message",
   Person = "/pages/profile/personal-info/personal-info",
-  EditInfo = "/pages/profile/edit-info/edit-info"
+  EditInfo = "/pages/profile/edit-info/edit-info",
+  HelpedPlans = "/pages/plan/helped-plans/helped-plans"
 }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 55fff72d..ac4b9cba 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,3 +1,5 @@
+import { nextTick, Ref } from "vue";
+
 export function getVersionCode(versionName: string) {
   const pattern = /(\d+)\.(\d+)\.(\d+)/;
   const result = versionName.match(pattern);
@@ -7,3 +9,10 @@ export function getVersionCode(versionName: string) {
     return Number(num1 + num2 + num3);
   }
 }
+
+export function refresh(show: Ref<boolean>) {
+  show.value = false;
+  nextTick(() => {
+    show.value = true;
+  });
+}