diff --git a/components/AppButton.vue b/components/AppButton.vue
index 3fd0052..a526382 100644
--- a/components/AppButton.vue
+++ b/components/AppButton.vue
@@ -35,8 +35,8 @@ const emit = defineEmits(["click"]);
const skin = computed(() =>
props.type === "secondary"
- ? "/static/assets/foundation/transparent/a01-scroll-secondary-v3.png"
- : "/static/assets/foundation/transparent/a01-scroll-primary-v3.png",
+ ? "/static/assets/foundation/transparent/scroll-secondary.png"
+ : "/static/assets/foundation/transparent/scroll-primary.png",
);
const handleClick = (event) => {
@@ -45,7 +45,7 @@ const handleClick = (event) => {
diff --git a/components/AppTabbar.vue b/components/AppTabbar.vue
index 50f6564..655dee2 100644
--- a/components/AppTabbar.vue
+++ b/components/AppTabbar.vue
@@ -1,4 +1,3 @@
-
-
+ {{ item.publisher }}{{ item.content }}{{ feedTypeLabel(item.type) }} · {{ item.time }}
+ >
+ {{ item.publisher }}
+ {{ feedPreview(item.content) }}
+
+ {{ feedTypeLabel(item.type) }} · {{ formatMinuteTimestamp(item.time) }}
+ {{ item.recommendationReason }}
+
+
+
{{ stateCopy.title }}
import { computed, ref } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
import AppLoading from "@/components/AppLoading.vue";
import AppTabbar from "@/components/AppTabbar.vue";
+import FamilyFeedMedia from "@/components/family/FeedMedia.vue";
import ModulePageBackground from "@/components/ModulePageBackground.vue";
import PageHeader from "@/components/PageHeader.vue";
-import { appApi, isRequestCancelled } from "@/utils/api.js";
-import { genealogyContext } from "@/utils/genealogy-context.js";
-import { goRoot, openPage } from "@/utils/navigation.js";
+import {
+ createRequestController,
+ isRequestCancelled
+} from "@/services/api/request-controller.js";
+import { familyFeedApi } from "@/services/api/family-feed-service.js";
+import { formatMinuteTimestamp } from "@/utils/display-time.js";
+import { genealogyContext } from "@/utils/genealogy/context.js";
+import { goRoot, openPage } from "@/utils/navigation/gateway.js";
const genealogyId = ref("");
const hasValidContext = ref(false);
const feedState = ref("loading");
const feeds = ref([]);
+const FEED_PAGE_SIZE = 20;
+const totalFeedCount = ref(0);
+const currentFeedPage = ref(1);
+const loadMoreState = ref("idle");
+const hasMoreFeeds = computed(
+ () => feedState.value === "list" && feeds.value.length < totalFeedCount.value,
+);
+const loadMoreLabel = computed(() => {
+ if (loadMoreState.value === "loading") return "正在加载";
+ if (loadMoreState.value === "error") return "加载失败，重新加载";
+ return "继续加载";
+});
let active = true;
+let skipInitialShowRefresh = true;
+const feedListRequestController = createRequestController();
+const recommendationRequestController = createRequestController();
const feedTypeLabel = (type) =>
String(type || "")
.trim()
.toLowerCase() === "text"
? "文字动态"
: "家族动态";
+const feedPreview = (content) => {
+ const text = String(content || "").trim();
+ return text.length > 96 ? `${text.slice(0, 96).trimEnd()}…` : text;
+};
const shortcuts = [
{ key: "articles", label: "谱文" },
{ key: "albums", label: "相册" },
@@ -109,16 +142,67 @@ const stateCopy = computed(() =>
const loadFeeds = async () => {
if (!hasValidContext.value) return;
feedState.value = "loading";
+ loadMoreState.value = "idle";
+ currentFeedPage.value = 1;
+ feedListRequestController.abort();
+ recommendationRequestController.abort();
try {
- const rows = await appApi.getFeeds(genealogyId.value);
+ const [pageResult, recommendationResult] = await Promise.allSettled([
+ familyFeedApi.getFeedPage(
+ genealogyId.value,
+ { pageNum: 1, pageSize: FEED_PAGE_SIZE },
+ { requestController: feedListRequestController },
+ ),
+ familyFeedApi.getFeedRecommendations(genealogyId.value, {
+ requestController: recommendationRequestController,
+ }),
+ ]);
+ if (pageResult.status === "rejected") throw pageResult.reason;
if (!active) return;
- feeds.value = rows;
+ const recommendations =
+ recommendationResult.status === "fulfilled"
+ ? recommendationResult.value
+ : [];
+ const reasons = new Map(
+ recommendations.map((item) => [String(item.id), item.recommendationReason]),
+ );
+ feeds.value = pageResult.value.rows.map((item) => ({
+ ...item,
+ recommendationReason: reasons.get(String(item.id)) || "",
+ }));
+ totalFeedCount.value = pageResult.value.total;
+ loadMoreState.value =
+ feeds.value.length < totalFeedCount.value ? "idle" : "done";
feedState.value = feeds.value.length ? "list" : "empty";
} catch (error) {
if (!active || isRequestCancelled(error)) return;
feedState.value = "error";
}
};
+const loadMoreFeeds = async () => {
+ if (!hasMoreFeeds.value || loadMoreState.value === "loading") return;
+ loadMoreState.value = "loading";
+ try {
+ const nextPage = currentFeedPage.value + 1;
+ const page = await familyFeedApi.getFeedPage(
+ genealogyId.value,
+ { pageNum: nextPage, pageSize: FEED_PAGE_SIZE },
+ { requestController: feedListRequestController },
+ );
+ if (!active) return;
+ const knownIds = new Set(feeds.value.map((item) => String(item.id)));
+ feeds.value = feeds.value.concat(
+ page.rows.filter((item) => !knownIds.has(String(item.id))),
+ );
+ currentFeedPage.value = nextPage;
+ totalFeedCount.value = page.total;
+ loadMoreState.value =
+ feeds.value.length < totalFeedCount.value ? "idle" : "done";
+ } catch (error) {
+ if (!active || isRequestCancelled(error)) return;
+ loadMoreState.value = "error";
+ }
+};
onLoad((query) => {
const supplied = Object.prototype.hasOwnProperty.call(
query || {},
@@ -132,11 +216,20 @@ onLoad((query) => {
else feedState.value = "error";
});
onShow(() => {
+ if (skipInitialShowRefresh) {
+ skipInitialShowRefresh = false;
+ return;
+ }
if (hasValidContext.value) void loadFeeds();
});
+onUnload(() => {
+ active = false;
+ feedListRequestController.abort();
+ recommendationRequestController.abort();
+});
const toPublish = () =>
hasValidContext.value
- ? openPage("F02", { genealogyId: genealogyId.value }, "F01")
+ ? openPage("F02", { genealogyId: genealogyId.value, mode: "create" }, "F01")
: goRoot("G01");
const openFeed = (item) =>
openPage("F03", { genealogyId: genealogyId.value, feedId: item.id }, "F01");
@@ -190,10 +283,17 @@ const handlePrimaryAction = () =>
.feed-shortcuts {
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));
+ gap: 8rpx;
margin-top: 15rpx;
}
.feed-shortcut {
+ box-sizing: border-box;
min-height: 48px;
+ margin: 0;
+ padding: 0;
+ border: 1rpx solid rgba(181, 137, 63, 0.45);
+ border-radius: 8rpx;
+ background: rgba(255, 252, 244, 0.58);
display: flex;
align-items: center;
justify-content: center;
@@ -237,6 +337,37 @@ const handlePrimaryAction = () =>
color: $ink-muted;
font-size: clamp(13px, 21rpx, 16px);
}
+.feed-shortcut::after {
+ border: 0;
+}
+.feed-shortcut:active {
+ background: rgba(181, 137, 63, 0.1);
+}
+.feed-card__reason {
+ margin-top: 8rpx;
+ color: #9a6555;
+ font-size: clamp(12px, 20rpx, 15px);
+}
+.feed-more {
+ @include adaptive-scroll-button(secondary);
+ display: block;
+ width: 420rpx;
+ max-width: 100%;
+ min-height: 76rpx;
+ margin: 22rpx auto 0;
+ padding: 0 24rpx;
+ border: 0;
+ color: $ink;
+ font-size: clamp(14px, 22rpx, 17px);
+ font-weight: 700;
+ line-height: 76rpx;
+}
+.feed-more::after {
+ border: 0;
+}
+.feed-more[disabled] {
+ opacity: 0.62;
+}
.feed-state-card {
min-height: 230rpx;
display: flex;
diff --git a/pages/family/videos.vue b/pages/family/videos.vue
new file mode 100644
index 0000000..8ad2922
--- /dev/null
+++ b/pages/family/videos.vue
@@ -0,0 +1,660 @@
+
+
+
+
+
+
+ {{
+ isEdit ? "编辑家族视频" : "发布家族视频"
+ }}
+ {{
+ isEdit
+ ? "原视频、封面和相关设置会保留。"
+ : "视频上传成功后会自动关联，无需额外填写。"
+ }}
+
+
+ *视频文件
+
+ 已上传：{{ receipt.fileName || "视频" }}
+
+ {{ uploadError }}
+
+
+ 视频封面
+
+ 已上传：{{ coverReceipt.fileName || "视频封面" }}
+
+ {{
+ coverUploadError
+ }}
+
+
+ *视频标题
+
+
+
+ 视频说明
+
+
+ {{ submitError }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂时无法读取视频
+ 请检查网络后重新加载。
+
+
+
+ 还没有家族视频
+ 可以先发布一段值得留存的影像。
+
+
+
+
+
+ {{ video.title }}
+ {{
+ video.description
+ }}
+ {{
+ video.publishTime || "刚刚发布"
+ }}
+
+
+
+
+
+
+ {{
+ videoActionError
+ }}
+
+
+ {{ stateCopy.title }}
+ {{ stateCopy.copy }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/genealogy/application-review.vue b/pages/genealogy/application-review.vue
new file mode 100644
index 0000000..7021dd9
--- /dev/null
+++ b/pages/genealogy/application-review.vue
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+ 暂时无法打开审核页面
+ 未找到家谱信息，请返回后重新进入。
+
+
+
+
+
+
+ 暂时无法读取待审核申请
+ {{ applicationReviewError || "请检查网络后重试。" }}
+
+
+
+ 暂无待审核申请
+ 新的加入申请会显示在这里。
+
+
+
+ 共 {{ applications.length }} 条待审核申请
+ {{ feedbackMessage }}
+
+
+ {{ applicantName(item) }}
+ {{ applicationTime(item) }}
+
+ {{ applicantPhone(item) }}
+ {{ applicationRelation(item) }}
+ {{ applicationReason(item) }}
+
+
+
+
+
+
+
+
+
+ 拒绝原因
+
+ {{ rejectionError }}
+
+ {{ operationError }}
+
+
+
+
+
+
+
diff --git a/pages/genealogy/g03-create-genealogy.vue b/pages/genealogy/create.vue
similarity index 58%
rename from pages/genealogy/g03-create-genealogy.vue
rename to pages/genealogy/create.vue
index 968ee92..700741c 100644
--- a/pages/genealogy/g03-create-genealogy.vue
+++ b/pages/genealogy/create.vue
@@ -1,4 +1,3 @@
-
@@ -9,7 +8,7 @@
立谱信息
为家族创建一部家谱
创建成功后会回到我的家谱；首代人物可在后续合同开放后再录入。创建成功后会回到“我的家谱”；可在世系树中录入首位成员。
@@ -44,7 +43,12 @@
fieldErrors.genealogyName
}}
-
+
*所在地区
@@ -59,6 +63,12 @@
: regionPickerError || "请选择所在地区"
}}
+
{{
fieldErrors.regionCode
@@ -109,7 +119,7 @@
封面图片
选择图片后会取得真实上传回执，并在创建家谱时关联。图片上传成功后，会作为家谱封面保存。