补齐未接入代码的功能域:参与人 / 评论 / 花销与分摊

数据库里早就建好了 comments、node_members + role_tags、expenses +
expense_splits 三组表,但一直没有代码接入。本次把这三块连上业务,
并新增「节点详情页」作为聚合入口。

新增
- src/Access.php          统一归属校验。此前每个控制器各写各的 family_id
                          条件,容易漏;现在 activity()/node()/target() 一处收敛,
                          requireAdmin() 统一管理员判断。
- src/Comments.php        两级平铺:parent_id 只允许指向顶层,写「回复的回复」
                          时规范化回顶层;删顶层会连同回复一起删。
- src/Members.php         参与人 + 角色标签 + 情绪 + 签到。情绪目录 17 项,
                          全部选用 Emoji 11.0(2018)及以前的码位,避免旧系统
                          字体缺字形显示成空白方块。
- src/Expenses.php        花销与分摊。分摊按「分」为单位 intdiv 平均,
                          余数归最后一人,保证 SUM(share_amount) = total_amount。
- templates/nodes/show.php 节点详情页:基本信息 + 参与人 + 花销 + 讨论 + 附件入口。
- 角色标签管理、评论区、参与人区、花销区各自的模板与控制器。

修复
- 越权:往别人活动的节点上插节点、把别家用户加成参与人,都只校验了
  「节点存在」,没校验「用户与节点同家庭」。现统一走 Access。
- 删活动时节点附件文件删不掉:附件在 /uploads/attachments/ 下,却调了
  只认 /uploads/covers/ 的删除函数,判定不通过 → 文件永久残留。改为
  统一的 deleteUploadFile(),两个目录都认。
- 删有引用记录的用户会 500(activities.created_by / attachments.uploader_id /
  comments.author_id / expenses.payer_user_id 这几处没有级联,也没做前置检查)。

其他
- 活动/节点列表补上附件、评论、参与人、花销四个计数(一次 GROUP BY 查完)。
- 首页布局新增一条迁移易踩的规避:新列上的索引必须排在 ALTER TABLE 之后。
- 新增 .gitignore:config.php(含数据库口令)与 uploads/ 下用户上传的
  头像封面不入库,只保留 uploads/.htaccess 那条禁止执行脚本的规则。
- 新增 config.example.php 作为新环境的配置模板。

本批不改数据库结构,不需要任何数据迁移。

本地与线上验证
- php -l 全绿(PHP 8.4 本地 / 线上 7.4.30 与 8.1.7 双版本)。
- 模板渲染检查 180 项全通过。
- 线上端到端 153 项全通过:登录、活动增删改查、节点流转、
  参与人/角色标签/情绪/签到、评论、花销与分摊、权限、级联清理、
  全站页面无 PHP 报错泄漏、跑完基线逐表核对且既有 id 集合逐字未变。
- 顺带写了 trip_sql_column_check.py:拿真实库表结构静态校验全项目 SQL 的
  列名引用。本次就是靠它之外的 e2e 抓到 travel_modes 并没有 line_name
  (该列属于 trip_nodes),一个列名写错导致节点详情页整页 Fatal。
This commit is contained in:
2026-09-22 22:03:08 +08:00
parent 6c1345e202
commit a79956758b
49 changed files with 7059 additions and 0 deletions
+129
View File
@@ -0,0 +1,129 @@
<?php
/**
* 节点卡片(计划列 / 执行列共用)
* 依赖外部变量:$n(节点行)、$cardCategory(plan|reality)、$executedPlanIds
*/
$cardCategory = $cardCategory ?? 'plan';
$executedPlanIds = $executedPlanIds ?? [];
$statusLabels = [
'planned' => '待执行',
'ongoing' => '进行中',
'completed' => '已完成',
'cancelled' => '已取消',
];
$st = (string)($n['status'] ?? ($cardCategory === 'plan' ? 'planned' : 'completed'));
if (!isset($statusLabels[$st])) $st = $cardCategory === 'plan' ? 'planned' : 'completed';
$isExecuted = $cardCategory === 'plan' && in_array((int)$n['id'], $executedPlanIds, true);
$sLoc = json_decode_field($n['start_location'] ?? null);
$eLoc = json_decode_field($n['end_location'] ?? null);
$transportParts = [];
if (!empty($n['trip_number'])) $transportParts[] = $n['trip_number'];
if (!empty($n['line_name'])) $transportParts[] = $n['line_name'];
if (!empty($n['carrier'])) $transportParts[] = $n['carrier'];
if (!empty($n['seat_info'])) $transportParts[] = $n['seat_info'];
if (!empty($n['gate'])) $transportParts[] = $n['gate'];
// 卡片上的状态快捷切换:计划节点在"待执行 / 已完成"之间来回,取消后可以恢复
$quickStatus = null;
$quickLabel = '';
if ($cardCategory === 'plan') {
if ($st === 'planned') { $quickStatus = 'completed'; $quickLabel = '✓ 标记完成'; }
elseif ($st === 'completed') { $quickStatus = 'planned'; $quickLabel = '↺ 撤销完成'; }
elseif ($st === 'cancelled') { $quickStatus = 'planned'; $quickLabel = '↺ 恢复'; }
} elseif ($st === 'cancelled') {
$quickStatus = 'completed';
$quickLabel = '↺ 恢复';
}
?>
<div class="node-card node-<?= e($cardCategory) ?><?= $st === 'cancelled' ? ' node-cancelled' : '' ?>">
<div class="node-head">
<span class="node-icon"><?= e($n['node_type_icon']) ?></span>
<span class="node-type"><?= e($n['node_type_name']) ?></span>
<?php if ($cardCategory === 'reality' && empty($n['original_plan_node_id'])): ?>
<span class="tag-temp">临时</span>
<?php endif; ?>
</div>
<div class="node-time">
<?= date('m-d H:i', strtotime($n['start_time'])) ?> - <?= date('H:i', strtotime($n['end_time'])) ?>
</div>
<div class="node-title"><?= e($n['title'] ?: '(无标题)') ?></div>
<?php if (!empty($sLoc['name']) || !empty($eLoc['name'])): ?>
<div class="node-loc">
<?php if (!empty($sLoc['name'])): ?>
<span class="loc-start">📍 <?= e($sLoc['name']) ?></span>
<?php endif; ?>
<?php if (!empty($sLoc['name']) && !empty($eLoc['name'])): ?>
<span class="loc-arrow"> → </span>
<?php endif; ?>
<?php if (!empty($eLoc['name'])): ?>
<span class="loc-end">📍 <?= e($eLoc['name']) ?></span>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if (!empty($transportParts)): ?>
<div class="node-transport">🚄 <?= e(implode(' · ', $transportParts)) ?></div>
<?php endif; ?>
<?php if ($st === 'cancelled' && !empty($n['cancel_reason'])): ?>
<div class="node-cancel-reason">取消原因:<?= e($n['cancel_reason']) ?></div>
<?php endif; ?>
<div class="node-actions">
<span class="status-tag status-<?= e($st) ?>"><?= e($statusLabels[$st]) ?></span>
<a href="<?= url('nodes/show', ['id' => $n['id']]) ?>" class="node-action-link node-action-strong">详情</a>
<a href="<?= url('attachments/node', ['id' => $n['id']]) ?>" class="node-action-link">
📎 附件 (<?= (int)($n['attachment_count'] ?? 0) ?>)
</a>
<?php if ((int)($n['member_count'] ?? 0) > 0): ?>
<a href="<?= url('nodes/show', ['id' => $n['id']]) ?>#members" class="node-action-link">
👥 <?= (int)$n['member_count'] ?>
</a>
<?php endif; ?>
<?php if ((int)($n['comment_count'] ?? 0) > 0): ?>
<a href="<?= url('nodes/show', ['id' => $n['id']]) ?>#comments" class="node-action-link">
💬 <?= (int)$n['comment_count'] ?>
</a>
<?php endif; ?>
<?php if ((int)($n['expense_count'] ?? 0) > 0): ?>
<a href="<?= url('nodes/show', ['id' => $n['id']]) ?>#expenses" class="node-action-link">
💰 <?= (int)$n['expense_count'] ?>
</a>
<?php endif; ?>
<a href="<?= url('nodes/edit', ['id' => $n['id']]) ?>" class="node-action-link">编辑</a>
<?php if ($quickStatus !== null): ?>
<form method="post" action="<?= url('nodes/status') ?>" class="node-action-form">
<input type="hidden" name="_csrf" value="<?= e(csrf_token()) ?>">
<input type="hidden" name="id" value="<?= (int)$n['id'] ?>">
<input type="hidden" name="status" value="<?= e($quickStatus) ?>">
<button type="submit" class="node-action-btn"><?= e($quickLabel) ?></button>
</form>
<?php endif; ?>
<?php if ($cardCategory === 'plan'): ?>
<?php if ($isExecuted): ?>
<span class="node-action-note">✓ 已成行</span>
<?php else: ?>
<form method="post" action="<?= url('nodes/fromPlan') ?>" class="node-action-form">
<input type="hidden" name="_csrf" value="<?= e(csrf_token()) ?>">
<input type="hidden" name="plan_node_id" value="<?= (int)$n['id'] ?>">
<button type="submit" class="node-action-btn">→ 生成执行记录</button>
</form>
<?php endif; ?>
<?php endif; ?>
<form method="post" action="<?= url('nodes/destroy') ?>" class="node-action-form"
onsubmit="return confirm('确定删除这个节点?该节点的附件也会一并删除。');">
<input type="hidden" name="_csrf" value="<?= e(csrf_token()) ?>">
<input type="hidden" name="id" value="<?= (int)$n['id'] ?>">
<button type="submit" class="node-action-btn danger">删除</button>
</form>
</div>
</div>
+190
View File
@@ -0,0 +1,190 @@
<?php
$isEdit = $activity !== null;
$cover = $isEdit ? (string)($activity['cover_image'] ?? '') : '';
?>
<div class="page-header">
<div>
<h1><?= $isEdit ? '编辑活动' : '新建活动' ?></h1>
<?php if ($isEdit): ?>
<p class="muted">
创建于 <?= e(date('Y-m-d', strtotime($activity['created_at']))) ?>
· 最近更新 <?= e(date('Y-m-d H:i', strtotime($activity['updated_at'] ?? $activity['created_at']))) ?>
</p>
<?php endif; ?>
</div>
<?php if ($isEdit): ?>
<a href="<?= url('activities/show', ['id' => $activity['id']]) ?>" class="btn">返回活动</a>
<?php else: ?>
<a href="<?= url('activities/index') ?>" class="btn">返回列表</a>
<?php endif; ?>
</div>
<form method="post" action="<?= url($isEdit ? 'activities/update' : 'activities/store') ?>" class="form">
<input type="hidden" name="_csrf" value="<?= e(csrf_token()) ?>">
<?php if ($isEdit): ?>
<input type="hidden" name="id" value="<?= (int)$activity['id'] ?>">
<?php endif; ?>
<div class="form-row">
<label>封面图</label>
<div class="cover-upload">
<div class="cover-preview" id="cover-preview">
<img id="cover-preview-img" src="<?= e($cover) ?>" alt=""
style="<?= $cover === '' ? 'display:none;' : '' ?>">
<div class="cover-placeholder" id="cover-placeholder"
style="<?= $cover === '' ? '' : 'display:none;' ?>">
<div style="font-size:32px;">🖼️</div>
<div style="font-size:12px; margin-top:6px;">16:9 封面</div>
</div>
</div>
<div class="cover-upload-actions">
<button type="button" class="btn-sm" id="btn-upload-cover"><?= $cover === '' ? '选择图片' : '更换图片' ?></button>
<button type="button" class="btn-sm btn-danger" id="btn-remove-cover"
style="<?= $cover === '' ? 'display:none;' : '' ?>">移除</button>
<span class="muted" style="font-size:12px;">支持 JPG/PNG/WebP,裁剪为 800×450</span>
</div>
<input type="file" id="cover-file-input" accept="image/*" style="display:none;">
<input type="hidden" name="cover_image" id="cover-url-input" value="<?= e($cover) ?>">
</div>
</div>
<div class="form-row">
<label>活动标题 *</label>
<input type="text" name="title" required maxlength="200" placeholder="例如:2026 盛夏去奥森"
value="<?= e($activity['title'] ?? '') ?>">
</div>
<div class="form-row">
<label>活动简介</label>
<textarea name="description" rows="4" placeholder="简单描述一下这次活动..."><?= e($activity['description'] ?? '') ?></textarea>
</div>
<div class="form-actions">
<a href="<?= url($isEdit ? 'activities/show' : 'activities/index', $isEdit ? ['id' => $activity['id']] : []) ?>" class="btn">取消</a>
<button type="submit" class="btn-primary"><?= $isEdit ? '保存' : '创建' ?></button>
</div>
</form>
<!-- 裁剪模态框 -->
<div class="modal" id="cover-crop-modal" style="display:none;">
<div class="modal-backdrop" id="cover-crop-backdrop"></div>
<div class="modal-content modal-content-wide">
<h2>裁剪封面图</h2>
<div class="crop-container crop-container-wide">
<img id="cover-crop-image" src="" alt="">
</div>
<div class="modal-actions">
<button type="button" class="btn" id="btn-cancel-cover-crop">取消</button>
<button type="button" class="btn-primary" id="btn-confirm-cover-crop">确认裁剪</button>
</div>
</div>
</div>
<script>
(function () {
var fileInput = document.getElementById('cover-file-input');
var btnUpload = document.getElementById('btn-upload-cover');
var btnRemove = document.getElementById('btn-remove-cover');
var previewImg = document.getElementById('cover-preview-img');
var placeholder = document.getElementById('cover-placeholder');
var urlInput = document.getElementById('cover-url-input');
var modal = document.getElementById('cover-crop-modal');
var cropImage = document.getElementById('cover-crop-image');
var backdrop = document.getElementById('cover-crop-backdrop');
var btnCancel = document.getElementById('btn-cancel-cover-crop');
var btnConfirm = document.getElementById('btn-confirm-cover-crop');
var csrfToken = '<?= e(csrf_token()) ?>';
if (!btnUpload) return;
var cropper = null;
btnUpload.addEventListener('click', function () { fileInput.click(); });
fileInput.addEventListener('change', function (e) {
var file = e.target.files && e.target.files[0];
if (!file) return;
if (!/^image\//.test(file.type)) { alert('请选择图片文件'); return; }
if (file.size > 15 * 1024 * 1024) { alert('原始图片不能超过 15MB'); return; }
var reader = new FileReader();
reader.onload = function (ev) {
cropImage.src = ev.target.result;
modal.style.display = 'flex';
if (cropper) cropper.destroy();
cropper = new Cropper(cropImage, {
aspectRatio: 16 / 9,
viewMode: 1,
autoCropArea: 0.9,
background: false,
movable: true,
zoomable: true,
rotatable: false,
scalable: false,
});
};
reader.readAsDataURL(file);
});
function closeCrop() {
modal.style.display = 'none';
if (cropper) { cropper.destroy(); cropper = null; }
fileInput.value = '';
}
btnCancel.addEventListener('click', closeCrop);
backdrop.addEventListener('click', closeCrop);
btnConfirm.addEventListener('click', function () {
if (!cropper) return;
btnConfirm.disabled = true;
btnConfirm.textContent = '上传中...';
var canvas = cropper.getCroppedCanvas({
width: 800,
height: 450,
imageSmoothingQuality: 'high',
});
var dataUrl = canvas.toDataURL('image/jpeg', 0.9);
fetch('index.php?r=activities/uploadCover', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRF-Token': csrfToken,
},
body: JSON.stringify({ image: dataUrl, old: urlInput.value }),
})
.then(function (r) { return r.json().then(function (d) { return { ok: r.ok, data: d }; }); })
.then(function (res) {
btnConfirm.disabled = false;
btnConfirm.textContent = '确认裁剪';
if (!res.ok || res.data.error) {
alert(res.data.error || '上传失败');
return;
}
urlInput.value = res.data.url;
previewImg.src = res.data.url;
previewImg.style.display = 'block';
placeholder.style.display = 'none';
btnRemove.style.display = 'inline-block';
btnUpload.textContent = '更换图片';
closeCrop();
})
.catch(function (err) {
btnConfirm.disabled = false;
btnConfirm.textContent = '确认裁剪';
alert('网络错误:' + err.message);
});
});
btnRemove.addEventListener('click', function () {
urlInput.value = '';
previewImg.src = '';
previewImg.style.display = 'none';
placeholder.style.display = 'flex';
btnRemove.style.display = 'none';
btnUpload.textContent = '选择图片';
});
})();
</script>
+30
View File
@@ -0,0 +1,30 @@
<div class="page-header">
<h1>活动列表</h1>
</div>
<?php if (empty($activities)): ?>
<div class="empty">
<p>还没有任何活动</p>
<a href="<?= url('activities/create') ?>" class="btn-primary">创建第一个活动</a>
</div>
<?php else: ?>
<div class="card-grid">
<?php foreach ($activities as $a): ?>
<a href="<?= url('activities/show', ['id' => $a['id']]) ?>" class="card">
<?php if (!empty($a['cover_image'])): ?>
<img src="<?= e($a['cover_image']) ?>" alt="" class="card-cover">
<?php else: ?>
<div class="card-cover card-cover-placeholder">📸</div>
<?php endif; ?>
<div class="card-body">
<h3><?= e($a['title']) ?></h3>
<p class="muted"><?= e($a['description'] ?: '暂无简介') ?></p>
<div class="meta">
<span><?= (int)$a['node_count'] ?> 个节点</span>
<span><?= date('Y-m-d', strtotime($a['created_at'])) ?></span>
</div>
</div>
</a>
<?php endforeach; ?>
</div>
<?php endif; ?>
+66
View File
@@ -0,0 +1,66 @@
<div class="page-header">
<div>
<h1><?= e($activity['title']) ?></h1>
<p class="muted"><?= e($activity['description'] ?: '暂无简介') ?></p>
</div>
<div class="actions" style="display:flex; gap:8px; flex-wrap:wrap;">
<a href="<?= url('nodes/create', ['activity_id' => $activity['id'], 'category' => 'plan']) ?>" class="btn">+ 计划节点</a>
<a href="<?= url('nodes/create', ['activity_id' => $activity['id'], 'category' => 'reality']) ?>" class="btn-primary">+ 执行节点</a>
<a href="<?= url('activities/edit', ['id' => $activity['id']]) ?>" class="btn">编辑活动</a>
<form method="post" action="<?= url('activities/destroy') ?>" style="display:inline;"
onsubmit="return confirm('确定删除活动「<?= e($activity['title']) ?>」?\n该活动下的所有节点、附件、评论都会一并删除,且不可恢复。');">
<input type="hidden" name="_csrf" value="<?= e(csrf_token()) ?>">
<input type="hidden" name="id" value="<?= (int)$activity['id'] ?>">
<button type="submit" class="btn btn-danger">删除活动</button>
</form>
</div>
</div>
<?php if (!empty($activity['cover_image'])): ?>
<div class="activity-cover">
<img src="<?= e($activity['cover_image']) ?>" alt="">
</div>
<?php endif; ?>
<?php $expenseSummary = $expenseSummary ?? ['budget' => 0.0, 'actual' => 0.0, 'count' => 0, 'diff' => 0.0]; ?>
<?php if ((int)$expenseSummary['count'] > 0): ?>
<div class="activity-stats">
<span class="activity-stat">💰 共 <?= (int)$expenseSummary['count'] ?> 笔</span>
<span class="activity-stat">预算 ¥<?= number_format((float)$expenseSummary['budget'], 2) ?></span>
<span class="activity-stat">实际 ¥<?= number_format((float)$expenseSummary['actual'], 2) ?></span>
<span class="activity-stat <?= (float)$expenseSummary['diff'] > 0 ? 'money-over' : 'money-under' ?>">
<?= (float)$expenseSummary['diff'] > 0 ? '超出预算' : '比预算省' ?>
¥<?= number_format(abs((float)$expenseSummary['diff']), 2) ?>
</span>
</div>
<?php endif; ?>
<div class="timeline-grid">
<section class="timeline-col">
<h2>📋 计划 (<?= count($planNodes) ?>)</h2>
<?php if (empty($planNodes)): ?>
<p class="muted">暂无计划节点</p>
<?php else: ?>
<?php foreach ($planNodes as $n): ?>
<?php $cardCategory = 'plan'; require __DIR__ . '/_node_card.php'; ?>
<?php endforeach; ?>
<?php endif; ?>
</section>
<section class="timeline-col">
<h2>🎬 实际 (<?= count($realityNodes) ?>)</h2>
<?php if (empty($realityNodes)): ?>
<p class="muted">暂无执行节点</p>
<?php else: ?>
<?php foreach ($realityNodes as $n): ?>
<?php $cardCategory = 'reality'; require __DIR__ . '/_node_card.php'; ?>
<?php endforeach; ?>
<?php endif; ?>
</section>
</div>
<?php
$commentTargetType = \App\Comments::TARGET_ACTIVITY;
$commentTargetId = (int)$activity['id'];
require dirname(__DIR__) . '/comments/_block.php';
?>