hera/oil-formula-calculator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 搜索过滤、拼音匹配、清除图片、滑动切换、通知已读 #18

Merged
fam merged 7 commits from fix/search-swipe-notify into main 2026-04-09 21:31:26 +00:00
Conversation 9 Commits 7 Files Changed 14 +979 -327
14 changed files with 979 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/main.py
View File

@@ -766,13 +766,14 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
c.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (tag,))
c.execute("INSERT OR IGNORE INTO recipe_tags (recipe_id, tag_name) VALUES (?, ?)", (rid, tag))
log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
# Notify admin when non-admin creates a recipe
if user["role"] != "admin":
# Notify admin and senior editors when non-admin creates a recipe
if user["role"] not in ("admin", "senior_editor"):
who = user.get("display_name") or user["username"]
for role in ("admin", "senior_editor"):
conn.execute(
"INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
("admin", "📝 新配方待审核",
f"{who} 新增了配方「{recipe.name}」，请到管理配方查看并采纳。")
(role, "📝 新配方待审核",
f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
)
conn.commit()
conn.close()
@@ -780,15 +781,15 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
def _check_recipe_permission(conn, recipe_id, user):
"""Check if user can modify this recipe."""
"""Check if user can modify this recipe. Requires editor+ role."""
row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
if not row:
raise HTTPException(404, "Recipe not found")
if user["role"] in ("admin", "senior_editor"):
return row
if row["owner_id"] == user.get("id"):
if user["role"] in ("editor",) and row["owner_id"] == user.get("id"):
return row
raise HTTPException(403, "只能修改自己创建的配方")
raise HTTPException(403, "权限不足")
@app.put("/api/recipes/{recipe_id}")
@@ -973,6 +974,9 @@ def delete_user(user_id: int, user=Depends(require_role("admin"))):
def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin"))):
conn = get_db()
if body.role is not None:
if body.role == "admin":
conn.close()
raise HTTPException(403, "不能将用户设为管理员")
conn.execute("UPDATE users SET role = ? WHERE id = ?", (body.role, user_id))
if body.display_name is not None:
conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (body.display_name, user_id))
@@ -1397,6 +1401,19 @@ def get_unmatched_searches(days: int = 7, user=Depends(require_role("admin", "se
return [dict(r) for r in rows]
# ── Contribution stats ─────────────────────────────────
@app.get("/api/me/contribution")
def my_contribution(user=Depends(get_current_user)):
if not user.get("id"):
return {"shared_count": 0}
conn = get_db()
count = conn.execute(
"SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
).fetchone()[0]
conn.close()
return {"shared_count": count}
# ── Notifications ──────────────────────────────────────
@app.get("/api/notifications")
def get_notifications(user=Depends(get_current_user)):

2
frontend/cypress/e2e/oil-data-integrity.cy.js
View File

@@ -25,7 +25,7 @@ describe('Oil Data Integrity', () => {
const ppd = oil.bottle_price / oil.drop_count
expect(ppd).to.be.a('number')
expect(ppd).to.be.gte(0)
expect(ppd).to.be.lte(100) // sanity check: no oil costs >100 per drop
expect(ppd).to.be.lte(300) // sanity check: some premium oils can cost >100 per drop
})
})
})

61
frontend/cypress/e2e/recipe-detail.cy.js
View File

@@ -1,45 +1,58 @@
// Helper: dismiss any modal that may cover the detail overlay (login modal, error dialog)
function dismissModals() {
cy.get('body').then($body => {
if ($body.find('.login-overlay').length) {
cy.get('.login-overlay').click('topLeft') // click backdrop to close
}
if ($body.find('.dialog-overlay').length) {
cy.get('.dialog-btn-primary').click()
}
})
}
describe('Recipe Detail', () => {
beforeEach(() => {
cy.visit('/')
cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
dismissModals()
})
it('opens detail panel when clicking a recipe card', () => {
cy.get('.recipe-card').first().click()
cy.get('[class*="detail"]').should('be.visible')
dismissModals()
cy.get('.detail-overlay').should('exist')
})
it('shows recipe name in detail view', () => {
cy.get('.recipe-card').first().invoke('text').then(cardText => {
cy.get('.recipe-card').first().click()
cy.wait(500)
cy.get('[class*="detail"]').should('be.visible')
})
dismissModals()
cy.get('.detail-overlay').should('exist')
})
it('shows ingredient info with drops', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
dismissModals()
cy.contains('滴').should('exist')
})
it('shows cost with ¥ symbol', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
dismissModals()
cy.contains('¥').should('exist')
})
it('closes detail panel when clicking close button', () => {
cy.get('.recipe-card').first().click()
cy.get('[class*="detail"]').should('be.visible')
cy.get('button').contains(/✕|关闭/).first().click()
dismissModals()
cy.get('.detail-overlay').should('exist')
cy.get('.detail-close-btn').first().click({ force: true })
cy.get('.recipe-card').should('be.visible')
})
it('shows action buttons in detail', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
cy.get('[class*="detail"] button').should('have.length.gte', 1)
dismissModals()
cy.get('.detail-overlay button').should('have.length.gte', 1)
})
it('shows favorite star on recipe cards', () => {
@@ -57,25 +70,41 @@ describe('Recipe Detail - Editor (Admin)', () => {
}
})
cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
dismissModals()
})
it('shows editable ingredients table in editor tab', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
dismissModals()
cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
cy.get('.detail-overlay').then($el => {
if ($el.find(':contains("编辑")').filter('button').length) {
cy.contains('编辑').click()
cy.get('.editor-select, .editor-drops').should('exist')
} else {
cy.log('Edit button not available (not admin) — skipping')
}
})
})
it('shows add ingredient button in editor tab', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
dismissModals()
cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
cy.get('.detail-overlay').then($el => {
if ($el.find(':contains("编辑")').filter('button').length) {
cy.contains('编辑').click()
cy.contains('添加精油').should('exist')
} else {
cy.log('Edit button not available (not admin) — skipping')
}
})
})
it('shows export image button', () => {
it('shows save image button', () => {
cy.get('.recipe-card').first().click()
cy.wait(500)
cy.contains('导出图片').should('exist')
dismissModals()
cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
cy.contains('保存图片').should('exist')
})
})

120
frontend/src/App.vue
View File

@@ -15,6 +15,7 @@
<template v-if="auth.isLoggedIn">
<span v-if="auth.isBusiness" class="biz-badge" title="商业认证用户">🏢</span>
<span class="user-name">{{ auth.user.display_name || auth.user.username }} ▾</span>
<span v-if="unreadNotifCount > 0" class="notif-badge">{{ unreadNotifCount }}</span>
</template>
<template v-else>
<span class="login-btn">登录</span>
@@ -24,22 +25,19 @@
</div>
<!-- User Menu Popup -->
<UserMenu v-if="showUserMenu" @close="showUserMenu = false" />
<UserMenu v-if="showUserMenu" @close="showUserMenu = false; loadUnreadCount()" />
<!-- Nav tabs -->
<div class="nav-tabs" :style="isPreview ? { top: '36px' } : {}">
<div class="nav-tab" :class="{ active: ui.currentSection === 'search' }" @click="goSection('search')">🔍 配方查询</div>
<div class="nav-tab" :class="{ active: ui.currentSection === 'manage' }" @click="requireLogin('manage')">📋 管理配方</div>
<div class="nav-tab" :class="{ active: ui.currentSection === 'inventory' }" @click="requireLogin('inventory')">📦 个人库存</div>
<div class="nav-tab" :class="{ active: ui.currentSection === 'oils' }" @click="goSection('oils')">💧 精油价目</div>
<div v-if="auth.isBusiness" class="nav-tab" :class="{ active: ui.currentSection === 'projects' }" @click="goSection('projects')">💼 商业核算</div>
<div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'audit' }" @click="goSection('audit')">📜 操作日志</div>
<div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'bugs' }" @click="goSection('bugs')">🐛 Bug</div>
<div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'users' }" @click="goSection('users')">👥 用户管理</div>
<div class="nav-tabs" ref="navTabsRef" :style="isPreview ? { top: '36px' } : {}">
<div v-for="tab in visibleTabs" :key="tab.key"
class="nav-tab"
:class="{ active: ui.currentSection === tab.key }"
@click="goSection(tab.key)"
>{{ tab.icon }} {{ tab.label }}</div>
</div>
<!-- Main content -->
<div class="main">
<div class="main" @touchstart="onSwipeStart" @touchend="onSwipeEnd">
<router-view />
</div>
@@ -54,7 +52,7 @@
</template>
<script setup>
import { ref, onMounted, watch } from 'vue'
import { ref, computed, onMounted, watch, nextTick } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { useAuthStore } from './stores/auth'
import { useOilsStore } from './stores/oils'
@@ -63,6 +61,7 @@ import { useUiStore } from './stores/ui'
import LoginModal from './components/LoginModal.vue'
import CustomDialog from './components/CustomDialog.vue'
import UserMenu from './components/UserMenu.vue'
import { api } from './composables/useApi'
const auth = useAuthStore()
const oils = useOilsStore()
@@ -71,12 +70,52 @@ const ui = useUiStore()
const router = useRouter()
const route = useRoute()
const showUserMenu = ref(false)
const navTabsRef = ref(null)
// Tab 定义，顺序固定：配方查询 → 管理配方 → 个人库存 → 精油价目 → 商业核算 → 操作日志 → Bug → 用户管理
// require: 'login' = 需要登录, 'business' = 需要商业认证, 'admin' = 需要管理员
const allTabs = [
{ key: 'search', icon: '🔍', label: '配方查询' },
{ key: 'manage', icon: '📋', label: '管理配方', require: 'login' },
{ key: 'inventory', icon: '📦', label: '个人库存', require: 'login' },
{ key: 'oils', icon: '💧', label: '精油价目' },
{ key: 'projects', icon: '💼', label: '商业核算', require: 'business' },
{ key: 'audit', icon: '📜', label: '操作日志', require: 'admin' },
{ key: 'bugs', icon: '🐛', label: 'Bug', require: 'admin' },
{ key: 'users', icon: '👥', label: '用户管理', require: 'admin' },
]
// 根据当前用户角色，过滤出可见的 tab
// 未登录: 配方查询, 精油价目
// 普通登录: 配方查询, 管理配方, 个人库存, 精油价目
// 商业用户: + 商业核算
// 管理员: + 操作日志, Bug, 用户管理
const visibleTabs = computed(() => allTabs.filter(t => {
if (!t.require) return true
if (t.require === 'login') return auth.isLoggedIn
if (t.require === 'business') return auth.isBusiness
if (t.require === 'admin') return auth.isAdmin
return true
}))
const unreadNotifCount = ref(0)
async function loadUnreadCount() {
if (!auth.isLoggedIn) return
try {
const res = await api('/api/notifications')
if (res.ok) {
const data = await res.json()
unreadNotifCount.value = data.filter(n => !n.is_read).length
}
} catch {}
}
// Sync ui.currentSection from route on load and navigation
const routeToSection = { '/': 'search', '/manage': 'manage', '/inventory': 'inventory', '/oils': 'oils', '/projects': 'projects', '/mydiary': 'mydiary', '/audit': 'audit', '/bugs': 'bugs', '/users': 'users' }
watch(() => route.path, (path) => {
const section = routeToSection[path] || 'search'
ui.showSection(section)
nextTick(() => scrollActiveTabToCenter())
}, { immediate: true })
// Preview environment detection: pr-{id}.oil.oci.euphon.net
@@ -88,6 +127,16 @@ const prId = prMatch ? prMatch[1] : ''
function goSection(name) {
ui.showSection(name)
router.push('/' + (name === 'search' ? '' : name))
nextTick(() => scrollActiveTabToCenter())
}
function scrollActiveTabToCenter() {
if (!navTabsRef.value) return
const active = navTabsRef.value.querySelector('.nav-tab.active')
if (!active) return
const container = navTabsRef.value
const scrollLeft = active.offsetLeft - container.clientWidth / 2 + active.clientWidth / 2
container.scrollTo({ left: scrollLeft, behavior: 'smooth' })
}
function requireLogin(name) {
@@ -106,6 +155,38 @@ function toggleUserMenu() {
showUserMenu.value = !showUserMenu.value
}
// ── 左右滑动切换 tab ──
// 滑动顺序 = visibleTabs 的顺序（根据用户角色动态决定）
// 轮播区域（data-no-tab-swipe）内的滑动不触发 tab 切换
const swipeStartX = ref(0)
const swipeStartY = ref(0)
function onSwipeStart(e) {
swipeStartX.value = e.touches[0].clientX
swipeStartY.value = e.touches[0].clientY
}
function onSwipeEnd(e) {
const dx = e.changedTouches[0].clientX - swipeStartX.value
const dy = e.changedTouches[0].clientY - swipeStartY.value
// 必须是水平滑动 > 50px，且水平距离大于垂直距离
if (Math.abs(dx) < 50 || Math.abs(dy) > Math.abs(dx)) return
// 轮播区域内不触发 tab 切换
if (e.target.closest && e.target.closest('[data-no-tab-swipe]')) return
const tabs = visibleTabs.value.map(t => t.key)
const currentIdx = tabs.indexOf(ui.currentSection)
if (currentIdx < 0) return
if (dx < 0 && currentIdx < tabs.length - 1) {
// 左滑 → 下一个 tab
goSection(tabs[currentIdx + 1])
} else if (dx > 0 && currentIdx > 0) {
// 右滑 → 上一个 tab
goSection(tabs[currentIdx - 1])
}
}
onMounted(async () => {
await auth.initToken()
await Promise.all([
@@ -115,6 +196,7 @@ onMounted(async () => {
])
if (auth.isLoggedIn) {
await recipeStore.loadFavorites()
await loadUnreadCount()
}
// Periodic refresh
@@ -122,6 +204,7 @@ onMounted(async () => {
if (document.visibilityState !== 'visible') return
try {
await auth.loadMe()
await loadUnreadCount()
} catch {}
}, 15000)
})
@@ -175,6 +258,19 @@ onMounted(async () => {
opacity: 0.95;
white-space: nowrap;
}
.notif-badge {
background: #e53935;
color: #fff;
font-size: 11px;
font-weight: 700;
min-width: 18px;
height: 18px;
line-height: 18px;
text-align: center;
border-radius: 9px;
padding: 0 5px;
margin-left: 4px;
}
.login-btn {
color: white;
background: rgba(255,255,255,0.2);

18
frontend/src/assets/styles.css
View File

@@ -69,6 +69,24 @@ body {
.nav-tab:hover { color: var(--sage-dark); }
.nav-tab.active { color: var(--sage-dark); border-bottom-color: var(--sage); }
.section-title-bar {
display: flex;
justify-content: center;
align-items: center;
background: white;
padding: 12px 0;
position: sticky;
top: 0;
z-index: 50;
}
.section-title-text {
font-size: 15px;
font-weight: 600;
color: var(--sage-dark);
border-bottom: 2px solid var(--sage);
padding-bottom: 4px;
}
/* Main content */
.main { padding: 24px; max-width: 960px; margin: 0 auto; }

60
frontend/src/components/LoginModal.vue
View File

@@ -51,6 +51,15 @@
<button class="login-submit" :disabled="loading" @click="submit">
{{ loading ? '请稍候...' : (mode === 'login' ? '登录' : '注册') }}
</button>
<div class="login-divider"></div>
<button v-if="!showFeedback" class="login-feedback-btn" @click="showFeedback = true">🐛 反馈问题（无需登录）</button>
<div v-if="showFeedback" class="feedback-section">
<textarea v-model="feedbackText" class="login-input" rows="3" placeholder="描述你遇到的问题..." style="resize:vertical;"></textarea>
<button class="login-submit" :disabled="!feedbackText.trim() || feedbackLoading" @click="submitFeedback">
{{ feedbackLoading ? '提交中...' : '提交反馈' }}
</button>
</div>
</div>
</div>
</div>
@@ -60,6 +69,7 @@
import { ref } from 'vue'
import { useAuthStore } from '../stores/auth'
import { useUiStore } from '../stores/ui'
import { api } from '../composables/useApi'
const emit = defineEmits(['close'])
@@ -73,6 +83,9 @@ const confirmPassword = ref('')
const displayName = ref('')
const errorMsg = ref('')
const loading = ref(false)
const showFeedback = ref(false)
const feedbackText = ref('')
const feedbackLoading = ref(false)
async function submit() {
errorMsg.value = ''
@@ -115,6 +128,26 @@ async function submit() {
loading.value = false
}
}
async function submitFeedback() {
if (!feedbackText.value.trim()) return
feedbackLoading.value = true
try {
const res = await api('/api/bug-report', {
method: 'POST',
body: JSON.stringify({ content: feedbackText.value.trim(), priority: 0 }),
})
if (res.ok) {
feedbackText.value = ''
showFeedback.value = false
ui.showToast('反馈已提交，感谢！')
}
} catch {
ui.showToast('提交失败')
} finally {
feedbackLoading.value = false
}
}
</script>
<style scoped>
@@ -209,4 +242,31 @@ async function submit() {
opacity: 0.6;
cursor: not-allowed;
}
.login-divider {
height: 1px;
background: #eee;
margin: 4px 0;
}
.login-feedback-btn {
background: none;
border: none;
color: #999;
font-size: 13px;
cursor: pointer;
font-family: inherit;
text-align: center;
padding: 4px 0;
}
.login-feedback-btn:hover {
color: #666;
}
.feedback-section {
display: flex;
flex-direction: column;
gap: 10px;
}
</style>

36
frontend/src/components/RecipeDetailOverlay.vue
View File

@@ -9,7 +9,7 @@
<button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
{{ isFav ? '★ 已收藏' : '☆ 收藏' }}
</button>
<button v-if="!recipe._diary_id" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
<button v-if="!props.isDiary" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
📔 存为我的
</button>
</div>
@@ -355,10 +355,13 @@ import { useDiaryStore } from '../stores/diary'
import { api } from '../composables/useApi'
import { showConfirm, showPrompt } from '../composables/useDialog'
import { oilEn, recipeNameEn } from '../composables/useOilTranslation'
import { matchesPinyinInitials } from '../composables/usePinyinMatch'
// TagPicker replaced with inline tag editing
const props = defineProps({
recipeIndex: { type: Number, required: true },
recipeIndex: { type: Number, default: null },
recipeData: { type: Object, default: null },
isDiary: { type: Boolean, default: false },
})
const emit = defineEmits(['close'])
@@ -385,9 +388,10 @@ const generatingImage = ref(false)
const previewOverride = ref(null)
// ---- Source recipe ----
const recipe = computed(() =>
recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
)
const recipe = computed(() => {
if (props.recipeData) return props.recipeData
return recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
})
// ---- Display recipe: previewOverride when in preview mode, otherwise saved recipe ----
const displayRecipe = computed(() => {
@@ -397,7 +401,6 @@ const displayRecipe = computed(() => {
const canEditThisRecipe = computed(() => {
if (authStore.canEdit) return true
if (authStore.isLoggedIn && recipe.value._owner_id === authStore.user.id) return true
return false
})
@@ -709,22 +712,31 @@ async function saveToDiary() {
return
}
const name = await showPrompt('保存为我的配方，名称：', recipe.value.name)
// null = user cancelled (clicked 取消)
if (name === null) return
// empty string = user cleared the name field
if (!name.trim()) {
ui.showToast('请输入配方名称')
return
}
const trimmed = name.trim()
const dupDiary = diaryStore.userDiary.some(d => d.name === trimmed)
const dupPublic = recipesStore.recipes.some(r => r.name === trimmed)
if (dupDiary) {
ui.showToast('我的配方中已有同名配方「' + trimmed + '」')
return
}
if (dupPublic) {
ui.showToast('公共配方库中已有同名配方「' + trimmed + '」')
return
}
try {
const payload = {
name: name.trim(),
note: recipe.value.note || '',
ingredients: recipe.value.ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
ingredients: recipe.value.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
tags: recipe.value.tags || [],
source_recipe_id: recipe.value._id || null,
}
console.log('[saveToDiary] saving recipe:', payload)
await recipesStore.saveRecipe(payload)
await diaryStore.createDiary(payload)
ui.showToast('已保存！可在「配方查询 → 我的配方」查看')
} catch (e) {
console.error('[saveToDiary] failed:', e)
@@ -751,7 +763,7 @@ const filteredOilsForAdd = computed(() => {
if (!q) return oilsStore.oilNames
return oilsStore.oilNames.filter(n => {
const en = oilEn(n).toLowerCase()
return n.includes(q) || en.startsWith(q) || en.includes(q)
return n.includes(q) || en.startsWith(q) || en.includes(q) || matchesPinyinInitials(n, q)
})
})

59
frontend/src/components/UserMenu.vue
View File

@@ -28,7 +28,17 @@
<div class="notif-list">
<div v-for="n in notifications.slice(0, 20)" :key="n.id"
class="notif-item" :class="{ unread: !n.is_read }">
<div class="notif-item-header">
<div class="notif-title">{{ n.title }}</div>
<div v-if="!n.is_read" class="notif-actions">
<!-- 搜索未收录通知：已添加按钮 -->
<button v-if="isSearchMissing(n)" class="notif-action-btn notif-btn-added" @click="markAdded(n)">已添加</button>
<!-- 审核类通知：去审核按钮 -->
<button v-else-if="isReviewable(n)" class="notif-action-btn notif-btn-review" @click="goReview(n)">去审核</button>
<!-- 默认：已读按钮 -->
<button v-else class="notif-mark-one" @click="markOneRead(n)">已读</button>
</div>
</div>
<div v-if="n.body" class="notif-body">{{ n.body }}</div>
<div class="notif-time">{{ formatTime(n.created_at) }}</div>
</div>
@@ -105,6 +115,36 @@ async function submitBug() {
}
}
function isSearchMissing(n) {
return n.title && n.title.includes('用户需求')
}
function isReviewable(n) {
if (!n.title) return false
return n.title.includes('待审核') || n.title.includes('商业认证') || n.title.includes('申请')
}
async function markAdded(n) {
await markOneRead(n)
}
function goReview(n) {
markOneRead(n)
emit('close')
if (n.title.includes('配方')) {
router.push('/manage')
} else if (n.title.includes('商业认证') || n.title.includes('申请')) {
router.push('/users')
}
}
async function markOneRead(n) {
try {
await api(`/api/notifications/${n.id}/read`, { method: 'POST', body: '{}' })
n.is_read = 1
} catch {}
}
async function markAllRead() {
try {
await api('/api/notifications/read-all', { method: 'POST', body: '{}' })
@@ -191,7 +231,24 @@ onMounted(loadNotifications)
padding: 8px 0; border-bottom: 1px solid #f5f5f5; font-size: 13px;
}
.notif-item.unread { background: #fafafa; }
.notif-title { font-weight: 500; color: #333; }
.notif-item-header { display: flex; justify-content: space-between; align-items: center; gap: 6px; }
.notif-title { font-weight: 500; color: #333; flex: 1; }
.notif-mark-one {
background: none; border: 1px solid #ccc; border-radius: 6px;
font-size: 11px; color: #7a9e7e; cursor: pointer; padding: 2px 8px;
font-family: inherit; white-space: nowrap; flex-shrink: 0;
}
.notif-mark-one:hover { background: #f0faf5; border-color: #7a9e7e; }
.notif-actions { display: flex; gap: 4px; flex-shrink: 0; }
.notif-action-btn {
background: none; border: 1px solid #ccc; border-radius: 6px;
font-size: 11px; cursor: pointer; padding: 2px 8px;
font-family: inherit; white-space: nowrap;
}
.notif-btn-added { color: #4a9d7e; border-color: #7ec6a4; }
.notif-btn-added:hover { background: #e8f5e9; }
.notif-btn-review { color: #e65100; border-color: #ffb74d; }
.notif-btn-review:hover { background: #fff3e0; }
.notif-body { color: #888; font-size: 12px; margin-top: 2px; white-space: pre-line; }
.notif-time { color: #bbb; font-size: 11px; margin-top: 2px; }
.notif-empty { text-align: center; color: #ccc; padding: 16px; font-size: 13px; }

73
frontend/src/composables/usePinyinMatch.js Normal file
View File

@@ -0,0 +1,73 @@
/**
* Simple pinyin initial matching for Chinese oil names.
* Maps common Chinese characters used in essential oil names to their pinyin initials.
* This is a lightweight approach - no full pinyin library needed.
*/
// Common characters in essential oil / herb names mapped to pinyin initials
const PINYIN_MAP = {
'薰': 'x', '衣': 'y', '草': 'c', '茶': 'c', '树': 's',
'柠': 'n', '檬': 'm', '薄': 'b', '荷': 'h', '迷': 'm',
'迭': 'd', '香': 'x', '乳': 'r', '沉': 'c', '丝': 's',
'柏': 'b', '尤': 'y', '加': 'j', '利': 'l', '丁': 'd',
'肉': 'r', '桂': 'g', '罗': 'l', '勒': 'l', '百': 'b',
'里': 'l', '牛': 'n', '至': 'z', '马': 'm', '鞭': 'b',
'天': 't', '竺': 'z', '葵': 'k', '生': 's', '姜': 'j',
'黑': 'h', '胡': 'h', '椒': 'j', '玫': 'm', '瑰': 'g',
'茉': 'm', '莉': 'l', '依': 'y', '兰': 'l', '花': 'h',
'橙': 'c', '佛': 'f', '手': 's', '柑': 'g', '葡': 'p',
'萄': 't', '柚': 'y', '甜': 't', '苦': 'k', '野': 'y',
'山': 's', '松': 's', '杉': 's', '杜': 'd', '雪': 'x',
'莲': 'l', '芦': 'l', '荟': 'h', '白': 'b', '芷': 'z',
'当': 'd', '归': 'g', '川': 'c', '芎': 'x', '红': 'h',
'枣': 'z', '枸': 'g', '杞': 'q', '菊': 'j', '洋': 'y',
'甘': 'g', '菘': 's', '蓝': 'l', '永': 'y', '久': 'j',
'快': 'k', '乐': 'l', '鼠': 's', '尾': 'w', '岩': 'y',
'冷': 'l', '杰': 'j', '绿': 'lv', '芫': 'y', '荽': 's',
'椰': 'y', '子': 'z', '油': 'y', '基': 'j', '底': 'd',
'精': 'j', '纯': 'c', '露': 'l', '木': 'm', '果': 'g',
'叶': 'y', '根': 'g', '皮': 'p', '籽': 'z', '仁': 'r',
'大': 'd', '小': 'x', '西': 'x', '东': 'd', '南': 'n',
'北': 'b', '中': 'z', '新': 'x', '古': 'g', '老': 'l',
'春': 'c', '夏': 'x', '秋': 'q', '冬': 'd', '温': 'w',
'热': 'r', '凉': 'l', '冰': 'b', '火': 'h', '水': 's',
'金': 'j', '银': 'y', '铜': 't', '铁': 't', '玉': 'y',
'珍': 'z', '珠': 'z', '翠': 'c', '碧': 'b', '紫': 'z',
'青': 'q', '蓝': 'l', '绿': 'lv', '黄': 'h', '棕': 'z',
'褐': 'h', '灰': 'h', '粉': 'f', '豆': 'd', '蔻': 'k',
'藿': 'h', '苏': 's', '萃': 'c', '缬': 'x', '安': 'a',
'息': 'x', '宁': 'n', '静': 'j', '和': 'h', '平': 'p',
'舒': 's', '缓': 'h', '放': 'f', '松': 's', '活': 'h',
'力': 'l', '能': 'n', '量': 'l', '保': 'b', '护': 'h',
'防': 'f', '御': 'y', '健': 'j', '康': 'k', '美': 'm',
'丽': 'l', '清': 'q', '新': 'x', '自': 'z', '然': 'r',
'植': 'z', '物': 'w', '芳': 'f', '疗': 'l', '复': 'f',
'方': 'f', '单': 'd', '配': 'p', '调': 'd',
}
/**
* Get pinyin initials string for a Chinese name.
* e.g. "薰衣草" -> "xyc"
*/
export function getPinyinInitials(name) {
let result = ''
for (const char of name) {
const initial = PINYIN_MAP[char]
if (initial) {
result += initial
}
}
return result
}
/**
* Check if a query matches a name by pinyin initials.
* The query is matched as a prefix or substring of the pinyin initials.
*/
export function matchesPinyinInitials(name, query) {
if (!query || !name) return false
const initials = getPinyinInitials(name)
if (!initials) return false
const q = query.toLowerCase()
return initials.includes(q)
}

12
frontend/src/stores/auth.js
View File

@@ -28,16 +28,6 @@ export const useAuthStore = defineStore('auth', () => {
// Actions
async function initToken() {
const params = new URLSearchParams(window.location.search)
const urlToken = params.get('token')
if (urlToken) {
token.value = urlToken
localStorage.setItem('oil_auth_token', urlToken)
// Clean URL
const url = new URL(window.location)
url.searchParams.delete('token')
window.history.replaceState({}, '', url)
}
if (token.value) {
await loadMe()
}
@@ -85,7 +75,7 @@ export const useAuthStore = defineStore('auth', () => {
function canEditRecipe(recipe) {
if (isAdmin.value || user.value.role === 'senior_editor') return true
if (recipe._owner_id === user.value.id) return true
if (canEdit.value && recipe._owner_id === user.value.id) return true
return false
}

5
frontend/src/views/OilReference.vue
View File

@@ -260,12 +260,15 @@
</div>
<!-- Edit Oil Overlay -->
<div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null">
<div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
<div class="modal-panel">
<div class="modal-header">
<h3>{{ editingOilName }}</h3>
<div style="display:flex;gap:8px;align-items:center">
<button class="btn-primary" style="padding:6px 16px;font-size:13px" @click="saveEditOil">保存</button>
<button class="btn-close" @click="editingOilName = null">✕</button>
</div>
</div>
<div class="modal-body">
<div class="form-group">
<label>精油名称</label>

277
frontend/src/views/RecipeManager.vue
View File

@@ -14,7 +14,8 @@
</div>
</div>
<!-- Search & Actions Bar -->
<!-- Search & Actions Bar (editor+) -->
<template v-if="auth.canEdit">
<div class="manage-toolbar">
<div class="search-box">
<input
@@ -24,8 +25,10 @@
/>
<button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
</div>
<button class="btn-primary" @click="showAddOverlay = true">+ 添加配方</button>
<button class="btn-outline" @click="exportExcel">📊 导出Excel</button>
<div class="toolbar-actions">
<button class="btn-outline btn-sm" @click="showAddOverlay = true">+ 添加配方</button>
<button class="btn-outline btn-sm" @click="exportExcel">📥 导出Excel</button>
</div>
</div>
<!-- Tag Filter Bar -->
@@ -43,32 +46,40 @@
>{{ tag }}</span>
</div>
</div>
</template>
<!-- Batch Operations -->
<div v-if="selectedIds.size > 0" class="batch-bar">
<span>已选 {{ selectedIds.size }} 项</span>
<select v-model="batchAction" class="batch-select">
<option value="">批量操作...</option>
<option value="tag">添加标签</option>
<option value="share">分享</option>
<option value="export">导出卡片</option>
<option value="delete">删除</option>
</select>
<button class="btn-sm btn-primary" @click="executeBatch" :disabled="!batchAction">执行</button>
<button class="btn-sm btn-outline" @click="clearSelection">取消选择</button>
<div v-if="selectedIds.size > 0 || selectedDiaryIds.size > 0" class="batch-bar">
<span>已选 {{ selectedIds.size + selectedDiaryIds.size }} 项</span>
<button class="btn-sm btn-outline" @click="executeBatchAction('tag')">🏷 打标签</button>
<button class="btn-sm btn-outline" @click="executeBatchAction('share_public')" v-if="selectedDiaryIds.size > 0">📤 分享到公共库</button>
<button class="btn-sm btn-outline" @click="executeBatchAction('export')">📷 导出卡片</button>
<button class="btn-sm btn-danger-outline" @click="executeBatchAction('delete')">🗑 删除</button>
<button class="btn-sm btn-outline" @click="clearSelection">取消</button>
</div>
<!-- My Recipes Section (from diary) -->
<div class="recipe-section">
<h3 class="section-title">📖 我的配方 ({{ myRecipes.length }})</h3>
<h3 class="section-title">
<span>📖 我的配方 ({{ myRecipes.length }})</span>
<button class="btn-sm btn-outline" @click="toggleSelectAllDiary">全选/取消</button>
</h3>
<div class="recipe-list">
<div
v-for="d in myFilteredRecipes"
:key="'diary-' + d.id"
class="recipe-row diary-row"
class="recipe-row"
:class="{ selected: selectedDiaryIds.has(d.id) }"
>
<input
type="checkbox"
:checked="selectedDiaryIds.has(d.id)"
@change="toggleDiarySelect(d.id)"
class="row-check"
/>
<div class="row-info" @click="editDiaryRecipe(d)">
<span class="row-name">{{ d.name }}</span>
<span class="row-owner">{{ auth.user?.display_name || auth.user?.username }}</span>
<span class="row-tags">
<span v-for="t in (d.tags || [])" :key="t" class="mini-tag">{{ t }}</span>
</span>
@@ -83,8 +94,8 @@
</div>
</div>
<!-- Public Recipes Section -->
<div class="recipe-section">
<!-- Public Recipes Section (editor+) -->
<div v-if="auth.canEdit" class="recipe-section">
<h3 class="section-title">🌿 公共配方库 ({{ publicRecipes.length }})</h3>
<div class="recipe-list">
<div
@@ -124,7 +135,8 @@
<button class="btn-close" @click="closeOverlay">✕</button>
</div>
<!-- Smart Paste Section -->
<!-- Smart Paste Section (only for new recipes) -->
<template v-if="!editingRecipe">
<div class="paste-section">
<textarea
v-model="smartPasteText"
@@ -138,6 +150,7 @@
</div>
<div class="divider-text">或手动输入</div>
</template>
<!-- Manual Form -->
<div class="form-group">
@@ -148,14 +161,29 @@
<div class="form-group">
<label>成分</label>
<div v-for="(ing, i) in formIngredients" :key="i" class="ing-row">
<select v-model="ing.oil" class="form-select">
<option value="">选择精油</option>
<option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
</select>
<div class="oil-search-wrap">
<input
v-model="ing._search"
class="form-select"
placeholder="输入搜索精油..."
@focus="ing._open = true"
@input="ing._open = true"
@blur="onOilBlur(ing)"
/>
<div v-if="ing._open" class="oil-dropdown">
<div
v-for="name in filteredOilNames(ing._search || '')"
:key="name"
class="oil-option"
@mousedown.prevent="selectOil(ing, name)"
>{{ name }}</div>
<div v-if="filteredOilNames(ing._search || '').length === 0" class="oil-option oil-empty">无匹配</div>
</div>
</div>
<input v-model.number="ing.drops" type="number" min="0" class="form-input-sm" placeholder="滴数" />
<button class="btn-icon-sm" @click="formIngredients.splice(i, 1)">✕</button>
</div>
<button class="btn-outline btn-sm" @click="formIngredients.push({ oil: '', drops: 1 })">+ 添加成分</button>
<button class="btn-outline btn-sm" @click="formIngredients.push({ oil: '', drops: 1, _search: '', _open: false })">+ 添加成分</button>
</div>
<div class="form-group">
@@ -205,6 +233,7 @@ import { useUiStore } from '../stores/ui'
import { api } from '../composables/useApi'
import { showConfirm, showPrompt } from '../composables/useDialog'
import { parseSingleBlock } from '../composables/useSmartPaste'
import { matchesPinyinInitials } from '../composables/usePinyinMatch'
import RecipeCard from '../components/RecipeCard.vue'
import TagPicker from '../components/TagPicker.vue'
@@ -218,7 +247,7 @@ const manageSearch = ref('')
const selectedTags = ref([])
const showTagFilter = ref(false)
const selectedIds = reactive(new Set())
const batchAction = ref('')
const selectedDiaryIds = reactive(new Set())
const showAddOverlay = ref(false)
const editingRecipe = ref(null)
const showPending = ref(false)
@@ -259,7 +288,7 @@ function filterBySearchAndTags(list) {
r.tags && selectedTags.value.every(t => r.tags.includes(t))
)
}
return result
return result.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
}
const myFilteredRecipes = computed(() => filterBySearchAndTags(myRecipes.value))
@@ -276,47 +305,84 @@ function toggleSelect(id) {
else selectedIds.add(id)
}
function toggleDiarySelect(id) {
if (selectedDiaryIds.has(id)) selectedDiaryIds.delete(id)
else selectedDiaryIds.add(id)
}
function clearSelection() {
selectedIds.clear()
batchAction.value = ''
selectedDiaryIds.clear()
}
async function executeBatch() {
const ids = [...selectedIds]
if (!ids.length || !batchAction.value) return
function toggleSelectAllDiary() {
if (selectedDiaryIds.size === myFilteredRecipes.value.length) {
selectedDiaryIds.clear()
} else {
myFilteredRecipes.value.forEach(d => selectedDiaryIds.add(d.id))
}
}
if (batchAction.value === 'delete') {
const ok = await showConfirm(`确定删除 ${ids.length} 个配方？`)
async function executeBatchAction(action) {
const pubIds = [...selectedIds]
const diaryIds = [...selectedDiaryIds]
const totalCount = pubIds.length + diaryIds.length
if (!totalCount) return
if (action === 'delete') {
const ok = await showConfirm(`确定删除 ${totalCount} 个配方？`)
if (!ok) return
for (const id of ids) {
for (const id of pubIds) {
await recipeStore.deleteRecipe(id)
}
ui.showToast(`已删除 ${ids.length} 个配方`)
} else if (batchAction.value === 'tag') {
for (const id of diaryIds) {
await diaryStore.deleteDiary(id)
}
ui.showToast(`已删除 ${totalCount} 个配方`)
} else if (action === 'tag') {
const tagName = await showPrompt('输入要添加的标签:')
if (!tagName) return
for (const id of ids) {
for (const id of pubIds) {
const recipe = recipeStore.recipes.find(r => r._id === id)
if (recipe && !recipe.tags.includes(tagName)) {
recipe.tags.push(tagName)
await recipeStore.saveRecipe(recipe)
}
}
ui.showToast(`已为 ${ids.length} 个配方添加标签`)
} else if (batchAction.value === 'share') {
const text = ids.map(id => {
const r = recipeStore.recipes.find(rec => rec._id === id)
if (!r) return ''
const ings = r.ingredients.map(ing => `${ing.oil} ${ing.drops}滴`).join('，')
return `${r.name}：${ings}`
}).filter(Boolean).join('\n\n')
try {
await navigator.clipboard.writeText(text)
ui.showToast('已复制到剪贴板')
} catch {
ui.showToast('复制失败')
for (const id of diaryIds) {
const d = diaryStore.userDiary.find(r => r.id === id)
if (d) {
const tags = [...(d.tags || [])]
if (!tags.includes(tagName)) {
tags.push(tagName)
await diaryStore.updateDiary(id, { ...d, tags })
}
} else if (batchAction.value === 'export') {
}
}
ui.showToast(`已为 ${totalCount} 个配方添加标签`)
} else if (action === 'share_public') {
const ok = await showConfirm(`将 ${diaryIds.length} 个配方分享到公共配方库？`)
if (!ok) return
let count = 0
for (const id of diaryIds) {
const d = diaryStore.userDiary.find(r => r.id === id)
if (!d) continue
try {
await api('/api/recipes', {
method: 'POST',
body: JSON.stringify({
name: d.name,
note: d.note || '',
ingredients: (d.ingredients || []).map(i => ({ oil_name: i.oil, drops: i.drops })),
tags: d.tags || [],
}),
})
count++
} catch {}
}
await recipeStore.loadRecipes()
ui.showToast(`已提交 ${count} 个配方，等待审核`)
} else if (action === 'export') {
ui.showToast('导出卡片功能开发中')
}
clearSelection()
@@ -325,7 +391,7 @@ async function executeBatch() {
function editRecipe(recipe) {
editingRecipe.value = recipe
formName.value = recipe.name
formIngredients.value = recipe.ingredients.map(i => ({ ...i }))
formIngredients.value = recipe.ingredients.map(i => ({ ...i, _search: i.oil, _open: false }))
formNote.value = recipe.note || ''
formTags.value = [...(recipe.tags || [])]
showAddOverlay.value = true
@@ -339,7 +405,7 @@ function closeOverlay() {
function resetForm() {
formName.value = ''
formIngredients.value = [{ oil: '', drops: 1 }]
formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }]
formNote.value = ''
formTags.value = []
smartPasteText.value = ''
@@ -356,6 +422,28 @@ function handleSmartPaste() {
}
}
function filteredOilNames(search) {
if (!search) return oils.oilNames
const q = search.toLowerCase()
return oils.oilNames.filter(name =>
name.toLowerCase().includes(q) || matchesPinyinInitials(name, q)
)
}
function selectOil(ing, name) {
ing.oil = name
ing._search = name
ing._open = false
}
function onOilBlur(ing) {
setTimeout(() => {
ing._open = false
if (!ing.oil) ing._search = ''
else ing._search = ing.oil
}, 150)
}
function toggleFormTag(tag) {
const idx = formTags.value.indexOf(tag)
if (idx >= 0) formTags.value.splice(idx, 1)
@@ -380,6 +468,18 @@ async function saveCurrentRecipe() {
tags: formTags.value,
}
if (editingRecipe.value && editingRecipe.value._diary_id) {
// Editing a diary (personal) recipe
try {
await diaryStore.updateDiary(editingRecipe.value._diary_id, payload)
ui.showToast('个人配方已更新')
closeOverlay()
} catch (e) {
ui.showToast('保存失败: ' + (e.message || '未知错误'))
}
return
}
if (editingRecipe.value) {
payload._id = editingRecipe.value._id
payload._version = editingRecipe.value._version
@@ -402,9 +502,12 @@ onMounted(async () => {
})
function editDiaryRecipe(diary) {
// For now, navigate to MyDiary page to edit
// TODO: inline editing
ui.showToast('请到「我的」页面编辑个人配方')
editingRecipe.value = { _diary_id: diary.id, name: diary.name }
formName.value = diary.name
formIngredients.value = (diary.ingredients || []).map(i => ({ ...i, _search: i.oil, _open: false }))
formNote.value = diary.note || ''
formTags.value = [...(diary.tags || [])]
showAddOverlay.value = true
}
async function removeDiaryRecipe(diary) {
@@ -882,6 +985,44 @@ watch(() => recipeStore.recipes, () => {
text-align: center;
}
.oil-search-wrap {
flex: 1;
position: relative;
}
.oil-dropdown {
position: absolute;
top: 100%;
left: 0;
right: 0;
background: #fff;
border: 1.5px solid #d4cfc7;
border-radius: 8px;
max-height: 180px;
overflow-y: auto;
z-index: 10;
box-shadow: 0 4px 12px rgba(0,0,0,0.1);
}
.oil-option {
padding: 8px 12px;
font-size: 13px;
cursor: pointer;
}
.oil-option:hover {
background: #e8f5e9;
}
.oil-empty {
color: #999;
cursor: default;
}
.oil-empty:hover {
background: transparent;
}
.btn-icon-sm {
border: none;
background: transparent;
@@ -938,6 +1079,32 @@ watch(() => recipeStore.recipes, () => {
background: #f8f7f5;
}
.toolbar-actions {
display: flex;
gap: 8px;
}
.btn-sm {
padding: 7px 14px;
font-size: 13px;
}
.btn-danger-outline {
background: #fff;
color: #c0392b;
border: 1.5px solid #e8b4b0;
border-radius: 10px;
padding: 7px 14px;
font-size: 13px;
cursor: pointer;
font-family: inherit;
white-space: nowrap;
}
.btn-danger-outline:hover {
background: #fdf0ee;
}
.btn-sm {
padding: 6px 14px;
font-size: 12px;

311
frontend/src/views/RecipeSearch.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="recipe-search">
<!-- Category Carousel (full-width image slides) -->
<div class="cat-wrap" v-if="categories.length && !selectedCategory">
<div class="cat-wrap" v-if="categories.length && !selectedCategory" data-no-tab-swipe @touchstart="onCarouselTouchStart" @touchend="onCarouselTouchEnd">
<div class="cat-track" :style="{ transform: `translateX(-${catIdx * 100}%)` }">
<div
v-for="cat in categories"
@@ -49,27 +49,27 @@
<!-- Personal Section (logged in) -->
<div v-if="auth.isLoggedIn" class="personal-section">
<template v-if="!searchQuery || myDiaryRecipes.length > 0">
<div class="section-header" @click="showMyRecipes = !showMyRecipes">
<span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
<span v-if="!auth.isAdmin && sharedCount > 0" class="contrib-badge">已贡献 {{ sharedCount }} 条公共配方</span>
<span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
</div>
<div v-if="showMyRecipes" class="recipe-grid">
<div
v-for="d in myDiaryRecipes"
:key="'diary-' + d.id"
class="recipe-card diary-card"
<div v-for="d in myDiaryRecipes" :key="'diary-' + d.id" class="diary-card-wrap">
<RecipeCard
:recipe="diaryAsRecipe(d)"
:index="-1"
@click="openDiaryDetail(d)"
>
<div class="card-name">{{ d.name }}</div>
<div class="card-oils">{{ (d.ingredients || []).map(i => i.oil).join('、') }}</div>
<div class="card-bottom">
<span class="card-price">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
<button class="share-btn" @click.stop="shareDiaryToPublic(d)" title="共享到公共配方库">📤</button>
</div>
/>
<span v-if="getDiaryShareStatus(d) === 'shared'" class="share-status shared">已共享</span>
<span v-else-if="getDiaryShareStatus(d) === 'pending'" class="share-status pending">审核中</span>
</div>
<div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
</div>
</template>
<template v-if="!searchQuery || favoritesPreview.length > 0">
<div class="section-header" @click="showFavorites = !showFavorites">
<span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
<span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
@@ -85,21 +85,55 @@
/>
<div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
</div>
</template>
</div>
<!-- Search Results (public recipes) -->
<div v-if="searchQuery" class="search-results-section">
<div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
<!-- Exact matches -->
<template v-if="exactResults.length > 0">
<div class="section-label">🔍 搜索结果 ({{ exactResults.length }})</div>
<div class="recipe-grid">
<RecipeCard
v-for="(r, i) in fuzzyResults"
v-for="r in exactResults"
:key="r._id"
:recipe="r"
:index="findGlobalIndex(r)"
@click="openDetail(findGlobalIndex(r))"
@toggle-fav="handleToggleFav(r)"
/>
<div v-if="fuzzyResults.length === 0" class="empty-hint">未找到匹配的公共配方</div>
</div>
</template>
<!-- Similar/related matches -->
<template v-if="similarResults.length > 0">
<div class="section-label similar-label">
{{ exactResults.length > 0 ? '💡 相关配方' : '💡 没有完全匹配，以下是相关配方' }}
({{ similarResults.length }})
</div>
<div class="recipe-grid">
<RecipeCard
v-for="r in similarResults"
:key="'sim-' + r._id"
:recipe="r"
:index="findGlobalIndex(r)"
@click="openDetail(findGlobalIndex(r))"
@toggle-fav="handleToggleFav(r)"
/>
</div>
</template>
<!-- No results at all -->
<div v-if="exactResults.length === 0 && similarResults.length === 0" class="no-match-box">
<div class="empty-hint">未找到「{{ searchQuery }}」相关配方</div>
</div>
<!-- Report missing button (always shown at bottom) -->
<div class="no-match-box" style="margin-top:12px">
<button v-if="!reportedMissing" class="btn-report-missing" @click="reportMissing">
📢 没找到想要的？通知编辑添加
</button>
<div v-else class="reported-hint">已通知编辑，感谢反馈！</div>
</div>
</div>
@@ -121,9 +155,11 @@
<!-- Recipe Detail Overlay -->
<RecipeDetailOverlay
v-if="selectedRecipeIndex !== null"
v-if="selectedRecipeIndex !== null || selectedDiaryRecipe !== null"
:recipeIndex="selectedRecipeIndex"
@close="selectedRecipeIndex = null"
:recipeData="selectedDiaryRecipe"
:isDiary="selectedDiaryRecipe !== null"
@close="selectedRecipeIndex = null; selectedDiaryRecipe = null"
/>
</div>
</template>
@@ -152,9 +188,11 @@ const searchQuery = ref('')
const selectedCategory = ref(null)
const categories = ref([])
const selectedRecipeIndex = ref(null)
const selectedDiaryRecipe = ref(null)
const showMyRecipes = ref(true)
const showFavorites = ref(true)
const catIdx = ref(0)
const sharedCount = ref(0)
onMounted(async () => {
try {
@@ -164,9 +202,16 @@ onMounted(async () => {
}
} catch {}
// Load personal diary recipes
// Load personal diary recipes & contribution stats
if (auth.isLoggedIn) {
await diaryStore.loadDiary()
try {
const cRes = await api('/api/me/contribution')
if (cRes.ok) {
const data = await cRes.json()
sharedCount.value = data.shared_count || 0
}
} catch {}
}
// Return to a recipe card after QR upload redirect
@@ -206,21 +251,107 @@ const filteredRecipes = computed(() => {
if (selectedCategory.value) {
list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
}
return list
return list.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
})
// Search results from public recipes
const fuzzyResults = computed(() => {
// Synonym groups for broader fuzzy matching
const synonymGroups = [
['胸', '乳腺', '乳房', '丰胸', '胸部'],
['瘦', '减肥', '减脂', '消脂', '纤体', '塑形', '体重'],
['痘', '痤疮', '粉刺', '暗疮', '长痘', '祛痘'],
['斑', '色斑', '淡斑', '雀斑', '黑色素', '美白', '亮肤'],
['皱', '抗皱', '皱纹', '紧致', '抗衰', '抗老'],
['睡', '眠', '失眠', '助眠', '安眠', '好眠', '入睡'],
['焦虑', '紧张', '压力', '情绪', '放松', '舒缓', '安神', '宁神'],
['头', '头痛', '头疼', '偏头痛', '头晕'],
['咳', '咳嗽', '止咳', '清咽'],
['鼻', '鼻炎', '鼻塞', '过敏性鼻炎', '打喷嚏'],
['感冒', '发烧', '发热', '流感', '风寒', '风热'],
['胃', '消化', '肠胃', '胃痛', '胃胀', '积食', '便秘'],
['肝', '护肝', '养肝', '肝脏', '排毒'],
['肾', '补肾', '养肾', '肾虚'],
['腰', '腰痛', '腰酸', '腰椎'],
['肩', '肩颈', '颈椎', '肩周'],
['关节', '骨骼', '骨质', '风湿', '类风湿'],
['肌肉', '酸痛', '疼痛', '拉伤'],
['月经', '痛经', '经期', '姨妈', '生理期', '调经'],
['子宫', '卵巢', '生殖', '备孕', '怀孕', '孕'],
['前列腺', '男性', '阳'],
['湿', '祛湿', '排湿', '湿气', '化湿'],
['免疫', '免疫力', '抵抗力'],
['脱发', '掉发', '生发', '头发', '发际线', '秃'],
['过敏', '敏感', '荨麻疹', '湿疹', '皮炎'],
['血压', '高血压', '低血压', '血管', '循环'],
['血糖', '糖尿病', '降糖'],
['淋巴', '排毒', '水肿', '浮肿'],
['呼吸', '肺', '支气管', '哮喘', '气管'],
['眼', '眼睛', '视力', '近视', '干眼'],
['耳', '耳鸣', '中耳炎', '耳朵'],
['口', '口腔', '口臭', '牙', '牙龈', '牙疼'],
['皮肤', '护肤', '保湿', '修复', '焕肤'],
['疤', '疤痕', '伤疤', '妊娠纹'],
['心', '心脏', '心悸', '养心'],
['甲状腺', '甲亢', '甲减'],
['高', '长高', '增高', '个子'],
['静脉', '静脉曲张'],
['痔', '痔疮'],
]
function expandQuery(q) {
const terms = [q]
for (const group of synonymGroups) {
if (group.some(t => q.includes(t) || t.includes(q))) {
for (const t of group) {
if (!terms.includes(t)) terms.push(t)
}
}
}
return terms
}
// Search results: exact matches (query in recipe name or tags, NOT oil names to avoid noise like 西班牙牛至)
const exactResults = computed(() => {
if (!searchQuery.value.trim()) return []
const q = searchQuery.value.trim().toLowerCase()
return recipeStore.recipes.filter(r => {
const nameMatch = r.name.toLowerCase().includes(q)
const oilMatch = r.ingredients.some(ing => ing.oil.toLowerCase().includes(q))
const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
return nameMatch || oilMatch || tagMatch
return nameMatch || tagMatch
}).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
})
// Similar results: synonym expansion, only match against recipe NAME (not ingredients/tags)
// Filter out single-char expanded terms to avoid overly broad matches
const similarResults = computed(() => {
if (!searchQuery.value.trim()) return []
const q = searchQuery.value.trim()
const exactIds = new Set(exactResults.value.map(r => r._id))
const terms = expandQuery(q).filter(t => t.length >= 2 || t === q)
return recipeStore.recipes.filter(r => {
if (exactIds.has(r._id)) return false
const name = r.name
// Match by expanded synonyms (name only, not ingredients)
if (terms.some(t => name.includes(t))) return true
return false
}).sort((a, b) => a.name.localeCompare(b.name, 'zh')).slice(0, 30)
})
const reportedMissing = ref(false)
async function reportMissing() {
try {
await api('/api/symptom-search', {
method: 'POST',
body: JSON.stringify({ query: searchQuery.value.trim(), report_missing: true }),
})
reportedMissing.value = true
ui.showToast('已通知编辑，感谢反馈！')
} catch {
ui.showToast('通知失败')
}
}
// Personal recipes from diary (separate from public recipes)
const myDiaryRecipes = computed(() => {
if (!auth.isLoggedIn) return []
@@ -237,9 +368,17 @@ const myDiaryRecipes = computed(() => {
const favoritesPreview = computed(() => {
if (!auth.isLoggedIn) return []
return recipeStore.recipes
.filter(r => recipeStore.isFavorite(r))
.slice(0, 6)
let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r))
if (searchQuery.value.trim()) {
const q = searchQuery.value.trim().toLowerCase()
list = list.filter(r => {
const nameMatch = r.name.toLowerCase().includes(q)
const oilMatch = r.ingredients.some(ing => ing.oil.toLowerCase().includes(q))
const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
return nameMatch || oilMatch || tagMatch
})
}
return list.slice(0, 6)
})
function findGlobalIndex(recipe) {
@@ -252,27 +391,24 @@ function openDetail(index) {
}
}
function getDiaryShareStatus(d) {
const pub = recipeStore.recipes.find(r => r.name === d.name && r._owner_id === auth.user?.id)
if (pub) return 'shared'
return null
}
function diaryAsRecipe(d) {
return {
_id: 'diary-' + d.id,
name: d.name,
note: d.note || '',
tags: d.tags || [],
ingredients: d.ingredients || [],
}
}
function openDiaryDetail(diary) {
// Create a temporary recipe-like object from diary and open it
const tmpRecipe = {
_id: null,
_diary_id: diary.id,
name: diary.name,
note: diary.note || '',
tags: diary.tags || [],
ingredients: diary.ingredients || [],
_owner_id: auth.user.id,
}
recipeStore.recipes.push(tmpRecipe)
const tmpIdx = recipeStore.recipes.length - 1
selectedRecipeIndex.value = tmpIdx
// Clean up temp recipe when detail closes
const unwatch = watch(selectedRecipeIndex, (val) => {
if (val === null) {
recipeStore.recipes.splice(tmpIdx, 1)
unwatch()
}
})
selectedDiaryRecipe.value = diaryAsRecipe(diary)
}
async function handleToggleFav(recipe) {
@@ -309,12 +445,25 @@ async function shareDiaryToPublic(diary) {
}
function onSearch() {
// fuzzyResults computed handles the filtering reactively
reportedMissing.value = false
}
function clearSearch() {
searchQuery.value = ''
selectedCategory.value = null
reportedMissing.value = false
}
// Carousel swipe
const carouselTouchStartX = ref(0)
function onCarouselTouchStart(e) {
carouselTouchStartX.value = e.touches[0].clientX
}
function onCarouselTouchEnd(e) {
const dx = e.changedTouches[0].clientX - carouselTouchStartX.value
if (Math.abs(dx) > 50) {
slideCat(dx < 0 ? 1 : -1)
}
}
</script>
@@ -515,6 +664,40 @@ function clearSearch() {
color: #999;
}
.diary-card-wrap {
position: relative;
}
.share-status {
position: absolute;
top: 8px;
right: 8px;
font-size: 10px;
padding: 2px 8px;
border-radius: 8px;
font-weight: 600;
}
.share-status.shared {
background: #e8f5e9;
color: #2e7d32;
}
.share-status.pending {
background: #fff3e0;
color: #e65100;
}
.contrib-badge {
font-size: 11px;
color: #4a9d7e;
background: #e8f5e9;
padding: 2px 8px;
border-radius: 8px;
font-weight: 500;
margin-left: auto;
}
.section-label {
font-size: 14px;
font-weight: 600;
@@ -542,6 +725,40 @@ function clearSearch() {
padding: 24px 0;
}
.similar-label {
color: #e65100;
background: #fff8e1;
padding: 8px 14px;
border-radius: 10px;
}
.no-match-box {
text-align: center;
padding: 12px 0;
}
.btn-report-missing {
background: linear-gradient(135deg, #ffb74d, #e65100);
color: #fff;
border: none;
border-radius: 10px;
padding: 10px 20px;
font-size: 14px;
cursor: pointer;
font-family: inherit;
margin-top: 8px;
}
.btn-report-missing:hover {
opacity: 0.9;
}
.reported-hint {
color: #4a9d7e;
font-size: 13px;
font-weight: 500;
}
.diary-card {
background: white;
border-radius: 14px;

95
frontend/src/views/UserManagement.vue
View File

@@ -38,27 +38,7 @@
</div>
</div>
<!-- New User Creation -->
<div class="create-section">
<h4 class="section-title">➕ 创建新用户</h4>
<div class="create-form">
<input v-model="newUser.username" class="form-input" placeholder="用户名" />
<input v-model="newUser.display_name" class="form-input" placeholder="显示名称" />
<input v-model="newUser.password" class="form-input" type="password" placeholder="密码 (留空自动生成)" />
<select v-model="newUser.role" class="form-select">
<option value="viewer">查看者</option>
<option value="editor">编辑</option>
<option value="senior_editor">高级编辑</option>
<option value="admin">管理员</option>
</select>
<button class="btn-primary" @click="createUser" :disabled="!newUser.username.trim()">创建</button>
</div>
<div v-if="createdLink" class="created-link">
<span>登录链接:</span>
<code>{{ createdLink }}</code>
<button class="btn-sm btn-outline" @click="copyLink(createdLink)">复制</button>
</div>
</div>
<!-- User self-registers, admin assigns roles below -->
<!-- Search & Filter -->
<div class="filter-toolbar">
@@ -100,13 +80,12 @@
:value="u.role"
class="role-select"
@change="changeRole(u, $event.target.value)"
:disabled="u.role === 'admin'"
>
<option value="viewer">查看者</option>
<option value="editor">编辑</option>
<option value="senior_editor">高级编辑</option>
<option value="admin">管理员</option>
</select>
<button class="btn-sm btn-outline" @click="copyUserLink(u)" title="复制登录链接">🔗</button>
<button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
</div>
</div>
@@ -118,7 +97,7 @@
</template>
<script setup>
import { ref, computed, reactive, onMounted } from 'vue'
import { ref, computed, onMounted } from 'vue'
import { useAuthStore } from '../stores/auth'
import { useUiStore } from '../stores/ui'
import { api } from '../composables/useApi'
@@ -132,15 +111,6 @@ const searchQuery = ref('')
const filterRole = ref('')
const translations = ref([])
const businessApps = ref([])
const createdLink = ref('')
const newUser = reactive({
username: '',
display_name: '',
password: '',
role: 'viewer',
})
const roles = [
{ value: 'admin', label: '管理员' },
{ value: 'senior_editor', label: '高级编辑' },
@@ -206,43 +176,10 @@ async function loadBusinessApps() {
}
}
async function createUser() {
if (!newUser.username.trim()) return
try {
const res = await api('/api/users', {
method: 'POST',
body: JSON.stringify({
username: newUser.username.trim(),
display_name: newUser.display_name.trim() || newUser.username.trim(),
password: newUser.password || undefined,
role: newUser.role,
}),
})
if (res.ok) {
const data = await res.json()
if (data.token) {
const baseUrl = window.location.origin
createdLink.value = `${baseUrl}/?token=${data.token}`
}
newUser.username = ''
newUser.display_name = ''
newUser.password = ''
newUser.role = 'viewer'
await loadUsers()
ui.showToast('用户已创建')
} else {
const err = await res.json().catch(() => ({}))
ui.showToast('创建失败: ' + (err.error || err.message || ''))
}
} catch {
ui.showToast('创建失败')
}
}
async function changeRole(user, newRole) {
const id = user._id || user.id
try {
const res = await api(`/api/users/${id}/role`, {
const res = await api(`/api/users/${id}`, {
method: 'PUT',
body: JSON.stringify({ role: newRole }),
})
@@ -270,30 +207,6 @@ async function removeUser(user) {
}
}
async function copyUserLink(user) {
try {
const id = user._id || user.id
const res = await api(`/api/users/${id}/token`)
if (res.ok) {
const data = await res.json()
const link = `${window.location.origin}/?token=${data.token}`
await navigator.clipboard.writeText(link)
ui.showToast('链接已复制')
}
} catch {
ui.showToast('获取链接失败')
}
}
async function copyLink(link) {
try {
await navigator.clipboard.writeText(link)
ui.showToast('已复制')
} catch {
ui.showToast('复制失败')
}
}
async function approveTranslation(t) {
const id = t._id || t.id
try {