Compare commits
2
Commits
3250b94bc6
...
6a48b7311b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a48b7311b | ||
|
|
7e229ecc84 |
@@ -257,13 +257,20 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
|
|
||||||
{err && <div className="error-banner">{err}<span className="retry-link" onClick={() => { loadCal(false); loadDetail(false) }}>重试</span></div>}
|
{err && <div className="error-banner">{err}<span className="retry-link" onClick={() => { loadCal(false); loadDetail(false) }}>重试</span></div>}
|
||||||
|
|
||||||
{/* 当日栏 */}
|
{/* 当日栏: 右侧放「+ 新建」, 替代原来无实际作用的「点环即打卡」提示 */}
|
||||||
<div className="mv-daybar">
|
<div className="mv-daybar">
|
||||||
{dayLabel(date, detail?.today || today)}
|
{dayLabel(date, detail?.today || today)}
|
||||||
{isFuture
|
{isFuture
|
||||||
? <span className="badge">计划(不可打卡)</span>
|
? <span className="badge">计划(不可打卡)</span>
|
||||||
: <span className="badge">已完成 {summary.done} / {summary.total}</span>}
|
: <span className="badge">已完成 {summary.done} / {summary.total}</span>}
|
||||||
<span className="sum">点环即打卡</span>
|
<Button
|
||||||
|
className="mv-new-btn"
|
||||||
|
size="mini"
|
||||||
|
color="primary"
|
||||||
|
onClick={openCreate}
|
||||||
|
>
|
||||||
|
+ 新建
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{detail === null && !err && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
{detail === null && !err && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
@@ -318,14 +325,6 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{detail !== null && (
|
|
||||||
<div className="mv-add-wrap">
|
|
||||||
<Button block fill="outline" size="small" onClick={openCreate} style={{ margin: '4px 12px 12px' }}>
|
|
||||||
+ 新建打卡项
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* 「⋯」操作面板: 撤销 / 编辑 / 归档 */}
|
{/* 「⋯」操作面板: 撤销 / 编辑 / 归档 */}
|
||||||
<Popup
|
<Popup
|
||||||
visible={!!sheetItem}
|
visible={!!sheetItem}
|
||||||
|
|||||||
@@ -847,7 +847,8 @@ body.me-safe-top .app-safe-top { height: 0; }
|
|||||||
/* ---- 当日栏 ---- */
|
/* ---- 当日栏 ---- */
|
||||||
.mv-daybar { display: flex; align-items: center; gap: 8px; padding: 10px 14px 2px; font-size: 13px; font-weight: 600; }
|
.mv-daybar { display: flex; align-items: center; gap: 8px; padding: 10px 14px 2px; font-size: 13px; font-weight: 600; }
|
||||||
.mv-daybar .badge { font-weight: 400; color: var(--color-muted); font-size: 11px; }
|
.mv-daybar .badge { font-weight: 400; color: var(--color-muted); font-size: 11px; }
|
||||||
.mv-daybar .sum { margin-left: auto; font-size: 11px; color: var(--color-muted); font-weight: 400; }
|
/* 「+ 新建」按钮右对齐 (原「点环即打卡」文字位置) */
|
||||||
|
.mv-daybar .mv-new-btn { margin-left: auto; flex-shrink: 0; font-size: 11px; }
|
||||||
|
|
||||||
/* ---- 分组 ---- */
|
/* ---- 分组 ---- */
|
||||||
.mv-groups { padding-bottom: 4px; }
|
.mv-groups { padding-bottom: 4px; }
|
||||||
@@ -871,7 +872,6 @@ body.me-safe-top .app-safe-top { height: 0; }
|
|||||||
}
|
}
|
||||||
.mv-btn.grey { background: #f2f3f5; color: var(--color-muted); }
|
.mv-btn.grey { background: #f2f3f5; color: var(--color-muted); }
|
||||||
.mv-more { color: #c0c4cc; font-size: 15px; line-height: 1; padding: 4px 2px 4px 6px; flex-shrink: 0; cursor: pointer; }
|
.mv-more { color: #c0c4cc; font-size: 15px; line-height: 1; padding: 4px 2px 4px 6px; flex-shrink: 0; cursor: pointer; }
|
||||||
.mv-add-wrap { margin-top: 2px; }
|
|
||||||
|
|
||||||
/* ---- 「⋯」操作面板 ---- */
|
/* ---- 「⋯」操作面板 ---- */
|
||||||
.mv-sheet { padding: 16px 16px 4px; }
|
.mv-sheet { padding: 16px 16px 4px; }
|
||||||
|
|||||||
Reference in New Issue
Block a user