feat: 消耗分析+认证修复+套装更新+认证简化
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 16s
Test / e2e-test (push) Successful in 49s
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 16s
Test / e2e-test (push) Successful in 49s
商业核算: - 芳香调理技术作为体验项目,使用真实配方数据 - 新增消耗分析:每种精油可做次数、哪个最先消耗完、最多可做几次 个人库存: - 芳香调理套装改为正确精油列表 商业认证: - 简化为商户名+证明图片 - 通过后内容保持显示 - 用户管理页面根据用户实际认证状态显示(修复拒绝后又通过仍显示已拒绝) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -30,10 +30,10 @@
|
||||
<div class="review-info">
|
||||
<span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
|
||||
<span class="review-reason">商户名:{{ group.latest.business_name }}</span>
|
||||
<span class="biz-status-tag" :class="'biz-' + group.latest.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.latest.status] }}</span>
|
||||
<span class="biz-status-tag" :class="'biz-' + group.effectiveStatus">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.effectiveStatus] }}</span>
|
||||
</div>
|
||||
<div class="review-actions">
|
||||
<template v-if="group.latest.status === 'pending'">
|
||||
<template v-if="group.effectiveStatus === 'pending'">
|
||||
<button class="btn-sm btn-approve" @click="approveBusiness(group.latest)">通过</button>
|
||||
<button class="btn-sm btn-reject" @click="rejectBusiness(group.latest)">拒绝</button>
|
||||
</template>
|
||||
@@ -141,6 +141,13 @@ const groupedBizApps = computed(() => {
|
||||
return Object.values(map).map(g => {
|
||||
g.history.sort((a, b) => b.id - a.id)
|
||||
g.latest = g.history[0]
|
||||
// Check if user is already verified (from users list)
|
||||
const user = users.value.find(u => (u._id || u.id) === g.user_id)
|
||||
if (user && user.business_verified) {
|
||||
g.effectiveStatus = 'approved'
|
||||
} else {
|
||||
g.effectiveStatus = g.latest.status
|
||||
}
|
||||
return reactive(g)
|
||||
}).filter(g => g.latest)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user