feat(public): 首页改为极简谷歌风格

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

api/internal/adminhandler/handler.go

@@ -14,6 +14,7 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 
 	"github.com/baicai2026-baicai/goods/api/internal/adminstore"
+	"github.com/baicai2026-baicai/goods/api/internal/apikey"
 	"github.com/baicai2026-baicai/goods/api/internal/auth"
 	"github.com/baicai2026-baicai/goods/api/internal/gtin"
 	"github.com/baicai2026-baicai/goods/api/internal/ratelimit"
@@ -90,6 +91,8 @@ func (h *Handler) Router() http.Handler {
 			r.Put("/api/categories/{id}", h.UpdateCategory)
 			r.Delete("/api/categories/{id}", h.DeleteCategory)
 
+			r.Post("/api/import/bypos", h.ImportBypos)
+
 			r.Get("/api/submissions", h.ListSubmissions)
 			r.Get("/api/submissions/{id}", h.GetSubmission)
 			r.Post("/api/submissions/{id}/approve", h.ApproveSubmission)
@@ -108,6 +111,11 @@ func (h *Handler) Router() http.Handler {
 	// admin approves them.
 	r.Post("/api/public/submissions", h.CreateSubmission)
 
+	// Archive backflow: inventory-management software pushes products missing
+	// from the archive. Authenticated with a public API key; records enter the
+	// same moderation queue and are archived only after admin approval.
+	r.Post("/api/public/backflow", h.Backflow)
+
 	return r
 }
 
@@ -632,6 +640,62 @@ func (h *Handler) CreateSubmission(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusCreated, map[string]string{"id": id, "status": "pending"})
 }
 
+// Backflow accepts a batch of products pushed by inventory-management software.
+// It authenticates with a public API key (X-API-Key or Bearer), enqueues each
+// item for admin review (deduplicating by GTIN), and returns a per-item summary.
+func (h *Handler) Backflow(w http.ResponseWriter, r *http.Request) {
+	raw := presentedAPIKey(r)
+	if raw == "" {
+		writeError(w, http.StatusUnauthorized, "missing_api_key", "缺少 API key（请在 X-API-Key 或 Authorization: Bearer 中提供）")
+		return
+	}
+	if !apikey.IsWellFormed(raw) {
+		writeError(w, http.StatusUnauthorized, "invalid_api_key", "API key 格式无效")
+		return
+	}
+	if _, err := h.store.APIKeyByHash(r.Context(), apikey.Hash(raw)); err != nil {
+		if errors.Is(err, adminstore.ErrNotFound) {
+			writeError(w, http.StatusUnauthorized, "invalid_api_key", "API key 无效或已吊销")
+			return
+		}
+		writeError(w, http.StatusInternalServerError, "internal_error", err.Error())
+		return
+	}
+
+	var items []adminstore.SubmissionInput
+	if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 16<<20)).Decode(&items); err != nil {
+		writeError(w, http.StatusBadRequest, "bad_request", "请求体应为商品数组 (JSON array)")
+		return
+	}
+
+	if len(items) == 0 {
+		writeError(w, http.StatusBadRequest, "bad_request", "回流列表为空")
+		return
+	}
+	if len(items) > 1000 {
+		writeError(w, http.StatusBadRequest, "too_many", "单次回流最多 1000 条")
+		return
+	}
+
+	sum, err := h.store.CreateBackflowSubmissions(r.Context(), items, realIP(r))
+	if err != nil {
+		writeError(w, http.StatusInternalServerError, "internal_error", err.Error())
+		return
+	}
+	writeJSON(w, http.StatusOK, sum)
+}
+
+// presentedAPIKey extracts a public API key from X-API-Key or a Bearer token.
+func presentedAPIKey(r *http.Request) string {
+	if v := strings.TrimSpace(r.Header.Get("X-API-Key")); v != "" {
+		return v
+	}
+	if v := r.Header.Get("Authorization"); strings.HasPrefix(v, "Bearer ") {
+		return strings.TrimSpace(strings.TrimPrefix(v, "Bearer "))
+	}
+	return ""
+}
+
 // ListSubmissions returns the moderation queue (admin).
 func (h *Handler) ListSubmissions(w http.ResponseWriter, r *http.Request) {
 	status := r.URL.Query().Get("status")

api/internal/adminhandler/import_bypos.go

@@ -0,0 +1,30 @@
+package adminhandler
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/baicai2026-baicai/goods/api/internal/adminstore"
+)
+
+func (h *Handler) ImportBypos(w http.ResponseWriter, r *http.Request) {
+	var records []adminstore.ByposRecord
+	dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, 50<<20))
+	for dec.More() {
+		var rec adminstore.ByposRecord
+		if err := dec.Decode(&rec); err != nil {
+			continue
+		}
+		records = append(records, rec)
+	}
+	if len(records) == 0 {
+		writeError(w, http.StatusBadRequest, "empty", "\u6ca1\u6709\u53ef\u5bfc\u5165\u7684\u8bb0\u5f55")
+		return
+	}
+	result, err := h.store.ImportByposRecords(r.Context(), records)
+	if err != nil {
+		writeError(w, http.StatusInternalServerError, "import_error", err.Error())
+		return
+	}
+	writeJSON(w, http.StatusOK, result)
+}

api/internal/adminstore/backflow.go

@@ -0,0 +1,158 @@
+package adminstore
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"strings"
+
+	"github.com/baicai2026-baicai/goods/api/internal/gtin"
+	"github.com/jackc/pgx/v5"
+)
+
+// backflowSource is the value stored in submission.payload->>'source' for
+// records pushed by inventory-management software via the backflow API.
+const backflowSource = "backflow"
+
+// APIKeyAuth is the minimal key metadata needed to authenticate a backflow
+// caller. Only active (non-revoked) keys resolve.
+type APIKeyAuth struct {
+	ID   string
+	Name string
+}
+
+// APIKeyByHash returns the active key matching a SHA-256 hash, or ErrNotFound
+// when no such active key exists. Used to authenticate machine callers (e.g.
+// the backflow endpoint) with the same public API keys issued to API users.
+func (s *Store) APIKeyByHash(ctx context.Context, hash string) (*APIKeyAuth, error) {
+	var k APIKeyAuth
+	err := s.pool.QueryRow(ctx,
+		"SELECT id, name FROM api_key WHERE key_hash = $1 AND revoked_at IS NULL", hash,
+	).Scan(&k.ID, &k.Name)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, ErrNotFound
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &k, nil
+}
+
+// BackflowResult reports the outcome of one item in a backflow batch.
+type BackflowResult struct {
+	GTIN   *string `json:"gtin"`
+	Name   string  `json:"name"`
+	Status string  `json:"status"`       // queued | exists | duplicate | invalid
+	ID     string  `json:"id,omitempty"` // submission id when queued
+	Reason string  `json:"reason,omitempty"`
+}
+
+// BackflowSummary aggregates a backflow batch outcome.
+type BackflowSummary struct {
+	Total     int              `json:"total"`
+	Queued    int              `json:"queued"`
+	Exists    int              `json:"exists"`
+	Duplicate int              `json:"duplicate"`
+	Invalid   int              `json:"invalid"`
+	Results   []BackflowResult `json:"results"`
+}
+
+// CreateBackflowSubmissions enqueues products pushed by inventory software for
+// admin review. Each item is deduplicated by GTIN: items whose barcode already
+// matches an archived product are skipped ("exists"), and items that duplicate
+// a pending submission are skipped ("duplicate"). Accepted items are tagged
+// with source="backflow" and enter the same moderation queue as public
+// contributions; approval creates the product exactly as ApproveSubmission does.
+//
+// Items are processed independently: a bad item never rolls back accepted ones.
+func (s *Store) CreateBackflowSubmissions(ctx context.Context, items []SubmissionInput, remoteIP string) (BackflowSummary, error) {
+	sum := BackflowSummary{Total: len(items), Results: make([]BackflowResult, 0, len(items))}
+
+	for _, in := range items {
+		in.Name = strings.TrimSpace(in.Name)
+		res := BackflowResult{Name: in.Name}
+
+		if in.GTIN != nil {
+			g := strings.TrimSpace(*in.GTIN)
+			if g == "" {
+				in.GTIN = nil
+			} else {
+				// Validate/normalize so a malformed barcode is reported as an
+				// invalid item instead of aborting the batch (the gtin column
+				// is varchar(14) and only GS1 codes are archived).
+				norm, err := gtin.Normalize(g)
+				if err != nil {
+					res.GTIN = &g
+					res.Status = "invalid"
+					res.Reason = err.Error()
+					sum.Invalid++
+					sum.Results = append(sum.Results, res)
+					continue
+				}
+				in.GTIN = &norm
+				res.GTIN = &norm
+			}
+		}
+
+		if in.Name == "" {
+			res.Status = "invalid"
+			res.Reason = "商品名称不能为空"
+			sum.Invalid++
+			sum.Results = append(sum.Results, res)
+			continue
+		}
+
+		if in.GTIN != nil {
+			// Already archived: backflow only carries products we don't have yet.
+			var pid string
+			err := s.pool.QueryRow(ctx, "SELECT id FROM product WHERE gtin = $1", *in.GTIN).Scan(&pid)
+			if err == nil {
+				res.Status = "exists"
+				res.Reason = "该条码商品已收录"
+				sum.Exists++
+				sum.Results = append(sum.Results, res)
+				continue
+			} else if !errors.Is(err, pgx.ErrNoRows) {
+				return sum, err
+			}
+
+			// Collapse repeated auto-pushes of the same barcode in the queue.
+			var sid string
+			err = s.pool.QueryRow(ctx,
+				"SELECT id FROM submission WHERE gtin = $1 AND status = 'pending' LIMIT 1", *in.GTIN).Scan(&sid)
+			if err == nil {
+				res.Status = "duplicate"
+				res.Reason = "已有待审核的同条码回流记录"
+				res.ID = sid
+				sum.Duplicate++
+				sum.Results = append(sum.Results, res)
+				continue
+			} else if !errors.Is(err, pgx.ErrNoRows) {
+				return sum, err
+			}
+		}
+
+		src := backflowSource
+		in.Source = &src
+
+		payload, err := json.Marshal(in)
+		if err != nil {
+			return sum, err
+		}
+
+		var id string
+		err = s.pool.QueryRow(ctx, `
+INSERT INTO submission (gtin, name, payload, submitter_name, submitter_contact, note, remote_ip)
+VALUES ($1,$2,$3,$4,$5,$6,$7) RETURNING id`,
+			in.GTIN, in.Name, payload, in.SubmitterName, in.SubmitterContact, in.Note, remoteIP).Scan(&id)
+		if err != nil {
+			return sum, err
+		}
+		res.Status = "queued"
+		res.ID = id
+		sum.Queued++
+		sum.Results = append(sum.Results, res)
+	}
+
+	return sum, nil
+}

api/internal/adminstore/import_bypos.go

@@ -0,0 +1,217 @@
+package adminstore
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+
+	"github.com/jackc/pgx/v5"
+)
+
+type ByposRecord struct {
+	Barcode      string `json:"barcode"`
+	Name         string `json:"name"`
+	Spec         string `json:"spec"`
+	Unit         string `json:"unit"`
+	Area         string `json:"area"`
+	Manufacturer string `json:"manufacturer"`
+	License      string `json:"license"`
+	InPrice      string `json:"in_price"`
+	SellPrice    string `json:"sell_price"`
+	Status       string `json:"status"`
+	RetMsg       string `json:"retmsg"`
+	FetchedAt    string `json:"fetched_at"`
+	Source       string `json:"source"`
+}
+
+type ImportByposResult struct {
+	Loaded  int `json:"loaded"`
+	Skipped int `json:"skipped"`
+	Errored int `json:"errored"`
+}
+
+const byposSourceName = "bypos\u4e2d\u5fc3\u5e93"
+const byposSourceURL = "https://zc.bypos.net"
+
+func (s *Store) ensureByposSource(ctx context.Context, tx pgx.Tx) (string, error) {
+	var id string
+	err := tx.QueryRow(ctx, `
+INSERT INTO source (name, homepage, license, trust_weight)
+VALUES ($1, $2, 'proprietary', 0.6)
+ON CONFLICT (name) DO UPDATE SET homepage = EXCLUDED.homepage
+RETURNING id`, byposSourceName, byposSourceURL).Scan(&id)
+	return id, err
+}
+
+func (s *Store) ensureManufacturer(ctx context.Context, tx pgx.Tx, name string, country *string) (string, error) {
+	norm := strings.Join(strings.Fields(strings.ToLower(name)), " ")
+	var id string
+	err := tx.QueryRow(ctx, `
+INSERT INTO manufacturer (name, normalized_name, country)
+VALUES ($1, $2, $3)
+ON CONFLICT (normalized_name) DO UPDATE SET name = manufacturer.name
+RETURNING id`, name, norm, country).Scan(&id)
+	return id, err
+}
+
+func (s *Store) importByposRecord(ctx context.Context, tx pgx.Tx, rec ByposRecord, sourceID string) error {
+	if rec.Status != "hit" || strings.TrimSpace(rec.Name) == "" {
+		return nil
+	}
+
+	barcode := strings.TrimSpace(rec.Barcode)
+	name := strings.TrimSpace(rec.Name)
+
+	var country *string
+	if strings.HasPrefix(barcode, "69") {
+		c := "\u4e2d\u56fd"
+		country = &c
+	}
+
+	var manufacturerID *string
+	if mfr := strings.TrimSpace(rec.Manufacturer); mfr != "" {
+		mid, err := s.ensureManufacturer(ctx, tx, mfr, country)
+		if err != nil {
+			return err
+		}
+		manufacturerID = &mid
+	}
+
+	attrs := map[string]interface{}{}
+	if v := strings.TrimSpace(rec.Spec); v != "" {
+		attrs["spec"] = v
+	}
+	if v := strings.TrimSpace(rec.Unit); v != "" {
+		attrs["pack_unit"] = v
+	}
+	if v := strings.TrimSpace(rec.Area); v != "" {
+		attrs["origin_area"] = v
+	}
+	if v := strings.TrimSpace(rec.License); v != "" {
+		attrs["production_license"] = v
+	}
+	attrsJSON, _ := json.Marshal(attrs)
+
+	var productID string
+	if barcode != "" {
+		err := tx.QueryRow(ctx, `
+INSERT INTO product (gtin, name, manufacturer_id, country_of_origin, attributes, status)
+VALUES ($1, $2, $3, $4, $5, 'active')
+ON CONFLICT (gtin) WHERE gtin IS NOT NULL DO UPDATE SET
+    name = EXCLUDED.name,
+    manufacturer_id = COALESCE(EXCLUDED.manufacturer_id, product.manufacturer_id),
+    country_of_origin = COALESCE(EXCLUDED.country_of_origin, product.country_of_origin),
+    attributes = product.attributes || EXCLUDED.attributes
+RETURNING id`, barcode, name, manufacturerID, country, attrsJSON).Scan(&productID)
+		if err != nil {
+			return err
+		}
+	} else {
+		err := tx.QueryRow(ctx, `
+INSERT INTO product (name, manufacturer_id, country_of_origin, attributes, status)
+VALUES ($1, $2, $3, $4, 'active')
+RETURNING id`, name, manufacturerID, country, attrsJSON).Scan(&productID)
+		if err != nil {
+			return err
+		}
+	}
+
+	_, _ = tx.Exec(ctx, "DELETE FROM product_msrp WHERE product_id = $1 AND source_id = $2", productID, sourceID)
+	if sp := strings.TrimSpace(rec.SellPrice); sp != "" && sp != "0" {
+		_, _ = tx.Exec(ctx, `
+INSERT INTO product_msrp (product_id, amount, currency, region, source_id, source_url)
+VALUES ($1, $2::numeric, 'CNY', 'CN', $3, $4)`, productID, sp, sourceID, byposSourceURL)
+	}
+
+	_, _ = tx.Exec(ctx, "DELETE FROM product_source WHERE product_id = $1 AND source_id = $2", productID, sourceID)
+	fields := []string{"name", "country_of_origin"}
+	if manufacturerID != nil {
+		fields = append(fields, "manufacturer")
+	}
+	if len(attrs) > 0 {
+		fields = append(fields, "attributes")
+	}
+	if barcode != "" {
+		fields = append(fields, "gtin")
+	}
+	rawJSON, _ := json.Marshal(rec)
+	fetchedAt := strings.TrimSpace(rec.FetchedAt)
+	if fetchedAt == "" {
+		fetchedAt = ""
+	}
+
+	if fetchedAt != "" {
+		_, err := tx.Exec(ctx, `
+INSERT INTO product_source (product_id, source_id, url, fields, fetched_at, raw)
+VALUES ($1, $2, $3, $4, $5::timestamptz, $6)`,
+			productID, sourceID, byposSourceURL, fields, fetchedAt, rawJSON)
+		if err != nil {
+			return err
+		}
+	} else {
+		_, err := tx.Exec(ctx, `
+INSERT INTO product_source (product_id, source_id, url, fields, fetched_at, raw)
+VALUES ($1, $2, $3, $4, now(), $5)`,
+			productID, sourceID, byposSourceURL, fields, rawJSON)
+		if err != nil {
+			return err
+		}
+	}
+
+	if barcode != "" {
+		gtinType := "EAN13"
+		switch len(barcode) {
+		case 8:
+			gtinType = "EAN8"
+		case 12:
+			gtinType = "UPC"
+		case 14:
+			gtinType = "GTIN14"
+		}
+		_, _ = tx.Exec(ctx, `
+INSERT INTO product_barcode (product_id, gtin, gtin_type, pack_level, is_primary, source_id)
+VALUES ($1, $2, $3, 'each', true, $4)
+ON CONFLICT (gtin) DO NOTHING`, productID, barcode, gtinType, sourceID)
+	}
+
+	_, err := s.recomputeQualityTx(ctx, tx, productID)
+	return err
+}
+
+func (s *Store) ImportByposRecords(ctx context.Context, records []ByposRecord) (*ImportByposResult, error) {
+	result := &ImportByposResult{}
+	tx, err := s.pool.Begin(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback(ctx)
+
+	sourceID, err := s.ensureByposSource(ctx, tx)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, rec := range records {
+		if rec.Status != "hit" || strings.TrimSpace(rec.Name) == "" {
+			result.Skipped++
+			continue
+		}
+		sp, spErr := tx.Begin(ctx)
+		if spErr != nil {
+			result.Errored++
+			continue
+		}
+		if err := s.importByposRecord(ctx, sp, rec, sourceID); err != nil {
+			sp.Rollback(ctx)
+			result.Errored++
+		} else {
+			sp.Commit(ctx)
+			result.Loaded++
+		}
+	}
+
+	if err := tx.Commit(ctx); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

api/internal/adminstore/submission.go

@@ -31,6 +31,7 @@ type SubmissionInput struct {
 	CountryOfOrigin  *string           `json:"country_of_origin"`
 	IngredientsText  *string           `json:"ingredients_text"`
 	Nutriments       map[string]any    `json:"nutriments"`
+	Attributes       map[string]any    `json:"attributes"`
 	NutritionBasis   *string           `json:"nutrition_basis"`
 	ServingSize      *string           `json:"serving_size"`
 	NutriScore       *string           `json:"nutri_score"`
@@ -39,6 +40,10 @@ type SubmissionInput struct {
 	SubmitterName    *string           `json:"submitter_name"`
 	SubmitterContact *string           `json:"submitter_contact"`
 	Note             *string           `json:"note"`
+	// Source tags the origin of the submission, stored inside the payload so no
+	// schema change is needed. Empty means the default public contribution
+	// ("community"); "backflow" marks records pushed by inventory software.
+	Source *string `json:"source,omitempty"`
 }
 
 // SubmissionRow is a queue-list row for the admin review table.
@@ -48,6 +53,7 @@ type SubmissionRow struct {
 	Name          string  `json:"name"`
 	Status        string  `json:"status"`
 	SubmitterName *string `json:"submitter_name"`
+	Source        *string `json:"source"`
 	Matched       bool    `json:"matched"`
 	CreatedAt     string  `json:"created_at"`
 	ReviewedAt    *string `json:"reviewed_at"`
@@ -128,8 +134,8 @@ func (s *Store) ListSubmissions(ctx context.Context, status string, limit, offse
 
 	args = append(args, limit, offset)
 	sql := `
-SELECT id, gtin, name, status, submitter_name, (target_product_id IS NOT NULL),
-       created_at, reviewed_at
+SELECT id, gtin, name, status, submitter_name, NULLIF(payload->>'source',''),
+       (target_product_id IS NOT NULL), created_at, reviewed_at
 FROM submission ` + where +
 		" ORDER BY (status='pending') DESC, created_at DESC LIMIT $" +
 		strconv.Itoa(len(args)-1) + " OFFSET $" + strconv.Itoa(len(args))
@@ -145,7 +151,7 @@ FROM submission ` + where +
 		var r SubmissionRow
 		var created time.Time
 		var reviewed *time.Time
-		if err := rows.Scan(&r.ID, &r.GTIN, &r.Name, &r.Status, &r.SubmitterName, &r.Matched, &created, &reviewed); err != nil {
+		if err := rows.Scan(&r.ID, &r.GTIN, &r.Name, &r.Status, &r.SubmitterName, &r.Source, &r.Matched, &created, &reviewed); err != nil {
 			return nil, 0, err
 		}
 		r.CreatedAt = created.Format(time.RFC3339)
@@ -278,14 +284,19 @@ func (s *Store) ApproveSubmission(ctx context.Context, id, actor string) (*Produ
 
 	fields := submissionFields(in)
 
+	var attrJSON []byte
+	if len(in.Attributes) > 0 {
+		attrJSON, _ = json.Marshal(in.Attributes)
+	}
+
 	if productID == "" {
 		// Create a new product from the contribution.
 		err = tx.QueryRow(ctx, `
 INSERT INTO product (gtin, name, brand_id, category_id, gpc_brick_code,
-   net_content_value, net_content_unit, net_content_canonical, country_of_origin, status)
-VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,'active') RETURNING id`,
+   net_content_value, net_content_unit, net_content_canonical, country_of_origin, attributes, status)
+VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,COALESCE($10::jsonb,'{}'::jsonb),'active') RETURNING id`,
 			in.GTIN, in.Name, brandID, in.CategoryID, gpc,
-			in.NetContentValue, in.NetContentUnit, canonical, in.CountryOfOrigin).Scan(&productID)
+			in.NetContentValue, in.NetContentUnit, canonical, in.CountryOfOrigin, attrJSON).Scan(&productID)
 		if err != nil {
 			return nil, err
 		}
@@ -302,21 +313,29 @@ UPDATE product SET
    net_content_unit=COALESCE($7, net_content_unit),
    net_content_canonical=COALESCE($8, net_content_canonical),
    country_of_origin=COALESCE($9, country_of_origin),
-   gtin=COALESCE($10, gtin)
+   gtin=COALESCE($10, gtin),
+   attributes=product.attributes || COALESCE($11::jsonb,'{}'::jsonb)
 WHERE id=$1`,
 			productID, in.Name, brandID, in.CategoryID, gpc,
-			in.NetContentValue, in.NetContentUnit, canonical, in.CountryOfOrigin, in.GTIN)
+			in.NetContentValue, in.NetContentUnit, canonical, in.CountryOfOrigin, in.GTIN, attrJSON)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	// food_detail: upsert, preserving existing values where not provided.
+	// food_detail: upsert only when the contribution carries food data, so a
+	// non-food submission (drug/3C/generic) doesn't create an empty row.
 	var nutriJSON []byte
 	if len(in.Nutriments) > 0 {
 		nutriJSON, _ = json.Marshal(in.Nutriments)
 	}
-	_, err = tx.Exec(ctx, `
+	foodPresent := len(in.Nutriments) > 0 ||
+		(in.IngredientsText != nil && *in.IngredientsText != "") ||
+		(in.NutritionBasis != nil && *in.NutritionBasis != "") ||
+		(in.ServingSize != nil && *in.ServingSize != "") ||
+		(in.NutriScore != nil && *in.NutriScore != "")
+	if foodPresent {
+		_, err = tx.Exec(ctx, `
 INSERT INTO food_detail (product_id, ingredients_text, nutriments, nutrition_basis, serving_size, nutri_score)
 VALUES ($1,$2,$3,$4,$5,$6)
 ON CONFLICT (product_id) DO UPDATE SET
@@ -325,9 +344,10 @@ ON CONFLICT (product_id) DO UPDATE SET
    nutrition_basis=COALESCE(EXCLUDED.nutrition_basis, food_detail.nutrition_basis),
    serving_size=COALESCE(EXCLUDED.serving_size, food_detail.serving_size),
    nutri_score=COALESCE(EXCLUDED.nutri_score, food_detail.nutri_score)`,
-		productID, in.IngredientsText, nutriJSON, in.NutritionBasis, in.ServingSize, in.NutriScore)
-	if err != nil {
-		return nil, err
+			productID, in.IngredientsText, nutriJSON, in.NutritionBasis, in.ServingSize, in.NutriScore)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	for _, im := range in.Images {
@@ -417,5 +437,14 @@ func submissionFields(in SubmissionInput) []string {
 	add("ingredients", in.IngredientsText != nil && *in.IngredientsText != "")
 	add("nutriments", len(in.Nutriments) > 0)
 	add("image", len(in.Images) > 0)
+	for k, v := range in.Attributes {
+		if v == nil {
+			continue
+		}
+		if s, ok := v.(string); ok && s == "" {
+			continue
+		}
+		fields = append(fields, k)
+	}
 	return fields
 }

api/internal/handler/handler.go

@@ -127,6 +127,7 @@ func (h *Handler) Router() http.Handler {
 			})
 			r.Get("/brands", h.ListBrands)
 			r.Get("/categories", h.ListCategories)
+			r.Get("/kind-fields", h.ListKindFields)
 			r.Get("/sources/{id}", h.SourceByID)
 			r.Get("/stats", h.Stats)
 		})
@@ -275,6 +276,21 @@ func (h *Handler) ListCategories(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, map[string]any{"items": items})
 }
 
+// ListKindFields returns the read-only spec field template for an archive kind,
+// used by the contribution form to render kind-specific inputs.
+func (h *Handler) ListKindFields(w http.ResponseWriter, r *http.Request) {
+	kind := strings.TrimSpace(r.URL.Query().Get("kind"))
+	if kind == "" {
+		writeError(w, r, http.StatusBadRequest, "bad_request", "missing kind")
+		return
+	}
+	items, err := h.store.ListKindFields(r.Context(), kind)
+	if h.handleErr(w, r, err) {
+		return
+	}
+	writeJSON(w, http.StatusOK, map[string]any{"items": items, "kind": kind})
+}
+
 // SourceByID returns a single data source.
 func (h *Handler) SourceByID(w http.ResponseWriter, r *http.Request) {
 	src, err := h.store.SourceByID(r.Context(), chi.URLParam(r, "id"))

api/internal/handler/openapi.json

@@ -208,7 +208,22 @@
           "nutriments": { "type": "object", "additionalProperties": true, "nullable": true },
           "nutrition_basis": { "type": "string", "nullable": true },
           "nutri_score": { "type": "string", "nullable": true },
-          "ingredients_text": { "type": "string", "nullable": true }
+          "ingredients_text": { "type": "string", "nullable": true },
+          "msrp": {
+            "type": "array",
+            "description": "Manufacturer suggested retail price snapshots (reference only, newest first; zero-amount entries omitted).",
+            "items": {
+              "type": "object",
+              "properties": {
+                "amount": { "type": "number" },
+                "currency": { "type": "string" },
+                "region": { "type": "string" },
+                "effective_date": { "type": "string", "nullable": true },
+                "source_url": { "type": "string", "nullable": true },
+                "note": { "type": "string", "nullable": true }
+              }
+            }
+          }
         }
       }
     }

api/internal/store/store.go

@@ -126,6 +126,7 @@ type Product struct {
 	Ingredients     *string        `json:"ingredients_text,omitempty"`
 	Allergens       []string       `json:"allergens,omitempty"`
 	Additives       []string       `json:"additives,omitempty"`
+	MSRP            []MSRP         `json:"msrp,omitempty"`
 }
 
 // ProductBarcodes returns every barcode attached to a product, primary first.
@@ -280,6 +281,9 @@ func (s *Store) ProductByGTIN(ctx context.Context, gtin string) (*Product, error
 	if p.Specs, err = s.buildSpecs(ctx, p.ArchiveKind, attrs); err != nil {
 		return nil, err
 	}
+	if p.MSRP, err = s.ListMSRP(ctx, p.ID); err != nil {
+		return nil, err
+	}
 	s.cacheSet(ctx, suffix+gtin, p, productCacheTTL)
 	return p, nil
 }
@@ -301,6 +305,9 @@ func (s *Store) ProductByID(ctx context.Context, id string) (*Product, error) {
 	if p.Specs, err = s.buildSpecs(ctx, p.ArchiveKind, attrs); err != nil {
 		return nil, err
 	}
+	if p.MSRP, err = s.ListMSRP(ctx, p.ID); err != nil {
+		return nil, err
+	}
 	s.cacheSet(ctx, suffix+id, p, productCacheTTL)
 	return p, nil
 }
@@ -445,11 +452,12 @@ type MSRP struct {
 	Note          *string `json:"note"`
 }
 
-// ListMSRP returns all MSRP snapshots for a product.
+// ListMSRP returns a product's suggested-retail-price snapshots, newest first.
+// Zero-amount entries are excluded as they carry no price information.
 func (s *Store) ListMSRP(ctx context.Context, id string) ([]MSRP, error) {
 	rows, err := s.pool.Query(ctx,
 		`SELECT amount, currency, region, effective_date::text, source_url, note
-		 FROM product_msrp WHERE product_id = $1 ORDER BY effective_date DESC NULLS LAST`, id)
+		 FROM product_msrp WHERE product_id = $1 AND amount > 0 ORDER BY effective_date DESC NULLS LAST`, id)
 	if err != nil {
 		return nil, err
 	}
@@ -501,12 +509,13 @@ type Category struct {
 	Path         string  `json:"path"`
 	GPCBrickCode *string `json:"gpc_brick_code"`
 	Level        int     `json:"level"`
+	ArchiveKind  string  `json:"archive_kind"`
 }
 
 // ListCategories returns the full category tree ordered by path.
 func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
 	rows, err := s.pool.Query(ctx,
-		"SELECT id, name_zh, name_en, path::text, gpc_brick_code, level FROM category ORDER BY path")
+		"SELECT id, name_zh, name_en, path::text, gpc_brick_code, level, COALESCE(archive_kind, 'generic') FROM category ORDER BY path")
 	if err != nil {
 		return nil, err
 	}
@@ -514,7 +523,7 @@ func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
 	out := []Category{}
 	for rows.Next() {
 		var c Category
-		if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.GPCBrickCode, &c.Level); err != nil {
+		if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.GPCBrickCode, &c.Level, &c.ArchiveKind); err != nil {
 			return nil, err
 		}
 		out = append(out, c)
@@ -522,6 +531,45 @@ func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
 	return out, rows.Err()
 }
 
+// KindField describes one editable spec field for an archive kind. It drives
+// the dynamic contribution form (public, read-only view of the template).
+type KindField struct {
+	Kind        string   `json:"kind"`
+	FieldKey    string   `json:"field_key"`
+	GroupLabel  string   `json:"group_label"`
+	LabelZH     string   `json:"label_zh"`
+	FieldType   string   `json:"field_type"`
+	Unit        *string  `json:"unit"`
+	Options     []string `json:"options"`
+	Placeholder *string  `json:"placeholder"`
+	SortOrder   int      `json:"sort_order"`
+	Qualified   bool     `json:"qualified"`
+}
+
+// ListKindFields returns the ordered field template for one archive kind so the
+// public contribution form can render kind-specific inputs.
+func (s *Store) ListKindFields(ctx context.Context, kind string) ([]KindField, error) {
+	rows, err := s.pool.Query(ctx, `
+SELECT kind, field_key, group_label, label_zh, field_type, unit, options,
+       placeholder, sort_order, qualified
+FROM kind_field WHERE kind = $1 ORDER BY sort_order, field_key`, kind)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []KindField{}
+	for rows.Next() {
+		var f KindField
+		if err := rows.Scan(&f.Kind, &f.FieldKey, &f.GroupLabel, &f.LabelZH,
+			&f.FieldType, &f.Unit, &f.Options, &f.Placeholder, &f.SortOrder,
+			&f.Qualified); err != nil {
+			return nil, err
+		}
+		out = append(out, f)
+	}
+	return out, rows.Err()
+}
+
 // APIKey is the minimal metadata the public API needs to authorize a caller.
 type APIKey struct {
 	ID              string

docs/api.md

@@ -112,6 +112,64 @@ curl "https://goods.tangshasha.com/api/v1/products/barcode/5449000000996"
 
 ### `GET /sources/{id}` — 数据来源
 
+## 档案回流（写接口，需 API Key）
+
+> 仅供进销存等机器调用方使用：把档案里**尚未收录**的商品批量回流到站点，进入人工审核队列，审核通过后才会收录。**必须携带 API Key**（与上文同一类 `og_live_` 密钥），不会直接写入商品。
+
+### `POST /api/public/backflow` — 批量回流未收录商品
+
+- 鉴权：请求头携带 `X-API-Key: og_live_xxxxxxxx`（或 `Authorization: Bearer og_live_xxxxxxxx`）。缺失/无效/已吊销返回 `401`。
+- 请求体：商品对象**数组**（与公众投稿同结构），单次最多 `1000` 条。常用字段：
+
+| 字段 | 必填 | 说明 |
+| --- | --- | --- |
+| `name` | 是 | 商品名称 |
+| `gtin` | 否 | 条码（GTIN）。强烈建议提供，用于去重 |
+| `brand_name` | 否 | 品牌名 |
+| `category_id` | 否 | 品类编码，如 `food.beverages` |
+| `net_content_value` / `net_content_unit` | 否 | 净含量数值 / 单位 |
+| `country_of_origin` | 否 | 产地 |
+| `ingredients_text` | 否 | 配料表 |
+| `nutriments` | 否 | 营养成分对象 |
+| `msrp` | 否 | 零售价快照数组，元素含 `amount`/`currency`/`region`/`effective_date` |
+| `note` | 否 | 备注 |
+
+> 来源会自动标记为 `source="backflow"`，在后台审核队列中与公众投稿区分，无需调用方提供。
+
+- 去重（按 `gtin` 逐条判断，互不影响）：
+  - 该条码已收录为商品 → `exists`，跳过；
+  - 已存在同条码的待审核回流 → `duplicate`，跳过（避免反复刷队列）；
+  - 否则入队 → `queued`（status=`pending`，等待后台审核）；
+  - 名称为空等 → `invalid`。
+
+```bash
+curl -X POST "https://goods.tangshasha.com/api/public/backflow" \
+  -H "X-API-Key: og_live_xxxxxxxx" \
+  -H "Content-Type: application/json" \
+  -d '[
+    {"name":"某某牛奶 250ml","gtin":"6901234567890","brand_name":"某品牌",
+     "net_content_value":250,"net_content_unit":"ml",
+     "msrp":[{"amount":3.5,"currency":"CNY","region":"CN"}]},
+    {"name":"已收录商品","gtin":"5449000000996"}
+  ]'
+```
+
+```json
+{
+  "total": 2,
+  "queued": 1,
+  "exists": 1,
+  "duplicate": 0,
+  "invalid": 0,
+  "results": [
+    { "gtin": "6901234567890", "name": "某某牛奶 250ml", "status": "queued", "id": "<submission-id>" },
+    { "gtin": "5449000000996", "name": "已收录商品", "status": "exists", "reason": "该条码商品已收录" }
+  ]
+}
+```
+
+审核通过后，系统按提交内容**新建商品**；若审核时该条码已存在商品，则**补全**到已有商品（逻辑与公众投稿一致）。
+
 ## 免责声明
 
 数据可能存在误差或滞后，按「现状」提供，不构成医疗/购买建议。商品资料版权归各原始来源所有，请遵循其许可（如 OpenFoodFacts 的 ODbL），引用时请注明天工商品档案公共仓及原始来源。

migrations/0013_drug_archive_kind.down.sql

@@ -0,0 +1,8 @@
+-- Reverse 0013: detach products from the seeded drug categories, drop the drug
+-- category subtree, and remove the drug field template.
+UPDATE product SET category_id = NULL
+WHERE category_id IN (SELECT id FROM category WHERE path <@ 'drug');
+
+DELETE FROM category WHERE path <@ 'drug';
+
+DELETE FROM kind_field WHERE kind = 'drug';

migrations/0013_drug_archive_kind.up.sql

@@ -0,0 +1,43 @@
+-- Drug (药品) archive kind: a new domain on the generic archive_kind framework
+-- (see 0010). No new table — drug spec values live in product.attributes JSONB,
+-- driven by the kind_field template below, plus a 'drug' category subtree.
+
+-- Field template for the drug domain. field_type is constrained to
+-- text/number/textarea/select/list by kind_field_type_chk. The `qualified`
+-- fields are the identifying / regulatory essentials that count toward the
+-- kind-aware completeness score.
+INSERT INTO kind_field (kind, field_key, group_label, label_zh, field_type, unit, options, sort_order, qualified) VALUES
+('drug','approval_number',    '基础信息','批准文号',        'text',     NULL, '{}',                                  10, true),
+('drug','generic_name',       '基础信息','通用名',          'text',     NULL, '{}',                                  20, true),
+('drug','trade_name',         '基础信息','商品名',          'text',     NULL, '{}',                                  30, false),
+('drug','dosage_form',        '基础信息','剂型',            'select',   NULL, '{片剂,胶囊剂,颗粒剂,散剂,丸剂,注射剂,口服液,糖浆剂,软膏剂,乳膏剂,凝胶剂,滴剂,喷雾剂,气雾剂,栓剂,贴剂,其他}', 40, true),
+('drug','specification',      '基础信息','规格',            'text',     NULL, '{}',                                  50, true),
+('drug','pack_spec',          '基础信息','包装规格',        'text',     NULL, '{}',                                  60, false),
+('drug','rx_class',           '分类与企业','处方分类',      'select',   NULL, '{处方药,甲类OTC,乙类OTC}',            70, true),
+('drug','manufacturer',       '分类与企业','生产企业',      'text',     NULL, '{}',                                  80, true),
+('drug','mah',                '分类与企业','上市许可持有人','text',     NULL, '{}',                                  90, false),
+('drug','indications',        '说明书','适应症/功能主治',   'textarea', NULL, '{}',                                 100, true),
+('drug','dosage_usage',       '说明书','用法用量',          'textarea', NULL, '{}',                                 110, false),
+('drug','adverse_reactions',  '说明书','不良反应',          'textarea', NULL, '{}',                                 120, false),
+('drug','contraindications',  '说明书','禁忌',              'textarea', NULL, '{}',                                 130, false),
+('drug','precautions',        '说明书','注意事项',          'textarea', NULL, '{}',                                 140, false),
+('drug','interactions',       '说明书','药物相互作用',      'textarea', NULL, '{}',                                 150, false),
+('drug','storage',            '贮藏与有效期','贮藏',        'text',     NULL, '{}',                                 160, false),
+('drug','shelf_life',         '贮藏与有效期','有效期',      'text',     NULL, '{}',                                 170, false),
+('drug','spec_source',        '贮藏与有效期','说明书来源',  'text',     NULL, '{}',                                 180, false);
+
+-- Drug category tree. ltree labels are English slugs (no spaces/Chinese);
+-- Chinese names live in category.name_zh.
+INSERT INTO category (name_zh, name_en, parent_id, path, level, archive_kind)
+VALUES ('药品', 'Drug', NULL, 'drug', 0, 'drug');
+
+INSERT INTO category (name_zh, name_en, parent_id, path, level, archive_kind)
+SELECT v.name_zh, v.name_en, c.id, v.path::ltree, 1, 'drug'
+FROM (VALUES
+    ('化学药品',   'Chemical drug',            'drug.chemical'),
+    ('中成药',     'Chinese patent medicine',  'drug.tcm_patent'),
+    ('中药饮片',   'Chinese herbal pieces',    'drug.tcm_herb'),
+    ('生物制品',   'Biological product',       'drug.biological'),
+    ('疫苗',       'Vaccine',                  'drug.vaccine')
+) AS v(name_zh, name_en, path)
+JOIN category c ON c.path = 'drug';

public-frontend/src/api.ts

@@ -1,4 +1,4 @@
-import type { Category, Product, ProductSummary, SubmissionInput } from "./types";
+import type { Category, KindField, Product, ProductSummary, SubmissionInput } from "./types";
 
 async function req<T>(path: string, init?: RequestInit): Promise<T> {
   const res = await fetch(path, {
@@ -67,6 +67,10 @@ export const api = {
   },
   product: (id: string) => req<Product>(`/api/v1/products/${id}`),
   categories: () => req<{ items: Category[] }>(`/api/v1/categories`),
+  kindFields: (kind: string) =>
+    req<{ items: KindField[]; kind: string }>(
+      `/api/v1/kind-fields?kind=${encodeURIComponent(kind)}`,
+    ),
   submit: (input: SubmissionInput) =>
     req<{ id: string; status: string }>(`/api/public/submissions`, {
       method: "POST",

public-frontend/src/components/ApiDocs.tsx

@@ -343,6 +343,41 @@ curl -H "Authorization: Bearer og_live_xxxxxxxx" ${BASE}/products/search?q=牛
 }`}
       />
 
+      <Endpoint
+        method="POST"
+        path="/api/public/backflow"
+        title="档案回流（批量回流未收录商品，需 API Key）"
+        desc="供进销存等机器调用方使用：把档案里尚未收录的商品批量推送过来，进入人工审核队列，审核通过后才收录。必须携带 API Key（与上文同一类 og_live_ 密钥），不会直接写入商品。请求体为商品对象数组（与公众投稿同结构），单次最多 1000 条；按条码 GTIN 逐条去重，返回每条结果：queued（入队待审）/ exists（已收录跳过）/ duplicate（已有同条码待审跳过）/ invalid（无效，如名称为空）。"
+        params={[
+          { name: "name", required: true, desc: "商品名称（数组中每个元素）" },
+          { name: "gtin", desc: "条码（GTIN），强烈建议提供，用于去重" },
+          { name: "brand_name", desc: "品牌名" },
+          { name: "category_id", desc: "品类编码，如 food.beverages" },
+          { name: "net_content_value / net_content_unit", desc: "净含量数值 / 单位" },
+          { name: "country_of_origin", desc: "产地" },
+          { name: "msrp", desc: "零售价快照数组，元素含 amount/currency/region/effective_date" },
+          { name: "note", desc: "备注" },
+        ]}
+        example={`curl -X POST ${ORIGIN}/api/public/backflow \\
+  -H "X-API-Key: og_live_xxxxxxxx" \\
+  -H "Content-Type: application/json" \\
+  -d '[
+    {"name":"某某牛奶 250ml","gtin":"6901234567890","brand_name":"某品牌",
+     "net_content_value":250,"net_content_unit":"ml",
+     "msrp":[{"amount":3.5,"currency":"CNY","region":"CN"}]},
+    {"name":"已收录商品","gtin":"5449000000996"}
+  ]'`}
+        response={`{
+  "total": 2, "queued": 1, "exists": 1, "duplicate": 0, "invalid": 0,
+  "results": [
+    { "gtin": "6901234567890", "name": "某某牛奶 250ml",
+      "status": "queued", "id": "<submission-id>" },
+    { "gtin": "5449000000996", "name": "已收录商品",
+      "status": "exists", "reason": "该条码商品已收录" }
+  ]
+}`}
+      />
+
       <Endpoint
         method="POST"
         path="/api/v1/register"

public-frontend/src/components/Contribute.tsx

@@ -1,7 +1,7 @@
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { CheckCircle2, PlusCircle, Trash2 } from "lucide-react";
 import { api } from "../api";
-import type { Category, SubmissionImage, SubmissionInput } from "../types";
+import type { Category, KindField, SubmissionImage, SubmissionInput } from "../types";
 
 const NUTRI_FIELDS: { key: string; label: string }[] = [
   { key: "energy_kcal", label: "能量 (kcal)" },
@@ -35,6 +35,8 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
   const [ingredients, setIngredients] = useState("");
   const [basis, setBasis] = useState("");
   const [nutri, setNutri] = useState<Record<string, string>>({});
+  const [kindFields, setKindFields] = useState<KindField[]>([]);
+  const [attrs, setAttrs] = useState<Record<string, string>>({});
   const [images, setImages] = useState<SubmissionImage[]>([]);
   const [imageURL, setImageURL] = useState("");
   const [submitter, setSubmitter] = useState("");
@@ -45,6 +47,33 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
     api.categories().then((r) => setCategories(r.items)).catch(() => undefined);
   }, []);
 
+  // Derive the archive kind from the selected category. No category => generic.
+  const kind = useMemo(() => {
+    const c = categories.find((x) => x.id === categoryID);
+    return c?.archive_kind || "generic";
+  }, [categories, categoryID]);
+
+  // Fetch the kind-specific field template for non-food kinds.
+  useEffect(() => {
+    setAttrs({});
+    if (kind === "food" || kind === "generic") {
+      setKindFields([]);
+      return;
+    }
+    let alive = true;
+    api
+      .kindFields(kind)
+      .then((r) => {
+        if (alive) setKindFields(r.items);
+      })
+      .catch(() => {
+        if (alive) setKindFields([]);
+      });
+    return () => {
+      alive = false;
+    };
+  }, [kind]);
+
   async function submit(e: React.FormEvent) {
     e.preventDefault();
     if (name.trim() === "") {
@@ -55,9 +84,31 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
     setError("");
 
     const nutriments: Record<string, number> = {};
-    for (const [k, v] of Object.entries(nutri)) {
-      const n = parseFloat(v);
-      if (!Number.isNaN(n)) nutriments[k] = n;
+    if (kind === "food") {
+      for (const [k, v] of Object.entries(nutri)) {
+        const n = parseFloat(v);
+        if (!Number.isNaN(n)) nutriments[k] = n;
+      }
+    }
+
+    const attributes: Record<string, unknown> = {};
+    if (kind !== "food" && kind !== "generic") {
+      for (const f of kindFields) {
+        const raw = (attrs[f.field_key] || "").trim();
+        if (raw === "") continue;
+        if (f.field_type === "number") {
+          const n = parseFloat(raw);
+          if (!Number.isNaN(n)) attributes[f.field_key] = n;
+        } else if (f.field_type === "list") {
+          const parts = raw
+            .split(/[\n,，、]/)
+            .map((s) => s.trim())
+            .filter((s) => s !== "");
+          if (parts.length) attributes[f.field_key] = parts;
+        } else {
+          attributes[f.field_key] = raw;
+        }
+      }
     }
 
     const input: SubmissionInput = {
@@ -68,9 +119,10 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
       net_content_value: field(netValue) ? parseFloat(netValue) : null,
       net_content_unit: field(netUnit),
       country_of_origin: field(country),
-      ingredients_text: field(ingredients),
+      ingredients_text: kind === "food" ? field(ingredients) : null,
       nutriments: Object.keys(nutriments).length ? nutriments : null,
-      nutrition_basis: basis || null,
+      attributes: Object.keys(attributes).length ? attributes : null,
+      nutrition_basis: kind === "food" && basis ? basis : null,
       images: images.length ? images : undefined,
       submitter_name: field(submitter),
       submitter_contact: field(contact),
@@ -107,11 +159,66 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
   const input = "input";
   const label = "block text-xs font-medium text-gray-500 mb-1";
 
+  // Group the kind fields by their group label, preserving template order.
+  const groups: { label: string; fields: KindField[] }[] = [];
+  for (const f of kindFields) {
+    let g = groups.find((x) => x.label === f.group_label);
+    if (!g) {
+      g = { label: f.group_label, fields: [] };
+      groups.push(g);
+    }
+    g.fields.push(f);
+  }
+
+  const KIND_LABEL: Record<string, string> = {
+    drug: "药品",
+    electronics: "数码 3C",
+    food: "食品",
+    generic: "通用",
+  };
+
+  function renderField(f: KindField) {
+    const val = attrs[f.field_key] || "";
+    const set = (v: string) => setAttrs((p) => ({ ...p, [f.field_key]: v }));
+    const lbl = f.unit ? `${f.label_zh} (${f.unit})` : f.label_zh;
+    return (
+      <div key={f.field_key} className={f.field_type === "textarea" || f.field_type === "list" ? "sm:col-span-2" : ""}>
+        <label className={label}>
+          {lbl}
+          {f.qualified && <span className="text-brand-500"> *</span>}
+        </label>
+        {f.field_type === "select" ? (
+          <select className={input} value={val} onChange={(e) => set(e.target.value)}>
+            <option value="">（未选择）</option>
+            {(f.options || []).map((o) => (
+              <option key={o} value={o}>
+                {o}
+              </option>
+            ))}
+          </select>
+        ) : f.field_type === "textarea" ? (
+          <textarea className={input} rows={3} value={val} placeholder={f.placeholder || ""} onChange={(e) => set(e.target.value)} />
+        ) : f.field_type === "list" ? (
+          <textarea className={input} rows={2} value={val} placeholder={f.placeholder || "每行一项，或用、逗号分隔"} onChange={(e) => set(e.target.value)} />
+        ) : (
+          <input
+            type={f.field_type === "number" ? "number" : "text"}
+            step={f.field_type === "number" ? "any" : undefined}
+            className={input}
+            value={val}
+            placeholder={f.placeholder || ""}
+            onChange={(e) => set(e.target.value)}
+          />
+        )}
+      </div>
+    );
+  }
+
   return (
     <form onSubmit={submit} className="max-w-3xl mx-auto animate-fade-up">
       <h1 className="text-2xl font-semibold tracking-tight text-gray-900">贡献商品档案</h1>
       <p className="mt-1 text-sm text-gray-500">
-        任何人都可以提交新商品资料。提交后会进入审核队列，<b>通过人工审核后才会收纳</b>。带 * 为必填。
+        任何人都可以提交新商品资料。提交后会进入审核队列，<b>通过人工审核后才会收纳</b>。除商品名称外均为选填，按品类填写对应资料即可。
       </p>
 
       {error && (
@@ -143,6 +250,11 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
                 </option>
               ))}
             </select>
+            {categoryID && (
+              <p className="mt-1 text-xs text-gray-400">
+                档案类型：{KIND_LABEL[kind] || kind}
+              </p>
+            )}
           </div>
           <div>
             <label className={label}>产地</label>
@@ -165,39 +277,56 @@ export default function Contribute({ onDone }: { onDone: () => void }) {
         </div>
       </div>
 
-      <div className="card p-5 mt-4">
-        <h2 className="font-medium text-gray-700 mb-3">配料与营养</h2>
-        <label className={label}>配料表</label>
-        <textarea
-          className={input}
-          rows={3}
-          value={ingredients}
-          onChange={(e) => setIngredients(e.target.value)}
-        />
-        <div className="mt-3">
-          <label className={label}>营养基准</label>
-          <select className={input} value={basis} onChange={(e) => setBasis(e.target.value)}>
-            <option value="">（未设置）</option>
-            <option value="per_100g">每 100g</option>
-            <option value="per_100ml">每 100ml</option>
-            <option value="per_serving">每份</option>
-          </select>
+      {kind === "food" && (
+        <div className="card p-5 mt-4">
+          <h2 className="font-medium text-gray-700 mb-3">配料与营养</h2>
+          <label className={label}>配料表</label>
+          <textarea
+            className={input}
+            rows={3}
+            value={ingredients}
+            onChange={(e) => setIngredients(e.target.value)}
+          />
+          <div className="mt-3">
+            <label className={label}>营养基准</label>
+            <select className={input} value={basis} onChange={(e) => setBasis(e.target.value)}>
+              <option value="">（未设置）</option>
+              <option value="per_100g">每 100g</option>
+              <option value="per_100ml">每 100ml</option>
+              <option value="per_serving">每份</option>
+            </select>
+          </div>
+          <div className="grid grid-cols-2 sm:grid-cols-4 gap-3 mt-3">
+            {NUTRI_FIELDS.map((f) => (
+              <div key={f.key}>
+                <label className={label}>{f.label}</label>
+                <input
+                  type="number"
+                  step="any"
+                  className={input}
+                  value={nutri[f.key] || ""}
+                  onChange={(e) => setNutri({ ...nutri, [f.key]: e.target.value })}
+                />
+              </div>
+            ))}
+          </div>
         </div>
-        <div className="grid grid-cols-2 sm:grid-cols-4 gap-3 mt-3">
-          {NUTRI_FIELDS.map((f) => (
-            <div key={f.key}>
-              <label className={label}>{f.label}</label>
-              <input
-                type="number"
-                step="any"
-                className={input}
-                value={nutri[f.key] || ""}
-                onChange={(e) => setNutri({ ...nutri, [f.key]: e.target.value })}
-              />
+      )}
+
+      {kind !== "food" && kind !== "generic" && kindFields.length > 0 && (
+        <div className="card p-5 mt-4">
+          <h2 className="font-medium text-gray-700 mb-1">{KIND_LABEL[kind] || kind}资料</h2>
+          <p className="text-xs text-gray-400 mb-3">带 * 为该品类的关键字段，建议尽量填写。</p>
+          {groups.map((g) => (
+            <div key={g.label} className="mt-3 first:mt-0">
+              {g.label && <h3 className="text-xs font-semibold text-gray-400 mb-2">{g.label}</h3>}
+              <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                {g.fields.map(renderField)}
+              </div>
             </div>
           ))}
         </div>
-      </div>
+      )}
 
       <div className="card p-5 mt-4">
         <h2 className="font-medium text-gray-700 mb-3">图片（仅填 URL）</h2>

public-frontend/src/components/Home.tsx

@@ -1,28 +1,8 @@
 import { useState } from "react";
-import { Search, PlusCircle, Code2, ScanBarcode, ShieldCheck, ArrowRight } from "lucide-react";
+import { Search, PlusCircle, ArrowRight } from "lucide-react";
 import { api } from "../api";
 import type { ProductSummary } from "../types";
 
-const EXAMPLES = ["可乐", "Nutella", "牛奶", "5449000000996"];
-
-const FEATURES = [
-  {
-    icon: Search,
-    title: "客观可查",
-    desc: "按名称或条码检索商品的成分、营养、规格等官方事实。",
-  },
-  {
-    icon: ShieldCheck,
-    title: "可溯源",
-    desc: "每条资料标注数据来源与质量分，公开透明、人人可核。",
-  },
-  {
-    icon: Code2,
-    title: "开放 API",
-    desc: "免鉴权只读 REST 接口，开发者可直接接入商品档案。",
-  },
-];
-
 export default function Home({
   onOpen,
   onContribute,
@@ -57,47 +37,47 @@ export default function Home({
 
   return (
     <div className="animate-fade-up">
-      <section className="relative overflow-hidden rounded-3xl border border-gray-100 bg-gradient-to-b from-white to-brand-50/40 px-6 py-14 text-center shadow-card">
-        <div
-          aria-hidden
-          className="pointer-events-none absolute -top-24 left-1/2 h-72 w-[42rem] -translate-x-1/2 rounded-full bg-brand-200/30 blur-3xl"
-        />
-        <div className="relative">
-          <span className="inline-flex items-center gap-1.5 rounded-full border border-brand-200 bg-white/70 px-3 py-1 text-xs font-medium text-brand-700">
-            <ShieldCheck className="w-3.5 h-3.5" /> 公益 · 开放 · 可溯源
-          </span>
-          <h1 className="mt-5 text-4xl sm:text-5xl font-extrabold tracking-tight text-gray-900">
-            天<span className="bg-gradient-to-r from-brand-600 to-emerald-500 bg-clip-text text-transparent">工</span>
-          </h1>
-          <p className="mx-auto mt-3 max-w-xl text-gray-500">
-            输入商品名称或条码，检索客观、可溯源的商品资料。人人可查，人人可贡献。
-          </p>
+      <section
+        className={`flex flex-col items-center px-4 text-center ${
+          searched
+            ? "pt-2 pb-6"
+            : "min-h-[calc(100vh-12rem)] justify-center"
+        }`}
+      >
+        <h1
+          className={`font-medium tracking-tight text-gray-800 ${
+            searched ? "text-3xl" : "text-6xl sm:text-7xl"
+          }`}
+        >
+          天<span className="text-brand-600">工</span>
+        </h1>
 
-          <form onSubmit={(e) => run(undefined, e)} className="mx-auto mt-7 flex max-w-2xl gap-2">
-            <div className="flex flex-1 items-center gap-2 rounded-xl border border-gray-200 bg-white px-3.5 shadow-sm transition focus-within:border-brand-400 focus-within:ring-4 focus-within:ring-brand-500/10">
-              <Search className="h-5 w-5 shrink-0 text-gray-400" />
-              <input
-                autoFocus
-                value={q}
-                onChange={(e) => setQ(e.target.value)}
-                placeholder="例如：可乐、Nutella、5449000000996"
-                className="flex-1 bg-transparent py-3.5 outline-none"
-              />
-            </div>
-            <button type="submit" disabled={loading} className="btn-primary px-7">
-              {loading ? "检索中…" : "检索"}
-            </button>
-          </form>
-
-          <div className="mt-4 flex flex-wrap items-center justify-center gap-2">
-            <span className="text-xs text-gray-400">试试：</span>
-            {EXAMPLES.map((ex) => (
-              <button key={ex} type="button" className="chip" onClick={() => run(ex)}>
-                <ScanBarcode className="w-3 h-3" /> {ex}
-              </button>
-            ))}
+        <form
+          onSubmit={(e) => run(undefined, e)}
+          className="mx-auto mt-8 w-full max-w-xl"
+        >
+          <div className="flex items-center gap-3 rounded-full border border-gray-200 bg-white px-5 py-3 shadow-sm transition hover:shadow-md focus-within:shadow-md">
+            <Search className="h-5 w-5 shrink-0 text-gray-400" />
+            <input
+              autoFocus
+              value={q}
+              onChange={(e) => setQ(e.target.value)}
+              placeholder="搜索商品名称或条码"
+              className="flex-1 bg-transparent outline-none"
+            />
           </div>
-        </div>
+          {!searched && (
+            <div className="mt-8">
+              <button
+                type="submit"
+                disabled={loading}
+                className="rounded-md border border-gray-200 bg-gray-50 px-6 py-2.5 text-sm text-gray-700 transition hover:border-gray-300 hover:shadow-sm"
+              >
+                {loading ? "检索中…" : "检索"}
+              </button>
+            </div>
+          )}
+        </form>
       </section>
 
       {error && (
@@ -106,7 +86,7 @@ export default function Home({
         </div>
       )}
 
-      {searched ? (
+      {searched && (
         <div className="mt-8">
           <div className="mb-3 text-sm text-gray-500">
             共 <span className="font-semibold text-gray-700">{total}</span> 条结果
@@ -154,18 +134,6 @@ export default function Home({
             </ul>
           )}
         </div>
-      ) : (
-        <div className="mt-8 grid gap-4 sm:grid-cols-3">
-          {FEATURES.map(({ icon: Icon, title, desc }) => (
-            <div key={title} className="card p-5 transition hover:shadow-card-hover">
-              <span className="grid h-10 w-10 place-items-center rounded-xl bg-brand-50 text-brand-600">
-                <Icon className="h-5 w-5" />
-              </span>
-              <h3 className="mt-3 font-semibold text-gray-800">{title}</h3>
-              <p className="mt-1 text-sm leading-relaxed text-gray-500">{desc}</p>
-            </div>
-          ))}
-        </div>
       )}
     </div>
   );

public-frontend/src/components/ProductView.tsx

@@ -42,6 +42,12 @@ export default function ProductView({ id, onBack }: { id: string; onBack: () =>
   const nutriEntries = Object.entries(p.nutriments || {}).filter(
     ([, v]) => v !== null && v !== undefined,
   );
+  const latestMsrp = (p.msrp || [])[0];
+  const msrpText = latestMsrp
+    ? latestMsrp.currency === "CNY"
+      ? `¥${latestMsrp.amount.toFixed(2)}`
+      : `${latestMsrp.amount.toFixed(2)} ${latestMsrp.currency}`
+    : null;
 
   return (
     <div>
@@ -93,6 +99,17 @@ export default function ProductView({ id, onBack }: { id: string; onBack: () =>
             }
           />
           <Row label="产地" value={p.country_of_origin} />
+          <Row
+            label="建议零售价"
+            value={
+              msrpText ? (
+                <span className="inline-flex items-baseline gap-2">
+                  <span className="font-medium text-gray-900">{msrpText}</span>
+                  <span className="text-xs text-gray-400">厂商建议，仅供参考</span>
+                </span>
+              ) : null
+            }
+          />
           <Row label="Nutri-Score" value={p.nutri_score} />
           <Row label="配料" value={p.ingredients_text} />
           <Row

public-frontend/src/types.ts

@@ -24,6 +24,15 @@ export interface ProductSpec {
   unit?: string;
 }
 
+export interface Msrp {
+  amount: number;
+  currency: string;
+  region: string;
+  effective_date?: string | null;
+  source_url?: string | null;
+  note?: string | null;
+}
+
 export interface Product {
   id: string;
   gtin: string | null;
@@ -43,6 +52,7 @@ export interface Product {
   ingredients_text?: string | null;
   allergens?: string[] | null;
   additives?: string[] | null;
+  msrp?: Msrp[] | null;
 }
 
 export interface Category {
@@ -51,6 +61,20 @@ export interface Category {
   name_en: string | null;
   path: string;
   level: number;
+  archive_kind: string;
+}
+
+export interface KindField {
+  kind: string;
+  field_key: string;
+  group_label: string;
+  label_zh: string;
+  field_type: "text" | "number" | "textarea" | "select" | "list";
+  unit: string | null;
+  options: string[] | null;
+  placeholder: string | null;
+  sort_order: number;
+  qualified: boolean;
 }
 
 export interface SubmissionImage {
@@ -68,6 +92,7 @@ export interface SubmissionInput {
   country_of_origin?: string | null;
   ingredients_text?: string | null;
   nutriments?: Record<string, number> | null;
+  attributes?: Record<string, unknown> | null;
   nutrition_basis?: string | null;
   serving_size?: string | null;
   nutri_score?: string | null;