refactor(fe): 报告页重构成数据看板,历史页降级成「全部记录」
## 之前报告页的问题
它是个顶级 tab,却只有四张薄卡,而真正的分析全被埋起来:
- 养宠账单里「记一笔」开 cost 弹层 —— 那分支上一轮随记录表单搬走了,
点了开空弹层,是个断按钮
- 养宠账单是我新建花销页的一个残缺子集,重复
- 后端有 6 条洞察 + 体重曲线,全在「历史页」,报告页只用一行链过去
- 健康摘要四行手拼字符串,很薄
## 报告 = 数据看板
把埋在历史页的分析提上来,报告页成为真正「看数据」的地方:
本周概览 周报小结 + 完成/体重变化/高风险三个数 + 生成分享卡片
健康洞察 6 条洞察直接铺在报告页(按 alert>warn>info 上色),
点一条跳去记那一类。这是看板的主角
体重趋势 把那张 SVG 曲线图提上来(点圆点看每次记录)
健康摘要 疫苗/驱虫/体重/异常四行 + 导出就医摘要
养宠花销 只给「本月 ¥X + top 类别 + 分类条」概要,点整卡进花销页,
不再内嵌半套花销 UI,断掉的「记一笔」删了
全部记录 一行入口进历史页
## 历史页降级成「全部记录」
洞察和体重曲线搬走了,历史页只留「时间轴流水 + 类型筛选」——
分工清晰:报告=看分析,全部记录=翻流水。nav 标题改成「全部记录」,
去掉不再用的 bottom-sheet / fab / seg-tabs 之外的东西。
体重曲线的「记一笔」原来开 weight 弹层(已删),改成跳
addrecord?type=weight;洞察点击也从开弹层改成跳 addrecord。
## 顺手
报告页去掉了 Pro 会员占位卡(支付未接入,就是个营销占位),
接入支付时再加回来。
## 验证(预生产库实跑)
周报 需要关注 / 完成0 / 高风险1,小结文案对
洞察 1 条(食便相关),带 level=warn + action=food + 依据
体重趋势 字段验证只有 1 个点 → 曲线走空态「先记录几次」
健康摘要 疫苗 0/3 即将到期、驱虫下次日期、体重稳定增长、异常 1 次
账单 本月 ¥188、top 医疗、2 个类别
5 个接口全部返回真数据
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
const store = require('../../utils/store.js');
|
const store = require('../../utils/store.js');
|
||||||
const api = require('../../utils/api.js');
|
const api = require('../../utils/api.js');
|
||||||
const { toastErr } = require('../../utils/ui.js');
|
const { toastErr } = require('../../utils/ui.js');
|
||||||
|
const recordTypes = require('../../utils/recordTypes.js');
|
||||||
|
|
||||||
function pad(n) {
|
function pad(n) {
|
||||||
return n < 10 ? '0' + n : '' + n;
|
return n < 10 ? '0' + n : '' + n;
|
||||||
@@ -15,23 +16,15 @@ function fmtTime(iso) {
|
|||||||
if (d.toDateString() === y.toDateString()) return '昨天 ' + hm;
|
if (d.toDateString() === y.toDateString()) return '昨天 ' + hm;
|
||||||
return d.getMonth() + 1 + '月' + d.getDate() + '日';
|
return d.getMonth() + 1 + '月' + d.getDate() + '日';
|
||||||
}
|
}
|
||||||
// 记录类型 → 配色。和首页快速记录入口用同一套分组:
|
// 每条记录的分组配色。这页只读历史,引一份轻量的 code→组 映射就够
|
||||||
// 体重/疫苗=橙、便便/饮食=绿、异常/用药=蓝、消费/照片=紫
|
|
||||||
// 时间轴每条记录的色调。这页只读历史,不需要整份类型表,
|
|
||||||
// 但仍要按分组着色——所以引一份轻量的 code→组 映射
|
|
||||||
const recordTypes = require('../../utils/recordTypes.js');
|
|
||||||
function toneOf(type) {
|
function toneOf(type) {
|
||||||
const t = recordTypes.get(type);
|
const t = recordTypes.get(type);
|
||||||
return (t && t.tone) || 'tone-1';
|
return (t && t.tone) || 'tone-1';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 「记一笔」的入口不再写死在这里:类型和分组由后端 record_types 表提供
|
|
||||||
// (后台可配),前端只负责渲染。utils/recordTypes.js 是两处共用的缓存。
|
|
||||||
|
|
||||||
function mapRecord(r) {
|
function mapRecord(r) {
|
||||||
return {
|
return {
|
||||||
id: r.id,
|
id: r.id,
|
||||||
// 图标按 type 取(9 值枚举,可靠);老数据 icon 字段里的 emoji 只作兜底
|
// 图标按 type 取(可靠);老数据 icon 字段里的 emoji 只作兜底
|
||||||
type: r.type || r.icon || '',
|
type: r.type || r.icon || '',
|
||||||
tone: toneOf(r.type),
|
tone: toneOf(r.type),
|
||||||
title: r.title,
|
title: r.title,
|
||||||
@@ -40,57 +33,19 @@ function mapRecord(r) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 时间轴类型筛选
|
// 时间轴类型筛选。常用的一组,不是全部 24 种——seg-tabs 放满会挤成一条难点的横条
|
||||||
const REC_FILTERS = [
|
const REC_FILTERS = [
|
||||||
{ key: '', label: '全部' },
|
{ key: '', label: '全部' },
|
||||||
{ key: 'weight', label: '体重' },
|
{ key: 'weight', label: '体重' },
|
||||||
{ key: 'poop', label: '便便' },
|
{ key: 'poop', label: '排便' },
|
||||||
{ key: 'food', label: '饮食' },
|
{ key: 'food', label: '饮食' },
|
||||||
{ key: 'symptom', label: '异常' },
|
{ key: 'symptom', label: '异常' },
|
||||||
{ key: 'medicine', label: '用药' },
|
|
||||||
{ key: 'vaccine', label: '疫苗' },
|
{ key: 'vaccine', label: '疫苗' },
|
||||||
{ key: 'cost', label: '消费' },
|
{ key: 'cost', label: '记账' },
|
||||||
{ key: 'photo', label: '照片' },
|
{ key: 'photo', label: '照片' },
|
||||||
];
|
];
|
||||||
|
|
||||||
function fmtDay(iso) {
|
const REC_PAGE = 8;
|
||||||
if (!iso) return '';
|
|
||||||
const d = new Date(iso);
|
|
||||||
return d.getMonth() + 1 + '月' + d.getDate() + '日';
|
|
||||||
}
|
|
||||||
|
|
||||||
// 用真实体重点生成趋势图:返回 { svg(折线), dots(可点圆点,坐标为百分比) }
|
|
||||||
function buildChart(points) {
|
|
||||||
const vals = points.map((p) => Number(p.value) || 0);
|
|
||||||
const W = 300, H = 100, pad = 12, n = vals.length;
|
|
||||||
let min = Math.min.apply(null, vals);
|
|
||||||
let max = Math.max.apply(null, vals);
|
|
||||||
if (max === min) max = min + 1;
|
|
||||||
const xs = (i) => (n === 1 ? W / 2 : pad + ((W - 2 * pad) * i) / (n - 1));
|
|
||||||
const ys = (v) => H - pad - ((H - 2 * pad) * (v - min)) / (max - min);
|
|
||||||
const pts = vals.map((v, i) => xs(i).toFixed(1) + ',' + ys(v).toFixed(1)).join(' ');
|
|
||||||
const svg =
|
|
||||||
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ' + W + ' ' + H + '" preserveAspectRatio="none">' +
|
|
||||||
'<polyline points="' + pts + '" fill="none" stroke="#73BE9D" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>' +
|
|
||||||
'</svg>';
|
|
||||||
const dots = points.map((p, i) => ({
|
|
||||||
xp: Number(((xs(i) / W) * 100).toFixed(2)),
|
|
||||||
yp: Number(((ys(vals[i]) / H) * 100).toFixed(2)),
|
|
||||||
value: vals[i],
|
|
||||||
date: fmtDay(p.occurred_at),
|
|
||||||
note: p.note || '',
|
|
||||||
delta: i > 0 ? Number((vals[i] - vals[i - 1]).toFixed(2)) : null,
|
|
||||||
}));
|
|
||||||
return { svg: 'data:image/svg+xml,' + encodeURIComponent(svg), dots };
|
|
||||||
}
|
|
||||||
|
|
||||||
// 洞察等级 → 图标。alert 用警告号,其余按类别给
|
|
||||||
const INS_ICON = { alert: 'warn', warn: 'warn', info: 'trend' };
|
|
||||||
function mapInsight(i) {
|
|
||||||
return { ...i, icon: i.level === 'info' ? (INS_ICON.info) : INS_ICON.alert };
|
|
||||||
}
|
|
||||||
|
|
||||||
const REC_PAGE = 6;
|
|
||||||
|
|
||||||
Page({
|
Page({
|
||||||
data: {
|
data: {
|
||||||
@@ -101,19 +56,11 @@ Page({
|
|||||||
recHasMore: false,
|
recHasMore: false,
|
||||||
recFilters: REC_FILTERS,
|
recFilters: REC_FILTERS,
|
||||||
recFilterIdx: 0,
|
recFilterIdx: 0,
|
||||||
insights: [],
|
|
||||||
trendSvg: '',
|
|
||||||
trendStats: null,
|
|
||||||
trendDots: [],
|
|
||||||
selDot: null,
|
|
||||||
selIdx: -1,
|
|
||||||
sheetShow: false,
|
|
||||||
sheetType: '',
|
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
this._unsub = store.subscribe((pet) => {
|
this._unsub = store.subscribe((pet) => {
|
||||||
this.setData({ pet });
|
this.setData({ pet });
|
||||||
if (!this._inited) return; // 首次由 onShow 加载
|
if (!this._inited) return;
|
||||||
this.loadRecords();
|
this.loadRecords();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -121,9 +68,9 @@ Page({
|
|||||||
if (this._unsub) this._unsub();
|
if (this._unsub) this._unsub();
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
// 时间轴的分组配色要读类型缓存。这页可能是从报告页直接进来的,
|
// 分组配色要读类型缓存。这页可能直接从报告页进来,缓存没经过首页热过,
|
||||||
// 缓存没经过首页/记录页热过,所以自己拉一次(load 内部只会真请求一次)
|
// 自己拉一次(load 内部只真请求一次),拉完刷新已有列表的配色
|
||||||
recordTypes.load().then(() => this.setData({ timeline: this.data.timeline })).catch(() => {});
|
recordTypes.load().then(() => this.setData({ timeline: this.data.timeline.map((t) => ({ ...t, tone: toneOf(t.type) })) })).catch(() => {});
|
||||||
store
|
store
|
||||||
.ready()
|
.ready()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
@@ -136,13 +83,37 @@ Page({
|
|||||||
curFilter() {
|
curFilter() {
|
||||||
return this.data.recFilters[this.data.recFilterIdx].key;
|
return this.data.recFilters[this.data.recFilterIdx].key;
|
||||||
},
|
},
|
||||||
// 来自 seg-tabs 的 change 事件
|
|
||||||
onFilterTap(e) {
|
onFilterTap(e) {
|
||||||
const i = Number(e.detail.index);
|
const i = Number(e.detail.index);
|
||||||
if (i === this.data.recFilterIdx) return;
|
if (i === this.data.recFilterIdx) return;
|
||||||
this.setData({ recFilterIdx: i }, () => this.loadRecords());
|
this.setData({ recFilterIdx: i }, () => this.loadRecords());
|
||||||
},
|
},
|
||||||
// 长按删除一条记录
|
loadRecords() {
|
||||||
|
const id = store.currentPetId();
|
||||||
|
if (!id) return;
|
||||||
|
api
|
||||||
|
.getRecords(id, { page: 1, pageSize: REC_PAGE, type: this.curFilter() })
|
||||||
|
.then((res) => {
|
||||||
|
const list = (res.list || []).map(mapRecord);
|
||||||
|
this.setData({ timeline: list, recPage: 1, recTotal: res.total || 0, recHasMore: list.length < (res.total || 0) });
|
||||||
|
})
|
||||||
|
.catch((e) => toastErr(e));
|
||||||
|
},
|
||||||
|
loadMoreRecords() {
|
||||||
|
const id = store.currentPetId();
|
||||||
|
if (!id) return;
|
||||||
|
const next = this.data.recPage + 1;
|
||||||
|
api
|
||||||
|
.getRecords(id, { page: next, pageSize: REC_PAGE, type: this.curFilter() })
|
||||||
|
.then((res) => {
|
||||||
|
const merged = this.data.timeline.concat((res.list || []).map(mapRecord));
|
||||||
|
this.setData({ timeline: merged, recPage: next, recTotal: res.total || 0, recHasMore: merged.length < (res.total || 0) });
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
},
|
||||||
|
collapseRecords() {
|
||||||
|
this.loadRecords();
|
||||||
|
},
|
||||||
onDeleteRecord(e) {
|
onDeleteRecord(e) {
|
||||||
const r = this.data.timeline[e.currentTarget.dataset.index];
|
const r = this.data.timeline[e.currentTarget.dataset.index];
|
||||||
if (!r || !r.id) return;
|
if (!r || !r.id) return;
|
||||||
@@ -162,96 +133,10 @@ Page({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 健康洞察:把散落的记录变成结论。点一条直接跳到对应的记录入口
|
|
||||||
loadInsights() {
|
|
||||||
const id = store.currentPetId();
|
|
||||||
if (!id) return this.setData({ insights: [] });
|
|
||||||
api
|
|
||||||
.petInsights(id)
|
|
||||||
.then((list) => this.setData({ insights: (list || []).map(mapInsight) }))
|
|
||||||
.catch(() => this.setData({ insights: [] }));
|
|
||||||
},
|
|
||||||
onTapInsight(e) {
|
|
||||||
const it = this.data.insights[e.currentTarget.dataset.index];
|
|
||||||
if (it && it.action) this.openSheetType(it.action);
|
|
||||||
},
|
|
||||||
loadRecords() {
|
|
||||||
const id = store.currentPetId();
|
|
||||||
if (!id) return;
|
|
||||||
api
|
|
||||||
.getRecords(id, { page: 1, pageSize: REC_PAGE, type: this.curFilter() })
|
|
||||||
.then((res) => {
|
|
||||||
const list = (res.list || []).map(mapRecord);
|
|
||||||
this.setData({ timeline: list, recPage: 1, recTotal: res.total || 0, recHasMore: list.length < (res.total || 0) });
|
|
||||||
})
|
|
||||||
.catch((e) => toastErr(e));
|
|
||||||
this.loadTrend();
|
|
||||||
this.loadInsights();
|
|
||||||
},
|
|
||||||
loadMoreRecords() {
|
|
||||||
const id = store.currentPetId();
|
|
||||||
if (!id) return;
|
|
||||||
const next = this.data.recPage + 1;
|
|
||||||
api
|
|
||||||
.getRecords(id, { page: next, pageSize: REC_PAGE, type: this.curFilter() })
|
|
||||||
.then((res) => {
|
|
||||||
const merged = this.data.timeline.concat((res.list || []).map(mapRecord));
|
|
||||||
this.setData({ timeline: merged, recPage: next, recTotal: res.total || 0, recHasMore: merged.length < (res.total || 0) });
|
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
},
|
|
||||||
collapseRecords() {
|
|
||||||
this.loadRecords();
|
|
||||||
},
|
|
||||||
loadTrend() {
|
|
||||||
const id = store.currentPetId();
|
|
||||||
if (!id) {
|
|
||||||
this.setData({ trendSvg: '', trendStats: null, trendDots: [], selDot: null, selIdx: -1 });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
api
|
|
||||||
.weightTrend(id)
|
|
||||||
.then((points) => {
|
|
||||||
points = points || [];
|
|
||||||
if (points.length < 2) {
|
|
||||||
this.setData({ trendSvg: '', trendStats: null, trendDots: [], selDot: null, selIdx: -1 });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const vals = points.map((p) => Number(p.value) || 0);
|
|
||||||
const latest = vals[vals.length - 1];
|
|
||||||
const delta = Number((latest - vals[0]).toFixed(2));
|
|
||||||
const chart = buildChart(points);
|
|
||||||
const lastIdx = chart.dots.length - 1;
|
|
||||||
this.setData({
|
|
||||||
trendSvg: chart.svg,
|
|
||||||
trendDots: chart.dots,
|
|
||||||
selDot: chart.dots[lastIdx], // 默认选中最新一次
|
|
||||||
selIdx: lastIdx,
|
|
||||||
trendStats: { latest, delta, count: points.length },
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
},
|
|
||||||
onTapPoint(e) {
|
|
||||||
const i = e.currentTarget.dataset.index;
|
|
||||||
this.setData({ selDot: this.data.trendDots[i], selIdx: i });
|
|
||||||
},
|
|
||||||
previewImage(e) {
|
previewImage(e) {
|
||||||
const src = e.currentTarget.dataset.src;
|
const src = e.currentTarget.dataset.src;
|
||||||
if (src) wx.previewImage({ urls: [src], current: src });
|
if (src) wx.previewImage({ urls: [src], current: src });
|
||||||
},
|
},
|
||||||
openSheet(e) {
|
|
||||||
this.openSheetType(e.currentTarget.dataset.type);
|
|
||||||
},
|
|
||||||
openSheetType(type) {
|
|
||||||
this.setData({ sheetType: type, sheetShow: true });
|
|
||||||
},
|
|
||||||
closeSheet() {
|
|
||||||
this.setData({ sheetShow: false });
|
|
||||||
},
|
|
||||||
onSheetSaved() {
|
|
||||||
this.loadRecords();
|
|
||||||
},
|
|
||||||
onAddPet() {
|
onAddPet() {
|
||||||
wx.navigateTo({ url: '/pages/petform/petform' });
|
wx.navigateTo({ url: '/pages/petform/petform' });
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
"usingComponents": {
|
"usingComponents": {
|
||||||
"nav-bar": "/components/nav-bar/nav-bar",
|
"nav-bar": "/components/nav-bar/nav-bar",
|
||||||
"pet-switch": "/components/pet-switch/pet-switch",
|
"pet-switch": "/components/pet-switch/pet-switch",
|
||||||
"bottom-sheet": "/components/bottom-sheet/bottom-sheet",
|
|
||||||
"fab": "/components/fab/fab",
|
|
||||||
"pt-icon": "/components/pt-icon/index",
|
"pt-icon": "/components/pt-icon/index",
|
||||||
"seg-tabs": "/components/seg-tabs/index"
|
"seg-tabs": "/components/seg-tabs/index"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<nav-bar title="记录与趋势" show-back="{{true}}"></nav-bar>
|
<nav-bar title="全部记录" show-back="{{true}}"></nav-bar>
|
||||||
|
|
||||||
<view class="top-bar"><pet-switch bind:add="onAddPet"></pet-switch></view>
|
<view class="top-bar"><pet-switch bind:add="onAddPet"></pet-switch></view>
|
||||||
|
|
||||||
@@ -7,53 +7,15 @@
|
|||||||
<view wx:if="{{!pet.id}}" class="no-pet">
|
<view wx:if="{{!pet.id}}" class="no-pet">
|
||||||
<view class="no-pet-ic"><pt-icon name="community" size="{{52}}"></pt-icon></view>
|
<view class="no-pet-ic"><pt-icon name="community" size="{{52}}"></pt-icon></view>
|
||||||
<view class="no-pet-b">还没有毛孩子的档案</view>
|
<view class="no-pet-b">还没有毛孩子的档案</view>
|
||||||
<view class="no-pet-p">建好档并记上几笔,这里就会长出趋势和洞察。</view>
|
<view class="no-pet-p">建好档并记上几笔,这里就会长出完整的记录流水。</view>
|
||||||
<view class="btn btn-dark" bindtap="onAddPet"><pt-icon name="plus" size="{{30}}"></pt-icon>建一份档案</view>
|
<view class="btn btn-dark" bindtap="onAddPet"><pt-icon name="plus" size="{{30}}"></pt-icon>建一份档案</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view wx:if="{{insights.length}}" class="card">
|
<!-- 全部记录时间轴。洞察和体重趋势已经提到报告页,这里只做「翻流水 + 按类型筛」 -->
|
||||||
<view class="section-head"><view class="sh-title">健康洞察</view><view class="tiny">来自你的记录</view></view>
|
<block wx:else>
|
||||||
<view wx:for="{{insights}}" wx:key="title" class="ins ins-{{item.level}}" data-index="{{index}}" bindtap="onTapInsight">
|
|
||||||
<view class="ins-head">
|
|
||||||
<view class="ins-ic"><pt-icon name="{{item.icon}}" size="{{30}}"></pt-icon></view>
|
|
||||||
<view class="ins-title">{{item.title}}</view>
|
|
||||||
</view>
|
|
||||||
<view class="ins-detail">{{item.detail}}</view>
|
|
||||||
<view class="ins-ev">{{item.evidence}}</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="card">
|
|
||||||
<view class="section-head"><view class="sh-title">体重趋势</view><view class="link" data-type="weight" bindtap="openSheet">记录</view></view>
|
|
||||||
<view wx:if="{{trendStats}}" class="trend-stats">最新 {{trendStats.latest}}kg · 较首次 {{trendStats.delta >= 0 ? '+' : ''}}{{trendStats.delta}}kg · 共 {{trendStats.count}} 次</view>
|
|
||||||
<block wx:if="{{trendSvg}}">
|
|
||||||
<view class="mini-chart">
|
|
||||||
<image class="chart-line" mode="scaleToFill" src="{{trendSvg}}"></image>
|
|
||||||
<view class="dot-layer">
|
|
||||||
<view wx:for="{{trendDots}}" wx:key="index"
|
|
||||||
class="dot {{selIdx === index ? 'on' : ''}}"
|
|
||||||
style="left:{{item.xp}}%;top:{{item.yp}}%"
|
|
||||||
data-index="{{index}}" bindtap="onTapPoint"></view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view wx:if="{{selDot}}" class="point-detail">
|
|
||||||
<view class="pd-main">
|
|
||||||
<text class="pd-date">{{selDot.date}}</text>
|
|
||||||
<text class="pd-weight">{{selDot.value}}kg</text>
|
|
||||||
<text wx:if="{{selDot.delta !== null}}" class="pd-delta {{selDot.delta > 0 ? 'up' : (selDot.delta < 0 ? 'down' : '')}}">{{selDot.delta > 0 ? '+' : ''}}{{selDot.delta}}kg</text>
|
|
||||||
</view>
|
|
||||||
<view wx:if="{{selDot.note}}" class="pd-note"><pt-icon name="note" size="{{26}}"></pt-icon> {{selDot.note}}</view>
|
|
||||||
<view wx:else class="pd-note muted">这次没有填备注</view>
|
|
||||||
</view>
|
|
||||||
<view class="chart-hint">点击圆点查看每次记录</view>
|
|
||||||
</block>
|
|
||||||
<view wx:else class="empty">先记录几次体重,这里会自动画出趋势曲线</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="card">
|
|
||||||
<view class="section-head"><view class="sh-title">健康时间轴</view><view class="link" data-type="vetSummary" bindtap="openSheet">摘要</view></view>
|
|
||||||
<seg-tabs items="{{recFilters}}" current="{{recFilterIdx}}" bind:change="onFilterTap"></seg-tabs>
|
<seg-tabs items="{{recFilters}}" current="{{recFilterIdx}}" bind:change="onFilterTap"></seg-tabs>
|
||||||
|
|
||||||
|
<view class="card">
|
||||||
<view class="health-timeline">
|
<view class="health-timeline">
|
||||||
<view wx:for="{{timeline}}" wx:key="id" class="health-event"
|
<view wx:for="{{timeline}}" wx:key="id" class="health-event"
|
||||||
bindlongpress="onDeleteRecord" data-index="{{index}}">
|
bindlongpress="onDeleteRecord" data-index="{{index}}">
|
||||||
@@ -63,13 +25,12 @@
|
|||||||
<image wx:if="{{item.image}}" class="he-img" src="{{item.image}}" mode="aspectFill" catchtap="previewImage" data-src="{{item.image}}"></image>
|
<image wx:if="{{item.image}}" class="he-img" src="{{item.image}}" mode="aspectFill" catchtap="previewImage" data-src="{{item.image}}"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view wx:if="{{timeline.length === 0}}" class="empty">这个分类下还没有记录</view>
|
<view wx:if="{{timeline.length === 0}}" class="empty lg">这个分类下还没有记录</view>
|
||||||
</view>
|
</view>
|
||||||
<view wx:if="{{timeline.length}}" class="tl-tip">长按任意一条可删除</view>
|
<view wx:if="{{timeline.length}}" class="tl-tip">长按任意一条可删除</view>
|
||||||
<view wx:if="{{recHasMore}}" class="tl-more" bindtap="loadMoreRecords">查看更多(共 {{recTotal}} 条)</view>
|
<view wx:if="{{recHasMore}}" class="tl-more" bindtap="loadMoreRecords">查看更多(共 {{recTotal}} 条)</view>
|
||||||
<view wx:elif="{{recPage > 1}}" class="tl-more" bindtap="collapseRecords">收起</view>
|
<view wx:elif="{{recPage > 1}}" class="tl-more" bindtap="collapseRecords">收起</view>
|
||||||
</view>
|
</view>
|
||||||
|
</block>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
||||||
<bottom-sheet show="{{sheetShow}}" type="{{sheetType}}" bind:close="closeSheet" bind:saved="onSheetSaved"></bottom-sheet>
|
|
||||||
|
|||||||
@@ -1,29 +1,4 @@
|
|||||||
.mini-chart{
|
/* 全部记录时间轴。洞察和体重趋势已经搬到报告页,这里只留流水 + 筛选 */
|
||||||
height:256rpx;border-radius:var(--r-md);margin-top:var(--sp-4);position:relative;overflow:hidden;
|
|
||||||
background:
|
|
||||||
linear-gradient(180deg,rgba(115,190,157,.16),rgba(115,190,157,0)),
|
|
||||||
repeating-linear-gradient(0deg,#fff,#fff 60rpx,#EFE8DE 62rpx);
|
|
||||||
}
|
|
||||||
.chart-line{position:absolute;left:36rpx;right:36rpx;top:44rpx;bottom:44rpx;width:auto;height:auto}
|
|
||||||
.dot-layer{position:absolute;left:36rpx;right:36rpx;top:44rpx;bottom:44rpx}
|
|
||||||
.dot{position:absolute;width:40rpx;height:40rpx;margin:-20rpx 0 0 -20rpx;border-radius:50%;}
|
|
||||||
.dot::after{content:'';position:absolute;left:50%;top:50%;width:18rpx;height:18rpx;margin:-9rpx 0 0 -9rpx;border-radius:50%;background:#fff;border:4rpx solid var(--green);box-sizing:border-box}
|
|
||||||
.dot.on::after{width:26rpx;height:26rpx;margin:-13rpx 0 0 -13rpx;background:var(--green);box-shadow:0 0 0 6rpx rgba(115,190,157,.25)}
|
|
||||||
.trend-stats{margin-top:var(--sp-3);font-size:var(--fs-sm);color:var(--muted)}
|
|
||||||
|
|
||||||
.point-detail{
|
|
||||||
margin-top:var(--sp-3);padding:var(--sp-4);border-radius:var(--r-md);
|
|
||||||
background:var(--green-soft);border:1rpx solid #DCEFE4;
|
|
||||||
}
|
|
||||||
.pd-main{display:flex;align-items:baseline;gap:var(--sp-3)}
|
|
||||||
.pd-date{font-size:var(--fs-sm);color:var(--muted)}
|
|
||||||
.pd-weight{font-size:var(--fs-xl);font-weight:var(--fw-b);color:var(--green-ink)}
|
|
||||||
.pd-delta{font-size:var(--fs-sm);font-weight:var(--fw-b)}
|
|
||||||
.pd-delta.up{color:var(--red-ink)}
|
|
||||||
.pd-delta.down{color:var(--green-ink)}
|
|
||||||
.pd-note{margin-top:var(--sp-2);font-size:var(--fs-md);color:var(--text-2);line-height:1.5}
|
|
||||||
.pd-note.muted{color:var(--muted)}
|
|
||||||
.chart-hint{margin-top:var(--sp-2);font-size:var(--fs-cap);color:var(--muted);text-align:center}
|
|
||||||
|
|
||||||
.health-timeline{display:flex;flex-direction:column;gap:var(--sp-2)}
|
.health-timeline{display:flex;flex-direction:column;gap:var(--sp-2)}
|
||||||
.health-event{display:flex;gap:var(--sp-3);background:var(--surface-2);border-radius:var(--r-md);padding:var(--sp-4)}
|
.health-event{display:flex;gap:var(--sp-3);background:var(--surface-2);border-radius:var(--r-md);padding:var(--sp-4)}
|
||||||
@@ -42,18 +17,3 @@
|
|||||||
margin-top:var(--sp-3);padding:var(--sp-3);text-align:center;color:var(--primary-dark);
|
margin-top:var(--sp-3);padding:var(--sp-3);text-align:center;color:var(--primary-dark);
|
||||||
background:var(--surface-2);border-radius:var(--r-md);font-size:var(--fs-sm);font-weight:var(--fw-b);
|
background:var(--surface-2);border-radius:var(--r-md);font-size:var(--fs-sm);font-weight:var(--fw-b);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 健康洞察 */
|
|
||||||
.ins{border-radius:var(--r-md);padding:var(--sp-4);margin-bottom:var(--sp-2)}
|
|
||||||
.ins:last-child{margin-bottom:0}
|
|
||||||
.ins-info{background:var(--surface-2)}
|
|
||||||
.ins-warn{background:var(--primary-soft)}
|
|
||||||
.ins-alert{background:var(--red-soft)}
|
|
||||||
.ins-head{display:flex;align-items:flex-start;gap:var(--sp-2)}
|
|
||||||
.ins-ic{flex:none;margin-top:2rpx}
|
|
||||||
.ins-info .ins-ic{color:var(--green-ink)}
|
|
||||||
.ins-warn .ins-ic{color:var(--primary-ink)}
|
|
||||||
.ins-alert .ins-ic{color:var(--red-ink)}
|
|
||||||
.ins-title{flex:1;font-size:var(--fs-md);font-weight:var(--fw-b);line-height:1.4}
|
|
||||||
.ins-detail{color:var(--text-2);font-size:var(--fs-sm);line-height:1.6;margin-top:var(--sp-2)}
|
|
||||||
.ins-ev{color:var(--muted);font-size:var(--fs-cap);margin-top:var(--sp-2)}
|
|
||||||
|
|||||||
+109
-13
@@ -2,20 +2,64 @@ const store = require('../../utils/store.js');
|
|||||||
const api = require('../../utils/api.js');
|
const api = require('../../utils/api.js');
|
||||||
const { syncTabBar } = require('../../utils/tabbar.js');
|
const { syncTabBar } = require('../../utils/tabbar.js');
|
||||||
|
|
||||||
|
function fmtDay(iso) {
|
||||||
|
if (!iso) return '';
|
||||||
|
const d = new Date(iso);
|
||||||
|
return d.getMonth() + 1 + '月' + d.getDate() + '日';
|
||||||
|
}
|
||||||
|
|
||||||
|
// 体重点 → 趋势图。返回 { svg(折线 data-uri), dots(可点圆点,坐标为百分比) }。
|
||||||
|
// 从历史页搬过来的:报告页才是「看数据」的地方,图不该埋在二级页
|
||||||
|
function buildChart(points) {
|
||||||
|
const vals = points.map((p) => Number(p.value) || 0);
|
||||||
|
const W = 300, H = 100, pad = 12, n = vals.length;
|
||||||
|
let min = Math.min.apply(null, vals);
|
||||||
|
let max = Math.max.apply(null, vals);
|
||||||
|
if (max === min) max = min + 1;
|
||||||
|
const xs = (i) => (n === 1 ? W / 2 : pad + ((W - 2 * pad) * i) / (n - 1));
|
||||||
|
const ys = (v) => H - pad - ((H - 2 * pad) * (v - min)) / (max - min);
|
||||||
|
const pts = vals.map((v, i) => xs(i).toFixed(1) + ',' + ys(v).toFixed(1)).join(' ');
|
||||||
|
const svg =
|
||||||
|
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ' + W + ' ' + H + '" preserveAspectRatio="none">' +
|
||||||
|
'<polyline points="' + pts + '" fill="none" stroke="#73BE9D" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>' +
|
||||||
|
'</svg>';
|
||||||
|
const dots = points.map((p, i) => ({
|
||||||
|
xp: Number(((xs(i) / W) * 100).toFixed(2)),
|
||||||
|
yp: Number(((ys(vals[i]) / H) * 100).toFixed(2)),
|
||||||
|
value: vals[i],
|
||||||
|
date: fmtDay(p.occurred_at),
|
||||||
|
note: p.note || '',
|
||||||
|
delta: i > 0 ? Number((vals[i] - vals[i - 1]).toFixed(2)) : null,
|
||||||
|
}));
|
||||||
|
return { svg: 'data:image/svg+xml,' + encodeURIComponent(svg), dots };
|
||||||
|
}
|
||||||
|
|
||||||
|
// 洞察等级 → 图标。alert/warn 用警告号,info 用趋势
|
||||||
|
function mapInsight(i) {
|
||||||
|
return { ...i, icon: i.level === 'info' ? 'trend' : 'warn' };
|
||||||
|
}
|
||||||
|
|
||||||
Page({
|
Page({
|
||||||
data: {
|
data: {
|
||||||
pet: {},
|
pet: {},
|
||||||
report: null,
|
report: null,
|
||||||
gainText: '+0.0',
|
gainText: '+0.0',
|
||||||
bill: null,
|
insights: [],
|
||||||
|
trendSvg: '',
|
||||||
|
trendStats: null,
|
||||||
|
trendDots: [],
|
||||||
|
selDot: null,
|
||||||
|
selIdx: -1,
|
||||||
summary: null,
|
summary: null,
|
||||||
|
bill: null,
|
||||||
|
billTop: null,
|
||||||
sheetShow: false,
|
sheetShow: false,
|
||||||
sheetType: '',
|
sheetType: '',
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
this._unsub = store.subscribe((pet) => {
|
this._unsub = store.subscribe((pet) => {
|
||||||
this.setData({ pet });
|
this.setData({ pet });
|
||||||
if (!this._inited) return; // 首次由 onShow 加载
|
if (!this._inited) return;
|
||||||
this.loadData();
|
this.loadData();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -36,18 +80,74 @@ Page({
|
|||||||
loadData() {
|
loadData() {
|
||||||
const id = store.currentPetId();
|
const id = store.currentPetId();
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
Promise.all([api.weeklyReport(id), api.getBill(id, 'month'), api.healthSummary(id)])
|
api
|
||||||
.then(([report, bill, summary]) => {
|
.weeklyReport(id)
|
||||||
const g = report.weight_gain || 0;
|
.then((report) => {
|
||||||
|
const g = (report && report.weight_gain) || 0;
|
||||||
|
this.setData({ report, gainText: (g >= 0 ? '+' : '') + g.toFixed(1) });
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
api
|
||||||
|
.petInsights(id)
|
||||||
|
.then((list) => this.setData({ insights: (list || []).map(mapInsight) }))
|
||||||
|
.catch(() => this.setData({ insights: [] }));
|
||||||
|
api
|
||||||
|
.healthSummary(id)
|
||||||
|
.then((summary) => this.setData({ summary }))
|
||||||
|
.catch(() => {});
|
||||||
|
// 账单只在报告页取一个概要,详细录入和流水在花销页
|
||||||
|
api
|
||||||
|
.getBill(id, 'month')
|
||||||
|
.then((bill) => {
|
||||||
|
const cats = (bill && bill.categories) || [];
|
||||||
|
this.setData({ bill, billTop: cats.length ? cats[0] : null });
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
this.loadTrend(id);
|
||||||
|
},
|
||||||
|
loadTrend(id) {
|
||||||
|
api
|
||||||
|
.weightTrend(id)
|
||||||
|
.then((points) => {
|
||||||
|
points = points || [];
|
||||||
|
if (points.length < 2) {
|
||||||
|
this.setData({ trendSvg: '', trendStats: null, trendDots: [], selDot: null, selIdx: -1 });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const vals = points.map((p) => Number(p.value) || 0);
|
||||||
|
const latest = vals[vals.length - 1];
|
||||||
|
const delta = Number((latest - vals[0]).toFixed(2));
|
||||||
|
const chart = buildChart(points);
|
||||||
|
const last = chart.dots.length - 1;
|
||||||
this.setData({
|
this.setData({
|
||||||
report,
|
trendSvg: chart.svg,
|
||||||
gainText: (g >= 0 ? '+' : '') + g.toFixed(1),
|
trendDots: chart.dots,
|
||||||
bill,
|
selDot: chart.dots[last], // 默认选中最新一次
|
||||||
summary,
|
selIdx: last,
|
||||||
|
trendStats: { latest, delta, count: points.length },
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
},
|
},
|
||||||
|
onTapPoint(e) {
|
||||||
|
const i = e.currentTarget.dataset.index;
|
||||||
|
this.setData({ selDot: this.data.trendDots[i], selIdx: i });
|
||||||
|
},
|
||||||
|
// 点一条洞察,跳到对应类型的记录入口(洞察带 action = 记录类型 code)
|
||||||
|
onTapInsight(e) {
|
||||||
|
const it = this.data.insights[e.currentTarget.dataset.index];
|
||||||
|
if (it && it.action) wx.navigateTo({ url: '/pages/addrecord/addrecord?type=' + it.action });
|
||||||
|
},
|
||||||
|
// 体重趋势的「记一笔」直接去体重记录页(原来开的 weight 弹层已经搬成独立页)
|
||||||
|
goWeight() {
|
||||||
|
wx.navigateTo({ url: '/pages/addrecord/addrecord?type=weight' });
|
||||||
|
},
|
||||||
|
goExpense() {
|
||||||
|
wx.navigateTo({ url: '/pages/expense/expense' });
|
||||||
|
},
|
||||||
|
goHistory() {
|
||||||
|
wx.navigateTo({ url: '/pages/history/history' });
|
||||||
|
},
|
||||||
openSheet(e) {
|
openSheet(e) {
|
||||||
this.setData({ sheetType: e.currentTarget.dataset.type, sheetShow: true });
|
this.setData({ sheetType: e.currentTarget.dataset.type, sheetShow: true });
|
||||||
},
|
},
|
||||||
@@ -57,11 +157,7 @@ Page({
|
|||||||
onAddPet() {
|
onAddPet() {
|
||||||
wx.navigateTo({ url: '/pages/petform/petform' });
|
wx.navigateTo({ url: '/pages/petform/petform' });
|
||||||
},
|
},
|
||||||
goHistory() {
|
|
||||||
wx.navigateTo({ url: '/pages/history/history' });
|
|
||||||
},
|
|
||||||
onShareAppMessage() {
|
onShareAppMessage() {
|
||||||
// 带上宠物名,转发出去别人一眼知道是谁家的
|
|
||||||
const n = (this.data.pet && this.data.pet.name) || '我家毛孩子';
|
const n = (this.data.pet && this.data.pet.name) || '我家毛孩子';
|
||||||
return { title: `${n} 的成长报告`, path: '/pages/report/report' };
|
return { title: `${n} 的成长报告`, path: '/pages/report/report' };
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
"nav-bar": "/components/nav-bar/nav-bar",
|
"nav-bar": "/components/nav-bar/nav-bar",
|
||||||
"pet-switch": "/components/pet-switch/pet-switch",
|
"pet-switch": "/components/pet-switch/pet-switch",
|
||||||
"bottom-sheet": "/components/bottom-sheet/bottom-sheet",
|
"bottom-sheet": "/components/bottom-sheet/bottom-sheet",
|
||||||
"fab": "/components/fab/fab",
|
|
||||||
"pt-icon": "/components/pt-icon/index"
|
"pt-icon": "/components/pt-icon/index"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,60 +11,102 @@
|
|||||||
<view class="btn btn-dark" bindtap="onAddPet"><pt-icon name="plus" size="{{30}}"></pt-icon>建一份档案</view>
|
<view class="btn btn-dark" bindtap="onAddPet"><pt-icon name="plus" size="{{30}}"></pt-icon>建一份档案</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<block wx:else>
|
||||||
|
<!-- 本周概览:一句话小结 + 三个数 + 分享卡片 -->
|
||||||
<view class="card report-card">
|
<view class="card report-card">
|
||||||
<view class="section-head"><view class="sh-title">本周成长报告</view><view class="tag">{{report.health_status || '稳定成长'}}</view></view>
|
<view class="section-head"><view class="sh-title">本周概览</view><view class="tag">{{report.health_status || '稳定成长'}}</view></view>
|
||||||
<view class="rc-text">{{report.summary || '暂无本周数据'}}</view>
|
<view class="rc-text">{{report.summary || '这周还没有足够的记录,多记几笔就有小结了'}}</view>
|
||||||
<view class="stats-grid">
|
<view class="stats-grid">
|
||||||
<view class="stat"><text class="stat-b">{{report.tasks_completed || 0}}</text><text class="stat-s">完成任务</text></view>
|
<view class="stat"><text class="stat-b">{{report.tasks_completed || 0}}</text><text class="stat-s">完成任务</text></view>
|
||||||
<view class="stat"><text class="stat-b">{{gainText}}</text><text class="stat-s">kg 增长</text></view>
|
<view class="stat"><text class="stat-b">{{gainText}}</text><text class="stat-s">kg 变化</text></view>
|
||||||
<view class="stat"><text class="stat-b">{{report.high_risk_count || 0}}</text><text class="stat-s">高风险异常</text></view>
|
<view class="stat"><text class="stat-b">{{report.high_risk_count || 0}}</text><text class="stat-s">高风险异常</text></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="sheet-actions">
|
<view class="btn btn-primary btn-block rc-share" data-type="poster" bindtap="openSheet">
|
||||||
<button class="btn btn-ghost" data-type="reportDetail" bindtap="openSheet">查看报告</button>
|
<pt-icon name="share" size="{{30}}"></pt-icon>生成分享卡片
|
||||||
<button class="btn btn-primary" data-type="poster" bindtap="openSheet">分享卡片</button>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 洞察/趋势/时间轴从记录页搬过来了,报告页才是「看数据」的地方 -->
|
<!-- 健康洞察:把散落的记录变成结论。以前埋在历史页,现在是报告页的主角。
|
||||||
<view class="profile-list">
|
点一条跳去记那一类。有洞察才显示这张卡 -->
|
||||||
<view class="profile-row" bindtap="goHistory">
|
<view wx:if="{{insights.length}}" class="card">
|
||||||
<view class="pr-ic"><pt-icon name="trend" size="{{34}}"></pt-icon></view>
|
<view class="section-head"><view class="sh-title">健康洞察</view><view class="tiny">来自你的记录</view></view>
|
||||||
<text class="pr-label">记录与趋势</text>
|
<view wx:for="{{insights}}" wx:key="title" class="ins ins-{{item.level}}" data-index="{{index}}" bindtap="onTapInsight">
|
||||||
<text class="pr-val">洞察 · 体重 · 时间轴</text>
|
<view class="ins-head">
|
||||||
<view class="pr-arrow"><pt-icon name="next" size="{{28}}"></pt-icon></view>
|
<view class="ins-ic"><pt-icon name="{{item.icon}}" size="{{30}}"></pt-icon></view>
|
||||||
|
<view class="ins-title">{{item.title}}</view>
|
||||||
|
<view wx:if="{{item.action}}" class="ins-go"><pt-icon name="next" size="{{26}}"></pt-icon></view>
|
||||||
|
</view>
|
||||||
|
<view wx:if="{{item.detail}}" class="ins-detail">{{item.detail}}</view>
|
||||||
|
<view wx:if="{{item.evidence}}" class="ins-ev">{{item.evidence}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<!-- 体重趋势 -->
|
||||||
<view class="card">
|
<view class="card">
|
||||||
<view class="section-head"><view class="sh-title">健康摘要</view><view class="link" data-type="vetSummary" bindtap="openSheet">导出</view></view>
|
<view class="section-head"><view class="sh-title">体重趋势</view><view class="link" bindtap="goWeight">记一笔</view></view>
|
||||||
|
<view wx:if="{{trendStats}}" class="trend-stats">最新 {{trendStats.latest}}kg · 较首次 {{trendStats.delta >= 0 ? '+' : ''}}{{trendStats.delta}}kg · 共 {{trendStats.count}} 次</view>
|
||||||
|
<block wx:if="{{trendSvg}}">
|
||||||
|
<view class="mini-chart">
|
||||||
|
<image class="chart-line" mode="scaleToFill" src="{{trendSvg}}"></image>
|
||||||
|
<view class="dot-layer">
|
||||||
|
<view wx:for="{{trendDots}}" wx:key="index"
|
||||||
|
class="dot {{selIdx === index ? 'on' : ''}}"
|
||||||
|
style="left:{{item.xp}}%;top:{{item.yp}}%"
|
||||||
|
data-index="{{index}}" bindtap="onTapPoint"></view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view wx:if="{{selDot}}" class="point-detail">
|
||||||
|
<view class="pd-main">
|
||||||
|
<text class="pd-date">{{selDot.date}}</text>
|
||||||
|
<text class="pd-weight">{{selDot.value}}kg</text>
|
||||||
|
<text wx:if="{{selDot.delta !== null}}" class="pd-delta {{selDot.delta > 0 ? 'up' : (selDot.delta < 0 ? 'down' : '')}}">{{selDot.delta > 0 ? '+' : ''}}{{selDot.delta}}kg</text>
|
||||||
|
</view>
|
||||||
|
<view wx:if="{{selDot.note}}" class="pd-note"><pt-icon name="note" size="{{26}}"></pt-icon> {{selDot.note}}</view>
|
||||||
|
<view wx:else class="pd-note muted">这次没有填备注</view>
|
||||||
|
</view>
|
||||||
|
<view class="chart-hint">点击圆点查看每次记录</view>
|
||||||
|
</block>
|
||||||
|
<view wx:else class="empty">先记录几次体重,这里会自动画出趋势曲线</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<!-- 健康摘要:紧凑状态带 + 导出就医摘要 -->
|
||||||
|
<view class="card">
|
||||||
|
<view class="section-head"><view class="sh-title">健康摘要</view><view class="link" data-type="vetSummary" bindtap="openSheet">就医摘要</view></view>
|
||||||
<view class="record-row"><text class="bold">疫苗进度</text><text class="muted">{{summary.vaccine_progress || '—'}}</text></view>
|
<view class="record-row"><text class="bold">疫苗进度</text><text class="muted">{{summary.vaccine_progress || '—'}}</text></view>
|
||||||
<view class="record-row"><text class="bold">驱虫状态</text><text class="muted">{{summary.deworm_status || '—'}}</text></view>
|
<view class="record-row"><text class="bold">驱虫状态</text><text class="muted">{{summary.deworm_status || '—'}}</text></view>
|
||||||
<view class="record-row"><text class="bold">体重趋势</text><text class="muted">{{summary.weight_trend || '—'}}</text></view>
|
<view class="record-row"><text class="bold">体重趋势</text><text class="muted">{{summary.weight_trend || '—'}}</text></view>
|
||||||
<view class="record-row"><text class="bold">异常记录</text><text class="muted">{{summary.anomaly_count || 0}} 次</text></view>
|
<view class="record-row"><text class="bold">异常记录</text><text class="muted">{{summary.anomaly_count || 0}} 次</text></view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="card">
|
<!-- 养宠账单:只给概要,详细录入和流水在花销页(原来这里内嵌了半套花销 UI,
|
||||||
<view class="section-head"><view class="sh-title">养宠账单</view><view class="link" data-type="cost" bindtap="openSheet">记一笔</view></view>
|
还带个已经断掉的「记一笔」按钮)-->
|
||||||
<view class="stats-grid">
|
<view class="card bill-card" bindtap="goExpense">
|
||||||
<view class="stat"><text class="stat-b">¥{{bill.total || 0}}</text><text class="stat-s">本月花费</text></view>
|
<view class="section-head"><view class="sh-title">养宠花销</view><view class="link">去记账 ›</view></view>
|
||||||
<view class="stat"><text class="stat-b">¥{{bill.max_single || 0}}</text><text class="stat-s">最大支出</text></view>
|
<view class="bill-sum">
|
||||||
<view class="stat"><text class="stat-b">{{bill.categories.length || 0}}</text><text class="stat-s">消费类别</text></view>
|
<view class="bill-total"><text class="bill-cur">¥</text>{{bill.total || 0}}</view>
|
||||||
|
<view class="bill-sub">本月{{billTop ? ',' + billTop.category + '花得最多' : ''}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="bill-bars">
|
<view wx:if="{{bill.categories.length}}" class="bill-bars">
|
||||||
<view wx:for="{{bill.categories}}" wx:key="category" class="bill-row">
|
<view wx:for="{{bill.categories}}" wx:key="category" class="bill-row">
|
||||||
<text class="bill-cat">{{item.category}}</text>
|
<text class="bill-cat">{{item.category}}</text>
|
||||||
<view class="mini-bar"><view class="mini-bar-fill" style="width:{{item.percent}}%"></view></view>
|
<view class="mini-bar"><view class="mini-bar-fill" style="width:{{item.percent}}%"></view></view>
|
||||||
<text class="bill-amt">¥{{item.amount}}</text>
|
<text class="bill-amt">¥{{item.amount}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view wx:else class="empty">这个月还没有记过花销</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="card">
|
<!-- 记录与趋势的完整流水在「全部记录」,报告页只放洞察和趋势 -->
|
||||||
<view class="section-head"><view class="sh-title">Pro 会员</view></view>
|
<view class="profile-list">
|
||||||
<view class="rc-text">解锁 365 天计划、PDF 健康档案、月度报告、多宠物管理与年度账单。</view>
|
<view class="profile-row" bindtap="goHistory">
|
||||||
<button class="btn btn-dark btn-block" style="margin-top:24rpx" data-type="pro" bindtap="openSheet">查看 Pro 权益</button>
|
<view class="pr-ic"><pt-icon name="note" size="{{34}}"></pt-icon></view>
|
||||||
|
<text class="pr-label">全部记录</text>
|
||||||
|
<text class="pr-val">按类型筛选、翻看历史</text>
|
||||||
|
<view class="pr-arrow"><pt-icon name="next" size="{{28}}"></pt-icon></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</block>
|
||||||
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
||||||
<bottom-sheet show="{{sheetShow}}" type="{{sheetType}}" bind:close="closeSheet"></bottom-sheet>
|
<bottom-sheet show="{{sheetShow}}" type="{{sheetType}}" bind:close="closeSheet"></bottom-sheet>
|
||||||
|
|||||||
@@ -1,7 +1,57 @@
|
|||||||
.report-card{background:linear-gradient(135deg,#FFFFFF,#F2FAF6)}
|
.report-card{background:linear-gradient(135deg,#FFFFFF,#F2FAF6)}
|
||||||
.rc-text{color:var(--text-2);font-size:var(--fs-md);line-height:1.6}
|
.rc-text{color:var(--text-2);font-size:var(--fs-md);line-height:1.6}
|
||||||
|
.rc-share{margin-top:var(--sp-4)}
|
||||||
|
|
||||||
.bill-bars{display:flex;flex-direction:column;gap:var(--sp-3);margin-top:var(--sp-4)}
|
/* ===== 健康洞察(从历史页搬来,报告页的主角)===== */
|
||||||
|
.ins{border-radius:var(--r-md);padding:var(--sp-4);margin-bottom:var(--sp-2)}
|
||||||
|
.ins:last-child{margin-bottom:0}
|
||||||
|
.ins-info{background:var(--surface-2)}
|
||||||
|
.ins-warn{background:var(--primary-soft)}
|
||||||
|
.ins-alert{background:var(--red-soft)}
|
||||||
|
.ins-head{display:flex;align-items:flex-start;gap:var(--sp-2)}
|
||||||
|
.ins-ic{flex:none;margin-top:2rpx}
|
||||||
|
.ins-info .ins-ic{color:var(--green-ink)}
|
||||||
|
.ins-warn .ins-ic{color:var(--primary-ink)}
|
||||||
|
.ins-alert .ins-ic{color:var(--red-ink)}
|
||||||
|
.ins-title{flex:1;font-size:var(--fs-md);font-weight:var(--fw-b);line-height:1.4}
|
||||||
|
.ins-go{flex:none;color:var(--muted2);margin-top:2rpx}
|
||||||
|
.ins-detail{color:var(--text-2);font-size:var(--fs-sm);line-height:1.6;margin-top:var(--sp-2)}
|
||||||
|
.ins-ev{color:var(--muted);font-size:var(--fs-cap);margin-top:var(--sp-2)}
|
||||||
|
|
||||||
|
/* ===== 体重趋势曲线(从历史页搬来)===== */
|
||||||
|
.trend-stats{margin-top:var(--sp-3);font-size:var(--fs-sm);color:var(--muted)}
|
||||||
|
.mini-chart{
|
||||||
|
height:256rpx;border-radius:var(--r-md);margin-top:var(--sp-4);position:relative;overflow:hidden;
|
||||||
|
background:
|
||||||
|
linear-gradient(180deg,rgba(115,190,157,.16),rgba(115,190,157,0)),
|
||||||
|
repeating-linear-gradient(0deg,#fff,#fff 60rpx,#EFE8DE 62rpx);
|
||||||
|
}
|
||||||
|
.chart-line{position:absolute;left:36rpx;right:36rpx;top:44rpx;bottom:44rpx;width:auto;height:auto}
|
||||||
|
.dot-layer{position:absolute;left:36rpx;right:36rpx;top:44rpx;bottom:44rpx}
|
||||||
|
.dot{position:absolute;width:40rpx;height:40rpx;margin:-20rpx 0 0 -20rpx;border-radius:50%}
|
||||||
|
.dot::after{content:'';position:absolute;left:50%;top:50%;width:18rpx;height:18rpx;margin:-9rpx 0 0 -9rpx;border-radius:50%;background:#fff;border:4rpx solid var(--green);box-sizing:border-box}
|
||||||
|
.dot.on::after{width:26rpx;height:26rpx;margin:-13rpx 0 0 -13rpx;background:var(--green);box-shadow:0 0 0 6rpx rgba(115,190,157,.25)}
|
||||||
|
.point-detail{
|
||||||
|
margin-top:var(--sp-3);padding:var(--sp-4);border-radius:var(--r-md);
|
||||||
|
background:var(--green-soft);border:1rpx solid #DCEFE4;
|
||||||
|
}
|
||||||
|
.pd-main{display:flex;align-items:baseline;gap:var(--sp-3)}
|
||||||
|
.pd-date{font-size:var(--fs-sm);color:var(--muted)}
|
||||||
|
.pd-weight{font-size:var(--fs-xl);font-weight:var(--fw-b);color:var(--green-ink)}
|
||||||
|
.pd-delta{font-size:var(--fs-sm);font-weight:var(--fw-b)}
|
||||||
|
.pd-delta.up{color:var(--red-ink)}
|
||||||
|
.pd-delta.down{color:var(--green-ink)}
|
||||||
|
.pd-note{margin-top:var(--sp-2);font-size:var(--fs-md);color:var(--text-2);line-height:1.5}
|
||||||
|
.pd-note.muted{color:var(--muted)}
|
||||||
|
.chart-hint{margin-top:var(--sp-2);font-size:var(--fs-cap);color:var(--muted);text-align:center}
|
||||||
|
|
||||||
|
/* ===== 养宠花销概要(详细在花销页)===== */
|
||||||
|
.bill-card:active{opacity:.85}
|
||||||
|
.bill-sum{margin:var(--sp-2) 0 var(--sp-4)}
|
||||||
|
.bill-total{font-size:56rpx;font-weight:var(--fw-b);color:var(--text);line-height:1.1}
|
||||||
|
.bill-cur{font-size:var(--fs-lg);color:var(--muted);margin-right:4rpx}
|
||||||
|
.bill-sub{font-size:var(--fs-sm);color:var(--muted);margin-top:4rpx}
|
||||||
|
.bill-bars{display:flex;flex-direction:column;gap:var(--sp-3)}
|
||||||
.bill-row{display:grid;grid-template-columns:88rpx 1fr 108rpx;gap:var(--sp-3);align-items:center;font-size:var(--fs-sm)}
|
.bill-row{display:grid;grid-template-columns:88rpx 1fr 108rpx;gap:var(--sp-3);align-items:center;font-size:var(--fs-sm)}
|
||||||
.bill-cat{color:var(--text)}
|
.bill-cat{color:var(--text)}
|
||||||
.bill-amt{font-weight:var(--fw-b);text-align:right}
|
.bill-amt{font-weight:var(--fw-b);text-align:right}
|
||||||
|
|||||||
Reference in New Issue
Block a user