feat: 精油排序+容量显示+共享状态+注册日志+防误关
All checks were successful
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 5s
PR Preview / deploy-preview (pull_request) Successful in 15s
Test / e2e-test (push) Successful in 51s
All checks were successful
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 5s
PR Preview / deploy-preview (pull_request) Successful in 15s
Test / e2e-test (push) Successful in 51s
- 配方卡片精油按字母排序 - 配方卡片显示容量(单次/Xml) - 管理员共享直接显示已共享 - 编辑overlay不会误关(去掉backdrop点击关闭) - 注册记入活动日志 - 轮播分类已按tag_name匹配 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -96,6 +96,7 @@ const ACTION_MAP = {
|
||||
reject_business: '拒绝商业认证',
|
||||
grant_business: '开通商业认证',
|
||||
revoke_business: '撤销商业认证',
|
||||
register: '用户注册',
|
||||
}
|
||||
|
||||
const actionTypes = [
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
</div>
|
||||
|
||||
<!-- Add/Edit Recipe Overlay -->
|
||||
<div v-if="showAddOverlay" class="overlay" @click.self="closeOverlay">
|
||||
<div v-if="showAddOverlay" class="overlay">
|
||||
<div class="overlay-panel">
|
||||
<div class="overlay-header">
|
||||
<h3>{{ editingRecipe ? '编辑配方' : '添加配方' }}</h3>
|
||||
@@ -1312,12 +1312,10 @@ function diaryMatchesPublic(d) {
|
||||
}
|
||||
|
||||
function getDiaryShareStatus(d) {
|
||||
// Check pending (owned by user in public library, not yet adopted)
|
||||
if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
|
||||
// Check if public library has same recipe with same content
|
||||
// Admin/senior_editor share directly — check public match first
|
||||
if (diaryMatchesPublic(d)) return 'shared'
|
||||
// Check adopted names from audit log
|
||||
if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
|
||||
// Non-admin: check pending (owned by user, not yet adopted)
|
||||
if (!auth.isAdmin && !auth.canManage && sharedCount.value.pendingNames.includes(d.name)) return 'pending'
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user