diff --git a/app.html b/app.html index b448289..d246646 100644 --- a/app.html +++ b/app.html @@ -148,5 +148,6 @@ + diff --git a/article-detail.html b/article-detail.html index e3f77a2..66f3de1 100644 --- a/article-detail.html +++ b/article-detail.html @@ -3,11 +3,11 @@ - 为什么家谱不只是一本名册 - 文章详情 - 代代相传 + 资讯详情 - 代代相传 - +
-
-
-
-
-
Article Detail
-

为什么家谱不只是一本名册

-

- 家谱记录的是家族关系，也记录一个家庭如何理解自己的来处、秩序和传承。 -

-
- 家谱知识2026.05阅读 2,418 -
-
-
- 谱 -

记录来处，也照见未来。

-
-
-
- -
-
-
-

谱文详情加载中...

-
- -
-
+
+

+
+
+
资讯详情加载中
- + + + + + + diff --git a/news.html b/news.html index 89975dd..33967fe 100644 --- a/news.html +++ b/news.html @@ -7,7 +7,7 @@ - +
News Center

新闻资讯

- 集中阅读平台公告与家谱文化内容。当前为静态展示，后续由新闻内容接口统一提供列表、分类和详情。 + 集中阅读平台新闻、公告与下载内容。

闻
@@ -42,27 +42,19 @@
-
- 平台公告 -

平台内容公开展示规范说明

-

- 说明公开展示的家谱与文化内容范围，以及资料维护时应注意的边界。 -

家谱文化 -

为什么家谱不只是一本名册

-

- 从成员关系、家风记忆与共同维护三个角度理解数字家谱的价值。 -

+
+

+
+
资讯内容加载中
+
@@ -78,6 +70,12 @@
+ + + + + + diff --git a/profile-families.html b/profile-families.html index 2889bf8..5d2cf6b 100644 --- a/profile-families.html +++ b/profile-families.html @@ -79,7 +79,7 @@ 入

加入家谱

-

输入邀请码或由管理员邀请，加入已有家谱协作。

搜索并选择可加入的家谱，提交关系和申请说明等待审核。

diff --git a/profile-family-admin.html b/profile-family-admin.html index 20d1462..e1006be 100644 --- a/profile-family-admin.html +++ b/profile-family-admin.html @@ -37,6 +37,7 @@ 辈

字辈谱

查看或维护家谱字辈。

 祭

祭祀活动

维护活动、祭品与受邀名单。

 文

谱文

查看或维护当前家谱谱文。

 + 审

入谱审核

审核当前家谱的待处理加入申请。
diff --git a/profile-family-home.html b/profile-family-home.html index 6c9d743..7cbccaa 100644 --- a/profile-family-home.html +++ b/profile-family-home.html @@ -8,7 +8,7 @@ - +
我的家谱家族管理内容发布内容发布个人资料帮助与服务 @@ -33,12 +33,12 @@
Family Home
-

四川武胜汤氏族

+

家谱主页

后台家谱主页，用于进入世系、相册、家族圈、内容管理和成员协作。

-
@@ -50,29 +50,36 @@ 家谱主页世系图相册内容发布家族管理内容发布消息中心

家谱概览

-
+
谱 -

家谱编号

-

家谱信息加载中...

+

家谱信息

+

家谱概览加载中...

- 世 -

世系图

-

查看树谱模式和成员关系。

邀 +
+ 员 +

家谱成员

+

-- 人

+
+
+ 世 +

世系人物

+

-- 人

+
+
+ 邀

邀请家人

-

生成邀请入口，邀请亲人协作。

 +

PC 暂未开放邀请，请等待后端提供正式接口。

+
+

正在读取家谱概览

世系预览

@@ -120,7 +127,8 @@ - + + diff --git a/profile-feedback.html b/profile-feedback.html index 3823ce5..3c93ded 100644 --- a/profile-feedback.html +++ b/profile-feedback.html @@ -8,7 +8,7 @@ - +
意见反馈
- 返回服务中心 + 返回服务中心
@@ -52,9 +51,10 @@
@@ -62,30 +62,22 @@
-
- - -
- +
+

- +
-

历史反馈

-
-
-
-

资料导入建议

-

已受理 · 2026.05

-
- 查看 -
+
+

历史反馈

+
+
@@ -99,7 +91,7 @@ - + diff --git a/profile-join-family.html b/profile-join-family.html index 4e8947d..3a50056 100644 --- a/profile-join-family.html +++ b/profile-join-family.html @@ -8,7 +8,7 @@ - +

加入家谱

-

- 输入亲人分享的邀请码，提交后进入个人中心消息流程等待管理员审核。 -

+

查看加入申请进度；待审核申请可以撤销后重新提交。
-

我的加入申请

-
- -
-

提交新的加入申请

-

输入家谱 ID 和关系说明，等待管理员审核。

-
- 去申请 - +
+

我的加入申请

+
+

+
@@ -75,7 +69,7 @@ - + diff --git a/profile-join-review.html b/profile-join-review.html index 77324fb..874c90f 100644 --- a/profile-join-review.html +++ b/profile-join-review.html @@ -8,7 +8,7 @@ - +
入谱审核
- 返回消息全部处理 + 返回家族管理
@@ -38,9 +31,7 @@

入谱审核

-

- 个人中心专用审核页，处理加入家谱、绑定账号和成员资料补全申请。 -

+

审核当前家谱的加入申请。只有家谱管理者可以执行通过或拒绝。

@@ -49,47 +40,18 @@
-

待审核申请

-
-
-

某某人申请加入四川武胜汤氏族

-

提交时间：2026.05.26 · 关系说明待确认

-
- 审核
-

张三申请绑定成员账号

-

需要核对手机号和成员资料

-
- 处理 -
-
-
-

审核操作

-
- 同意拒绝 +
+

待审核申请

+
+

+
@@ -104,7 +66,7 @@ - + diff --git a/profile-services.html b/profile-services.html index 5071b0f..a1c6d6c 100644 --- a/profile-services.html +++ b/profile-services.html @@ -8,7 +8,7 @@ - +
- 提交反馈 @@ -68,7 +68,7 @@

应用分享

邀请好友使用，了解应用下载和分享奖励。

- 馈

意见反馈

提交产品问题、资料异常和改进建议。

会员服务

-

选择适合当前家谱的会员套餐，创建订单后继续完成支付。

+

选择适合的会员套餐并创建订单。当前 PC 暂未开放在线支付。

会员套餐加载中
-
-
- - -
-
- - -
-
+

尚未选择套餐

- - +
- + 等待选择套餐
-

会员订单

+
+

会员订单

+ +
会员订单加载中
@@ -162,7 +154,7 @@ - + diff --git a/profile.html b/profile.html index dbb770a..54e28c8 100644 --- a/profile.html +++ b/profile.html @@ -87,8 +87,8 @@ 7 条
- 入谱申请3 人等待审核入谱申请进入当前家谱查看 贺礼邀请2 条需要确认管理世代

设置世代、调整始祖世代、维护排行。

- 审

入谱审核

-

处理加入家谱、成员绑定和资料审核。

处理当前家谱的待审核加入申请。

/g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var normalized; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + normalized = String(value).trim(); + return /^[1-9][0-9]*$/.test(normalized) ? normalized : ''; + } + + function text(value) { + return value === undefined || value === null ? '' : String(value).trim(); + } + + function normalizeTargetUrl(value) { + var normalized = text(value); + var parsed; + + if (!normalized) return ''; + try { + parsed = new URL(normalized); + } catch (error) { + return ''; + } + return parsed.protocol === 'http:' || parsed.protocol === 'https:' ? parsed.href : ''; + } + + function normalizePromotion(item) { + var source = item || {}; + var promotionId = normalizeId(source.promotionId); + var promotionTitle = text(source.promotionTitle); + + if (!promotionId || !promotionTitle || String(source.status) !== '0') return null; + return { + promotionId: promotionId, + promotionTitle: promotionTitle, + promotionDesc: text(source.promotionDesc), + targetUrl: normalizeTargetUrl(source.targetUrl) + }; + } + + function normalizePromotionList(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizePromotion); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function renderPromotionCard(item) { + var content = '

' + escapeHtml(item.promotionTitle) + '

' + + '

' + escapeHtml(item.promotionDesc) + '

'; + + if (!item.targetUrl) { + return '
' + content + '
'; + } + return '' + content + ''; + } + + function renderPromotionList(data) { + var items = normalizePromotionList(data); + + if (!items.length) return '
当前暂无应用推广
'; + return items.map(renderPromotionCard).join(''); + } + + function renderPromotionLoginRequired() { + return '
登录后可查看应用推广，立即登录
'; + } + + async function loadPromotions(api) { + var data; + var items; + + if (!api || typeof api.promotions !== 'function') throw new Error('应用推广接口不可用'); + data = await api.promotions({ platform: 'pc' }); + items = normalizePromotionList(data); + if (!Array.isArray(data) || items.length !== data.length) { + throw new Error('推广列表响应无效'); + } + return items; + } + + function isUnauthorized(error) { + return Number(error && (error.status || error.code)) === 401; + } + + async function init() { + var page = root.document && root.document.querySelector('[data-promotion-page]'); + var list = root.document && root.document.querySelector('[data-promotion-list]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + + if (!page || !list) return; + if (!api || !api.getToken || !api.getToken()) { + list.innerHTML = renderPromotionLoginRequired(); + return; + } + + try { + list.classList.add('is-loading'); + list.innerHTML = renderPromotionList(await loadPromotions(api)); + } catch (error) { + if (isUnauthorized(error)) { + if (api.clearToken) api.clearToken(); + list.innerHTML = renderPromotionLoginRequired(); + return; + } + list.innerHTML = '
应用推广读取失败，请稍后重试
'; + } finally { + list.classList.remove('is-loading'); + } + } + + return { + normalizePromotion: normalizePromotion, + normalizePromotionList: normalizePromotionList, + normalizeTargetUrl: normalizeTargetUrl, + renderPromotionList: renderPromotionList, + renderPromotionLoginRequired: renderPromotionLoginRequired, + loadPromotions: loadPromotions, + isUnauthorized: isUnauthorized, + init: init + }; +}); diff --git a/public/js/family-home-pages.js b/public/js/family-home-pages.js new file mode 100644 index 0000000..5914090 --- /dev/null +++ b/public/js/family-home-pages.js @@ -0,0 +1,202 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.FamilyHomePages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.FamilyHomePages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var result; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + result = String(value).trim(); + return /^[1-9][0-9]*$/.test(result) ? result : ''; + } + + function text(value) { + if (value === undefined || value === null) return ''; + return String(value).trim(); + } + + function normalizeCount(value) { + var result = Number(value); + + return Number.isSafeInteger(result) && result >= 0 ? result : null; + } + + function normalizeFamilyOverview(item, expectedGenealogyId) { + var source = item || {}; + var genealogyId = normalizeId(source.genealogyId); + var expectedId = normalizeId(expectedGenealogyId); + var memberCount = normalizeCount(source.memberCount); + var personCount = normalizeCount(source.personCount); + + if (!genealogyId || genealogyId !== expectedId || + !text(source.genealogyName) || String(source.status) !== '0' || + memberCount === null || personCount === null) { + return null; + } + return { + genealogyId: genealogyId, + genealogyNo: text(source.genealogyNo), + genealogyName: text(source.genealogyName), + surname: text(source.surname), + ancestralHall: text(source.ancestralHall), + originPlace: text(source.originPlace), + regionFullName: text(source.regionFullName), + memberCount: memberCount, + personCount: personCount, + canManage: source.canManage === true, + canEditContent: source.canEditContent === true + }; + } + + function renderFamilyOverview(overview) { + var source = overview || {}; + var details = [ + source.genealogyNo ? '家谱编号 ' + source.genealogyNo : '', + source.surname ? '姓氏 ' + source.surname : '', + source.ancestralHall ? '堂号 ' + source.ancestralHall : '', + source.originPlace ? '祖籍 ' + source.originPlace : '', + source.regionFullName ? '地区 ' + source.regionFullName : '' + ].filter(Boolean).join(' · '); + + return '

' + escapeHtml(source.genealogyName) + '

' + + escapeHtml(details) + '

成员 ' + escapeHtml(source.memberCount) + + ' 人 · 世系人物 ' + escapeHtml(source.personCount) + ' 人

'; + } + + function shouldShowFamilyManagement(overview) { + return !!overview && overview.canManage === true; + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + async function loadFamilyHome(api, genealogyId) { + var normalizedId = normalizeId(genealogyId); + var results; + var overview; + + if (!normalizedId || !api || !api.genealogyOverview || !api.lineageTree) { + throw new Error('家谱主页接口初始化失败'); + } + results = await Promise.all([ + api.genealogyOverview(normalizedId), + api.lineageTree(normalizedId) + ]); + overview = normalizeFamilyOverview(results[0], normalizedId); + if (!overview) throw new Error('家谱概览响应无效'); + return { + overview: overview, + tree: results[1] + }; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + function query(selector) { + return root.document && root.document.querySelector(selector); + } + + function queryAll(selector) { + return root.document ? Array.prototype.slice.call(root.document.querySelectorAll(selector)) : []; + } + + function setText(selector, value) { + var element = query(selector); + + if (element) element.textContent = value; + } + + async function initFamilyHomePage() { + var page = query('[data-family-home-page]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var genealogyId; + var result; + + if (!page) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + genealogyId = root.ProfileUI && root.ProfileUI.getGenealogyId(); + if (!genealogyId) { + if (root.location && typeof root.location.replace === 'function') { + root.location.replace('profile-families.html?next=profile-family-home.html'); + } + return; + } + if (root.ProfileUI && root.ProfileUI.syncGenealogyContextLinks) { + root.ProfileUI.syncGenealogyContextLinks(); + } + if (!root.LineagePages || !root.LineagePages.renderLineageTreeHtml) { + setText('[data-family-home-status]', '世系预览初始化失败，请刷新后重试'); + return; + } + + try { + result = await loadFamilyHome(api, genealogyId); + setText('[data-family-home-title]', result.overview.genealogyName); + query('[data-family-home-overview]').innerHTML = renderFamilyOverview(result.overview); + setText('[data-family-home-member-count]', String(result.overview.memberCount)); + setText('[data-family-home-person-count]', String(result.overview.personCount)); + queryAll('[data-family-home-management]').forEach(function (element) { + element.hidden = !shouldShowFamilyManagement(result.overview); + }); + query('[data-lineage-home-tree]').innerHTML = + root.LineagePages.renderLineageTreeHtml(result.tree); + setText('[data-family-home-status]', '家谱概览已更新'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + query('[data-family-home-overview]').innerHTML = + '
家谱概览读取失败，请稍后重试
'; + query('[data-lineage-home-tree]').innerHTML = + '
世系树读取失败，请稍后重试
'; + setText('[data-family-home-status]', error.message || '家谱主页读取失败，请稍后重试'); + } + } + + function init() { + return initFamilyHomePage(); + } + + return { + normalizeFamilyOverview: normalizeFamilyOverview, + renderFamilyOverview: renderFamilyOverview, + shouldShowFamilyManagement: shouldShowFamilyManagement, + shouldRedirectToLogin: shouldRedirectToLogin, + loadFamilyHome: loadFamilyHome, + initFamilyHomePage: initFamilyHomePage, + init: init + }; +}); diff --git a/public/js/feedback-pages.js b/public/js/feedback-pages.js new file mode 100644 index 0000000..dfc9b5b --- /dev/null +++ b/public/js/feedback-pages.js @@ -0,0 +1,385 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.FeedbackPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.FeedbackPages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + var FEEDBACK_TYPES = { + advice: '意见建议', + bug: '问题反馈', + complaint: '投诉反馈', + other: '其他反馈' + }; + var HANDLE_STATUS = { + '0': '待处理', + '1': '处理中', + '2': '已处理', + '3': '已关闭' + }; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var text; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return /^[1-9][0-9]*$/.test(text) ? text : ''; + } + + function optionalText(value) { + if (value === undefined || value === null) return ''; + return String(value).trim(); + } + + function getFeedbackId(search) { + var params = new URLSearchParams(String(search === undefined && root.location ? root.location.search : search || '').replace(/^\?/, '')); + + return normalizeId(params.get('feedbackId')); + } + + function buildFeedbackBody(values) { + var source = values || {}; + var body = {}; + var feedbackType = optionalText(source.feedbackType); + var feedbackContent = optionalText(source.feedbackContent); + var contactInfo = optionalText(source.contactInfo); + + if (feedbackType) body.feedbackType = feedbackType; + if (feedbackContent) body.feedbackContent = feedbackContent; + if (contactInfo) body.contactInfo = contactInfo; + return body; + } + + function validateFeedbackBody(body) { + var source = body || {}; + + if (!optionalText(source.feedbackContent)) return '请填写反馈内容'; + if (source.feedbackType && !Object.prototype.hasOwnProperty.call(FEEDBACK_TYPES, source.feedbackType)) { + return '反馈类型无效'; + } + return ''; + } + + function normalizeFeedback(item) { + var source = item || {}; + var feedbackId = normalizeId(source.feedbackId); + var feedbackType = optionalText(source.feedbackType); + var feedbackContent = optionalText(source.feedbackContent); + var handleStatus = String(source.handleStatus === undefined || source.handleStatus === null ? '' : source.handleStatus); + var status = String(source.status === undefined || source.status === null ? '' : source.status); + + if (!feedbackId || !feedbackContent || + !Object.prototype.hasOwnProperty.call(FEEDBACK_TYPES, feedbackType) || + !Object.prototype.hasOwnProperty.call(HANDLE_STATUS, handleStatus) || + ['0', '1'].indexOf(status) < 0) { + return null; + } + return { + feedbackId: feedbackId, + feedbackType: feedbackType, + feedbackContent: feedbackContent, + contactInfo: optionalText(source.contactInfo), + handleStatus: handleStatus, + handleResult: optionalText(source.handleResult), + handleTime: optionalText(source.handleTime), + status: status, + remark: optionalText(source.remark) + }; + } + + function normalizeFeedbackList(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizeFeedback); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function findFeedbackById(data, feedbackId) { + var targetId = normalizeId(feedbackId); + var items = normalizeFeedbackList(data); + var match; + + if (!targetId) return null; + match = items.find(function (item) { return item.feedbackId === targetId; }); + return match || null; + } + + function buildFeedbackDetailUrl(feedbackId, detailPage) { + var id = normalizeId(feedbackId); + var params; + + if (!id) return ''; + params = new URLSearchParams(); + params.set('feedbackId', id); + return (detailPage || 'ticket-detail.html') + '?' + params.toString(); + } + + function renderFeedbackList(data, options) { + var settings = options || {}; + var items = normalizeFeedbackList(data); + var detailPage = settings.detailPage || 'ticket-detail.html'; + + if (!items.length) return '
当前没有反馈记录
'; + return items.map(function (item) { + return '

' + escapeHtml(FEEDBACK_TYPES[item.feedbackType]) + + '

' + escapeHtml(item.feedbackContent) + + '

' + HANDLE_STATUS[item.handleStatus] + + ''; + }).join(''); + } + + function renderFeedbackDetail(item) { + var feedback = normalizeFeedback(item); + var details; + + if (!feedback) return '
反馈记录不存在或无权查看
'; + details = [ + feedback.contactInfo ? '
提交联系方式
' + escapeHtml(feedback.contactInfo) + '
' : '', + '
处理状态
' + HANDLE_STATUS[feedback.handleStatus] + '
', + feedback.handleResult ? '
处理结果
' + escapeHtml(feedback.handleResult) + '
' : '', + feedback.handleTime ? '
处理时间
' + escapeHtml(feedback.handleTime) + '
' : '', + feedback.remark ? '
备注
' + escapeHtml(feedback.remark) + '
' : '' + ].filter(Boolean).join(''); + + return '
' + + escapeHtml(FEEDBACK_TYPES[feedback.feedbackType]) + + '

问题说明

' + escapeHtml(feedback.feedbackContent) + + '

' + details + '
'; + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + function getFormValues(form) { + var values = {}; + + Array.prototype.forEach.call(form.querySelectorAll('[name]'), function (field) { + values[field.name] = field.value; + }); + return values; + } + + function setStatus(message) { + var status = root.document && root.document.querySelector('[data-feedback-status]'); + + if (status) status.textContent = message || ''; + } + + async function readMyFeedback(api) { + var data = await api.myFeedback(); + var items = normalizeFeedbackList(data); + + if (!Array.isArray(data) || items.length !== data.length) { + throw new Error('反馈列表响应无效'); + } + return items; + } + + async function initFeedbackFormPage() { + var form = root.document && root.document.querySelector('[data-feedback-form]'); + var list = root.document && root.document.querySelector('[data-feedback-list]'); + var refresh = root.document && root.document.querySelector('[data-feedback-refresh]'); + var page = root.document && root.document.querySelector('[data-feedback-page]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var pageMode = page && page.getAttribute('data-feedback-page'); + var writePending = false; + + if (!form) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + async function loadList() { + var items; + + if (!list) return []; + setStatus('正在读取反馈记录…'); + try { + items = await readMyFeedback(api); + list.innerHTML = renderFeedbackList(items, { detailPage: 'ticket-detail.html' }); + setStatus(''); + return items; + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return []; + } + list.innerHTML = '
读取反馈记录失败
'; + setStatus(error.message || '读取反馈记录失败，请稍后重试'); + return []; + } + } + + if (refresh) refresh.addEventListener('click', loadList); + form.addEventListener('submit', async function (event) { + var body; + var validation; + var created; + var refreshed; + var button = form.querySelector('[data-feedback-submit]'); + + event.preventDefault(); + if (writePending) return; + body = buildFeedbackBody(getFormValues(form)); + validation = validateFeedbackBody(body); + if (validation) { + setStatus(validation); + return; + } + writePending = true; + if (button) button.disabled = true; + setStatus('正在提交反馈…'); + try { + created = normalizeFeedback(await api.submitFeedback(body)); + if (!created) throw new Error('提交响应缺少有效反馈信息'); + refreshed = await readMyFeedback(api); + if (!refreshed.some(function (item) { return item.feedbackId === created.feedbackId; })) { + throw new Error('提交后无法读取同一反馈记录'); + } + if (pageMode === 'ticket') { + if (root.location) root.location.href = buildFeedbackDetailUrl(created.feedbackId); + return; + } + if (list) list.innerHTML = renderFeedbackList(refreshed, { detailPage: 'ticket-detail.html' }); + form.reset(); + setStatus('反馈已提交'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setStatus(error.message || '提交反馈失败，请稍后重试'); + } finally { + writePending = false; + if (button) button.disabled = false; + } + }); + await loadList(); + } + + async function initFeedbackListPage() { + var page = root.document && root.document.querySelector('[data-feedback-list-page]'); + var list = root.document && root.document.querySelector('[data-feedback-list]'); + var refresh = root.document && root.document.querySelector('[data-feedback-refresh]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + + if (!page || !list) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + async function loadList() { + try { + setStatus('正在读取反馈记录…'); + list.innerHTML = renderFeedbackList(await readMyFeedback(api), { + detailPage: 'ticket-detail.html' + }); + setStatus(''); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + list.innerHTML = '
读取反馈记录失败
'; + setStatus(error.message || '读取反馈记录失败，请稍后重试'); + } + } + + if (refresh) refresh.addEventListener('click', loadList); + await loadList(); + } + + async function initFeedbackDetailPage() { + var page = root.document && root.document.querySelector('[data-feedback-detail-page]'); + var detail = root.document && root.document.querySelector('[data-feedback-detail]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var feedbackId = getFeedbackId(); + var item; + + if (!page || !detail) return; + if (!feedbackId) { + detail.innerHTML = '
反馈记录不存在或无权查看
'; + return; + } + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + try { + setStatus('正在读取反馈详情…'); + item = findFeedbackById(await api.myFeedback(), feedbackId); + detail.innerHTML = renderFeedbackDetail(item); + setStatus(item ? '' : '反馈记录不存在或无权查看'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + detail.innerHTML = '
反馈详情读取失败
'; + setStatus(error.message || '反馈详情读取失败，请稍后重试'); + } + } + + async function init() { + if (root.document && root.document.querySelector('[data-feedback-form]')) { + await initFeedbackFormPage(); + return; + } + if (root.document && root.document.querySelector('[data-feedback-list-page]')) { + await initFeedbackListPage(); + return; + } + if (root.document && root.document.querySelector('[data-feedback-detail-page]')) { + await initFeedbackDetailPage(); + } + } + + return { + getFeedbackId: getFeedbackId, + buildFeedbackBody: buildFeedbackBody, + validateFeedbackBody: validateFeedbackBody, + normalizeFeedback: normalizeFeedback, + normalizeFeedbackList: normalizeFeedbackList, + findFeedbackById: findFeedbackById, + buildFeedbackDetailUrl: buildFeedbackDetailUrl, + renderFeedbackList: renderFeedbackList, + renderFeedbackDetail: renderFeedbackDetail, + initFeedbackFormPage: initFeedbackFormPage, + initFeedbackListPage: initFeedbackListPage, + initFeedbackDetailPage: initFeedbackDetailPage, + init: init + }; +}); diff --git a/public/js/help-pages.js b/public/js/help-pages.js new file mode 100644 index 0000000..41af41c --- /dev/null +++ b/public/js/help-pages.js @@ -0,0 +1,206 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.HelpPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.HelpPages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var text; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return /^[1-9][0-9]*$/.test(text) ? text : ''; + } + + function normalizeCount(value) { + var text; + + if (value === undefined || value === null || value === '') return '0'; + if (typeof value === 'number' && (!Number.isSafeInteger(value) || value < 0)) return ''; + text = String(value).trim(); + return /^(?:0|[1-9][0-9]*)$/.test(text) ? text : ''; + } + + function text(value) { + return value === undefined || value === null ? '' : String(value).trim(); + } + + function normalizeHelpArticle(item) { + var source = item || {}; + var helpId = normalizeId(source.helpId); + var helpTitle = text(source.helpTitle); + var helpContent = text(source.helpContent); + var viewCount = normalizeCount(source.viewCount); + + if (!helpId || !helpTitle || !helpContent || !viewCount || String(source.status) !== '0') { + return null; + } + return { + helpId: helpId, + helpCategory: text(source.helpCategory), + helpTitle: helpTitle, + helpContent: helpContent, + viewCount: viewCount + }; + } + + function normalizeHelpArticleList(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizeHelpArticle); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function renderHelpArticleList(data) { + var items = normalizeHelpArticleList(data); + + if (!items.length) return '
当前暂无帮助文章
'; + return items.map(function (item) { + var meta = [item.helpCategory, '浏览 ' + item.viewCount + ' 次'].filter(Boolean).join(' · '); + + return '
' + + '' + escapeHtml(item.helpTitle) + '' + + '

' + escapeHtml(meta) + '

' + + '
' + + '
'; + }).join(''); + } + + function renderHelpArticleDetail(item) { + var article = normalizeHelpArticle(item); + var meta; + + if (!article) return '
帮助文章不存在或已停用
'; + meta = [article.helpCategory, '浏览 ' + article.viewCount + ' 次'].filter(Boolean).join(' · '); + return '

' + escapeHtml(meta) + + '

' + escapeHtml(article.helpContent).replace(/\r?\n/g, '
') + '

'; + } + + async function loadHelpArticleDetail(api, helpId) { + var targetId = normalizeId(helpId); + var article; + + if (!api || typeof api.helpArticleDetail !== 'function') throw new Error('帮助文章接口不可用'); + if (!targetId) throw new Error('帮助文章编号无效'); + article = normalizeHelpArticle(await api.helpArticleDetail(targetId)); + if (!article) throw new Error('帮助文章详情响应无效'); + if (article.helpId !== targetId) throw new Error('详情响应与请求编号不一致'); + return article; + } + + async function loadHelpArticles(api) { + var data; + var items; + + if (!api || typeof api.helpArticles !== 'function') throw new Error('帮助文章接口不可用'); + data = await api.helpArticles(); + items = normalizeHelpArticleList(data); + if (!Array.isArray(data) || items.length !== data.length) throw new Error('帮助文章列表响应无效'); + return items; + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + async function init() { + var list = root.document && root.document.querySelector('[data-help-list]'); + var status = root.document && root.document.querySelector('[data-help-status]'); + var refresh = root.document && root.document.querySelector('[data-help-refresh]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + + if (!list) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + function setStatus(message) { + if (status) status.textContent = message || ''; + } + + async function refreshList() { + try { + list.classList.add('is-loading'); + setStatus('正在读取帮助文章…'); + list.innerHTML = renderHelpArticleList(await loadHelpArticles(api)); + setStatus(''); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + list.innerHTML = '
帮助文章读取失败，请稍后重试
'; + setStatus(error.message || '帮助文章读取失败'); + } finally { + list.classList.remove('is-loading'); + } + } + + list.addEventListener('click', async function (event) { + var button = event.target.closest('[data-help-detail-id]'); + var helpId; + var panel; + + if (!button || button.disabled) return; + helpId = button.getAttribute('data-help-detail-id'); + panel = list.querySelector('[data-help-detail-panel="' + helpId + '"]'); + if (!panel) return; + button.disabled = true; + panel.textContent = '正在读取完整解答…'; + try { + panel.innerHTML = renderHelpArticleDetail(await loadHelpArticleDetail(api, helpId)); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + panel.textContent = error.message || '帮助文章详情读取失败'; + } + }); + + if (refresh) refresh.addEventListener('click', refreshList); + await refreshList(); + } + + return { + normalizeHelpArticle: normalizeHelpArticle, + normalizeHelpArticleList: normalizeHelpArticleList, + renderHelpArticleList: renderHelpArticleList, + renderHelpArticleDetail: renderHelpArticleDetail, + loadHelpArticleDetail: loadHelpArticleDetail, + loadHelpArticles: loadHelpArticles, + shouldRedirectToLogin: shouldRedirectToLogin, + init: init + }; +}); diff --git a/public/js/join-pages.js b/public/js/join-pages.js new file mode 100644 index 0000000..9f46ce4 --- /dev/null +++ b/public/js/join-pages.js @@ -0,0 +1,407 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.JoinPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.JoinPages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + var APPLY_STATUS = { + '0': '待审核', + '1': '已通过', + '2': '已拒绝', + '3': '已撤销' + }; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var text; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return /^[1-9][0-9]*$/.test(text) ? text : ''; + } + + function optionalText(value) { + var text; + + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return text; + } + + function buildJoinApplyBody(values) { + var source = values || {}; + var body = {}; + + ['applicantName', 'phone', 'relationDesc', 'applyReason'].forEach(function (name) { + var value = optionalText(source[name]); + + if (value) body[name] = value; + }); + return body; + } + + function validateJoinApplyBody(body) { + var source = body || {}; + var limits = { + applicantName: [50, '申请人姓名不能超过 50 个字符'], + phone: [30, '联系电话不能超过 30 个字符'], + relationDesc: [100, '关系说明不能超过 100 个字符'], + applyReason: [500, '申请理由不能超过 500 个字符'] + }; + var names = Object.keys(limits); + var index; + + for (index = 0; index < names.length; index += 1) { + if (String(source[names[index]] || '').length > limits[names[index]][0]) { + return limits[names[index]][1]; + } + } + return ''; + } + + function normalizeJoinGenealogy(item) { + var source = item || {}; + var genealogyId = normalizeId(source.genealogyId); + var genealogyName = optionalText(source.genealogyName); + var surname = optionalText(source.surname); + var status = source.status === undefined || source.status === null ? '' : String(source.status); + + if (!genealogyId || !genealogyName || !surname || (status && status !== '0')) return null; + return { + genealogyId: genealogyId, + genealogyName: genealogyName, + surname: surname, + regionFullName: optionalText(source.regionFullName), + memberCount: source.memberCount, + joinMode: source.joinMode === undefined || source.joinMode === null ? '' : String(source.joinMode) + }; + } + + function normalizeJoinApply(item) { + var source = item || {}; + var applyId = normalizeId(source.applyId); + var genealogyId = normalizeId(source.genealogyId); + var genealogyName = optionalText(source.genealogyName); + var status = source.status === undefined || source.status === null ? '' : String(source.status); + + if (!applyId || !genealogyId || !genealogyName || !Object.prototype.hasOwnProperty.call(APPLY_STATUS, status)) { + return null; + } + return { + applyId: applyId, + genealogyId: genealogyId, + genealogyName: genealogyName, + surname: optionalText(source.surname), + relationDesc: optionalText(source.relationDesc), + applyReason: optionalText(source.applyReason), + auditRemark: optionalText(source.auditRemark), + auditTime: optionalText(source.auditTime), + status: status + }; + } + + function normalizeJoinApplies(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizeJoinApply); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function renderJoinGenealogyOptions(data) { + var items; + + if (!Array.isArray(data)) return '
家谱列表数据无效，请刷新重试
'; + items = data.map(normalizeJoinGenealogy).filter(Boolean); + if (!items.length) return '
没有找到可申请加入的家谱
'; + return items.map(function (item) { + var meta = [ + item.surname + '氏', + item.regionFullName, + item.memberCount === undefined || item.memberCount === null ? '' : item.memberCount + ' 位成员' + ].filter(Boolean).join(' · '); + + return ''; + }).join(''); + } + + function renderMyJoinApplies(data) { + var items = normalizeJoinApplies(data); + + if (!items.length) return '
当前没有加入申请
'; + return items.map(function (item) { + var details = [ + item.surname ? item.surname + '氏' : '', + item.relationDesc, + item.applyReason, + item.auditRemark ? '审核说明：' + item.auditRemark : '', + item.auditTime ? '审核时间：' + item.auditTime : '' + ].filter(Boolean).join(' · '); + var action = item.status === '0' + ? '' + : ''; + + return '

' + escapeHtml(item.genealogyName) + + '

' + escapeHtml(details || '等待申请状态更新') + + '

' + APPLY_STATUS[item.status] + + '' + action + '
'; + }).join(''); + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + function setText(selector, message) { + var element = root.document && root.document.querySelector(selector); + + if (element) element.textContent = message || ''; + } + + function getFormValues(form) { + var values = {}; + + Array.prototype.forEach.call(form.querySelectorAll('[name]'), function (field) { + values[field.name] = field.value; + }); + return values; + } + + function canJoinGenealogy(quota) { + var remaining = Number(quota && quota.joinRemaining); + + if (quota && typeof quota.canJoin === 'boolean') return quota.canJoin; + return Number.isInteger(remaining) && (remaining === -1 || remaining > 0); + } + + async function initJoinApplyPage() { + var page = root.document && root.document.querySelector('[data-join-apply-page]'); + var searchForm = root.document && root.document.querySelector('[data-join-genealogy-search]'); + var options = root.document && root.document.querySelector('[data-join-genealogy-options]'); + var applyForm = root.document && root.document.querySelector('[data-join-apply-form]'); + var selected = root.document && root.document.querySelector('[data-join-selected-genealogy]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var selectedGenealogyId = ''; + var writePending = false; + + if (!page) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + async function loadOptions(keyword) { + var data; + + setText('[data-join-apply-status]', '正在读取可申请家谱…'); + try { + data = await api.genealogyOptions(keyword ? { keyword: keyword } : {}); + options.innerHTML = renderJoinGenealogyOptions(data); + setText('[data-join-apply-status]', ''); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + options.innerHTML = '
读取家谱列表失败
'; + setText('[data-join-apply-status]', error.message || '读取家谱列表失败，请稍后重试'); + } + } + + try { + if (!canJoinGenealogy(await api.genealogyQuota())) { + setText('[data-join-apply-status]', '当前没有可用的家谱加入额度'); + applyForm.querySelector('[data-join-apply-submit]').disabled = true; + return; + } + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setText('[data-join-apply-status]', error.message || '无法读取家谱加入额度'); + applyForm.querySelector('[data-join-apply-submit]').disabled = true; + return; + } + + searchForm.addEventListener('submit', function (event) { + event.preventDefault(); + loadOptions(optionalText(searchForm.querySelector('[name="keyword"]').value)); + }); + options.addEventListener('click', function (event) { + var button = event.target.closest('[data-join-genealogy-id]'); + + if (!button || !options.contains(button)) return; + selectedGenealogyId = normalizeId(button.getAttribute('data-join-genealogy-id')); + if (!selectedGenealogyId) return; + selected.textContent = '已选择：' + button.getAttribute('data-join-genealogy-name'); + Array.prototype.forEach.call(options.querySelectorAll('[data-join-genealogy-id]'), function (item) { + item.classList.toggle('is-selected', item === button); + }); + }); + applyForm.addEventListener('submit', async function (event) { + var body; + var validation; + var created; + var refreshed; + + event.preventDefault(); + if (writePending) return; + if (!selectedGenealogyId) { + setText('[data-join-apply-status]', '请先从家谱列表中选择要加入的家谱'); + return; + } + body = buildJoinApplyBody(getFormValues(applyForm)); + validation = validateJoinApplyBody(body); + if (validation) { + setText('[data-join-apply-status]', validation); + return; + } + writePending = true; + applyForm.querySelector('[data-join-apply-submit]').disabled = true; + setText('[data-join-apply-status]', '正在提交申请…'); + try { + created = normalizeJoinApply(await api.applyToGenealogy(selectedGenealogyId, body)); + if (!created) throw new Error('申请响应缺少有效申请信息'); + refreshed = normalizeJoinApplies(await api.myGenealogyJoinApplies()); + if (!refreshed.some(function (item) { return item.applyId === created.applyId; })) { + throw new Error('提交后无法读取同一申请'); + } + if (root.location) root.location.href = 'profile-join-family.html'; + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setText('[data-join-apply-status]', error.message || '提交加入申请失败，请稍后重试'); + } finally { + writePending = false; + applyForm.querySelector('[data-join-apply-submit]').disabled = false; + } + }); + await loadOptions(''); + } + + async function initMyJoinAppliesPage() { + var page = root.document && root.document.querySelector('[data-my-join-applies-page]'); + var list = root.document && root.document.querySelector('[data-join-apply-list="mine"]'); + var refresh = root.document && root.document.querySelector('[data-join-apply-refresh]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var writePending = false; + + if (!page) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + async function loadApplies() { + var data; + + setText('[data-my-join-applies-status]', '正在读取申请记录…'); + try { + data = await api.myGenealogyJoinApplies(); + list.innerHTML = renderMyJoinApplies(data); + setText('[data-my-join-applies-status]', ''); + return normalizeJoinApplies(data); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return []; + } + list.innerHTML = '
读取加入申请失败
'; + setText('[data-my-join-applies-status]', error.message || '读取加入申请失败，请稍后重试'); + return []; + } + } + + refresh.addEventListener('click', function () { + loadApplies(); + }); + list.addEventListener('click', async function (event) { + var button = event.target.closest('[data-join-cancel-id]'); + var applyId; + var refreshed; + + if (!button || !list.contains(button) || writePending) return; + applyId = normalizeId(button.getAttribute('data-join-cancel-id')); + if (!applyId) return; + if (root.confirm && !root.confirm('确认撤销这条加入申请吗？')) return; + writePending = true; + button.disabled = true; + setText('[data-my-join-applies-status]', '正在撤销申请…'); + try { + await api.cancelGenealogyJoinApply(applyId); + refreshed = await loadApplies(); + if (refreshed.some(function (item) { return item.applyId === applyId && item.status === '0'; })) { + throw new Error('撤销后申请仍处于待审核状态'); + } + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setText('[data-my-join-applies-status]', error.message || '撤销加入申请失败，请稍后重试'); + } finally { + writePending = false; + } + }); + await loadApplies(); + } + + async function init() { + if (root.document && root.document.querySelector('[data-join-apply-page]')) { + await initJoinApplyPage(); + return; + } + if (root.document && root.document.querySelector('[data-my-join-applies-page]')) { + await initMyJoinAppliesPage(); + } + } + + return { + buildJoinApplyBody: buildJoinApplyBody, + validateJoinApplyBody: validateJoinApplyBody, + normalizeJoinGenealogy: normalizeJoinGenealogy, + normalizeJoinApply: normalizeJoinApply, + normalizeJoinApplies: normalizeJoinApplies, + renderJoinGenealogyOptions: renderJoinGenealogyOptions, + renderMyJoinApplies: renderMyJoinApplies, + canJoinGenealogy: canJoinGenealogy, + initJoinApplyPage: initJoinApplyPage, + initMyJoinAppliesPage: initMyJoinAppliesPage, + init: init + }; +}); diff --git a/public/js/join-review-pages.js b/public/js/join-review-pages.js new file mode 100644 index 0000000..4e171a2 --- /dev/null +++ b/public/js/join-review-pages.js @@ -0,0 +1,250 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.JoinReviewPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.JoinReviewPages.initJoinReviewPage(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var text; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return /^[1-9][0-9]*$/.test(text) ? text : ''; + } + + function optionalText(value) { + if (value === undefined || value === null) return ''; + return String(value).trim(); + } + + function getCurrentGenealogyId(search) { + var contextId; + var params; + + if (search === undefined && root.ProfileUI && root.ProfileUI.getGenealogyId) { + contextId = root.ProfileUI.getGenealogyId(); + return normalizeId(contextId); + } + params = new URLSearchParams(String(search || '').replace(/^\?/, '')); + return normalizeId(params.get('genealogyId')); + } + + function buildJoinAuditBody(values) { + var source = values || {}; + var body = { status: String(source.status === undefined || source.status === null ? '' : source.status).trim() }; + var auditRemark = optionalText(source.auditRemark); + + if (auditRemark) body.auditRemark = auditRemark; + return body; + } + + function validateJoinAuditBody(body) { + if (!body || ['1', '2'].indexOf(body.status) < 0) return '审核状态无效'; + if (String(body.auditRemark || '').length > 500) return '审核说明不能超过 500 个字符'; + return ''; + } + + function normalizePendingApply(item) { + var source = item || {}; + var applyId = normalizeId(source.applyId); + var genealogyId = normalizeId(source.genealogyId); + + if (!applyId || !genealogyId || String(source.status) !== '0') return null; + return { + applyId: applyId, + genealogyId: genealogyId, + genealogyName: optionalText(source.genealogyName), + applicantName: optionalText(source.applicantName) || optionalText(source.appUserNickName) || '未填写姓名', + phone: optionalText(source.phone), + relationDesc: optionalText(source.relationDesc), + applyReason: optionalText(source.applyReason) + }; + } + + function normalizePendingApplies(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizePendingApply); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function renderPendingJoinApplies(data, canManage) { + var items = normalizePendingApplies(data); + + if (!items.length) return '
当前没有待审核申请
'; + return items.map(function (item) { + var details = [ + item.phone ? '申请联系电话：' + item.phone : '', + item.relationDesc ? '关系：' + item.relationDesc : '', + item.applyReason ? '理由：' + item.applyReason : '' + ].filter(Boolean).join(' · '); + var actions = canManage + ? '
' + + '
' + : ''; + + return '

' + escapeHtml(item.applicantName) + + '申请加入' + escapeHtml(item.genealogyName || '当前家谱') + '

' + + escapeHtml(details || '申请人未补充说明') + '

' + actions + '
'; + }).join(''); + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + function setStatus(message) { + var element = root.document && root.document.querySelector('[data-join-review-status]'); + + if (element) element.textContent = message || ''; + } + + async function initJoinReviewPage() { + var page = root.document && root.document.querySelector('[data-join-review-page]'); + var list = root.document && root.document.querySelector('[data-join-apply-list="pending"]'); + var refresh = root.document && root.document.querySelector('[data-join-review-refresh]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var genealogyId = getCurrentGenealogyId(); + var canManage = false; + var writePending = false; + + if (!page) return; + if (!genealogyId) { + setStatus('请先从“我的家谱”选择要管理的家谱'); + list.innerHTML = '选择家谱后继续'; + return; + } + if (root.ProfileUI && root.ProfileUI.syncGenealogyContextLinks) { + root.ProfileUI.syncGenealogyContextLinks(); + } + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + + async function loadPending() { + var data; + + setStatus('正在读取待审核申请…'); + try { + data = await api.pendingGenealogyJoinApplies(genealogyId); + list.innerHTML = renderPendingJoinApplies(data, canManage); + setStatus(canManage ? '' : '当前账号没有审核该家谱申请的权限'); + return normalizePendingApplies(data); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return []; + } + list.innerHTML = '
读取待审核申请失败
'; + setStatus(error.message || '读取待审核申请失败，请稍后重试'); + return []; + } + } + + try { + var detail = await api.genealogyDetail(genealogyId); + + canManage = detail && detail.canManage === true; + if (!canManage) { + list.innerHTML = '
当前账号没有审核该家谱申请的权限
'; + setStatus('当前账号没有审核该家谱申请的权限'); + return; + } + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setStatus(error.message || '无法核验当前家谱管理权限'); + return; + } + + refresh.addEventListener('click', function () { + loadPending(); + }); + list.addEventListener('click', async function (event) { + var button = event.target.closest('[data-join-audit-id]'); + var applyId; + var status; + var auditRemark = ''; + var body; + var validation; + var refreshed; + + if (!button || !list.contains(button) || writePending || !canManage) return; + applyId = normalizeId(button.getAttribute('data-join-audit-id')); + status = button.getAttribute('data-join-audit-status'); + if (!applyId || ['1', '2'].indexOf(status) < 0) return; + if (status === '1' && root.confirm && !root.confirm('确认通过这条加入申请吗？')) return; + if (status === '2' && root.prompt) { + auditRemark = root.prompt('可填写拒绝原因（最多 500 个字符）', '') || ''; + } + body = buildJoinAuditBody({ status: status, auditRemark: auditRemark }); + validation = validateJoinAuditBody(body); + if (validation) { + setStatus(validation); + return; + } + writePending = true; + button.disabled = true; + setStatus('正在提交审核结果…'); + try { + await api.auditGenealogyJoinApply(genealogyId, applyId, body); + refreshed = await loadPending(); + if (refreshed.some(function (item) { return item.applyId === applyId; })) { + throw new Error('审核后申请仍在待审核列表'); + } + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setStatus(error.message || '提交审核结果失败，请稍后重试'); + } finally { + writePending = false; + } + }); + await loadPending(); + } + + return { + getCurrentGenealogyId: getCurrentGenealogyId, + buildJoinAuditBody: buildJoinAuditBody, + validateJoinAuditBody: validateJoinAuditBody, + normalizePendingApply: normalizePendingApply, + renderPendingJoinApplies: renderPendingJoinApplies, + initJoinReviewPage: initJoinReviewPage + }; +}); diff --git a/public/js/lineage-pages.js b/public/js/lineage-pages.js index 539f951..9e3f7e0 100644 --- a/public/js/lineage-pages.js +++ b/public/js/lineage-pages.js @@ -341,16 +341,19 @@ '' + escapeHtml(person.name) + '' + escapeHtml(getPersonSummary(person)) + '' + branches + ''; } - function renderTree(data) { - var container = query('[data-lineage-tree]'); + function renderLineageTreeHtml(data) { var nodes = normalizeList(data).map(function (item) { return renderTreeNode(item, {}); }).filter(Boolean); - if (!container) return; if (!nodes.length) { - container.innerHTML = '
暂无世系树
'; - return; + return '
暂无世系树
'; } - container.innerHTML = '
    ' + nodes.join('') + '
'; + return '
    ' + nodes.join('') + '
'; + } + + function renderTree(data) { + var container = query('[data-lineage-tree]'); + + if (container) container.innerHTML = renderLineageTreeHtml(data); } function renderOptions(data) { @@ -962,6 +965,7 @@ normalizeLineageBinding: normalizeLineageBinding, buildLineagePageQuery: buildLineagePageQuery, normalizeList: normalizeList, + renderLineageTreeHtml: renderLineageTreeHtml, relationLabel: relationLabel, shouldRedirectToLogin: shouldRedirectToLogin, isForbidden: isForbidden, diff --git a/public/js/site-news-pages.js b/public/js/site-news-pages.js new file mode 100644 index 0000000..f62421c --- /dev/null +++ b/public/js/site-news-pages.js @@ -0,0 +1,252 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.SiteNewsPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.SiteNewsPages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + var ARTICLE_TYPE_LABELS = { + news: '新闻', + notice: '公告', + download: '下载' + }; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function text(value) { + return value === undefined || value === null ? '' : String(value).trim(); + } + + function normalizeId(value) { + var normalized; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + normalized = String(value).trim(); + return /^[1-9][0-9]*$/.test(normalized) ? normalized : ''; + } + + function normalizeArticleType(value) { + var normalized = text(value); + + return Object.prototype.hasOwnProperty.call(ARTICLE_TYPE_LABELS, normalized) + ? normalized + : ''; + } + + function normalizeExternalUrl(value) { + var normalized = text(value); + var parsed; + + if (!normalized) return ''; + try { + parsed = new URL(normalized); + } catch (error) { + return ''; + } + return parsed.protocol === 'http:' || parsed.protocol === 'https:' ? parsed.href : ''; + } + + function normalizeArticle(item) { + var source = item || {}; + var articleId = normalizeId(source.articleId); + var articleType = normalizeArticleType(source.articleType); + var articleTitle = text(source.articleTitle); + + if (!articleId || !articleType || !articleTitle || String(source.status) !== '0') { + return null; + } + return { + articleId: articleId, + articleType: articleType, + articleTitle: articleTitle, + articleSummary: text(source.articleSummary), + articleContent: text(source.articleContent), + externalUrl: normalizeExternalUrl(source.externalUrl), + publishTime: text(source.publishTime) + }; + } + + function normalizeArticleList(data) { + var items; + + if (!Array.isArray(data)) return []; + items = data.map(normalizeArticle); + return items.some(function (item) { return !item; }) ? [] : items; + } + + function renderNormalizedArticleList(items) { + if (!items.length) return '
当前暂无资讯
'; + return items.map(function (item) { + return '' + + '' + escapeHtml(ARTICLE_TYPE_LABELS[item.articleType]) + '' + + '

' + escapeHtml(item.articleTitle) + '

' + + '

' + escapeHtml(item.articleSummary) + '

' + + '' + escapeHtml(item.publishTime) + ''; + }).join(''); + } + + function renderArticleList(data) { + return renderNormalizedArticleList(normalizeArticleList(data)); + } + + function renderNormalizedArticleDetail(item) { + var externalLink = item.externalUrl + ? '查看外部内容' + : ''; + var content = escapeHtml(item.articleContent).replace(/\r?\n/g, '
'); + + return '
' + + '
' + + escapeHtml(ARTICLE_TYPE_LABELS[item.articleType]) + '

' + + escapeHtml(item.articleTitle) + '

' + + escapeHtml(item.articleSummary) + '

' + + escapeHtml(item.publishTime) + '
' + + '
闻

' + + escapeHtml(item.articleSummary) + '

' + + '
' + + '

' + content + '

' + + externalLink + '
'; + } + + function renderArticleDetail(item) { + var article = normalizeArticle(item); + + return article + ? renderNormalizedArticleDetail(article) + : '
资讯不存在或已下线
'; + } + + function readQueryValue(search, key) { + var params = new URLSearchParams(String(search || '').replace(/^\?/, '')); + + return text(params.get(key)); + } + + function readArticleId(search) { + return normalizeId(readQueryValue(search, 'articleId')); + } + + async function loadArticles(api, articleType) { + var requestedType = text(articleType); + var normalizedType = normalizeArticleType(requestedType); + var query = { limit: 100 }; + var data; + var items; + + if (!api || typeof api.siteArticles !== 'function') throw new Error('资讯接口不可用'); + if (requestedType && !normalizedType) throw new Error('资讯分类无效'); + if (normalizedType) query.articleType = normalizedType; + data = await api.siteArticles(query); + items = normalizeArticleList(data); + if (!Array.isArray(data) || items.length !== data.length) { + throw new Error('资讯列表响应无效'); + } + return items; + } + + async function loadArticleDetail(api, targetArticleId) { + var normalizedId = normalizeId(targetArticleId); + var items; + var match; + + if (!normalizedId) throw new Error('资讯编号无效'); + items = await loadArticles(api, ''); + match = items.find(function (item) { + return item.articleId === normalizedId; + }); + if (!match) throw new Error('资讯不存在或已下线'); + return match; + } + + async function init() { + var document = root.document; + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var search = root.location && root.location.search || ''; + var listPage = document && document.querySelector('[data-site-news-page]'); + var detailPage = document && document.querySelector('[data-site-article-page]'); + var list; + var status; + var requestedType; + var detail; + var articleId; + + if (listPage) { + list = document.querySelector('[data-site-news-list]'); + status = document.querySelector('[data-site-news-status]'); + requestedType = readQueryValue(search, 'articleType'); + if (!list) return; + if (requestedType && !normalizeArticleType(requestedType)) { + list.innerHTML = '
资讯分类无效
'; + if (status) status.textContent = '资讯分类无效'; + return; + } + try { + list.classList.add('is-loading'); + list.innerHTML = renderNormalizedArticleList(await loadArticles(api, requestedType)); + if (status) status.textContent = ''; + } catch (error) { + list.innerHTML = '
资讯读取失败，请稍后重试
'; + if (status) status.textContent = error.message || '资讯读取失败'; + } finally { + list.classList.remove('is-loading'); + } + return; + } + + if (detailPage) { + detail = document.querySelector('[data-site-article-detail]'); + status = document.querySelector('[data-site-article-status]'); + articleId = readArticleId(search); + if (!detail) return; + if (!articleId) { + detail.innerHTML = '
资讯编号无效
'; + if (status) status.textContent = '资讯编号无效'; + return; + } + try { + detail.classList.add('is-loading'); + detail.innerHTML = renderNormalizedArticleDetail(await loadArticleDetail(api, articleId)); + if (status) status.textContent = ''; + } catch (error) { + detail.innerHTML = '
' + + escapeHtml(error.message || '资讯读取失败，请稍后重试') + '
'; + if (status) status.textContent = error.message || '资讯读取失败'; + } finally { + detail.classList.remove('is-loading'); + } + } + } + + return { + normalizeArticle: normalizeArticle, + normalizeArticleList: normalizeArticleList, + normalizeArticleType: normalizeArticleType, + normalizeExternalUrl: normalizeExternalUrl, + readArticleId: readArticleId, + renderArticleList: renderArticleList, + renderArticleDetail: renderArticleDetail, + loadArticles: loadArticles, + loadArticleDetail: loadArticleDetail, + init: init + }; +}); diff --git a/public/js/vip-pages.js b/public/js/vip-pages.js new file mode 100644 index 0000000..7671620 --- /dev/null +++ b/public/js/vip-pages.js @@ -0,0 +1,414 @@ +(function (root, factory) { + if (typeof module === 'object' && module.exports) { + module.exports = factory(root); + return; + } + + root.VipPages = factory(root); + if (root.document) { + root.document.addEventListener('DOMContentLoaded', function () { + root.VipPages.init(); + }); + } +})(typeof globalThis !== 'undefined' ? globalThis : window, function (root) { + 'use strict'; + + var PACKAGE_TYPES = { + vip: '会员套餐', + storage: '存储扩容' + }; + var DURATION_UNITS = { + permanent: '永久', + day: '天', + month: '个月', + year: '年' + }; + var PAY_STATUS = { + '0': '待支付', + '1': '已支付', + '2': '已关闭', + '3': '已退款' + }; + + function escapeHtml(value) { + return String(value === undefined || value === null ? '' : value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + function normalizeId(value) { + var text; + + if (typeof value === 'number' && !Number.isSafeInteger(value)) return ''; + if (value === undefined || value === null) return ''; + text = String(value).trim(); + return /^[1-9][0-9]*$/.test(text) ? text : ''; + } + + function optionalText(value) { + if (value === undefined || value === null) return ''; + return String(value).trim(); + } + + function moneyText(value, optional) { + var text; + + if ((value === undefined || value === null || value === '') && optional) return ''; + if (typeof value === 'number' && (!Number.isFinite(value) || value < 0)) return null; + text = String(value === undefined || value === null ? '' : value).trim(); + return /^(?:0|[1-9][0-9]*)(?:\.[0-9]+)?$/.test(text) ? text : null; + } + + function validLimit(value) { + return value === undefined || value === null || + (Number.isSafeInteger(Number(value)) && Number(value) >= 0); + } + + function normalizeVipPackage(item) { + var source = item || {}; + var packageId = normalizeId(source.packageId); + var packageName = optionalText(source.packageName); + var packageType = optionalText(source.packageType); + var durationUnit = optionalText(source.durationUnit); + var price = moneyText(source.price, false); + var originalPrice = moneyText(source.originalPrice, true); + var status = String(source.status === undefined || source.status === null ? '' : source.status); + + if (!packageId || !packageName || + !Object.prototype.hasOwnProperty.call(PACKAGE_TYPES, packageType) || + !Object.prototype.hasOwnProperty.call(DURATION_UNITS, durationUnit) || + price === null || originalPrice === null || status !== '0' || + !validLimit(source.durationValue) || !validLimit(source.genealogyLimit) || + !validLimit(source.memberLimit) || !validLimit(source.storageLimitMb)) { + return null; + } + return { + packageId: packageId, + packageName: packageName, + packageType: packageType, + packageDesc: optionalText(source.packageDesc), + price: price, + originalPrice: originalPrice, + durationValue: source.durationValue === undefined || source.durationValue === null ? null : Number(source.durationValue), + durationUnit: durationUnit, + genealogyLimit: source.genealogyLimit === undefined || source.genealogyLimit === null ? null : Number(source.genealogyLimit), + memberLimit: source.memberLimit === undefined || source.memberLimit === null ? null : Number(source.memberLimit), + storageLimitMb: source.storageLimitMb === undefined || source.storageLimitMb === null ? null : Number(source.storageLimitMb), + remark: optionalText(source.remark) + }; + } + + function normalizeVipPackages(data) { + if (!Array.isArray(data)) return []; + return data.map(normalizeVipPackage).filter(Boolean); + } + + function normalizeGenealogyOption(item) { + var source = item || {}; + var genealogyId = normalizeId(source.genealogyId); + var genealogyName = optionalText(source.genealogyName); + + if (!genealogyId || !genealogyName) return null; + return { + genealogyId: genealogyId, + genealogyName: genealogyName, + surname: optionalText(source.surname) + }; + } + + function buildVipOrderBody(values) { + var source = values || {}; + var body = {}; + var packageId = normalizeId(source.packageId); + var genealogyId = normalizeId(source.genealogyId); + var payType = optionalText(source.payType); + + if (packageId) body.packageId = packageId; + else if (source.packageId !== undefined) body.invalidPackageId = true; + if (genealogyId) body.genealogyId = genealogyId; + else if (source.genealogyId) body.invalidGenealogyId = true; + if (payType) body.payType = payType; + return body; + } + + function validateVipOrderBody(body) { + if (!body || !normalizeId(body.packageId) || body.invalidPackageId) return '请选择有效会员套餐'; + if (body.invalidGenealogyId || + (body.genealogyId !== undefined && body.genealogyId !== null && + String(body.genealogyId).trim() !== '' && !normalizeId(body.genealogyId))) { + return '家谱选项无效'; + } + if (body.payType && body.payType !== 'wechat') return '支付方式无效'; + return ''; + } + + function normalizeVipOrder(item) { + var source = item || {}; + var orderId = normalizeId(source.orderId); + var packageId = normalizeId(source.packageId); + var genealogyId = source.genealogyId === undefined || source.genealogyId === null + ? '' + : normalizeId(source.genealogyId); + var orderAmount = moneyText(source.orderAmount, false); + var payAmount = moneyText(source.payAmount, false); + var payStatus = String(source.payStatus === undefined || source.payStatus === null ? '' : source.payStatus); + var status = String(source.status === undefined || source.status === null ? '' : source.status); + + if (!orderId || !packageId || !optionalText(source.orderNo) || + !optionalText(source.packageName) || + (source.genealogyId !== undefined && source.genealogyId !== null && !genealogyId) || + orderAmount === null || payAmount === null || + !Object.prototype.hasOwnProperty.call(PAY_STATUS, payStatus) || + ['0', '1'].indexOf(status) < 0) { + return null; + } + return { + orderId: orderId, + orderNo: optionalText(source.orderNo), + packageId: packageId, + packageName: optionalText(source.packageName), + genealogyId: genealogyId, + genealogyNo: optionalText(source.genealogyNo), + genealogyName: optionalText(source.genealogyName), + orderAmount: orderAmount, + payAmount: payAmount, + payType: optionalText(source.payType), + payStatus: payStatus, + payTime: optionalText(source.payTime), + expireTime: optionalText(source.expireTime), + status: status, + remark: optionalText(source.remark) + }; + } + + function normalizeVipOrders(data) { + if (!Array.isArray(data)) return []; + return data.map(normalizeVipOrder).filter(Boolean); + } + + function renderVipPackages(data, selectedPackageId) { + var items = Array.isArray(data) ? data : []; + var selectedId = normalizeId(selectedPackageId); + + if (!items.length) return '
当前没有可用会员套餐
'; + return items.map(function (item) { + var duration = item.durationUnit === 'permanent' + ? DURATION_UNITS[item.durationUnit] + : (item.durationValue === null ? '' : item.durationValue) + DURATION_UNITS[item.durationUnit]; + var limits = [ + item.genealogyLimit === null ? '' : '家谱 ' + item.genealogyLimit + ' 部', + item.memberLimit === null ? '' : '成员 ' + item.memberLimit + ' 人', + item.storageLimitMb === null ? '' : '存储 ' + item.storageLimitMb + ' MB' + ].filter(Boolean).join(' · '); + + return ''; + }).join(''); + } + + function renderGenealogyOptions(data) { + var items = Array.isArray(data) ? data.map(normalizeGenealogyOption).filter(Boolean) : []; + + return '' + items.map(function (item) { + return ''; + }).join(''); + } + + function renderVipOrders(data) { + var items = normalizeVipOrders(data); + + if (!items.length) return '
当前没有会员订单
'; + return items.map(function (item) { + var details = [ + item.orderNo, + item.genealogyName, + '订单金额 ¥' + item.orderAmount, + '应付 ¥' + item.payAmount, + item.payType ? '支付方式 ' + item.payType : '', + item.payTime ? '支付时间 ' + item.payTime : '', + item.expireTime ? '有效期至 ' + item.expireTime : '', + item.remark + ].filter(Boolean).join(' · '); + + return '

' + escapeHtml(item.packageName) + + '

' + escapeHtml(details) + '

' + + PAY_STATUS[item.payStatus] + '
'; + }).join(''); + } + + function shouldRedirectToLogin(api, error) { + var status = error && (error.status || error.code); + + return !api || !api.getToken || !api.getToken() || Number(status) === 401; + } + + function redirectToLogin(api) { + if (api && api.clearToken) api.clearToken(); + if (!root.location) return; + if (typeof root.location.replace === 'function') root.location.replace('login.html'); + else root.location.href = 'login.html'; + } + + async function init() { + var page = root.document && root.document.querySelector('[data-vip-page]'); + var packageList = root.document && root.document.querySelector('[data-vip-package-list]'); + var selectedText = root.document && root.document.querySelector('[data-vip-selected-package]'); + var genealogySelect = root.document && root.document.querySelector('[data-vip-genealogy-options]'); + var form = root.document && root.document.querySelector('[data-vip-order-form]'); + var submit = root.document && root.document.querySelector('[data-vip-order-submit]'); + var status = root.document && root.document.querySelector('[data-vip-order-status]'); + var refresh = root.document && root.document.querySelector('[data-vip-order-refresh]'); + var orderList = root.document && root.document.querySelector('[data-vip-order-list]'); + var api = root.GenealogyApi && root.GenealogyApi.defaultClient; + var packages = []; + var selectedPackageId = ''; + var writePending = false; + + if (!page) return; + if (shouldRedirectToLogin(api)) { + redirectToLogin(api); + return; + } + if (!packageList || !selectedText || !genealogySelect || !form || !orderList || + !api.vipPackages || !api.genealogiesMine || !api.vipOrders || !api.createVipOrder) { + if (status) status.textContent = '会员服务接口初始化失败，请刷新后重试'; + return; + } + + function setStatus(message) { + if (status) status.textContent = message; + } + + function renderPackages() { + packageList.innerHTML = renderVipPackages(packages, selectedPackageId); + } + + function renderOrders(orders) { + orderList.innerHTML = renderVipOrders(orders); + } + + async function loadOrders() { + var orders = normalizeVipOrders(await api.vipOrders()); + renderOrders(orders); + return orders; + } + + try { + var initial = await Promise.all([api.vipPackages(), api.genealogiesMine(), api.vipOrders()]); + packages = normalizeVipPackages(initial[0]); + renderPackages(); + genealogySelect.innerHTML = renderGenealogyOptions(initial[1]); + renderOrders(initial[2]); + setStatus(packages.length ? '请选择会员套餐' : '当前没有可用会员套餐'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + packageList.innerHTML = '
会员套餐读取失败，请稍后重试
'; + orderList.innerHTML = '
会员订单读取失败，请稍后重试
'; + setStatus(error.message || '会员服务读取失败，请稍后重试'); + return; + } + + packageList.addEventListener('click', function (event) { + var button = event.target.closest('[data-vip-package-id]'); + var packageId; + var selected; + + if (!button || !packageList.contains(button)) return; + packageId = normalizeId(button.getAttribute('data-vip-package-id')); + selected = packages.find(function (item) { return item.packageId === packageId; }); + if (!selected) return; + selectedPackageId = selected.packageId; + selectedText.textContent = '已选择：' + selected.packageName + '（¥' + selected.price + '）'; + renderPackages(); + setStatus('可以创建会员订单'); + }); + + if (refresh) { + refresh.addEventListener('click', async function () { + if (writePending) return; + refresh.disabled = true; + setStatus('正在刷新订单…'); + try { + await loadOrders(); + setStatus('会员订单已刷新'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setStatus(error.message || '会员订单刷新失败，请稍后重试'); + } finally { + refresh.disabled = false; + } + }); + } + + form.addEventListener('submit', async function (event) { + var body; + var validation; + var created; + var refreshed; + var verified; + + event.preventDefault(); + if (writePending) return; + body = buildVipOrderBody({ + packageId: selectedPackageId, + genealogyId: genealogySelect.value + }); + validation = validateVipOrderBody(body); + if (validation) { + setStatus(validation); + return; + } + + writePending = true; + if (submit) submit.disabled = true; + setStatus('正在创建会员订单…'); + try { + created = normalizeVipOrder(await api.createVipOrder(body)); + if (!created) throw new Error('创建响应缺少有效会员订单信息'); + refreshed = normalizeVipOrders(await api.vipOrders()); + verified = refreshed.find(function (item) { return item.orderId === created.orderId; }); + if (!verified) throw new Error('订单已提交，但重新读取未找到对应记录'); + renderOrders(refreshed); + setStatus('订单已创建；当前 PC 暂未开放在线支付'); + } catch (error) { + if (shouldRedirectToLogin(api, error)) { + redirectToLogin(api); + return; + } + setStatus(error.message || '会员订单创建失败，请稍后重试'); + } finally { + writePending = false; + if (submit) submit.disabled = false; + } + }); + } + + return { + normalizeVipPackage: normalizeVipPackage, + normalizeVipPackages: normalizeVipPackages, + normalizeGenealogyOption: normalizeGenealogyOption, + buildVipOrderBody: buildVipOrderBody, + validateVipOrderBody: validateVipOrderBody, + normalizeVipOrder: normalizeVipOrder, + normalizeVipOrders: normalizeVipOrders, + renderVipPackages: renderVipPackages, + renderGenealogyOptions: renderGenealogyOptions, + renderVipOrders: renderVipOrders, + init: init + }; +}); diff --git a/submit-ticket.html b/submit-ticket.html index 3de8e43..07026a3 100644 --- a/submit-ticket.html +++ b/submit-ticket.html @@ -7,7 +7,7 @@ - +

工单信息

- - +

+
@@ -110,7 +112,7 @@ - + diff --git a/tests/api-client-contract.test.js b/tests/api-client-contract.test.js index f53a243..5565122 100644 --- a/tests/api-client-contract.test.js +++ b/tests/api-client-contract.test.js @@ -32,6 +32,10 @@ test('API client exposes latest document-defined PC operations', () => { 'genealogiesMine', 'genealogyOptions', 'genealogyDetail', 'genealogyOverview', 'genealogyQuota', 'createGenealogy', 'applyToGenealogy', 'myGenealogyJoinApplies', 'pendingGenealogyJoinApplies', 'auditGenealogyJoinApply', 'cancelGenealogyJoinApply', + 'submitFeedback', 'myFeedback', + 'helpArticles', 'helpArticleDetail', 'siteArticles', + 'promotions', + 'vipPackages', 'createVipOrder', 'vipOrders', 'notifications', 'notificationDetail', 'unreadNotificationCount', 'markNotificationRead', 'markAllNotificationsRead', 'feeds', 'feedsPage', 'feedDetail', 'createFeed', 'updateFeed', 'deleteFeed', 'likeFeed', 'unlikeFeed', 'feedComments', 'feedCommentsPage', 'createFeedComment', @@ -506,6 +510,110 @@ test('genealogy quota uses the current PC path without manufacturing a genealogy await client.genealogyQuota(); }); +test('help article methods use authenticated PC paths and whitelist the optional category', async () => { + const calls = []; + const client = GenealogyApi.createClient({ + baseUrl: 'https://api.example.test', + tokenStore: { getItem() { return 'access-token'; }, setItem() {}, removeItem() {} }, + axiosInstance: { + request(config) { + calls.push(config); + return Promise.resolve({ data: { code: 200, data: [] } }); + } + } + }); + + await client.helpArticles({ helpCategory: ' account ', keyword: 'must-drop' }); + await client.helpArticleDetail('2062179707935264769'); + + assert.deepEqual(calls.map((config) => [ + config.method, + config.url, + config.params, + config.headers.Authorization + ]), [ + ['get', '/genealogy/pc/help-articles', { helpCategory: ' account ' }, 'Bearer access-token'], + ['get', '/genealogy/pc/help-articles/2062179707935264769', undefined, 'Bearer access-token'] + ]); +}); + +test('promotion method uses the authenticated PC path and whitelists platform query', async () => { + const calls = []; + const client = GenealogyApi.createClient({ + baseUrl: 'https://api.example.test', + tokenStore: { getItem() { return 'access-token'; }, setItem() {}, removeItem() {} }, + axiosInstance: { + request(config) { + calls.push(config); + return Promise.resolve({ data: { code: 200, data: [] } }); + } + } + }); + + await client.promotions({ + platform: 'pc', + keyword: 'must-drop' + }); + + assert.deepEqual(calls.map((config) => [ + config.method, + config.url, + config.params, + config.headers.Authorization + ]), [ + ['get', '/genealogy/pc/promotions', { platform: 'pc' }, 'Bearer access-token'] + ]); + assert.throws( + () => client.promotions({ platform: 'desktop' }), + /不支持的推广平台/ + ); +}); + +test('site article method uses the public PC path and validates SQL query values', async () => { + const calls = []; + const client = GenealogyApi.createClient({ + baseUrl: 'https://api.example.test', + tokenStore: { + getItem() { return 'access-token'; }, + setItem() {}, + removeItem() {} + }, + axiosInstance: { + request(config) { + calls.push(config); + return Promise.resolve({ data: { code: 200, data: [] } }); + } + } + }); + + await client.siteArticles({ + articleType: 'notice', + limit: 100, + keyword: 'must-drop' + }); + await client.siteArticles({ limit: 100 }); + + assert.deepEqual(calls.map((config) => [ + config.method, + config.url, + config.params, + config.headers.Authorization + ]), [ + ['get', '/genealogy/pc/site/articles', { articleType: 'notice', limit: 100 }, undefined], + ['get', '/genealogy/pc/site/articles', { limit: 100 }, undefined] + ]); + assert.throws( + () => client.siteArticles({ articleType: 'culture', limit: 100 }), + /不支持的资讯类型/ + ); + [0, -1, 1.5, 101, '100'].forEach((limit) => { + assert.throws( + () => client.siteArticles({ limit }), + /资讯数量限制/ + ); + }); +}); + test('genealogy context methods obtain IDs from the real PC list and detail paths', async () => { const calls = []; const client = GenealogyApi.createClient({ @@ -613,6 +721,72 @@ test('genealogy lifecycle methods use PC paths and strict request bodies', async ); }); +test('feedback methods use the PC collection path and AppFeedbackBody whitelist', async () => { + const calls = []; + const client = GenealogyApi.createClient({ + baseUrl: 'https://api.example.test', + tokenStore: { getItem() { return 'access-token'; }, setItem() {}, removeItem() {} }, + axiosInstance: { + request(config) { + calls.push(config); + return Promise.resolve({ data: { code: 200, data: [] } }); + } + } + }); + + await client.submitFeedback({ + feedbackType: 'bug', + feedbackContent: '页面按钮无响应', + contactInfo: '19181970173', + feedbackTitle: 'must-drop', + appUserId: 'must-drop' + }); + await client.myFeedback(); + + assert.deepEqual(calls.map((config) => [config.method, config.url, config.data]), [ + ['post', '/genealogy/pc/feedback', { + feedbackType: 'bug', + feedbackContent: '页面按钮无响应', + contactInfo: '19181970173' + }], + ['get', '/genealogy/pc/feedback', undefined] + ]); +}); + +test('VIP methods use PC package and order paths with AppVipOrderBody whitelist', async () => { + const calls = []; + const client = GenealogyApi.createClient({ + baseUrl: 'https://api.example.test', + tokenStore: { getItem() { return 'access-token'; }, setItem() {}, removeItem() {} }, + axiosInstance: { + request(config) { + calls.push(config); + return Promise.resolve({ data: { code: 200, data: [] } }); + } + } + }); + + await client.vipPackages(); + await client.createVipOrder({ + packageId: '2062179707935264769', + genealogyId: '2062179707935264770', + payType: 'wechat', + appUserId: 'must-drop', + payStatus: 'must-drop' + }); + await client.vipOrders(); + + assert.deepEqual(calls.map((config) => [config.method, config.url, config.data]), [ + ['get', '/genealogy/pc/vip/packages', undefined], + ['post', '/genealogy/pc/vip/orders', { + packageId: '2062179707935264769', + genealogyId: '2062179707935264770', + payType: 'wechat' + }], + ['get', '/genealogy/pc/vip/orders', undefined] + ]); +}); + test('notification methods use the current PC list, unread and read paths', async () => { const calls = []; const client = GenealogyApi.createClient({ diff --git a/tests/app-promotion-pages.test.js b/tests/app-promotion-pages.test.js new file mode 100644 index 0000000..0d2f799 --- /dev/null +++ b/tests/app-promotion-pages.test.js @@ -0,0 +1,136 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const AppPromotionPages = require('../public/js/app-promotion-pages.js'); +const appPage = fs.readFileSync(path.resolve(__dirname, '../app.html'), 'utf8'); + +const promotionId = '2062179707935264769'; + +function promotionFixture(overrides) { + return Object.assign({ + promotionId, + promotionKey: 'app-download', + promotionTitle: '下载移动端', + promotionDesc: '随时查看家谱内容', + coverOssId: '2062179707935264701', + targetUrl: 'https://example.com/download', + platform: 'all', + sortOrder: 10, + status: '0', + remark: 'internal-only' + }, overrides); +} + +test('推广响应只保留 AppPromotionVo 的安全展示字段并保持长 ID 字符串', () => { + assert.deepEqual(AppPromotionPages.normalizePromotion(promotionFixture()), { + promotionId, + promotionTitle: '下载移动端', + promotionDesc: '随时查看家谱内容', + targetUrl: 'https://example.com/download' + }); + assert.equal(AppPromotionPages.normalizePromotion(promotionFixture({ + promotionId: Number.MAX_SAFE_INTEGER + 1 + })), null); +}); + +test('推广响应拒绝停用记录和空标题', () => { + assert.equal(AppPromotionPages.normalizePromotion(promotionFixture({ status: '1' })), null); + assert.equal(AppPromotionPages.normalizePromotion(promotionFixture({ promotionTitle: ' ' })), null); +}); + +test('推广列表只接受直接数组且任一非法元素使整批失败', () => { + assert.equal(AppPromotionPages.normalizePromotionList([promotionFixture()]).length, 1); + assert.deepEqual(AppPromotionPages.normalizePromotionList([]), []); + assert.deepEqual(AppPromotionPages.normalizePromotionList({ + rows: [promotionFixture()] + }), []); + assert.deepEqual(AppPromotionPages.normalizePromotionList([ + promotionFixture(), + promotionFixture({ promotionId: '' }) + ]), []); +}); + +test('推广链接只允许绝对 HTTP 或 HTTPS 地址', () => { + assert.equal( + AppPromotionPages.normalizeTargetUrl(' https://example.com/download '), + 'https://example.com/download' + ); + assert.equal(AppPromotionPages.normalizeTargetUrl('http://example.com'), 'http://example.com/'); + ['javascript:alert(1)', 'data:text/html,test', '/download', 'download.html', ''].forEach((value) => { + assert.equal(AppPromotionPages.normalizeTargetUrl(value), ''); + }); +}); + +test('推广卡片转义响应并隐藏 OSS ID、后台键、排序、状态和备注', () => { + const html = AppPromotionPages.renderPromotionList([promotionFixture({ + promotionTitle: '', + promotionDesc: '', + coverOssId: 'secret-oss', + promotionKey: 'secret-key', + remark: 'secret-remark' + })]); + + assert.match(html, /<script>/); + assert.match(html, /<img src=x>/); + assert.match(html, /target="_blank"/); + assert.match(html, /rel="noopener noreferrer"/); + assert.doesNotMatch( + html, + / { + const html = AppPromotionPages.renderPromotionList([ + promotionFixture({ targetUrl: 'javascript:alert(1)' }) + ]); + + assert.match(html, /^
)|href=|target=|rel=/); +}); + +test('PC 推广列表只请求 SQL 字典确认的 pc 平台', async () => { + const calls = []; + const api = { + async promotions() { + calls.push(Array.from(arguments)); + return [promotionFixture()]; + } + }; + + assert.equal((await AppPromotionPages.loadPromotions(api)).length, 1); + assert.deepEqual(calls, [[{ platform: 'pc' }]]); + await assert.rejects( + AppPromotionPages.loadPromotions({ + async promotions() { + return { rows: [promotionFixture()] }; + } + }), + /推广列表响应无效/ + ); +}); + +test('推广区域只把 401 视为登录失效', () => { + assert.equal(AppPromotionPages.isUnauthorized({ status: 401 }), true); + assert.equal(AppPromotionPages.isUnauthorized({ code: '401' }), true); + assert.equal(AppPromotionPages.isUnauthorized({ status: 403 }), false); + assert.equal(AppPromotionPages.isUnauthorized(new Error('网络失败')), false); +}); + +test('推广区域提供明确的未登录和空列表状态', () => { + assert.match( + AppPromotionPages.renderPromotionLoginRequired(), + /立即登录<\/a>/ + ); + assert.match(AppPromotionPages.renderPromotionList([]), /当前暂无应用推广/); +}); + +test('应用下载页只通过页面标记和新推广模块接入，不暴露业务 ID 输入', () => { + assert.match(appPage, /]*data-promotion-page/); + assert.match(appPage, /data-promotion-list/); + assert.match(appPage, /src="public\/js\/app-promotion-pages\.js"/); + assert.doesNotMatch(appPage, /src="public\/js\/promotion-pages\.js"/); + assert.doesNotMatch(appPage, /name="(?:promotionId|coverOssId)"/); +}); diff --git a/tests/family-home-pages.test.js b/tests/family-home-pages.test.js new file mode 100644 index 0000000..7f660de --- /dev/null +++ b/tests/family-home-pages.test.js @@ -0,0 +1,186 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const FamilyHomePages = require('../public/js/family-home-pages.js'); + +const genealogyId = '2062179707935264769'; +const root = path.resolve(__dirname, '..'); + +function overviewFixture(overrides) { + return Object.assign({ + genealogyId, + genealogyNo: 'G20260729001', + genealogyName: '叶氏家谱', + surname: '叶', + ancestralHall: '南阳堂', + originPlace: '四川成都', + regionCode: '510100', + regionName: '成都市', + regionFullName: '四川省 成都市', + addressDetail: '高新区', + coverOssId: '2062179707935264700', + intro: '叶氏源流', + ownerUserId: '2062179707935264701', + visibility: '1', + joinMode: '1', + memberCount: 12, + personCount: 36, + status: '0', + roleType: 'owner', + canManage: true, + canEditContent: true, + memberStatus: '0', + joinTime: '2026-07-29 12:00:00' + }, overrides); +} + +test('家谱主页只保留 AppGenealogyVo 的安全展示字段并匹配当前上下文', () => { + assert.deepEqual(FamilyHomePages.normalizeFamilyOverview( + overviewFixture(), + genealogyId + ), { + genealogyId, + genealogyNo: 'G20260729001', + genealogyName: '叶氏家谱', + surname: '叶', + ancestralHall: '南阳堂', + originPlace: '四川成都', + regionFullName: '四川省 成都市', + memberCount: 12, + personCount: 36, + canManage: true, + canEditContent: true + }); + + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ genealogyId: '2062179707935264770' }), + genealogyId + ), null); + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ genealogyId: Number.MAX_SAFE_INTEGER + 1 }), + genealogyId + ), null); +}); + +test('家谱主页拒绝停用、空名称和非法计数响应', () => { + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ status: '1' }), + genealogyId + ), null); + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ genealogyName: '' }), + genealogyId + ), null); + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ memberCount: -1 }), + genealogyId + ), null); + assert.equal(FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ personCount: Number.MAX_SAFE_INTEGER + 1 }), + genealogyId + ), null); +}); + +test('家谱概览渲染转义文本并隐藏内部用户与文件编号', () => { + const overview = FamilyHomePages.normalizeFamilyOverview( + overviewFixture({ + genealogyName: '<叶氏家谱>', + ancestralHall: '<南阳堂>' + }), + genealogyId + ); + const html = FamilyHomePages.renderFamilyOverview(overview); + + assert.match(html, /<叶氏家谱>/); + assert.match(html, /<南阳堂>/); + assert.match(html, /成员 12 人/); + assert.match(html, /世系人物 36 人/); + assert.doesNotMatch(html, /ownerUserId|coverOssId|206217970793526470[01]/); +}); + +test('家谱管理入口只接受后端布尔能力字段', () => { + assert.equal(FamilyHomePages.shouldShowFamilyManagement( + FamilyHomePages.normalizeFamilyOverview(overviewFixture({ canManage: true }), genealogyId) + ), true); + assert.equal(FamilyHomePages.shouldShowFamilyManagement( + FamilyHomePages.normalizeFamilyOverview(overviewFixture({ canManage: 'true' }), genealogyId) + ), false); +}); + +test('家谱主页只把缺失登录态和 401 视为登录失效', () => { + assert.equal(FamilyHomePages.shouldRedirectToLogin({ + getToken() { return 'token'; } + }, { status: 403 }), false); + assert.equal(FamilyHomePages.shouldRedirectToLogin({ + getToken() { return 'token'; } + }, { status: 401 }), true); + assert.equal(FamilyHomePages.shouldRedirectToLogin({ + getToken() { return ''; } + }), true); +}); + +test('家谱主页只读取当前家谱概览和世系树', async () => { + const calls = []; + const tree = [{ + personId: '2062179707935264770', + genealogyId, + name: '始祖', + spouses: [], + children: [] + }]; + const result = await FamilyHomePages.loadFamilyHome({ + genealogyOverview(receivedId) { + calls.push(['overview', receivedId]); + return Promise.resolve(overviewFixture()); + }, + lineageTree(receivedId) { + calls.push(['tree', receivedId]); + return Promise.resolve(tree); + } + }, genealogyId); + + assert.deepEqual(calls, [ + ['overview', genealogyId], + ['tree', genealogyId] + ]); + assert.deepEqual(result.overview, FamilyHomePages.normalizeFamilyOverview( + overviewFixture(), + genealogyId + )); + assert.deepEqual(result.tree, tree); +}); + +test('家谱主页开放真实只读概览且不制造邀请或聚合统计入口', () => { + const source = fs.readFileSync(path.join(root, 'profile-family-home.html'), 'utf8'); + + assert.doesNotMatch(source, /data-feature-status="pending"|pending-pages\.js/); + assert.doesNotMatch(source, /四川武胜汤氏族/); + assert.doesNotMatch(source, /href="profile-invite\.html"/); + assert.match(source, /PC 暂未开放邀请/); + assert.match(source, /data-family-home-title/); + assert.match(source, /data-family-home-overview/); + assert.match(source, /data-family-home-member-count/); + assert.match(source, /data-family-home-person-count/); + assert.match(source, /data-family-home-management/); + assert.match(source, /data-lineage-home-tree/); + assert.match(source, /src="public\/js\/lineage-pages\.js"/); + assert.match(source, /src="public\/js\/family-home-pages\.js"/); + + [ + 'profile-feed.html', + 'profile-tree.html', + 'profile-article.html', + 'profile-album.html', + 'profile-video.html', + 'profile-merit.html', + 'profile-ceremony.html' + ].forEach((href) => { + assert.match( + source, + new RegExp('href="' + href.replace('.', '\\.') + '"[^>]*data-genealogy-context-link'), + `${href} 缺少家谱上下文` + ); + }); +}); diff --git a/tests/feedback-pages.test.js b/tests/feedback-pages.test.js new file mode 100644 index 0000000..d4e2984 --- /dev/null +++ b/tests/feedback-pages.test.js @@ -0,0 +1,169 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const FeedbackPages = require('../public/js/feedback-pages.js'); + +const feedbackId = '2062179707935264769'; + +function read(relativePath) { + return fs.readFileSync(path.resolve(__dirname, '..', relativePath), 'utf8'); +} + +function feedbackFixture(overrides) { + return Object.assign({ + feedbackId, + appUserId: '2062179707935264701', + appUserNickName: '叶子', + appUserPhone: '19100000000', + feedbackType: 'bug', + feedbackContent: '页面按钮无响应', + contactInfo: '19181970173', + handleStatus: '2', + handleResult: '已经修复', + handlerId: '2062179707935264702', + handleTime: '2026-07-29 13:00:00', + status: '0', + remark: '感谢反馈' + }, overrides); +} + +test('反馈请求只构造 AppFeedbackBody 并裁剪文本', () => { + assert.deepEqual(FeedbackPages.buildFeedbackBody({ + feedbackType: ' bug ', + feedbackContent: ' 页面按钮无响应 ', + contactInfo: ' 19181970173 ', + feedbackTitle: 'must-drop', + appUserId: 'must-drop', + handlerId: 'must-drop' + }), { + feedbackType: 'bug', + feedbackContent: '页面按钮无响应', + contactInfo: '19181970173' + }); + assert.deepEqual(FeedbackPages.buildFeedbackBody({ + feedbackType: '', + feedbackContent: ' 建议增加导出 ', + contactInfo: ' ' + }), { + feedbackContent: '建议增加导出' + }); +}); + +test('反馈内容必填且类型只允许后端确认的四种值', () => { + assert.equal(FeedbackPages.validateFeedbackBody({ feedbackContent: '建议增加导出' }), ''); + assert.equal(FeedbackPages.validateFeedbackBody({ + feedbackType: 'advice', + feedbackContent: '建议增加导出' + }), ''); + assert.match(FeedbackPages.validateFeedbackBody({ feedbackContent: '' }), /反馈内容/); + assert.match(FeedbackPages.validateFeedbackBody({ + feedbackType: 'suggestion', + feedbackContent: '建议增加导出' + }), /反馈类型/); +}); + +test('FeedbackVo 只保留用户可见字段并保持长 ID 字符串', () => { + assert.deepEqual(FeedbackPages.normalizeFeedback(feedbackFixture()), { + feedbackId, + feedbackType: 'bug', + feedbackContent: '页面按钮无响应', + contactInfo: '19181970173', + handleStatus: '2', + handleResult: '已经修复', + handleTime: '2026-07-29 13:00:00', + status: '0', + remark: '感谢反馈' + }); + assert.equal(FeedbackPages.normalizeFeedback(feedbackFixture({ + feedbackId: Number.MAX_SAFE_INTEGER + 1 + })), null); + assert.equal(FeedbackPages.normalizeFeedback(feedbackFixture({ + feedbackContent: '' + })), null); + assert.equal(FeedbackPages.normalizeFeedback(feedbackFixture({ + handleStatus: '9' + })), null); + assert.equal(FeedbackPages.normalizeFeedback(feedbackFixture({ + status: '9' + })), null); +}); + +test('反馈数组包含非法记录时整批拒绝', () => { + assert.equal(FeedbackPages.normalizeFeedbackList([feedbackFixture()]).length, 1); + assert.deepEqual(FeedbackPages.normalizeFeedbackList([ + feedbackFixture(), + feedbackFixture({ feedbackId: '' }) + ]), []); + assert.deepEqual(FeedbackPages.normalizeFeedbackList({ rows: [feedbackFixture()] }), []); +}); + +test('详情只精确匹配 URL 中的反馈 ID 且不存在时不回退', () => { + const secondId = '2062179707935264770'; + const list = [feedbackFixture(), feedbackFixture({ feedbackId: secondId, feedbackContent: '第二条' })]; + + assert.equal(FeedbackPages.getFeedbackId('?feedbackId=' + secondId), secondId); + assert.equal(FeedbackPages.getFeedbackId('?feedbackId=unsafe'), ''); + assert.equal(FeedbackPages.findFeedbackById(list, secondId).feedbackContent, '第二条'); + assert.equal(FeedbackPages.findFeedbackById(list, '2062179707935264999'), null); + assert.equal( + FeedbackPages.buildFeedbackDetailUrl(secondId), + 'ticket-detail.html?feedbackId=2062179707935264770' + ); +}); + +test('反馈列表和详情转义文本且不暴露内部账号信息', () => { + const item = feedbackFixture({ + feedbackContent: '', + handleResult: '', + appUserId: 'secret-user', + handlerId: 'secret-handler', + appUserPhone: 'secret-account-phone' + }); + const listHtml = FeedbackPages.renderFeedbackList([item], { + detailPage: 'ticket-detail.html' + }); + const detailHtml = FeedbackPages.renderFeedbackDetail(item); + + assert.match(listHtml, /<script>/); + assert.match(detailHtml, /<img src=x>/); + assert.doesNotMatch(listHtml + detailHtml, / { + ['profile-feedback.html', 'submit-ticket.html'].forEach((page) => { + const source = read(page); + + assert.doesNotMatch(source, /data-feature-status="pending"|pending-pages\.js/); + assert.match(source, /data-feedback-form/); + assert.match(source, /name="feedbackType"/); + assert.match(source, /name="feedbackContent"/); + assert.match(source, /name="contactInfo"/); + assert.match(source, /public\/js\/feedback-pages\.js/); + assert.doesNotMatch(source, /name="(?:feedbackTitle|feedbackId|appUserId|handlerId)"/); + }); +}); + +test('我的工单和详情页读取同一反馈集合且不制造处理动作', () => { + const listPage = read('my-tickets.html'); + const detailPage = read('ticket-detail.html'); + + [listPage, detailPage].forEach((source) => { + assert.doesNotMatch(source, /data-feature-status="pending"|pending-pages\.js/); + assert.match(source, /public\/js\/feedback-pages\.js/); + }); + assert.match(listPage, /data-feedback-list/); + assert.match(listPage, /data-feedback-refresh/); + assert.match(detailPage, /data-feedback-detail/); + assert.doesNotMatch(detailPage, /回复|追问|删除|关闭工单|name="feedbackId"/); +}); + +test('反馈运行时提交后重读同一 ID，详情不存在时不回退', () => { + const source = read('public/js/feedback-pages.js'); + + assert.match(source, /await api\.submitFeedback\(/); + assert.match(source, /await api\.myFeedback\(\)/); + assert.match(source, /提交后无法读取同一反馈记录/); + assert.match(source, /反馈记录不存在或无权查看/); +}); diff --git a/tests/help-pages.test.js b/tests/help-pages.test.js new file mode 100644 index 0000000..c40dd28 --- /dev/null +++ b/tests/help-pages.test.js @@ -0,0 +1,116 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const HelpPages = require('../public/js/help-pages.js'); + +const helpId = '2062179707935264769'; + +function read(relativePath) { + return fs.readFileSync(path.resolve(__dirname, '..', relativePath), 'utf8'); +} + +function helpFixture(overrides) { + return Object.assign({ + helpId, + helpCategory: '账号与安全', + helpTitle: '如何修改登录密码？', + helpContent: '进入账号安全页，完成验证后修改密码。', + coverOssId: '2062179707935264701', + sortOrder: 10, + viewCount: 12, + status: '0', + remark: 'internal-only' + }, overrides); +} + +test('帮助文章只保留 HelpArticleVo 的安全展示字段并保持长 ID 字符串', () => { + assert.deepEqual(HelpPages.normalizeHelpArticle(helpFixture()), { + helpId, + helpCategory: '账号与安全', + helpTitle: '如何修改登录密码？', + helpContent: '进入账号安全页，完成验证后修改密码。', + viewCount: '12' + }); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ + helpId: Number.MAX_SAFE_INTEGER + 1 + })), null); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ + viewCount: '9007199254740993123' + })).viewCount, '9007199254740993123'); +}); + +test('帮助文章拒绝停用、空标题、空正文和非法浏览量', () => { + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ status: '1' })), null); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ helpTitle: ' ' })), null); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ helpContent: '' })), null); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ viewCount: -1 })), null); + assert.equal(HelpPages.normalizeHelpArticle(helpFixture({ viewCount: '1.5' })), null); +}); + +test('帮助文章列表只接受直接数组且任一非法元素使整批失败', () => { + assert.equal(HelpPages.normalizeHelpArticleList([helpFixture()]).length, 1); + assert.deepEqual(HelpPages.normalizeHelpArticleList([]), []); + assert.deepEqual(HelpPages.normalizeHelpArticleList({ + rows: [helpFixture()] + }), []); + assert.deepEqual(HelpPages.normalizeHelpArticleList([ + helpFixture(), + helpFixture({ helpId: '' }) + ]), []); +}); + +test('帮助文章列表和详情转义响应且不暴露 OSS ID、排序、状态和备注', () => { + const article = helpFixture({ + helpTitle: '', + helpContent: '\n第二行', + helpCategory: '分类', + coverOssId: 'secret-oss', + remark: 'secret-remark' + }); + const listHtml = HelpPages.renderHelpArticleList([article]); + const detailHtml = HelpPages.renderHelpArticleDetail(article); + + assert.match(listHtml, /<script>/); + assert.match(detailHtml, /<img src=x onerror=alert\(1\)>
第二行/); + assert.doesNotMatch(listHtml + detailHtml, / { + const calls = []; + const api = { + async helpArticleDetail(id) { + calls.push(id); + return helpFixture(); + } + }; + + assert.equal((await HelpPages.loadHelpArticleDetail(api, helpId)).helpId, helpId); + assert.deepEqual(calls, [helpId]); + await assert.rejects( + HelpPages.loadHelpArticleDetail({ + async helpArticleDetail() { + return helpFixture({ helpId: '2062179707935264770' }); + } + }, helpId), + /详情响应与请求编号不一致/ + ); +}); + +test('帮助中心只把缺失登录态和 401 视为登录失效', () => { + assert.equal(HelpPages.shouldRedirectToLogin(null), true); + assert.equal(HelpPages.shouldRedirectToLogin({ getToken() { return ''; } }), true); + assert.equal(HelpPages.shouldRedirectToLogin({ getToken() { return 'token'; } }, { status: 401 }), true); + assert.equal(HelpPages.shouldRedirectToLogin({ getToken() { return 'token'; } }, { status: 403 }), false); +}); + +test('帮助中心使用真实 PC 列表和详情，不再展示硬编码问答', () => { + const page = read('help.html'); + + assert.match(page, /data-help-list/); + assert.match(page, /data-help-status/); + assert.match(page, /public\/js\/help-pages\.js/); + assert.doesNotMatch(page, /如何创建第一本家谱|如何邀请亲人一起维护/); + assert.doesNotMatch(page, /data-feature-status="pending"|pending-pages\.js/); +}); diff --git a/tests/join-pages.test.js b/tests/join-pages.test.js new file mode 100644 index 0000000..db09a68 --- /dev/null +++ b/tests/join-pages.test.js @@ -0,0 +1,189 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const JoinPages = require('../public/js/join-pages.js'); + +const genealogyId = '2062179707935264769'; +const applyId = '2062179707935264770'; + +function read(relativePath) { + return fs.readFileSync(path.resolve(__dirname, '..', relativePath), 'utf8'); +} + +test('加入申请只构造 AppGenealogyJoinApplyBody 并裁剪可选文本', () => { + assert.deepEqual(JoinPages.buildJoinApplyBody({ + applicantName: ' 叶子 ', + phone: ' 19181970173 ', + relationDesc: ' 族亲 ', + applyReason: ' 申请加入 ', + inviterUserId: 'must-drop', + genealogyId: 'must-drop' + }), { + applicantName: '叶子', + phone: '19181970173', + relationDesc: '族亲', + applyReason: '申请加入' + }); + assert.deepEqual(JoinPages.buildJoinApplyBody({ + applicantName: ' ', + phone: '', + relationDesc: null + }), {}); +}); + +test('加入申请按后端长度约束校验四个可选字段', () => { + assert.equal(JoinPages.validateJoinApplyBody({ applicantName: '叶'.repeat(50) }), ''); + assert.match(JoinPages.validateJoinApplyBody({ applicantName: '叶'.repeat(51) }), /50/); + assert.equal(JoinPages.validateJoinApplyBody({ phone: '1'.repeat(30) }), ''); + assert.match(JoinPages.validateJoinApplyBody({ phone: '1'.repeat(31) }), /30/); + assert.equal(JoinPages.validateJoinApplyBody({ relationDesc: '亲'.repeat(100) }), ''); + assert.match(JoinPages.validateJoinApplyBody({ relationDesc: '亲'.repeat(101) }), /100/); + assert.equal(JoinPages.validateJoinApplyBody({ applyReason: '因'.repeat(500) }), ''); + assert.match(JoinPages.validateJoinApplyBody({ applyReason: '因'.repeat(501) }), /500/); +}); + +test('可申请家谱必须提供稳定字符串 ID、谱名和姓氏，并拒绝停用家谱', () => { + assert.deepEqual(JoinPages.normalizeJoinGenealogy({ + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + regionFullName: '四川省', + memberCount: 12, + joinMode: '0', + status: '0', + ownerUserId: 'must-drop' + }), { + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + regionFullName: '四川省', + memberCount: 12, + joinMode: '0' + }); + assert.equal(JoinPages.normalizeJoinGenealogy({ + genealogyId: Number.MAX_SAFE_INTEGER + 1, + genealogyName: '叶氏家谱', + surname: '叶', + status: '0' + }), null); + assert.equal(JoinPages.normalizeJoinGenealogy({ + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + status: '1' + }), null); +}); + +test('我的申请只接收稳定 ID 和 0/1/2/3 状态', () => { + assert.deepEqual(JoinPages.normalizeJoinApply({ + applyId, + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + relationDesc: '族亲', + applyReason: '申请加入', + auditRemark: '已核实', + auditTime: '2026-07-29 12:00:00', + status: '1', + appUserId: 'must-drop', + inviterUserId: 'must-drop', + auditUserId: 'must-drop', + appUserPhone: 'must-drop' + }), { + applyId, + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + relationDesc: '族亲', + applyReason: '申请加入', + auditRemark: '已核实', + auditTime: '2026-07-29 12:00:00', + status: '1' + }); + assert.equal(JoinPages.normalizeJoinApply({ + applyId: Number.MAX_SAFE_INTEGER + 1, + genealogyId, + genealogyName: '叶氏家谱', + status: '0' + }), null); + assert.equal(JoinPages.normalizeJoinApply({ + applyId, + genealogyId, + genealogyName: '叶氏家谱', + status: '9' + }), null); +}); + +test('申请数组只要包含非法元素就整批拒绝', () => { + const valid = { applyId, genealogyId, genealogyName: '叶氏家谱', status: '0' }; + + assert.equal(JoinPages.normalizeJoinApplies([valid]).length, 1); + assert.deepEqual(JoinPages.normalizeJoinApplies([valid, { status: '0' }]), []); + assert.deepEqual(JoinPages.normalizeJoinApplies({ rows: [valid] }), []); +}); + +test('普通用户列表隐藏内部字段且只有待审核申请可以撤销', () => { + const html = JoinPages.renderMyJoinApplies([{ + applyId, + genealogyId, + genealogyName: '<叶氏家谱>', + surname: '叶', + relationDesc: '族亲', + applyReason: '申请加入', + status: '0', + appUserId: 'secret-user', + inviterUserId: 'secret-inviter', + auditUserId: 'secret-auditor', + appUserPhone: 'secret-phone' + }]); + const approvedHtml = JoinPages.renderMyJoinApplies([{ + applyId, + genealogyId, + genealogyName: '叶氏家谱', + status: '1' + }]); + + assert.match(html, /<叶氏家谱>/); + assert.match(html, new RegExp('data-join-cancel-id="' + applyId + '"')); + assert.doesNotMatch(approvedHtml, /data-join-cancel-id/); + assert.doesNotMatch(html, /secret-user|secret-inviter|secret-auditor|secret-phone|must-drop/); +}); + +test('申请加入页由后端家谱选项驱动且不允许手填业务 ID 或邀请码', () => { + const source = read('join-genealogy.html'); + + assert.match(source, /data-join-apply-page/); + assert.match(source, /data-join-genealogy-search/); + assert.match(source, /data-join-genealogy-options/); + assert.match(source, /data-join-apply-form/); + assert.match(source, /name="applicantName"/); + assert.match(source, /name="phone"/); + assert.match(source, /name="relationDesc"/); + assert.match(source, /name="applyReason"/); + assert.match(source, /public\/js\/join-pages\.js/); + assert.doesNotMatch(source, /name="(?:genealogyId|applyId|inviterUserId|inviteCode)"/); + assert.doesNotMatch(source, /邀请码|分享码|手工.*ID|输入.*ID/); +}); + +test('我的加入申请页加载真实列表和刷新入口', () => { + const source = read('profile-join-family.html'); + + assert.doesNotMatch(source, /data-feature-status="pending"|pending-pages\.js/); + assert.match(source, /data-my-join-applies-page/); + assert.match(source, /data-join-apply-list="mine"/); + assert.match(source, /data-join-apply-refresh/); + assert.match(source, /public\/js\/join-pages\.js/); + assert.doesNotMatch(source, /邀请码|分享码|输入.*ID/); +}); + +test('加入申请运行时提交与撤销后都重新读取我的申请', () => { + const source = read('public/js/join-pages.js'); + + assert.match(source, /await api\.applyToGenealogy\(/); + assert.match(source, /await api\.myGenealogyJoinApplies\(\)/); + assert.match(source, /await api\.cancelGenealogyJoinApply\(/); + assert.match(source, /提交后无法读取同一申请/); + assert.match(source, /撤销后申请仍处于待审核状态/); +}); diff --git a/tests/join-review-pages.test.js b/tests/join-review-pages.test.js new file mode 100644 index 0000000..a813770 --- /dev/null +++ b/tests/join-review-pages.test.js @@ -0,0 +1,82 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const JoinReviewPages = require('../public/js/join-review-pages.js'); + +const genealogyId = '2062179707935264769'; +const applyId = '2062179707935264770'; + +function read(relativePath) { + return fs.readFileSync(path.resolve(__dirname, '..', relativePath), 'utf8'); +} + +test('审核页只从当前家谱上下文读取稳定字符串 ID', () => { + assert.equal(JoinReviewPages.getCurrentGenealogyId('?genealogyId=' + genealogyId), genealogyId); + assert.equal(JoinReviewPages.getCurrentGenealogyId('?genealogyId=unsafe'), ''); + assert.equal(JoinReviewPages.getCurrentGenealogyId('?genealogyId=1e21'), ''); +}); + +test('审核请求只构造 status 和可选审核说明', () => { + assert.deepEqual(JoinReviewPages.buildJoinAuditBody({ + status: '2', + auditRemark: ' 资料不一致 ', + applyId: 'must-drop', + genealogyId: 'must-drop' + }), { + status: '2', + auditRemark: '资料不一致' + }); + assert.deepEqual(JoinReviewPages.buildJoinAuditBody({ status: '1', auditRemark: ' ' }), { + status: '1' + }); + assert.equal(JoinReviewPages.validateJoinAuditBody({ status: '1' }), ''); + assert.equal(JoinReviewPages.validateJoinAuditBody({ status: '2', auditRemark: '因'.repeat(500) }), ''); + assert.match(JoinReviewPages.validateJoinAuditBody({ status: '0' }), /审核状态/); + assert.match(JoinReviewPages.validateJoinAuditBody({ status: '2', auditRemark: '因'.repeat(501) }), /500/); +}); + +test('待审核列表隐藏内部 ID 和账号手机号，只有管理者可见操作', () => { + const data = [{ + applyId, + genealogyId, + genealogyName: '叶氏家谱', + applicantName: '<叶子>', + phone: '19181970173', + relationDesc: '族亲', + applyReason: '申请加入', + status: '0', + appUserId: 'secret-user', + appUserPhone: 'secret-account-phone', + inviterUserId: 'secret-inviter', + auditUserId: 'secret-auditor' + }]; + const managerHtml = JoinReviewPages.renderPendingJoinApplies(data, true); + const memberHtml = JoinReviewPages.renderPendingJoinApplies(data, false); + + assert.match(managerHtml, /<叶子>/); + assert.match(managerHtml, /19181970173/); + assert.match(managerHtml, new RegExp('data-join-audit-id="' + applyId + '"')); + assert.match(managerHtml, /data-join-audit-status="1"/); + assert.match(managerHtml, /data-join-audit-status="2"/); + assert.doesNotMatch(memberHtml, /data-join-audit-id|data-join-audit-status/); + assert.doesNotMatch(managerHtml, /secret-user|secret-account-phone|secret-inviter|secret-auditor/); +}); + +test('审核页开放真实 PC 管理行为且不允许手填业务 ID', () => { + const page = read('profile-join-review.html'); + const script = read('public/js/join-review-pages.js'); + + assert.doesNotMatch(page, /data-feature-status="pending"|pending-pages\.js/); + assert.match(page, /data-join-review-page/); + assert.match(page, /data-join-apply-list="pending"/); + assert.match(page, /data-join-review-refresh/); + assert.match(page, /public\/js\/join-review-pages\.js/); + assert.doesNotMatch(page, /name="(?:genealogyId|applyId|appUserId|inviterUserId|auditUserId)"/); + assert.match(script, /await api\.genealogyDetail\(/); + assert.match(script, /detail\.canManage === true/); + assert.match(script, /await api\.auditGenealogyJoinApply\(/); + assert.match(script, /await api\.pendingGenealogyJoinApplies\(/); + assert.match(script, /审核后申请仍在待审核列表/); +}); diff --git a/tests/lineage-pages.test.js b/tests/lineage-pages.test.js index 741be89..7adf7f2 100644 --- a/tests/lineage-pages.test.js +++ b/tests/lineage-pages.test.js @@ -10,6 +10,22 @@ test('世系页只从 URL 读取真实家谱编号', () => { assert.equal(LineagePages.getCurrentGenealogyId(''), ''); }); +test('世系管理页和家谱主页复用同一棵安全树的 HTML', () => { + const html = LineagePages.renderLineageTreeHtml([{ + personId: '2062179707935264770', + genealogyId: '2062179707935264769', + name: '<始祖>', + generationName: '始', + spouses: [], + children: [] + }]); + + assert.match(html, /<始祖>/); + assert.match(html, /data-lineage-person="2062179707935264770"/); + assert.doesNotMatch(html, /2062179707935264769/); + assert.match(LineagePages.renderLineageTreeHtml([]), /暂无世系树/); +}); + test('世系人物表单只构造 Apifox LineagePersonBody 字段', () => { assert.deepEqual( LineagePages.buildLineagePersonBody({ diff --git a/tests/pc-scope.test.js b/tests/pc-scope.test.js index 639aa26..3480ccd 100644 --- a/tests/pc-scope.test.js +++ b/tests/pc-scope.test.js @@ -36,9 +36,9 @@ test('PC 对接规划记录本轮由用户指定的 YAML 冻结契约', () => { test('pages do not load scripts for unavailable business APIs', () => { const removedScripts = [ - 'feedback-pages.js', 'genealogy-pages.js', - 'help-pages.js', 'join-apply-pages.js', - 'promotion-pages.js', 'vip-pages.js' + 'genealogy-pages.js', + 'join-apply-pages.js', + 'promotion-pages.js' ]; const retainedPages = fs.readdirSync(root).filter((entry) => entry.endsWith('.html')); @@ -53,6 +53,17 @@ test('pages do not load scripts for unavailable business APIs', () => { assert.equal(read(page).includes('src="public/js/feed-pages.js"'), true, `${page} must load feed-pages.js`); }); assert.equal(read('profile-generation.html').includes('src="public/js/generation-pages.js"'), true, 'profile-generation.html must load generation-pages.js'); + assert.equal(read('join-genealogy.html').includes('src="public/js/join-pages.js"'), true, 'join-genealogy.html must load join-pages.js'); + assert.equal(read('profile-join-family.html').includes('src="public/js/join-pages.js"'), true, 'profile-join-family.html must load join-pages.js'); + assert.equal(read('profile-join-review.html').includes('src="public/js/join-review-pages.js"'), true, 'profile-join-review.html must load join-review-pages.js'); + ['profile-feedback.html', 'submit-ticket.html', 'my-tickets.html', 'ticket-detail.html'].forEach((page) => { + assert.equal(read(page).includes('src="public/js/feedback-pages.js"'), true, `${page} must load feedback-pages.js`); + }); + assert.equal(read('help.html').includes('src="public/js/help-pages.js"'), true, 'help.html must load help-pages.js'); + assert.equal(read('app.html').includes('src="public/js/app-promotion-pages.js"'), true, 'app.html must load app-promotion-pages.js'); + ['news.html', 'article-detail.html'].forEach((page) => { + assert.equal(read(page).includes('src="public/js/site-news-pages.js"'), true, `${page} must load site-news-pages.js`); + }); assert.equal(read('profile-tree.html').includes('src="public/js/lineage-pages.js"'), true, 'profile-tree.html must load lineage-pages.js'); assert.equal(read('profile-family-admin.html').includes('src="public/js/member-admin-pages.js"'), true, 'profile-family-admin.html must load member-admin-pages.js'); assert.equal(read('profile-video.html').includes('src="public/js/video-pages.js"'), true, 'profile-video.html must load video-pages.js'); @@ -60,4 +71,5 @@ test('pages do not load scripts for unavailable business APIs', () => { assert.equal(read('profile-ceremony.html').includes('src="public/js/ceremony-admin-pages.js"'), true, 'profile-ceremony.html must load ceremony-admin-pages.js'); assert.equal(read('profile-relative.html').includes('src="public/js/relative-pages.js"'), true, 'profile-relative.html must load relative-pages.js'); assert.equal(read('profile-memo.html').includes('src="public/js/memo-pages.js"'), true, 'profile-memo.html must load memo-pages.js'); + assert.equal(read('profile-services.html').includes('src="public/js/vip-pages.js"'), true, 'profile-services.html must load vip-pages.js'); }); diff --git a/tests/pending-pages.test.js b/tests/pending-pages.test.js index 566b1dc..43dd36c 100644 --- a/tests/pending-pages.test.js +++ b/tests/pending-pages.test.js @@ -7,21 +7,16 @@ const PageAvailability = require('../public/js/pending-pages.js'); const root = path.resolve(__dirname, '..'); const familyPendingPages = [ - 'profile-join-family.html', - 'profile-join-review.html', 'profile-invite.html', ]; const contentPendingPages = [ - 'profile-feedback.html', 'profile-admin-permissions.html', 'profile-data-reminders.html' ]; const residualPendingPages = [ - 'profile-family-home.html', - 'profile-share.html', - 'profile-services.html' + 'profile-share.html' ]; const pendingPages = familyPendingPages.concat(contentPendingPages, residualPendingPages); @@ -53,12 +48,17 @@ test('待开发页面显式加载状态脚本', () => { }); test('已接入的家谱业务页面保持真实功能状态', () => { - ['profile-families.html', 'profile-create-family.html', 'profile-family-admin.html', 'profile-content.html', 'profile-feed.html', 'profile-feed-edit.html', 'profile-feed-detail.html', 'profile-generation.html', 'profile-tree.html', 'profile-article.html', 'profile-article-edit.html', 'profile-album.html', 'profile-album-edit.html', 'profile-album-detail.html', 'profile-video.html', 'profile-video-edit.html', 'profile-gift.html', 'profile-gift-edit.html', 'profile-ceremony.html', 'profile-ceremony-detail.html', 'profile-growth.html', 'profile-growth-edit.html', 'profile-relative.html', 'profile-relative-edit.html', 'profile-memo.html', 'profile-memo-edit.html', 'profile-merit.html', 'profile-merit-edit.html', 'profile-messages.html'].forEach((page) => { + ['profile-families.html', 'profile-create-family.html', 'profile-join-family.html', 'profile-join-review.html', 'profile-family-home.html', 'profile-family-admin.html', 'profile-feedback.html', 'profile-services.html', 'profile-content.html', 'profile-feed.html', 'profile-feed-edit.html', 'profile-feed-detail.html', 'profile-generation.html', 'profile-tree.html', 'profile-article.html', 'profile-article-edit.html', 'profile-album.html', 'profile-album-edit.html', 'profile-album-detail.html', 'profile-video.html', 'profile-video-edit.html', 'profile-gift.html', 'profile-gift-edit.html', 'profile-ceremony.html', 'profile-ceremony-detail.html', 'profile-growth.html', 'profile-growth-edit.html', 'profile-relative.html', 'profile-relative-edit.html', 'profile-memo.html', 'profile-memo-edit.html', 'profile-merit.html', 'profile-merit-edit.html', 'profile-messages.html'].forEach((page) => { assert.doesNotMatch(read(page), /data-feature-status="pending"/, `${page} 不应标记为待开发`); }); assert.match(read('profile-generation.html'), /src="public\/js\/generation-pages\.js"/); assert.match(read('profile-families.html'), /src="public\/js\/genealogy-entry-pages\.js"/); assert.match(read('profile-create-family.html'), /src="public\/js\/genealogy-entry-pages\.js"/); + assert.match(read('profile-join-family.html'), /src="public\/js\/join-pages\.js"/); + assert.match(read('profile-join-review.html'), /src="public\/js\/join-review-pages\.js"/); + assert.match(read('profile-feedback.html'), /src="public\/js\/feedback-pages\.js"/); + assert.match(read('profile-services.html'), /src="public\/js\/vip-pages\.js"/); + assert.match(read('profile-family-home.html'), /src="public\/js\/family-home-pages\.js"/); assert.match(read('profile-tree.html'), /src="public\/js\/lineage-pages\.js"/); assert.match(read('profile-family-admin.html'), /src="public\/js\/member-admin-pages\.js"/); assert.match(read('profile-article.html'), /src="public\/js\/article-pages\.js"/); @@ -93,7 +93,7 @@ test('待开发的家谱管理页明确放行已接入的字辈入口并透传 }); test('待开发页面仅放行显式标记的可用功能入口', () => { - assert.equal(PageAvailability.shouldBlockLink(createLink({ href: 'profile-feedback.html' })), true); + assert.equal(PageAvailability.shouldBlockLink(createLink({ href: 'profile-share.html' })), true); assert.equal(PageAvailability.shouldBlockLink(createLink({ href: 'profile-feed.html', 'data-feature-link': 'available' })), false); assert.equal(PageAvailability.shouldBlockLink(createLink({ href: '#section' })), false); }); diff --git a/tests/public-static-pages.test.js b/tests/public-static-pages.test.js index 0ff2adf..7617604 100644 --- a/tests/public-static-pages.test.js +++ b/tests/public-static-pages.test.js @@ -37,14 +37,16 @@ test('官网静态信息页面均有独立入口', () => { }); }); -test('新闻页提供分类与现有详情跳转', () => { +test('新闻页提供真实 PC 文章分类与详情入口', () => { if (!exists('news.html')) return; const source = read('news.html'); - assert.match(source, /href="#platform"/); - assert.match(source, /href="#culture"/); - assert.match(source, /href="notice-detail\.html"/); - assert.match(source, /href="article-detail\.html"/); + assert.match(source, /href="news\.html"/); + assert.match(source, /href="news\.html\?articleType=news"/); + assert.match(source, /href="news\.html\?articleType=notice"/); + assert.match(source, /href="news\.html\?articleType=download"/); + assert.match(source, /data-site-news-list/); + assert.match(source, /src="public\/js\/site-news-pages\.js"/); }); test('法律页面明确等待法务确认', () => { @@ -54,14 +56,14 @@ test('法律页面明确等待法务确认', () => { }); }); -test('工单功能入口显示待开发状态并保留帮助中心跳转', () => { +test('工单功能入口开放真实反馈记录并保留帮助中心跳转', () => { ['submit-ticket.html', 'my-tickets.html', 'ticket-detail.html'].forEach((page) => { if (!exists(page)) return; const source = read(page); - assert.match(source, /data-feature-status="pending"/); - assert.match(source, /src="public\/js\/pending-pages\.js"/); - assert.match(source, /href="help\.html"\s+data-feature-link="available"/); + assert.doesNotMatch(source, /data-feature-status="pending"|pending-pages\.js/); + assert.match(source, /src="public\/js\/feedback-pages\.js"/); + assert.match(source, /href="help\.html"/); }); }); diff --git a/tests/request-auth-state.test.js b/tests/request-auth-state.test.js index cd3ca4c..beca6dd 100644 --- a/tests/request-auth-state.test.js +++ b/tests/request-auth-state.test.js @@ -2,6 +2,7 @@ const assert = require('node:assert/strict'); const test = require('node:test'); const GenealogyApi = require('../utils/ApiClient.js'); +const AxiosRequestUtil = require('../utils/AxiosRequestUtil.js'); function createFailingClient(status) { let storedToken = 'access-token'; @@ -96,3 +97,64 @@ test('business response code 401 clears the stored login token', async () => { assert.equal(client.getToken(), ''); }); + +test('public HTTP 401 neither sends nor clears the stored login token', async () => { + let storedToken = 'access-token'; + let seenRequest; + const requester = AxiosRequestUtil.createRequester({ + baseUrl: 'https://api.example.test', + clientId: 'web-pc', + getToken() { + return storedToken; + }, + onUnauthorized() { + storedToken = ''; + }, + axiosInstance: { + request(config) { + seenRequest = config; + return Promise.reject({ + message: 'Request failed', + response: { + status: 401, + data: { + code: 401, + msg: '认证失败' + } + } + }); + } + } + }); + + await assert.rejects(requester('GET', '/public', { auth: false })); + assert.equal(seenRequest.headers.Authorization, undefined); + assert.equal(storedToken, 'access-token'); +}); + +test('public business 401 preserves the stored login token', async () => { + let storedToken = 'access-token'; + const requester = AxiosRequestUtil.createRequester({ + baseUrl: 'https://api.example.test', + clientId: 'web-pc', + getToken() { + return storedToken; + }, + onUnauthorized() { + storedToken = ''; + }, + axiosInstance: { + request() { + return Promise.resolve({ + data: { + code: 401, + msg: '认证失败' + } + }); + } + } + }); + + await assert.rejects(requester('GET', '/public', { auth: false })); + assert.equal(storedToken, 'access-token'); +}); diff --git a/tests/site-news-pages.test.js b/tests/site-news-pages.test.js new file mode 100644 index 0000000..da3c2fb --- /dev/null +++ b/tests/site-news-pages.test.js @@ -0,0 +1,179 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const SiteNewsPages = require('../public/js/site-news-pages.js'); +const newsPage = fs.readFileSync(path.resolve(__dirname, '../news.html'), 'utf8'); +const detailPage = fs.readFileSync(path.resolve(__dirname, '../article-detail.html'), 'utf8'); + +const articleId = '2062179707935264769'; + +function articleFixture(overrides) { + return Object.assign({ + articleId, + articleType: 'notice', + articleTitle: '平台公告', + articleSummary: '公告摘要', + articleContent: '第一行\n第二行', + coverOssId: '2062179707935264701', + externalUrl: 'https://example.com/notice', + publishTime: '2026-07-30 09:00:00', + sortOrder: 1, + status: '0', + remark: 'internal-only' + }, overrides); +} + +test('站点文章只保留完整 SiteArticleVo 的安全展示字段和字符串长 ID', () => { + assert.deepEqual(SiteNewsPages.normalizeArticle(articleFixture()), { + articleId, + articleType: 'notice', + articleTitle: '平台公告', + articleSummary: '公告摘要', + articleContent: '第一行\n第二行', + externalUrl: 'https://example.com/notice', + publishTime: '2026-07-30 09:00:00' + }); + assert.equal(SiteNewsPages.normalizeArticle(articleFixture({ + articleId: Number.MAX_SAFE_INTEGER + 1 + })), null); + assert.equal(SiteNewsPages.normalizeArticle(articleFixture({ articleId: '0' })), null); +}); + +test('站点文章拒绝 SQL 字典外类型、停用记录和空标题', () => { + assert.equal(SiteNewsPages.normalizeArticle(articleFixture({ articleType: 'culture' })), null); + assert.equal(SiteNewsPages.normalizeArticle(articleFixture({ status: '1' })), null); + assert.equal(SiteNewsPages.normalizeArticle(articleFixture({ articleTitle: ' ' })), null); + assert.equal(SiteNewsPages.normalizeArticleType('news'), 'news'); + assert.equal(SiteNewsPages.normalizeArticleType('notice'), 'notice'); + assert.equal(SiteNewsPages.normalizeArticleType('download'), 'download'); + assert.equal(SiteNewsPages.normalizeArticleType('culture'), ''); +}); + +test('站点文章列表只接受直接数组且任一非法元素使整批失败', () => { + assert.equal(SiteNewsPages.normalizeArticleList([articleFixture()]).length, 1); + assert.deepEqual(SiteNewsPages.normalizeArticleList([]), []); + assert.deepEqual(SiteNewsPages.normalizeArticleList({ rows: [articleFixture()] }), []); + assert.deepEqual(SiteNewsPages.normalizeArticleList([ + articleFixture(), + articleFixture({ articleId: '' }) + ]), []); +}); + +test('站点资讯列表使用响应 ID 生成详情链接并隐藏内部字段', () => { + const html = SiteNewsPages.renderArticleList([articleFixture({ + articleTitle: '', + articleSummary: '', + coverOssId: 'secret-oss', + remark: 'secret-remark' + })]); + + assert.match(html, /article-detail\.html\?articleId=2062179707935264769/); + assert.match(html, /公告/); + assert.match(html, /<script>/); + assert.match(html, /<img src=x>/); + assert.doesNotMatch(html, / { + const html = SiteNewsPages.renderArticleDetail(articleFixture({ + articleContent: '\n第二行' + })); + + assert.match(html, /<script>alert\(1\)<\/script>
第二行/); + assert.match(html, /href="https:\/\/example\.com\/notice"/); + assert.match(html, /target="_blank"/); + assert.match(html, /rel="noopener noreferrer"/); + assert.doesNotMatch(html, / { + const unsafeHtml = SiteNewsPages.renderArticleDetail(articleFixture({ externalUrl: value })); + assert.doesNotMatch(unsafeHtml, /data-external-link/); + }); +}); + +test('站点文章外链只接受绝对 HTTP 或 HTTPS', () => { + assert.equal( + SiteNewsPages.normalizeExternalUrl(' https://example.com/notice '), + 'https://example.com/notice' + ); + assert.equal(SiteNewsPages.normalizeExternalUrl('http://example.com'), 'http://example.com/'); + assert.equal(SiteNewsPages.normalizeExternalUrl('javascript:alert(1)'), ''); + assert.equal(SiteNewsPages.normalizeExternalUrl('/notice'), ''); +}); + +test('资讯列表只提交已确认分类和系统 limit', async () => { + const calls = []; + const api = { + async siteArticles(query) { + calls.push(query); + return [articleFixture()]; + } + }; + + assert.equal((await SiteNewsPages.loadArticles(api, 'notice')).length, 1); + assert.equal((await SiteNewsPages.loadArticles(api, '')).length, 1); + assert.deepEqual(calls, [ + { articleType: 'notice', limit: 100 }, + { limit: 100 } + ]); + await assert.rejects(SiteNewsPages.loadArticles(api, 'culture'), /资讯分类无效/); + await assert.rejects( + SiteNewsPages.loadArticles({ + async siteArticles() { + return { rows: [articleFixture()] }; + } + }, ''), + /资讯列表响应无效/ + ); +}); + +test('资讯详情只精确匹配 URL 中由列表产生的文章 ID', async () => { + const api = { + async siteArticles(query) { + assert.deepEqual(query, { limit: 100 }); + return [ + articleFixture(), + articleFixture({ articleId: '2062179707935264770', articleTitle: '另一条' }) + ]; + } + }; + + assert.equal((await SiteNewsPages.loadArticleDetail(api, articleId)).articleTitle, '平台公告'); + await assert.rejects( + SiteNewsPages.loadArticleDetail(api, '2062179707935264771'), + /资讯不存在或已下线/ + ); + await assert.rejects( + SiteNewsPages.loadArticleDetail(api, Number.MAX_SAFE_INTEGER + 1), + /资讯编号无效/ + ); +}); + +test('详情 URL 只读取安全字符串文章 ID', () => { + assert.equal(SiteNewsPages.readArticleId('?articleId=' + articleId), articleId); + assert.equal(SiteNewsPages.readArticleId('?articleId=0'), ''); + assert.equal(SiteNewsPages.readArticleId('?articleId=unsafe'), ''); + assert.equal(SiteNewsPages.readArticleId(''), ''); +}); + +test('官网资讯列表与详情页加载同一个公开内容 owner 且不暴露业务 ID', () => { + assert.match(newsPage, /]*data-site-news-page/); + assert.match(newsPage, /data-site-news-list/); + assert.match(newsPage, /data-site-news-status/); + assert.match(newsPage, /news\.html\?articleType=news/); + assert.match(newsPage, /news\.html\?articleType=notice/); + assert.match(newsPage, /news\.html\?articleType=download/); + assert.match(newsPage, /src="public\/js\/site-news-pages\.js"/); + + assert.match(detailPage, /]*data-site-article-page/); + assert.match(detailPage, /资讯详情 - 代代相传<\/title>/); + assert.match(detailPage, /data-site-article-detail/); + assert.match(detailPage, /data-site-article-status/); + assert.match(detailPage, /src="public\/js\/site-news-pages\.js"/); + assert.doesNotMatch(detailPage, /src="public\/js\/article-pages\.js"/); + assert.doesNotMatch(detailPage, /href="article-detail\.html"/); + assert.doesNotMatch(newsPage + detailPage, /name="(?:articleId|coverOssId)"/); +}); diff --git a/tests/stage6-navigation.test.js b/tests/stage6-navigation.test.js index 9347617..88fb0e3 100644 --- a/tests/stage6-navigation.test.js +++ b/tests/stage6-navigation.test.js @@ -33,3 +33,24 @@ test('个人中心功能入口没有把家谱业务页当作无上下文普通 assert.match(page, new RegExp('href="' + href.replace('.', '\\.') + '"[^>]*data-genealogy-context-link'), `${href} 缺少个人中心上下文入口`); }); }); + +test('加入申请与管理员审核入口使用真实页面和家谱上下文', () => { + const families = read('profile-families.html'); + const familyAdmin = read('profile-family-admin.html'); + const profile = read('profile.html'); + + assert.match(families, /href="profile-join-family\.html"/); + assert.doesNotMatch(families, /邀请码|分享码|手填.*ID/); + assert.match(familyAdmin, /href="profile-join-review\.html"[^>]*data-genealogy-context-link/); + assert.match(profile, /href="profile-join-review\.html"[^>]*data-genealogy-context-link/); +}); + +test('帮助中心和服务中心开放同一反馈记录闭环', () => { + const help = read('help.html'); + const services = read('profile-services.html'); + + assert.match(help, /href="submit-ticket\.html"/); + assert.match(help, /href="my-tickets\.html"/); + assert.match(services, /href="profile-feedback\.html"[^>]*data-feature-link="available"/); + assert.doesNotMatch(help + services, /手填.*feedbackId|独立.*ticket.*接口/i); +}); diff --git a/tests/vip-pages.test.js b/tests/vip-pages.test.js new file mode 100644 index 0000000..08d6f18 --- /dev/null +++ b/tests/vip-pages.test.js @@ -0,0 +1,231 @@ +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const test = require('node:test'); + +const VipPages = require('../public/js/vip-pages.js'); +const root = path.resolve(__dirname, '..'); + +const packageId = '2062179707935264769'; +const genealogyId = '2062179707935264770'; +const orderId = '2062179707935264771'; + +function packageFixture(overrides) { + return Object.assign({ + packageId, + packageName: '家谱年度会员', + packageType: 'vip', + packageDesc: '适合持续维护家谱', + price: '99.00', + originalPrice: '129.00', + durationValue: 1, + durationUnit: 'year', + genealogyLimit: 3, + memberLimit: 500, + storageLimitMb: 10240, + featureJson: '{"export":true}', + sortOrder: 1, + status: '0', + remark: '年度套餐' + }, overrides); +} + +function orderFixture(overrides) { + return Object.assign({ + orderId, + orderNo: 'VIP202607291200001234', + packageId, + packageName: '家谱年度会员', + appUserId: '2062179707935264701', + appUserNickName: '叶子', + appUserPhone: '19100000000', + genealogyId, + genealogyNo: 'G20260729001', + genealogyName: '叶氏家谱', + orderAmount: '99.00', + payAmount: '99.00', + payType: 'wechat', + payStatus: '0', + payTime: null, + expireTime: null, + status: '0', + remark: '' + }, overrides); +} + +test('VIP 套餐只保留可展示字段并保持金额和长 ID 字符串', () => { + assert.deepEqual(VipPages.normalizeVipPackage(packageFixture()), { + packageId, + packageName: '家谱年度会员', + packageType: 'vip', + packageDesc: '适合持续维护家谱', + price: '99.00', + originalPrice: '129.00', + durationValue: 1, + durationUnit: 'year', + genealogyLimit: 3, + memberLimit: 500, + storageLimitMb: 10240, + remark: '年度套餐' + }); + assert.equal(VipPages.normalizeVipPackage(packageFixture({ + packageId: Number.MAX_SAFE_INTEGER + 1 + })), null); + assert.equal(VipPages.normalizeVipPackage(packageFixture({ + packageType: 'unknown' + })), null); + assert.equal(VipPages.normalizeVipPackage(packageFixture({ + durationUnit: 'week' + })), null); + assert.equal(VipPages.normalizeVipPackage(packageFixture({ + price: '-1.00' + })), null); + assert.equal(VipPages.normalizeVipPackage(packageFixture({ + status: '1' + })), null); +}); + +test('套餐列表过滤停用或非法记录', () => { + assert.equal(VipPages.normalizeVipPackages([ + packageFixture(), + packageFixture({ packageId: '2062179707935264772', status: '1' }) + ]).length, 1); + assert.deepEqual(VipPages.normalizeVipPackages({ rows: [packageFixture()] }), []); +}); + +test('家谱选择项只接受响应中的稳定 ID 和名称', () => { + assert.deepEqual(VipPages.normalizeGenealogyOption({ + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶', + ownerUserId: 'must-drop' + }), { + genealogyId, + genealogyName: '叶氏家谱', + surname: '叶' + }); + assert.equal(VipPages.normalizeGenealogyOption({ + genealogyId: Number.MAX_SAFE_INTEGER + 1, + genealogyName: '叶氏家谱' + }), null); + assert.equal(VipPages.normalizeGenealogyOption({ + genealogyId, + genealogyName: '' + }), null); +}); + +test('订单请求只构造 AppVipOrderBody 且页面默认省略支付方式', () => { + assert.deepEqual(VipPages.buildVipOrderBody({ + packageId: ' ' + packageId + ' ', + genealogyId: ' ' + genealogyId + ' ', + payType: '', + orderId: 'must-drop', + appUserId: 'must-drop', + payStatus: 'must-drop' + }), { + packageId, + genealogyId + }); + assert.deepEqual(VipPages.buildVipOrderBody({ + packageId, + payType: ' wechat ' + }), { + packageId, + payType: 'wechat' + }); +}); + +test('订单请求要求安全套餐 ID，并只接受已确认的可选值', () => { + assert.equal(VipPages.validateVipOrderBody({ packageId }), ''); + assert.equal(VipPages.validateVipOrderBody({ packageId, genealogyId }), ''); + assert.match(VipPages.validateVipOrderBody({ packageId: '' }), /套餐/); + assert.match(VipPages.validateVipOrderBody({ + packageId, + genealogyId: 'unsafe' + }), /家谱/); + assert.match(VipPages.validateVipOrderBody({ + packageId, + payType: 'alipay' + }), /支付方式/); +}); + +test('VIP 订单隐藏账号字段并校验金额和状态', () => { + assert.deepEqual(VipPages.normalizeVipOrder(orderFixture()), { + orderId, + orderNo: 'VIP202607291200001234', + packageId, + packageName: '家谱年度会员', + genealogyId, + genealogyNo: 'G20260729001', + genealogyName: '叶氏家谱', + orderAmount: '99.00', + payAmount: '99.00', + payType: 'wechat', + payStatus: '0', + payTime: '', + expireTime: '', + status: '0', + remark: '' + }); + assert.equal(VipPages.normalizeVipOrder(orderFixture({ + orderId: Number.MAX_SAFE_INTEGER + 1 + })), null); + assert.equal(VipPages.normalizeVipOrder(orderFixture({ + payAmount: '-1' + })), null); + assert.equal(VipPages.normalizeVipOrder(orderFixture({ + payStatus: '9' + })), null); + assert.equal(VipPages.normalizeVipOrder(orderFixture({ + status: '9' + })), null); +}); + +test('套餐和订单渲染不出现内部账号信息或伪支付操作', () => { + const packagesHtml = VipPages.renderVipPackages([packageFixture({ + packageName: '<年度会员>' + })], packageId); + const ordersHtml = VipPages.renderVipOrders([orderFixture({ + appUserId: 'secret-user', + appUserPhone: 'secret-phone' + })]); + const combined = packagesHtml + ordersHtml; + + assert.match(packagesHtml, /<年度会员>/); + assert.match(packagesHtml, new RegExp('data-vip-package-id="' + packageId + '"')); + assert.match(ordersHtml, /待支付/); + assert.doesNotMatch(combined, /secret-user|secret-phone|appUserId|appUserPhone|立即支付|模拟|取消订单|退款/); +}); + +test('套餐渲染接受初始化流程已经规范化的数据', () => { + const normalized = VipPages.normalizeVipPackages([packageFixture()]); + const html = VipPages.renderVipPackages(normalized, packageId); + + assert.match(html, /家谱年度会员/); + assert.match(html, /data-vip-package-id=/); + assert.doesNotMatch(html, /当前没有可用会员套餐/); +}); + +test('会员服务页只从接口结果选择套餐和家谱，不暴露业务 ID 或未开放支付操作', () => { + const source = fs.readFileSync(path.join(root, 'profile-services.html'), 'utf8'); + + assert.doesNotMatch(source, /data-feature-status="pending"/); + assert.match(source, /src="public\/js\/vip-pages\.js"/); + assert.match(source, /data-vip-package-list/); + assert.match(source, /data-vip-selected-package/); + assert.match(source, /<select[^>]+data-vip-genealogy-options/); + assert.match(source, /data-vip-order-refresh/); + assert.match(source, /data-vip-order-list/); + assert.doesNotMatch(source, /<input[^>]+name="(?:packageId|genealogyId|orderId)"/); + assert.doesNotMatch(source, /name="payType"/); + assert.doesNotMatch(source, /立即支付|模拟支付|取消订单|退款/); +}); + +test('会员服务运行时并行读取套餐、我的家谱和订单，并在创建后重新读取核验', () => { + const source = fs.readFileSync(path.join(root, 'public/js/vip-pages.js'), 'utf8'); + + assert.match(source, /Promise\.all\(\[api\.vipPackages\(\), api\.genealogiesMine\(\), api\.vipOrders\(\)\]\)/); + assert.match(source, /created = normalizeVipOrder\(await api\.createVipOrder\(body\)\)/); + assert.match(source, /refreshed = normalizeVipOrders\(await api\.vipOrders\(\)\)/); + assert.match(source, /item\.orderId === created\.orderId/); +}); diff --git a/ticket-detail.html b/ticket-detail.html index 78ccf1b..ded666d 100644 --- a/ticket-detail.html +++ b/ticket-detail.html @@ -7,10 +7,7 @@ <link rel="stylesheet" href="public/css/public.css" /> <link rel="stylesheet" href="public/css/site-info.css" /> </head> - <body - data-feature-status="pending" - data-feature-message="在线工单详情服务正在开发中，请先通过帮助中心了解常见问题。" - > + <body data-feedback-detail-page> <header class="site-header"> <div class="container nav"> <a class="brand magnetic" href="index.html"> @@ -34,23 +31,19 @@ <div> <div class="site-info-kicker">Ticket Detail</div> <h1>工单详情</h1> - <p>工单处理记录、客服回复与进度状态将在工单接口交付后接入。</p> + <p>详情来自当前账号的 PC 反馈列表，并按反馈编号精确匹配。</p> </div> <div class="site-info-mark">单</div> </div> </section> <section class="site-info-section alt"> <div class="container"> - <div class="site-info-status"> - <h2>暂未开放在线详情查询</h2> - <p>当前页面不会读取或展示工单数据，也不会伪造处理进度。</p> + <div class="site-info-list"> + <p class="form-note" aria-live="polite" data-feedback-status></p> + <div data-feedback-detail></div> <div class="site-info-actions"> - <a - class="btn ghost magnetic" - href="help.html" - data-feature-link="available" - >返回帮助中心</a - > + <a class="btn primary magnetic" href="my-tickets.html">返回我的工单</a> + <a class="btn ghost magnetic" href="help.html">返回帮助中心</a> </div> </div> </div> @@ -64,7 +57,12 @@ </div> </div> </footer> - <script src="public/js/pending-pages.js"></script> + <script src="config.js"></script> + <script src="utils/StorageUtil.js"></script> + <script src="utils/axios.js"></script> + <script src="utils/AxiosRequestUtil.js"></script> + <script src="utils/ApiClient.js"></script> + <script src="public/js/feedback-pages.js"></script> <script src="public/js/page-effects.js"></script> </body> </html> diff --git a/utils/ApiClient.js b/utils/ApiClient.js index 3dbf11e..380f823 100644 --- a/utils/ApiClient.js +++ b/utils/ApiClient.js @@ -511,6 +511,69 @@ return request('DELETE', '/genealogy/pc/genealogies/join-applies/' + toRequiredPathId(applyId, '申请编号')); }, + submitFeedback: function (body) { + return request('POST', '/genealogy/pc/feedback', { + body: pickDefined(body, ['feedbackType', 'feedbackContent', 'contactInfo']) + }); + }, + myFeedback: function () { + return request('GET', '/genealogy/pc/feedback'); + }, + helpArticles: function (query) { + return request('GET', '/genealogy/pc/help-articles', { + query: pickDefined(query, ['helpCategory']) + }); + }, + helpArticleDetail: function (helpId) { + return request('GET', '/genealogy/pc/help-articles/' + + toRequiredPathId(helpId, '帮助文章编号')); + }, + siteArticles: function (query) { + var source = query || {}; + var articleType = source.articleType === undefined || source.articleType === null + ? '' + : String(source.articleType).trim(); + var limit = source.limit; + var params = {}; + + if (articleType && ['news', 'notice', 'download'].indexOf(articleType) === -1) { + throw new Error('不支持的资讯类型：' + articleType); + } + if (limit !== undefined && + (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)) { + throw new Error('资讯数量限制必须是 1 到 100 的整数'); + } + if (articleType) params.articleType = articleType; + if (limit !== undefined) params.limit = limit; + return request('GET', '/genealogy/pc/site/articles', { + auth: false, + query: params + }); + }, + promotions: function (query) { + var source = query || {}; + var platform = source.platform === undefined || source.platform === null + ? '' + : String(source.platform).trim(); + + if (platform && ['all', 'app', 'pc', 'wechat'].indexOf(platform) === -1) { + throw new Error('不支持的推广平台：' + platform); + } + return request('GET', '/genealogy/pc/promotions', { + query: platform ? { platform: platform } : {} + }); + }, + vipPackages: function () { + return request('GET', '/genealogy/pc/vip/packages'); + }, + createVipOrder: function (body) { + return request('POST', '/genealogy/pc/vip/orders', { + body: pickDefined(body, ['packageId', 'genealogyId', 'payType']) + }); + }, + vipOrders: function () { + return request('GET', '/genealogy/pc/vip/orders'); + }, notifications: function (query) { return request('GET', '/genealogy/pc/notifications', { query: pickDefined(query, ['readStatus']) diff --git a/utils/AxiosRequestUtil.js b/utils/AxiosRequestUtil.js index f5d3b29..9288026 100644 --- a/utils/AxiosRequestUtil.js +++ b/utils/AxiosRequestUtil.js @@ -96,7 +96,7 @@ var responseData = error.response && error.response.data; var status = error.response && error.response.status; - handleUnauthorized(status); + if (req.auth !== false) handleUnauthorized(status); throw createHttpError((responseData && responseData.msg) || error.message || '接口请求失败', { status: status, @@ -108,7 +108,7 @@ try { return unwrapResponse(response.data); } catch (error) { - handleUnauthorized(error.code); + if (req.auth !== false) handleUnauthorized(error.code); throw error; } };