jack/digital-psychology
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ECR-045): ImageCardDeck 写面闭环并 Closed

Browse Source 
复用 admin.explore.write、POST/PUT+审计、C端 GET /cards/decks、
H5 无 active 空态/失败回退；migration 000054。无牌面内容编辑。
ExploreConfig Loop STOP，禁自动 ECR-046。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jackyu66git
2026-08-13 21:29:43 +08:00
co-authored by Cursor
parent dc93999f9e
commit 0158036341
33 changed files with 1111 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin-h5/src/api/client.ts
+39 -2
View File
@@ -677,9 +677,46 @@ export const adminApi = {
updated_at: string
}>('PUT', `/explore/rhythm-configs/${id}`, body),
imageCardDecks: () =>
request<{ items: Array<Record<string, unknown>> }>('GET', '/explore/image-card-decks'),
request<{
items: Array<{
id: string
code: string
title: string
active: boolean
system: boolean
updated_at: string
}>
}>('GET', '/explore/image-card-decks'),
imageCardDeck: (id: string) =>
request<Record<string, unknown>>('GET', `/explore/image-card-decks/${id}`),
request<{
id: string
code: string
title: string
active: boolean
system: boolean
updated_at: string
}>('GET', `/explore/image-card-decks/${id}`),
createImageCardDeck: (body: { code: string; title: string; active: boolean }) =>
request<{
id: string
code: string
title: string
active: boolean
system: boolean
updated_at: string
}>('POST', '/explore/image-card-decks', body),
updateImageCardDeck: (
id: string,
body: { code: string; title: string; active: boolean },
) =>
request<{
id: string
code: string
title: string
active: boolean
system: boolean
updated_at: string
}>('PUT', `/explore/image-card-decks/${id}`, body),
reportTemplates: () =>
request<{ items: Array<Record<string, unknown>> }>('GET', '/growth/report-templates'),
reportTemplate: (id: string) =>
apps/admin-h5/src/layouts/AdminShell.vue
+1
View File
@@ -37,6 +37,7 @@ async function onLogout() {
<RouterLink to="/cms">CMS</RouterLink>
<RouterLink to="/star-configs">星座配置</RouterLink>
<RouterLink to="/rhythm-configs">节律配置</RouterLink>
<RouterLink to="/image-card-decks">意象牌组</RouterLink>
<RouterLink to="/catalogs">目录仓</RouterLink>
<RouterLink to="/orders">订单</RouterLink>
<RouterLink v-if="auth.can('admin.membership.plans.read')" to="/pricing">定价</RouterLink>
apps/admin-h5/src/pages/ImageCardDeckPage.vue
+165
View File
@@ -0,0 +1,165 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from 'vue'
import { adminApi } from '@/api/client'
import { useAuthStore } from '@/stores/auth'
type Row = Awaited<ReturnType<typeof adminApi.imageCardDecks>>['items'][number]
const auth = useAuthStore()
const canWrite = () => auth.can('admin.explore.write')
const loading = ref(false)
const error = ref('')
const items = ref<Row[]>([])
const selected = ref<Row | null>(null)
const saving = ref(false)
const formErr = ref('')
const form = reactive({
code: '',
title: '',
active: true,
})
async function load() {
loading.value = true
error.value = ''
try {
const res = await adminApi.imageCardDecks()
items.value = res.items || []
} catch (e) {
error.value = e instanceof Error ? e.message : '加载失败'
} finally {
loading.value = false
}
}
function resetForm() {
form.code = ''
form.title = ''
form.active = true
selected.value = null
formErr.value = ''
}
async function openRow(id: string) {
formErr.value = ''
try {
const row = await adminApi.imageCardDeck(id)
selected.value = row
form.code = row.code
form.title = row.title
form.active = row.active
} catch {
selected.value = null
}
}
function payload() {
return {
code: form.code.trim(),
title: form.title.trim(),
active: form.active,
}
}
async function createRow() {
if (!canWrite()) return
saving.value = true
formErr.value = ''
try {
const row = await adminApi.createImageCardDeck(payload())
await load()
await openRow(row.id)
} catch (e) {
formErr.value = e instanceof Error ? e.message : '创建失败'
} finally {
saving.value = false
}
}
async function saveRow() {
if (!selected.value || !canWrite()) return
saving.value = true
formErr.value = ''
try {
const row = await adminApi.updateImageCardDeck(selected.value.id, payload())
selected.value = row
await load()
} catch (e) {
formErr.value = e instanceof Error ? e.message : '保存失败'
} finally {
saving.value = false
}
}
async function toggleActive() {
if (!selected.value || !canWrite()) return
form.active = !form.active
await saveRow()
}
onMounted(() => {
void load()
})
</script>
<template>
<section>
<h1>意象牌组</h1>
<p class="muted">ImageCardDeck 写面 · 下架仅 active=false · ECR-045</p>
<p v-if="!canWrite()" class="err">需要 admin.explore.write 才可写</p>
<p v-if="loading" class="muted">加载中…</p>
<p v-else-if="error" class="err">{{ error }}</p>
<div v-else class="layout">
<div class="card">
<h2>列表</h2>
<button v-if="canWrite()" class="btn" type="button" @click="resetForm">新建</button>
<p v-if="!items.length" class="muted">暂无</p>
<table v-else>
<thead>
<tr><th>代码</th><th>标题</th><th>状态</th><th></th></tr>
</thead>
<tbody>
<tr v-for="b in items" :key="b.id">
<td><code>{{ b.code }}</code></td>
<td>{{ b.title }}</td>
<td>{{ b.active ? '启用' : '停用' }}</td>
<td><button class="btn" type="button" @click="openRow(b.id)">编辑</button></td>
</tr>
</tbody>
</table>
</div>
<div class="card">
<h2>{{ selected ? '编辑' : '新建' }}</h2>
<label>代码 <input v-model="form.code" :disabled="!!selected?.system || !canWrite()" /></label>
<label>标题 <input v-model="form.title" :disabled="!canWrite()" /></label>
<label class="check"><input v-model="form.active" type="checkbox" :disabled="!canWrite()" /> 启用</label>
<p v-if="formErr" class="err">{{ formErr }}</p>
<div v-if="canWrite()" class="actions">
<button v-if="!selected" class="btn primary" type="button" :disabled="saving" @click="createRow">
创建
</button>
<template v-else>
<button class="btn primary" type="button" :disabled="saving" @click="saveRow">保存</button>
<button class="btn" type="button" :disabled="saving" @click="toggleActive">
{{ form.active ? '下架' : '上架' }}
</button>
</template>
</div>
</div>
</div>
</section>
</template>
<style scoped>
h1 { margin: 0 0 0.35rem; font-size: 1.35rem; }
h2 { margin: 0 0 0.6rem; font-size: 1.05rem; }
.layout { display: grid; grid-template-columns: 1.2fr 1fr; gap: 1rem; margin-top: 1rem; }
code { font-size: 0.8rem; }
.card label { display: block; margin: 0.4rem 0; font-size: 0.9rem; }
.card input { width: 100%; margin-top: 0.2rem; }
.check { display: flex; align-items: center; gap: 0.4rem; }
.actions { display: flex; gap: 0.5rem; margin-top: 0.75rem; }
.btn.primary { font-weight: 600; }
@media (max-width: 900px) { .layout { grid-template-columns: 1fr; } }
</style>
apps/admin-h5/src/router/index.ts
+6
View File
@@ -36,6 +36,12 @@ const router = createRouter({
component: () => import('@/pages/RhythmConfigPage.vue'),
meta: { permission: 'admin.explore.read' },
},
{
path: 'image-card-decks',
name: 'image-card-decks',
component: () => import('@/pages/ImageCardDeckPage.vue'),
meta: { permission: 'admin.explore.read' },
},
{ path: 'catalogs', name: 'catalogs', component: () => import('@/pages/CatalogHubPage.vue') },
{ path: 'push', name: 'push', component: () => import('@/pages/PushJobsPage.vue') },
{ path: 'admins', name: 'admins', component: () => import('@/pages/AdminsPage.vue'), meta: { superOnly: true } },
apps/api/internal/handler/admin_image_card_deck.go
+65
View File
@@ -16,6 +16,8 @@ func (h *AdminHandler) registerImageCardDecks(authed *gin.RouterGroup) {
g := authed.Group("/explore")
g.GET("/image-card-decks", middleware.RequireAdminPermission(h.Svc, admin.PermExploreRead), h.ListImageCardDecks)
g.GET("/image-card-decks/:id", middleware.RequireAdminPermission(h.Svc, admin.PermExploreRead), h.GetImageCardDeck)
g.POST("/image-card-decks", middleware.RequireAdminPermission(h.Svc, admin.PermExploreWrite), h.CreateImageCardDeck)
g.PUT("/image-card-decks/:id", middleware.RequireAdminPermission(h.Svc, admin.PermExploreWrite), h.UpdateImageCardDeck)
}
func (h *AdminHandler) ListImageCardDecks(c *gin.Context) {
@@ -44,3 +46,66 @@ func (h *AdminHandler) GetImageCardDeck(c *gin.Context) {
}
response.OK(c, row)
}
func (h *AdminHandler) CreateImageCardDeck(c *gin.Context) {
adminID, ok := middleware.AdminIDFromContext(c)
if !ok {
response.Fail(c, http.StatusUnauthorized, 40101, "admin auth required")
return
}
var body admin.ImageCardDeckWriteBody
if err := c.ShouldBindJSON(&body); err != nil {
response.Fail(c, http.StatusBadRequest, 40054, "invalid body")
return
}
row, err := h.Svc.CreateImageCardDeck(c.Request.Context(), adminID, body)
if errors.Is(err, admin.ErrInvalidImageCardDeck) {
response.Fail(c, http.StatusBadRequest, 40055, "invalid image card deck")
return
}
if errors.Is(err, admin.ErrImageCardDeckConflict) {
response.Fail(c, http.StatusConflict, 40912, "image card deck code conflict")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50052, "create image card deck failed")
return
}
response.OK(c, row)
}
func (h *AdminHandler) UpdateImageCardDeck(c *gin.Context) {
adminID, ok := middleware.AdminIDFromContext(c)
if !ok {
response.Fail(c, http.StatusUnauthorized, 40101, "admin auth required")
return
}
id, err := uuid.Parse(c.Param("id"))
if err != nil {
response.Fail(c, http.StatusBadRequest, 40002, "invalid id")
return
}
var body admin.ImageCardDeckWriteBody
if err := c.ShouldBindJSON(&body); err != nil {
response.Fail(c, http.StatusBadRequest, 40054, "invalid body")
return
}
row, err := h.Svc.UpdateImageCardDeck(c.Request.Context(), adminID, id, body)
if errors.Is(err, admin.ErrImageCardDeckNotFound) {
response.Fail(c, http.StatusNotFound, 40420, "image-card-deck not found")
return
}
if errors.Is(err, admin.ErrInvalidImageCardDeck) {
response.Fail(c, http.StatusBadRequest, 40055, "invalid image card deck")
return
}
if errors.Is(err, admin.ErrImageCardDeckConflict) {
response.Fail(c, http.StatusConflict, 40912, "image card deck code conflict")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50053, "update image card deck failed")
return
}
response.OK(c, row)
}
apps/api/internal/handler/image_card_deck_public.go
+36
View File
@@ -0,0 +1,36 @@
package handler
import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/yuxingu/digital-psychology/apps/api/internal/repository"
"github.com/yuxingu/digital-psychology/apps/api/pkg/response"
)
// ImageCardDeckPublicHandler serves GET /api/v1/cards/decks (DeviceAuth).
type ImageCardDeckPublicHandler struct {
Repo *repository.AdminRepo
}
// Register mounts public image card deck routes.
func (h *ImageCardDeckPublicHandler) Register(api *gin.RouterGroup) {
api.GET("/cards/decks", h.ListActive)
}
func (h *ImageCardDeckPublicHandler) ListActive(c *gin.Context) {
if h.Repo == nil {
response.OK(c, gin.H{"items": []repository.ImageCardDeckRow{}})
return
}
items, err := h.Repo.ListActiveImageCardDecks(c.Request.Context())
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50054, "card decks failed")
return
}
if items == nil {
items = []repository.ImageCardDeckRow{}
}
response.OK(c, gin.H{"items": items})
}
apps/api/internal/httpserver/router.go
+1
View File
@@ -103,6 +103,7 @@ func NewRouter(pool *pgxpool.Pool, cfg config.Config) *gin.Engine {
(&handler.HomeHandler{Svc: homeSvc}).Register(authed)
(&handler.StarConfigPublicHandler{Repo: adminRepo}).Register(authed)
(&handler.RhythmConfigPublicHandler{Repo: adminRepo}).Register(authed)
(&handler.ImageCardDeckPublicHandler{Repo: adminRepo}).Register(authed)
gated := authed.Group("")
gated.Use(middleware.RequireRegistered(pool))
apps/api/internal/integration/image_card_deck_write_test.go
+116
View File
@@ -0,0 +1,116 @@
package integration_test
import (
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
)
func TestExploreImageCardDeckWrite(t *testing.T) {
r, pool := setupAPIPool(t)
ctx := context.Background()
tok := adminLogin(t, r, "admin", "change-me")
devKey := fmt.Sprintf("deck-cfg-%d", time.Now().UnixNano())
code := fmt.Sprintf("deck_w_%d", time.Now().UnixNano()%1_000_000)
body := map[string]any{"code": code, "title": "测试意象牌组", "active": true}
env, httpCode := doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/image-card-decks", body, tok)
if httpCode != 200 || env.Code != 0 {
t.Fatalf("create http=%d code=%d msg=%s", httpCode, env.Code, env.Message)
}
var created struct {
ID string `json:"id"`
Code string `json:"code"`
}
_ = json.Unmarshal(env.Data, &created)
if created.ID == "" {
t.Fatal("bad create")
}
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `DELETE FROM image_card_decks WHERE id=$1`, created.ID)
})
_, httpCode = doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/image-card-decks", body, tok)
if httpCode != http.StatusConflict {
t.Fatalf("dup expected 409 got %d", httpCode)
}
env, _, httpCode = doJSONExpect(t, r, http.MethodGet, "/api/v1/cards/decks", nil, devKey, 0)
if httpCode != 200 {
t.Fatalf("public %d", httpCode)
}
var pub struct {
Items []struct {
Code string `json:"code"`
} `json:"items"`
}
_ = json.Unmarshal(env.Data, &pub)
found := false
for _, it := range pub.Items {
if it.Code == code {
found = true
break
}
}
if !found {
t.Fatalf("missing active %#v", pub.Items)
}
body["active"] = false
_, httpCode = doAdminJSON(t, r, http.MethodPut, "/api/v1/admin/explore/image-card-decks/"+created.ID, body, tok)
if httpCode != 200 {
t.Fatalf("update %d", httpCode)
}
env, _, _ = doJSONExpect(t, r, http.MethodGet, "/api/v1/cards/decks", nil, devKey, 0)
_ = json.Unmarshal(env.Data, &pub)
for _, it := range pub.Items {
if it.Code == code {
t.Fatal("inactive still listed")
}
}
_, _ = pool.Exec(ctx, `UPDATE image_card_decks SET active=false`)
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `UPDATE image_card_decks SET active=true WHERE system=true`)
})
env, _, _ = doJSONExpect(t, r, http.MethodGet, "/api/v1/cards/decks", nil, devKey, 0)
_ = json.Unmarshal(env.Data, &pub)
if len(pub.Items) != 0 {
t.Fatalf("expected empty after all inactive, got %#v", pub.Items)
}
var n int
_ = pool.QueryRow(ctx, `
SELECT COUNT(*) FROM admin_audit_logs
WHERE action IN ('explore.image_card_deck.create','explore.image_card_deck.update') AND target_id=$1`,
created.ID).Scan(&n)
if n < 2 {
t.Fatalf("audit %d", n)
}
limitedRoleID := uuid.New()
_, _ = pool.Exec(ctx, `INSERT INTO admin_roles(id, name, system) VALUES ($1,$2,false)`,
limitedRoleID, "dc_ro_"+limitedRoleID.String()[:8])
_, _ = pool.Exec(ctx, `INSERT INTO admin_role_permissions(role_id, code) VALUES ($1,'admin.explore.read')`, limitedRoleID)
hash, _ := bcrypt.GenerateFromPassword([]byte("ro-pass"), bcrypt.DefaultCost)
roUser := fmt.Sprintf("dcro_%d", time.Now().UnixNano())
_, _ = pool.Exec(ctx, `INSERT INTO admin_accounts(username, password_hash, role_id) VALUES ($1,$2,$3)`,
roUser, string(hash), limitedRoleID)
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `DELETE FROM admin_accounts WHERE username=$1`, roUser)
_, _ = pool.Exec(ctx, `DELETE FROM admin_roles WHERE id=$1`, limitedRoleID)
})
roTok := adminLogin(t, r, roUser, "ro-pass")
_, httpCode = doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/image-card-decks", map[string]any{
"code": "x_ro", "title": "no", "active": true,
}, roTok)
if httpCode != http.StatusForbidden {
t.Fatalf("expected 403 got %d", httpCode)
}
}
apps/api/internal/repository/image_card_deck_write.go
+139
View File
@@ -0,0 +1,139 @@
package repository
import (
"context"
"encoding/json"
"errors"
"strings"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
)
// ImageCardDeckWriteInput is create/update payload.
type ImageCardDeckWriteInput struct {
Code string
Title string
Active bool
}
// ListActiveImageCardDecks returns active decks for C-end.
func (r *AdminRepo) ListActiveImageCardDecks(ctx context.Context) ([]ImageCardDeckRow, error) {
rows, err := r.Pool.Query(ctx, `
SELECT id, code, title, active, system, updated_at
FROM image_card_decks
WHERE active = true
ORDER BY code ASC
LIMIT 100`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []ImageCardDeckRow
for rows.Next() {
var row ImageCardDeckRow
if err := rows.Scan(&row.ID, &row.Code, &row.Title, &row.Active, &row.System, &row.UpdatedAt); err != nil {
return nil, err
}
out = append(out, row)
}
return out, rows.Err()
}
// CreateImageCardDeckWithAudit inserts and audits.
func (r *AdminRepo) CreateImageCardDeckWithAudit(
ctx context.Context, adminID uuid.UUID, in ImageCardDeckWriteInput, meta json.RawMessage,
) (*ImageCardDeckRow, error) {
tx, err := r.Pool.Begin(ctx)
if err != nil {
return nil, err
}
defer tx.Rollback(ctx)
var row ImageCardDeckRow
err = tx.QueryRow(ctx, `
INSERT INTO image_card_decks(code, title, active, system)
VALUES ($1,$2,$3,false)
RETURNING id, code, title, active, system, updated_at`,
in.Code, in.Title, in.Active,
).Scan(&row.ID, &row.Code, &row.Title, &row.Active, &row.System, &row.UpdatedAt)
if err != nil {
return nil, mapImageCardDeckWriteErr(err)
}
if meta == nil {
meta = json.RawMessage(`{}`)
}
if _, err := tx.Exec(ctx, `
INSERT INTO admin_audit_logs(admin_id, action, target_type, target_id, meta)
VALUES ($1,'explore.image_card_deck.create','image_card_deck',$2,$3)`,
adminID, row.ID.String(), meta,
); err != nil {
return nil, err
}
if err := tx.Commit(ctx); err != nil {
return nil, err
}
return &row, nil
}
// UpdateImageCardDeckWithAudit updates and audits.
func (r *AdminRepo) UpdateImageCardDeckWithAudit(
ctx context.Context, adminID, id uuid.UUID, in ImageCardDeckWriteInput, meta json.RawMessage,
) (*ImageCardDeckRow, error) {
tx, err := r.Pool.Begin(ctx)
if err != nil {
return nil, err
}
defer tx.Rollback(ctx)
var system bool
var oldCode string
err = tx.QueryRow(ctx, `SELECT system, code FROM image_card_decks WHERE id=$1`, id).Scan(&system, &oldCode)
if errors.Is(err, pgx.ErrNoRows) {
return nil, pgx.ErrNoRows
}
if err != nil {
return nil, err
}
code := in.Code
if system {
code = oldCode
}
var row ImageCardDeckRow
err = tx.QueryRow(ctx, `
UPDATE image_card_decks
SET code=$2, title=$3, active=$4, updated_at=now()
WHERE id=$1
RETURNING id, code, title, active, system, updated_at`,
id, code, in.Title, in.Active,
).Scan(&row.ID, &row.Code, &row.Title, &row.Active, &row.System, &row.UpdatedAt)
if err != nil {
return nil, mapImageCardDeckWriteErr(err)
}
if meta == nil {
meta = json.RawMessage(`{}`)
}
if _, err := tx.Exec(ctx, `
INSERT INTO admin_audit_logs(admin_id, action, target_type, target_id, meta)
VALUES ($1,'explore.image_card_deck.update','image_card_deck',$2,$3)`,
adminID, id.String(), meta,
); err != nil {
return nil, err
}
if err := tx.Commit(ctx); err != nil {
return nil, err
}
return &row, nil
}
func mapImageCardDeckWriteErr(err error) error {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) && pgErr.Code == "23505" {
return errString("image card deck code conflict")
}
return err
}
// ImageCardDeckCodeConflict reports unique violation.
func ImageCardDeckCodeConflict(err error) bool {
return err != nil && strings.Contains(err.Error(), "image card deck code conflict")
}
apps/api/internal/service/admin/image_card_deck_write.go
+71
View File
@@ -0,0 +1,71 @@
package admin
import (
"context"
"encoding/json"
"errors"
"regexp"
"strings"
"unicode/utf8"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/yuxingu/digital-psychology/apps/api/internal/repository"
)
var (
ErrInvalidImageCardDeck = errors.New("invalid image card deck")
ErrImageCardDeckConflict = errors.New("image card deck code conflict")
imageCardDeckCodeRe = regexp.MustCompile(`^[a-z][a-z0-9_]{1,62}$`)
)
// ImageCardDeckWriteBody is JSON for create/update.
type ImageCardDeckWriteBody struct {
Code string `json:"code"`
Title string `json:"title"`
Active bool `json:"active"`
}
// CreateImageCardDeck validates, inserts, audits.
func (s *Service) CreateImageCardDeck(ctx context.Context, adminID uuid.UUID, body ImageCardDeckWriteBody) (*repository.ImageCardDeckRow, error) {
in, err := normalizeImageCardDeckWrite(body)
if err != nil {
return nil, err
}
meta, _ := json.Marshal(map[string]any{"code": in.Code, "active": in.Active})
row, err := s.Repo.CreateImageCardDeckWithAudit(ctx, adminID, in, meta)
if repository.ImageCardDeckCodeConflict(err) {
return nil, ErrImageCardDeckConflict
}
return row, err
}
// UpdateImageCardDeck validates, updates, audits.
func (s *Service) UpdateImageCardDeck(ctx context.Context, adminID, id uuid.UUID, body ImageCardDeckWriteBody) (*repository.ImageCardDeckRow, error) {
in, err := normalizeImageCardDeckWrite(body)
if err != nil {
return nil, err
}
meta, _ := json.Marshal(map[string]any{"code": in.Code, "active": in.Active})
row, err := s.Repo.UpdateImageCardDeckWithAudit(ctx, adminID, id, in, meta)
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrImageCardDeckNotFound
}
if repository.ImageCardDeckCodeConflict(err) {
return nil, ErrImageCardDeckConflict
}
return row, err
}
func normalizeImageCardDeckWrite(body ImageCardDeckWriteBody) (repository.ImageCardDeckWriteInput, error) {
code := strings.TrimSpace(body.Code)
title := strings.TrimSpace(body.Title)
if !imageCardDeckCodeRe.MatchString(code) {
return repository.ImageCardDeckWriteInput{}, ErrInvalidImageCardDeck
}
if title == "" || utf8.RuneCountInString(title) > 128 {
return repository.ImageCardDeckWriteInput{}, ErrInvalidImageCardDeck
}
return repository.ImageCardDeckWriteInput{Code: code, Title: title, Active: body.Active}, nil
}
apps/api/migrations/000054_ops_image_card_deck_write.down.sql
+2
View File
@@ -0,0 +1,2 @@
-- ECR-045 rollback marker (permission shared — do not revoke explore.write)
SELECT 1;
apps/api/migrations/000054_ops_image_card_deck_write.up.sql
+7
View File
@@ -0,0 +1,7 @@
-- ECR-045 ExploreConfig ImageCardDeck write (reuse admin.explore.write)
INSERT INTO admin_role_permissions(role_id, code)
SELECT r.id, 'admin.explore.write'
FROM admin_roles r
WHERE r.name = 'super_admin'
ON CONFLICT DO NOTHING;
apps/user-h5/src/composables/useImageCardPage.ts
+28 -2
View File
@@ -27,6 +27,8 @@ export function useImageCardPage() {
const paying = ref(false)
const error = ref('')
const bootError = ref('')
/** Fail-open until proven empty. */
const configAvailable = ref(true)
const cards = ref<{ id: string; title: string; imagery: string; prompt: string; tip: string }[]>([])
const report = ref<GrowthReport | null>(null)
const questionInput = ref('')
@@ -52,21 +54,38 @@ export function useImageCardPage() {
track('cards_scene_selected', { scene: key })
}
async function refreshConfigGate() {
try {
const res = await api.getCardDecks()
configAvailable.value = (res.items || []).length > 0
} catch {
configAvailable.value = true
}
}
function onPromptClick(row: { label: string; scene: string }) {
if (!configAvailable.value) {
error.value = '意象牌组暂未开放'
return
}
selectScene(row.scene)
questionInput.value = row.label
if (birthFilled()) {
draw()
void draw()
} else {
showBirth.value = true
}
}
function sendDraw() {
if (!configAvailable.value) {
error.value = '意象牌组暂未开放'
return
}
if (questionInput.value.trim()) {
scene.value = questionInput.value.trim()
}
draw()
void draw()
}
async function refreshQuota() {
@@ -75,6 +94,8 @@ export function useImageCardPage() {
async function boot() {
if (!(await ensureAccount(router, route.fullPath))) return
await refreshConfigGate()
if (!configAvailable.value) return
try {
const [sc] = await Promise.all([api.listImageCardScenes(), refreshQuota()])
scenes.value = sc.items || []
@@ -87,6 +108,10 @@ export function useImageCardPage() {
}
async function draw() {
if (!configAvailable.value) {
error.value = '意象牌组暂未开放'
return
}
if (!(await ensureAccount(router, route.fullPath))) return
error.value = ''
const y = Number(year.value)
@@ -145,6 +170,7 @@ export function useImageCardPage() {
return {
scene,
configAvailable,
quotaLabel,
year,
month,
apps/user-h5/src/pages/ImageCardPage.vue
+68 -27
View File
@@ -11,41 +11,50 @@
</template>
<div class="body" :class="{ 'has-results': cards.length }">
<ImageCardGreeting
:boot-error="bootError"
:quota-label="quotaLabel"
:scene="scene"
/>
<div v-if="!configAvailable && !cards.length" class="empty-gate">
<HomeToolIcon name="cards" :size="56" />
<p class="empty-title">意象牌组暂未开放</p>
<p class="empty-sub">运营尚未启用意象牌组，请稍后再来</p>
<button class="cta-off" type="button" disabled>抽取意象卡</button>
</div>
<ImageCardLanding
v-if="!cards.length"
v-model:want-depth="wantDepth"
v-model:show-birth="showBirth"
v-model:year="year"
v-model:month="month"
v-model:day="day"
:drawing="drawing"
@prompt-click="onPromptClick"
@draw="draw"
/>
<template v-else>
<ImageCardGreeting
:boot-error="bootError"
:quota-label="quotaLabel"
:scene="scene"
/>
<ImageCardResults
v-if="cards.length"
:cards="cards"
:report="report"
:summary="summary"
:detail="detail"
:want-depth="wantDepth"
:paying="paying"
@buy-deep="buyDeep"
/>
<ImageCardLanding
v-if="!cards.length"
v-model:want-depth="wantDepth"
v-model:show-birth="showBirth"
v-model:year="year"
v-model:month="month"
v-model:day="day"
:drawing="drawing"
@prompt-click="onPromptClick"
@draw="draw"
/>
<ImageCardResults
v-if="cards.length"
:cards="cards"
:report="report"
:summary="summary"
:detail="detail"
:want-depth="wantDepth"
:paying="paying"
@buy-deep="buyDeep"
/>
</template>
<p class="yxg-disc ai-note">意象卡片用于投射与自我反思，不判定好坏，也不预测未来。部分内容由 AI 生成，仅供参考。</p>
<p v-if="error" class="yxg-err err-float">{{ error }}</p>
</div>
<ImageCardInputBar
v-if="!cards.length"
v-if="configAvailable && !cards.length"
v-model:question-input="questionInput"
:drawing="drawing"
@send="sendDraw"
@@ -64,6 +73,7 @@ import { useImageCardPage } from '../composables/useImageCardPage'
const {
scene,
configAvailable,
quotaLabel,
year,
month,
@@ -119,4 +129,35 @@ const {
.err-float {
margin-top: 8px;
}
.empty-gate {
text-align: center;
padding: 28px 16px 12px;
}
.empty-title {
font-family: var(--font-display);
font-size: 20px;
font-weight: 700;
margin-top: 10px;
letter-spacing: 0.06em;
}
.empty-sub {
font-size: 13px;
color: rgba(0, 0, 0, 0.42);
margin-top: 8px;
line-height: 1.5;
}
.cta-off {
margin-top: 16px;
width: 100%;
max-width: 320px;
padding: 13px;
border: none;
border-radius: 22px;
color: #fff;
font-size: 15px;
font-weight: 600;
background: linear-gradient(135deg, #ff7a6e, var(--color-primary));
opacity: 0.45;
cursor: not-allowed;
}
</style>