-
diff --git a/src/pages/macro/AlertsView.jsx b/src/pages/macro/AlertsView.jsx
new file mode 100644
index 0000000..12bca59
--- /dev/null
+++ b/src/pages/macro/AlertsView.jsx
@@ -0,0 +1,101 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { Card, DotLoading, Empty } from 'antd-mobile'
+import { api } from '../../api/client.js'
+import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
+import { fmtDateTime } from '../../utils/format.js'
+
+// 报警 (V0.2 从「首页」并入「宏观」Tab)
+// - 数据: World Bank 与妙想 MCP 跨源同 (指标, 周期) 数据差异超阈值, 按时间倒序
+// - 无限滚动: 触底自动加载下一页
+// - onCount: 把总数回传给父级 (宏观 Tab 上显示角标)
+export default function AlertsView({ onCount }) {
+ const [items, setItems] = useState([])
+ const [loading, setLoading] = useState(false)
+ const [done, setDone] = useState(false)
+ const cursorRef = useRef(null)
+ const sentinelRef = useRef(null)
+ const inFlightRef = useRef(false)
+
+ const fetchPage = useCallback(async () => {
+ if (inFlightRef.current || done) return
+ inFlightRef.current = true
+ setLoading(true)
+ try {
+ const url = '/alerts?limit=10' + (cursorRef.current ? '&cursor=' + cursorRef.current : '')
+ const data = await api(url)
+ setItems((prev) => prev.concat(data.items || []))
+ onCount?.(data.total ?? (data.items?.length || 0))
+ cursorRef.current = data.nextCursor
+ if (!data.nextCursor) setDone(true)
+ } catch (e) {
+ console.error('alerts load error', e)
+ setDone(true)
+ } finally {
+ inFlightRef.current = false
+ setLoading(false)
+ }
+ }, [done, onCount])
+
+ useEffect(() => { fetchPage() }, [])
+ // 后台回前台: 重置游标重拉第一页, 新数据到了再更新视图
+ const reload = useCallback(async () => {
+ if (inFlightRef.current) return
+ inFlightRef.current = true
+ setLoading(true)
+ try {
+ const data = await api('/alerts?limit=10')
+ setItems(data.items || [])
+ onCount?.(data.total ?? (data.items?.length || 0))
+ cursorRef.current = data.nextCursor
+ setDone(!data.nextCursor)
+ } catch (e) {
+ console.error('alerts reload error', e)
+ setDone(true)
+ } finally {
+ inFlightRef.current = false
+ setLoading(false)
+ }
+ }, [onCount])
+ useRefreshOnVisible(reload)
+ useEffect(() => {
+ if (done || items.length === 0) return
+ const el = sentinelRef.current
+ if (!el) return
+ const io = new IntersectionObserver((entries) => {
+ if (entries[0].isIntersecting) fetchPage()
+ }, { rootMargin: '200px' })
+ io.observe(el)
+ return () => io.disconnect()
+ }, [items.length, done, fetchPage])
+
+ if (items.length === 0 && !loading) {
+ return (
+
+ )
+ }
+
+ return (
+
+
+ {items.map((a) => (
+
+
+ {a.indicatorName}
+ {a.period}
+
+
+ {a.sourceA} = {a.valueA} vs {a.sourceB} = {a.valueB}
+ 差异 {(a.diffRatio * 100).toFixed(1)}%
+
+ {fmtDateTime(a.createdAt)}
+
+ ))}
+
+ {loading ? : (done ? '— 已加载全部 —' : '')}
+
+
+ )
+}
diff --git a/src/pages/macro/NewsView.jsx b/src/pages/macro/NewsView.jsx
new file mode 100644
index 0000000..e883f72
--- /dev/null
+++ b/src/pages/macro/NewsView.jsx
@@ -0,0 +1,99 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { Card, DotLoading, Empty } from 'antd-mobile'
+import { api } from '../../api/client.js'
+import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
+import { fmtDate } from '../../utils/format.js'
+
+// 新闻 (V0.2 从「首页」并入「宏观」Tab)
+// - 数据: mx_finance_search_news 每日 3 点拉取国内外经济政治新闻, 按时间倒序
+// - 无限滚动: 触底自动加载下一页
+// - 详情: /macro/news/:id (挂在宏观 Tab 下, 保持底部 Tab 高亮)
+export default function NewsView() {
+ const [items, setItems] = useState([])
+ const [loading, setLoading] = useState(false)
+ const [done, setDone] = useState(false)
+ const cursorRef = useRef(null)
+ const sentinelRef = useRef(null)
+ const inFlightRef = useRef(false)
+ const navigate = useNavigate()
+
+ const fetchPage = useCallback(async () => {
+ if (inFlightRef.current || done) return
+ inFlightRef.current = true
+ setLoading(true)
+ try {
+ const url = '/news?limit=10' + (cursorRef.current ? '&cursor=' + encodeURIComponent(cursorRef.current) : '')
+ const data = await api(url)
+ setItems((prev) => prev.concat(data.items || []))
+ cursorRef.current = data.nextCursor
+ if (!data.nextCursor) setDone(true)
+ } catch (e) {
+ console.error('news load error', e)
+ setDone(true)
+ } finally {
+ inFlightRef.current = false
+ setLoading(false)
+ }
+ }, [done])
+
+ useEffect(() => { fetchPage() }, [])
+ // 后台回前台: 重置游标重拉第一页, 新数据到了再更新视图
+ const reload = useCallback(async () => {
+ if (inFlightRef.current) return
+ inFlightRef.current = true
+ setLoading(true)
+ try {
+ const data = await api('/news?limit=10')
+ setItems(data.items || [])
+ cursorRef.current = data.nextCursor
+ setDone(!data.nextCursor)
+ } catch (e) {
+ console.error('news reload error', e)
+ setDone(true)
+ } finally {
+ inFlightRef.current = false
+ setLoading(false)
+ }
+ }, [])
+ useRefreshOnVisible(reload)
+ useEffect(() => {
+ if (done || items.length === 0) return
+ const el = sentinelRef.current
+ if (!el) return
+ const io = new IntersectionObserver((entries) => {
+ if (entries[0].isIntersecting) fetchPage()
+ }, { rootMargin: '200px' })
+ io.observe(el)
+ return () => io.disconnect()
+ }, [items.length, done, fetchPage])
+
+ if (items.length === 0 && !loading) {
+ return (
+
+ )
+ }
+
+ return (
+
+
+ {items.map((n) => (
+
navigate('/macro/news/' + n.id)}>
+ {n.title}
+ {n.summary && {n.summary}
}
+
+ {n.source || '未知来源'}
+ {fmtDate(n.publishedAt)}
+ #{n.impactRank}
+
+
+ ))}
+
+ {loading ? : (done ? '— 已加载全部 —' : '')}
+
+
+ )
+}
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 4c407ee..24f269c 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -210,12 +210,9 @@ input, textarea, select { font: inherit; }
.me-list .adm-list-item { padding-left: 16px; padding-right: 16px; }
.me-logout { color: var(--color-danger); }
.me-version { text-align: center; font-size: 12px; color: var(--color-muted); padding: 18px 0 8px; }
-/* 首页模块: 报警 + 新闻 */
-.home-content { padding: 0 0 16px; flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
-.home-content .adm-tabs-content { --content-padding: 0; }
-.home-content .tab-label { display: inline-flex; align-items: center; gap: 4px; }
-.home-section { padding: 0 12px 16px; }
-.section-title { font-size: 16px; font-weight: 700; padding: 14px 4px 8px; color: var(--color-text); }
+/* 资讯模块: 报警 + 新闻 (V0.2 起从「首页」并入「宏观」Tab) */
+.tab-label { display: inline-flex; align-items: center; gap: 4px; }
+.home-section { padding: 12px 12px 16px; }
.section-list { display: flex; flex-direction: column; gap: 8px; }
.alert-card.adm-card { border-radius: 10px; margin: 0; }
.alert-card .adm-card-body { padding: 10px 12px; }
diff --git a/src/utils/format.js b/src/utils/format.js
new file mode 100644
index 0000000..9f92724
--- /dev/null
+++ b/src/utils/format.js
@@ -0,0 +1,19 @@
+// 通用格式化工具
+export function fmtDate(s) {
+ if (!s) return ''
+ const d = new Date(s)
+ if (isNaN(d.getTime())) return s
+ const pad = (n) => String(n).padStart(2, '0')
+ return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate())
+}
+
+export function fmtDateTime(s) {
+ if (!s) return ''
+ const d = new Date(s)
+ if (isNaN(d.getTime())) return s
+ const pad = (n) => String(n).padStart(2, '0')
+ return (
+ d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate()) +
+ ' ' + pad(d.getHours()) + ':' + pad(d.getMinutes())
+ )
+}
diff --git a/src/utils/version.js b/src/utils/version.js
new file mode 100644
index 0000000..adf69fc
--- /dev/null
+++ b/src/utils/version.js
@@ -0,0 +1,27 @@
+// 版本号比较 (纯函数, 无浏览器依赖, 方便单测)
+//
+// 口径: 把版本号按"非数字"切成数字字段, 逐段比较数值大小, 缺位补 0
+// "0.2.0-ota" → [0, 2, 0]
+// "v1.10.3" → [1, 10, 3]
+// "0.2" 与 "0.2.0" 视为相等
+
+export function parseVersionFields(v) {
+ return String(v || '')
+ .trim()
+ .split(/[^0-9]+/)
+ .filter((s) => s !== '')
+ .map((s) => Number(s))
+}
+
+// a > b 返回 1, a < b 返回 -1, 相等返回 0
+export function compareVersion(a, b) {
+ const fa = parseVersionFields(a)
+ const fb = parseVersionFields(b)
+ const n = Math.max(fa.length, fb.length)
+ for (let i = 0; i < n; i++) {
+ const x = fa[i] || 0
+ const y = fb[i] || 0
+ if (x !== y) return x > y ? 1 : -1
+ }
+ return 0
+}