revert: 删除购油方案功能,修复MyDiary模板错误
All checks were successful
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 6s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 5s
PR Preview / deploy-preview (pull_request) Successful in 14s
Test / e2e-test (push) Successful in 53s

完全移除oil_plans相关代码:
- 后端: 7个API端点、2个数据库表
- 前端: plans store、Inventory方案UI、UserManagement方案编辑器
- UserMenu: 方案通知按钮
- 修复MyDiary.vue多余的section-card div导致的构建失败

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-13 11:51:52 +00:00
parent e8a2915962
commit 9e1ebb3c86
7 changed files with 4 additions and 740 deletions

View File

@@ -2,86 +2,10 @@
<div class="inventory-page">
<!-- Login prompt -->
<div v-if="!auth.isLoggedIn" class="login-prompt">
<p>登录后可管理个人库存获取购油方案</p>
<p>登录后可管理个人库存</p>
<button class="btn-primary" @click="ui.openLogin()">登录 / 注册</button>
</div>
<template v-else>
<!-- My Oil Plan -->
<template v-if="auth.isLoggedIn">
<!-- Active plan: show shopping list -->
<div v-if="plansStore.activePlan" class="plan-section">
<div class="plan-header">
<span class="plan-title">📋 {{ plansStore.activePlan.title || '我的购油方案' }}</span>
<span class="plan-teacher">by {{ plansStore.activePlan.teacher_name || '老师' }}</span>
</div>
<div class="plan-recipes-summary">
<span v-for="r in plansStore.activePlan.recipes" :key="r.id" class="plan-recipe-chip">
{{ r.recipe_name }} × {{ r.times_per_month }}/
</span>
</div>
<div v-if="plansStore.shoppingList.length" class="shopping-list">
<div class="shopping-header">🛒 本月购油清单</div>
<div class="shopping-total">
预计月消费¥{{ shoppingTotal }}
</div>
<div v-for="item in plansStore.shoppingList" :key="item.oil_name"
class="shopping-item" :class="{ owned: item.in_inventory }">
<span class="shop-name">{{ item.oil_name }}</span>
<span class="shop-drops">{{ item.monthly_drops }}/</span>
<span class="shop-bottles">{{ item.bottles_needed }}</span>
<span class="shop-cost">¥{{ item.total_cost }}</span>
<button v-if="!item.in_inventory" class="shop-add-btn" @click="addOilFromPlan(item.oil_name)">
加入库存
</button>
<span v-else class="shop-owned-tag">已有</span>
</div>
</div>
</div>
<!-- Pending plan: editable -->
<div v-else-if="plansStore.pendingPlans.length" class="plan-section plan-pending">
<div class="plan-header">
<span class="plan-title"> 老师正在为你定制方案中</span>
</div>
<textarea v-model="pendingDesc" class="form-textarea" rows="3" @blur="updatePendingDesc"></textarea>
<div class="plan-pending-hint">修改后老师会收到通知</div>
</div>
<!-- No plan: request button -->
<div v-else class="plan-request-bar">
<button class="btn-primary" @click="showPlanRequest = true">📋 请求定制购油方案</button>
</div>
<!-- Plan request modal -->
<div v-if="showPlanRequest" class="overlay" @mousedown.self="showPlanRequest = false">
<div class="overlay-panel" style="max-width:400px">
<div class="overlay-header">
<h3>请求定制方案</h3>
<button class="btn-close" @click="showPlanRequest = false"></button>
</div>
<div style="padding:16px">
<label class="form-label">描述你的健康需求</label>
<textarea v-model="planHealthDesc" class="form-textarea" rows="4"
placeholder="例如:家里有老人膝盖痛,小孩经常感冒咳嗽,我自己想改善睡眠..."></textarea>
<label class="form-label" style="margin-top:12px">输入老师的名字</label>
<input v-model="planTeacherName" class="form-input" placeholder="请输入老师告诉你的名字"
@input="matchTeacher" />
<div v-if="matchedTeacher" class="teacher-matched">
已匹配{{ matchedTeacher.display_name }}
</div>
<div v-else-if="planTeacherName.trim() && !matchedTeacher" class="teacher-no-match">
未找到该老师请确认名字是否正确
</div>
<button class="btn-primary" style="width:100%;margin-top:16px"
:disabled="!planHealthDesc.trim() || !matchedTeacher"
@click="submitPlanRequest">
发送请求
</button>
</div>
</div>
</div>
</template>
<!-- Search + direct add -->
<div class="search-box">
<input
@@ -176,14 +100,12 @@ import { useAuthStore } from '../stores/auth'
import { useOilsStore } from '../stores/oils'
import { useRecipesStore } from '../stores/recipes'
import { useUiStore } from '../stores/ui'
import { usePlansStore } from '../stores/plans'
import { api } from '../composables/useApi'
const auth = useAuthStore()
const oils = useOilsStore()
const recipeStore = useRecipesStore()
const ui = useUiStore()
const plansStore = usePlansStore()
const searchQuery = ref('')
const ownedOils = ref([])
@@ -318,86 +240,14 @@ async function toggleOil(name) {
await saveInventory()
}
// Plan request
const showPlanRequest = ref(false)
const planHealthDesc = ref('')
const planTeacherName = ref('')
const matchedTeacher = ref(null)
function matchTeacher() {
const name = planTeacherName.value.trim()
if (!name) { matchedTeacher.value = null; return }
matchedTeacher.value = plansStore.teachers.find(t =>
t.display_name === name || t.username === name
) || null
}
const pendingDesc = ref('')
// Sync pendingDesc when plans load
watch(() => plansStore.pendingPlans, (pp) => {
if (pp.length) pendingDesc.value = pp[0].health_desc || ''
}, { immediate: true })
async function updatePendingDesc() {
const plan = plansStore.pendingPlans[0]
if (!plan || pendingDesc.value === plan.health_desc) return
try {
await api(`/api/oil-plans/${plan.id}`, {
method: 'PUT',
body: JSON.stringify({ health_desc: pendingDesc.value }),
})
plan.health_desc = pendingDesc.value
ui.showToast('已更新,老师会收到通知')
} catch {
ui.showToast('更新失败')
}
}
const shoppingTotal = computed(() =>
plansStore.shoppingList.filter(i => !i.in_inventory).reduce((s, i) => s + i.total_cost, 0).toFixed(2)
)
async function submitPlanRequest() {
try {
await plansStore.createPlan(planHealthDesc.value, matchedTeacher.value.id)
showPlanRequest.value = false
planHealthDesc.value = ''
planTeacherName.value = ''
matchedTeacher.value = null
ui.showToast('已发送方案请求')
} catch {
ui.showToast('发送失败')
}
}
async function addOilFromPlan(name) {
if (!ownedOils.value.includes(name)) {
ownedOils.value.push(name)
ownedOils.value.sort((a, b) => a.localeCompare(b, 'zh'))
await saveInventory()
}
// Refresh shopping list
if (plansStore.activePlan) {
await plansStore.loadShoppingList(plansStore.activePlan.id)
}
ui.showToast(`${name} 已加入库存`)
}
async function clearAll() {
ownedOils.value = []
await saveInventory()
ui.showToast('已清空库存')
}
onMounted(async () => {
await loadInventory()
if (auth.isLoggedIn) {
await Promise.all([plansStore.loadPlans(), plansStore.loadTeachers()])
if (plansStore.activePlan) {
await plansStore.loadShoppingList(plansStore.activePlan.id)
}
}
onMounted(() => {
loadInventory()
})
</script>
@@ -631,49 +481,6 @@ onMounted(async () => {
padding: 24px 0;
}
/* Plan section */
.plan-section {
background: #f8faf8; border: 1.5px solid #d4e8d4; border-radius: 12px;
padding: 14px; margin-bottom: 16px;
}
.plan-pending { border-color: #e5e4e7; background: #fafafa; }
.plan-header { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
.plan-title { font-weight: 600; font-size: 15px; color: #2e7d5a; }
.plan-teacher { font-size: 12px; color: #b0aab5; }
.plan-desc { font-size: 13px; color: #6b6375; margin: 0; }
.plan-recipes-summary { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 10px; }
.plan-recipe-chip {
font-size: 11px; padding: 3px 10px; border-radius: 8px;
background: #e8f5e9; color: #2e7d5a; white-space: nowrap;
}
.shopping-list { margin-top: 8px; }
.shopping-header { font-weight: 600; font-size: 14px; color: #3e3a44; margin-bottom: 4px; }
.shopping-total { font-size: 12px; color: #5a7d5e; margin-bottom: 8px; font-weight: 500; }
.shopping-item {
display: flex; align-items: center; gap: 8px; padding: 6px 0;
border-bottom: 1px solid #eee; font-size: 13px;
}
.shopping-item.owned { opacity: 0.5; }
.shop-name { flex: 1; font-weight: 500; color: #3e3a44; }
.shop-drops { color: #6b6375; font-size: 12px; white-space: nowrap; }
.shop-bottles { color: #5a7d5e; font-size: 12px; white-space: nowrap; }
.shop-cost { color: #5a7d5e; font-weight: 600; font-size: 12px; white-space: nowrap; }
.shop-add-btn {
padding: 2px 10px; border-radius: 6px; border: 1px solid #7ec6a4;
background: #fff; color: #2e7d5a; font-size: 11px; cursor: pointer; font-family: inherit;
}
.shop-add-btn:hover { background: #e8f5e9; }
.shop-owned-tag { font-size: 11px; color: #b0aab5; }
.plan-request-bar { text-align: center; margin-bottom: 16px; }
.overlay { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.4); z-index: 100; display: flex; align-items: center; justify-content: center; }
.overlay-panel { background: #fff; border-radius: 14px; width: 90%; max-width: 420px; max-height: 80vh; overflow-y: auto; }
.overlay-header { display: flex; align-items: center; justify-content: space-between; padding: 14px 16px; border-bottom: 1px solid #eee; }
.overlay-header h3 { margin: 0; font-size: 16px; }
.form-label { display: block; font-size: 13px; color: #6b6375; margin-bottom: 4px; font-weight: 500; }
.form-textarea { width: 100%; border: 1.5px solid #e5e4e7; border-radius: 8px; padding: 8px; font-size: 13px; font-family: inherit; resize: vertical; box-sizing: border-box; }
.login-prompt { text-align: center; padding: 60px 20px; color: #6b6375; }
.login-prompt p { margin-bottom: 16px; font-size: 15px; }
.plan-pending-hint { font-size: 11px; color: #b0aab5; margin-top: 4px; }
.teacher-matched { color: #2e7d5a; font-size: 13px; margin-top: 4px; font-weight: 500; }
.teacher-no-match { color: #c62828; font-size: 12px; margin-top: 4px; }
</style>