From d842182b175be40b540291a57fc4cbc4612c3d43 Mon Sep 17 00:00:00 2001
From: Sisyphus <sisyphus@direv.local>
Date: Sun, 5 Jul 2026 10:31:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(F006-W3xC):=20P2=20=E5=8D=87=E7=BA=A7=20-?=
 =?UTF-8?q?=204=20=E4=B8=AA=E6=97=A0=E5=90=8E=E7=AB=AF=E9=A1=B5=20?=
 =?UTF-8?q?=E6=94=B9=20redirect=20=E5=88=B0=E7=9C=9F=E6=95=B0=E6=8D=AE\n\n?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88=20P2=20=E5=8D=A0=E4=BD=8D?=
 =?UTF-8?q?=E9=A1=B5=E5=8F=AA=E5=88=97=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98.=20=E9=87=8D=E6=8E=A2=E6=B5=8B=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=91=E7=8E=B0=20/supplier/good/search=20=E8=BF=94?=
 =?UTF-8?q?=2016080=20=E8=A1=8C=E7=9C=9F=E6=95=B0=E6=8D=AE,=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=AE=BE=E8=AE=A1.\n\n=E6=94=B9=E5=8A=A8:\n-=20/suppl?=
 =?UTF-8?q?ier/good=20=E8=B5=B0=20/supplier/good/search=20=E7=9C=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20(16080=20=E8=A1=8C,=2010=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5:=20id/title/icon/brandName/3=20=E7=BA=A7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB/onShelf/type/remark),=20=E5=90=AB=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=20title=20=E6=A8=A1=E7=B3=8A=E7=AD=9B=E9=80=89=20+=20?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=20+=20=E5=B0=81=E9=9D=A2=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE\n-=20/product/shop=20redirect=20to=20/supplier/good?=
 =?UTF-8?q?=20(=E5=90=8E=E7=AB=AF=20404)\n-=20/supplier/servicegood=20redi?=
 =?UTF-8?q?rect=20to=20/supplier/good=20(=E5=90=8E=E7=AB=AF=20404)\n-=20/a?=
 =?UTF-8?q?pi/feedback=20redirect=20to=20/other/operateguide=20(=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=20404,=20=E5=86=85=E5=AE=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=AF=E7=9C=9F=E6=95=B0=E6=8D=AE=E9=A1=B5)\n-=203=20?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B9=20path=20=E6=94=B9=20redirect=20?=
 =?UTF-8?q?=E5=90=8E=E7=9B=AE=E6=A0=87,=20label=20=E5=8A=A0=20=E9=87=8D?=
 =?UTF-8?q?=E5=AE=9A=E5=90=91=E6=8F=90=E7=A4=BA=20=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=88=E5=B9=B6=E5=85=B3=E7=B3=BB\n-=20?=
 =?UTF-8?q?=E5=8D=A0=E4=BD=8D=20view=20=E6=96=87=E4=BB=B6=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=20(src/modules/{product/shop,supplier/servicegood,api?=
 =?UTF-8?q?/feedback}/*.vue),=20=E6=9C=AA=E6=9D=A5=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=97=B6=E5=8D=87=E7=BA=A7\n\n=E9=93=81?=
 =?UTF-8?q?=E5=BE=8B:=20=E4=BB=BB=E4=BD=95=E5=8D=A0=E4=BD=8D=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E7=9C=9F=E8=83=BD=E7=94=A8.=20P0/P1=20=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=20el-result=20OK=20=E4=BD=86=E8=A6=81=E7=9C=8B?=
 =?UTF-8?q?=E7=9C=9F=E6=95=B0=E6=8D=AE,=20P2=20=E7=94=A8=20redirect=20?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=9B=B4=E5=8F=8B=E5=A5=BD.=20=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=20P3+P4=20=E6=8E=A8=E8=BF=9B=E5=89=8D=E5=85=88?=
 =?UTF-8?q?=E5=85=A8=E9=87=8F=E9=87=8D=E6=8E=A2=E6=B5=8B=20API,=20?=
 =?UTF-8?q?=E8=83=BD=20redirect=20=E5=B0=B1=20redirect,=20=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=B0=B1=E5=8D=87=E7=BA=A7=E7=9C=9F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=88=96=E4=BF=9D=E7=95=99=E6=9E=81=E7=AE=80=20el-result.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/menu-labels.ts                  |   6 +-
 src/modules/supplier/good/GoodListView.vue | 185 ++++++++++++++-------
 src/router/index.ts                        |  12 +-
 3 files changed, 135 insertions(+), 68 deletions(-)

diff --git a/src/config/menu-labels.ts b/src/config/menu-labels.ts
index 62c3aef..451569c 100644
--- a/src/config/menu-labels.ts
+++ b/src/config/menu-labels.ts
@@ -80,7 +80,7 @@ export const MENU_LABELS: MenuLabel[] = [
 
   // ===== 供应商模块 =====
   { url: 'supplier/good',                    label: '实物商品',     icon: 'Box',           path: '/supplier/good',      sort: 300 },
-  { url: 'supplier/servicegood',             label: '服务商品',     icon: 'Box',           path: '/supplier/service',  sort: 301 },
+  { url: 'supplier/servicegood',             label: '服务商品(→实物商品)',     icon: 'Box',           path: '/supplier/good',  sort: 301 },
   { url: 'supplier/activityzone',            label: '活动专区',     icon: 'Promotion',     path: '/supplier/activity', sort: 302 },
   { url: 'supplier/coupon',                  label: '优惠券',       icon: 'Ticket',        path: '/supplier/coupon',   sort: 303 },
   { url: 'supplier/promoter',                label: '推广返佣',     icon: 'UserFilled',    path: '/supplier/promoter', sort: 304 },
@@ -107,7 +107,7 @@ export const MENU_LABELS: MenuLabel[] = [
 
   // ===== API 模块 =====
   { url: 'api/lunbo',        label: '轮播管理',       icon: 'Picture',        path: '/api/lunbo',         sort: 600 },
-  { url: 'api/feedback',     label: '意见反馈',       icon: 'ChatLineRound',  path: '/api/feedback',      sort: 601 },
+  { url: 'api/feedback',     label: '意见反馈(→内容列表)',       icon: 'ChatLineRound',  path: '/other/operateguide',      sort: 601 },
   { url: 'api/help',         label: '帮助中心',       icon: 'Notebook',       path: '/api/help',          sort: 602 },
 
   // ===== 其它模块(老版本"其它"分组) =====
@@ -156,7 +156,7 @@ export const MENU_LABELS: MenuLabel[] = [
   { url: 'sys/excel',                     label: 'Excel导出',      icon: 'Download',   path: '/sys/excel',                sort: 417 },
   { url: 'sys/charts',                    label: '图表示例',       icon: 'TrendCharts', path: '/sys/charts',              sort: 418 },
   { url: 'sys/product',                   label: '商品示例',       icon: 'Box',        path: '/sys/product',              sort: 419 },
-  { url: 'product/shop',                  label: '店铺管理',       icon: 'Shop',       path: '/product/shop',             sort: 350 },
+  { url: 'product/shop',                  label: '店铺管理(→商品管理)',       icon: 'Shop',       path: '/supplier/good',             sort: 350 },
   { url: 'orderMake/index-admin',         label: '开单(管理端)',   icon: 'Edit',       path: '/order/create-admin',       sort: 6 },
   { url: 'villageManage/farmerList',      label: '农户列表',       icon: 'User',       path: '/village/farmer',           sort: 7 },
   { url: 'villageManage/resourceList',    label: '资源列表',       icon: 'List',       path: '/village/resource',         sort: 8 },
diff --git a/src/modules/supplier/good/GoodListView.vue b/src/modules/supplier/good/GoodListView.vue
index 6659a15..6c12988 100644
--- a/src/modules/supplier/good/GoodListView.vue
+++ b/src/modules/supplier/good/GoodListView.vue
@@ -1,86 +1,159 @@
 <script setup lang="ts">
 /**
- * F006 商品管理 - W3.x C P2
- * 后端 /supplier/good/page 端点状态: 404 / 400 (端点不存在或参数错)
- * 走 el-result 优雅占位 + 展示参考老 /vue 后台的预期字段
+ * F006 商品管理 - W3.x C P2 升级
+ * 走 /supplier/good/search 真 API (返 {total, list}, 16080 行)
+ * 字段: id/title/icon/brandName/firstCategoryName/secondCategoryName/thirdCategoryName/onShelf/type/remark
+ * 后端限制: 不支持 server-side 筛选 (title/checkStatus 参数被忽略), 客户端按 title 模糊筛选
  */
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, computed } from 'vue'
 import { httpGet } from '@/utils/request'
+import DataTable from '@/components/DataTable/DataTable.vue'
 
-interface FieldSpec { key: string; label: string; desc: string }
+interface Good {
+  id: string
+  title: string
+  icon: string | null
+  brandName: string | null
+  firstCategoryName: string | null
+  secondCategoryName: string | null
+  thirdCategoryName: string | null
+  onShelf: number
+  type: number
+  remark: string | null
+  raw: any
+}
 
-const status = ref<'checking' | '404' | '200' | 'error'>('checking')
-const errorMsg = ref('')
+const ONSHELF_MAP: Record<number, { label: string; type: string }> = {
+  0: { label: '未铺货', type: 'info' },
+  1: { label: '已铺货', type: 'success' }
+}
 
-const expectedFields: FieldSpec[] = [
-  { key: 'icon', label: '封面', desc: '图片缩略图 40x40' },
-  { key: 'title', label: '商品名称', desc: '商品标题' },
-  { key: 'enterpriseName', label: '供应商', desc: '所属企业名' },
-  { key: 'firstCategoryName', label: '一级分类', desc: '一级分类名' },
-  { key: 'secondCategoryName', label: '二级分类', desc: '二级分类名' },
-  { key: 'thirdCategoryName', label: '三级分类', desc: '三级分类名' },
-  { key: 'brandName', label: '品牌', desc: '品牌名' },
-  { key: 'unitName', label: '单位', desc: '计量单位' },
-  { key: 'createDate', label: '申请时间', desc: '提交时间' },
-  { key: 'onShelf', label: '铺货', desc: '0=未铺货/1=已铺货' },
-  { key: 'checkOpinion', label: '审核意见', desc: '审核备注' },
-  { key: 'checkStatus', label: '状态', desc: '1=待审核/2=出售中/3=已驳回' }
-]
+const TYPE_MAP: Record<number, string> = {
+  1: '实物商品',
+  2: '服务商品'
+}
 
-onMounted(async () => {
+const list = ref<Good[]>([])
+const total = ref(0)
+const loading = ref(false)
+const error = ref<string | null>(null)
+const page = ref(1)
+const limit = ref(20)
+const filterKw = ref('')
+
+async function load() {
+  loading.value = true
+  error.value = null
   try {
-    const r: any = await httpGet('/supplier/good/page', { page: 1, limit: 1 })
-    if (r?.code === 0) status.value = '200'
-    else { status.value = 'error'; errorMsg.value = r?.msg || '未知错误' }
+    const data: any = await httpGet<{ total: number; list: any[] }>('/supplier/good/search', {
+      page: page.value,
+      limit: limit.value
+    })
+    list.value = (data?.list || []).map((it: any) => ({
+      id: String(it.id),
+      title: it.title || '--',
+      icon: it.icon || null,
+      brandName: it.brandName || null,
+      firstCategoryName: it.firstCategoryName || null,
+      secondCategoryName: it.secondCategoryName || null,
+      thirdCategoryName: it.thirdCategoryName || null,
+      onShelf: it.onShelf ?? 0,
+      type: it.type ?? 1,
+      remark: it.remark || null,
+      raw: it
+    }))
+    total.value = Number(data?.total || 0)
   } catch (e: any) {
-    if (e?.response?.status === 404 || e?.message?.includes('404')) {
-      status.value = '404'
-      errorMsg.value = '后端 API 未实现 (/supplier/good/page 返回 404)'
-    } else {
-      status.value = 'error'
-      errorMsg.value = e?.msg || e?.message || '请求失败'
-    }
+    error.value = e?.msg || e?.message || '加载失败'
+    list.value = []
+    total.value = 0
+  } finally {
+    loading.value = false
   }
+}
+
+const filtered = computed(() => {
+  const kw = filterKw.value.trim().toLowerCase()
+  if (!kw) return list.value
+  return list.value.filter(it => (it.title || '').toLowerCase().includes(kw))
 })
+
+function onSearch() { page.value = 1; load() }
+function onReset() { filterKw.value = ''; page.value = 1; load() }
+function onPageChange(p: number) { page.value = p; load() }
+function onLimitChange(l: number) { limit.value = l; page.value = 1; load() }
+
+onMounted(load)
 </script>
 
 <template>
   <div class="rr-page">
     <div class="rr-page-header">
       <h2 class="rr-page-title">商品管理</h2>
-      <p class="rr-page-sub">实物商品审核管理 - 数据接口未实现, 占位页展示预期字段</p>
+      <p class="rr-page-sub">实物商品审核管理(共 {{ total }} 个, 当前页 {{ filtered.length }} 个)</p>
     </div>
-    <div class="rr-card rr-status-card">
-      <el-result
-        :icon="status === '200' ? 'success' : 'warning'"
-        :title="status === '200' ? 'API 已就绪' : '后端 API 未实现'"
-        :sub-title="status === '200' ? '商品管理 数据接口已通, 可正常加载' : (errorMsg || '请联系后端实现 /supplier/good/page 接口')"
+
+    <div class="rr-filters">
+      <el-input v-model="filterKw" placeholder="按商品名称筛选" clearable class="rr-filter-input" size="default" @keyup.enter="onSearch" />
+      <el-button class="rr-btn-secondary" size="default" @click="onSearch">查询</el-button>
+      <el-button class="rr-btn-secondary" size="default" @click="onReset">重置</el-button>
+    </div>
+
+    <div class="rr-card">
+      <DataTable
+        :columns="[
+          { prop: 'id', label: 'ID', width: 80 },
+          { prop: 'icon', label: '封面', width: 80, slot: 'icon' },
+          { prop: 'title', label: '商品名称', minWidth: 240 },
+          { prop: 'brandName', label: '品牌', width: 140 },
+          { prop: 'firstCategoryName', label: '一级分类', width: 140 },
+          { prop: 'secondCategoryName', label: '二级分类', width: 140 },
+          { prop: 'thirdCategoryName', label: '三级分类', width: 140 },
+          { prop: 'type', label: '类型', width: 100, slot: 'type' },
+          { prop: 'onShelf', label: '铺货', width: 100, slot: 'onShelf' },
+          { prop: 'remark', label: '备注', minWidth: 200, slot: 'remark' }
+        ]"
+        :data="filtered"
+        :loading="loading"
+        :total="total"
+        :page="page"
+        :limit="limit"
+        :show-pagination="true"
+        :error="error"
+        empty-text="暂无商品"
+        borderless
+        row-key="id"
+        @page-change="onPageChange"
+        @limit-change="onLimitChange"
       >
-        <template #extra>
-          <el-tag v-if="status === 'checking'" type="info">检测中...</el-tag>
-          <el-tag v-else-if="status === '404'" type="warning">404 Not Found</el-tag>
-          <el-tag v-else-if="status === '200'" type="success">200 OK</el-tag>
-          <el-tag v-else type="danger">Error</el-tag>
+        <template #icon="{ row }">
+          <el-image v-if="row.icon" :src="row.icon" style="width: 40px; height: 40px; border-radius: 4px" fit="cover" />
+          <span v-else class="rr-no-img">无图</span>
         </template>
-      </el-result>
-    </div>
-    <div class="rr-card rr-fields-card">
-      <h3 class="rr-section-title">预期字段 (参考老 /vue 后台)</h3>
-      <el-table :data="expectedFields" border size="small" :show-header="true" empty-text="无字段">
-        <el-table-column prop="key" label="字段名 (key)" width="220" />
-        <el-table-column prop="label" label="表头 (label)" width="180" />
-        <el-table-column prop="desc" label="说明" />
-      </el-table>
+        <template #type="{ row }">
+          <el-tag size="small" effect="plain">{{ TYPE_MAP[row.type] || `类型${row.type}` }}</el-tag>
+        </template>
+        <template #onShelf="{ row }">
+          <el-tag :type="(ONSHELF_MAP[row.onShelf]?.type as any) || 'info'" size="small" effect="light">
+            {{ ONSHELF_MAP[row.onShelf]?.label || `状态${row.onShelf}` }}
+          </el-tag>
+        </template>
+        <template #remark="{ row }">
+          <span class="rr-remark">{{ row.remark || '--' }}</span>
+        </template>
+      </DataTable>
     </div>
   </div>
 </template>
 
 <style scoped lang="scss">
 .rr-page { max-width: 1400px; }
-.rr-page-header { margin-bottom: 20px; }
+.rr-page-header { margin-bottom: 16px; }
 .rr-page-title { font-size: 22px; font-weight: 600; letter-spacing: -0.02em; color: var(--ink); margin-bottom: 4px; }
 .rr-page-sub { color: var(--ink-3); font-size: 13px; }
-.rr-card { background: var(--surface); border: 1px solid var(--border); border-radius: var(--radius-lg); padding: 24px; margin-bottom: 16px; }
-.rr-status-card { padding: 20px 20px 8px; }
-.rr-section-title { margin: 0 0 12px; font-size: 14px; font-weight: 600; color: var(--ink); }
+.rr-filters { margin-bottom: 16px; display: flex; gap: 8px; align-items: center; }
+.rr-filter-input { width: 280px; }
+.rr-card { background: var(--surface); border: 1px solid var(--border); border-radius: var(--radius-lg); overflow: hidden; }
+.rr-no-img { color: var(--ink-3); font-size: 12px; }
+.rr-remark { color: var(--ink-2); font-size: 12.5px; }
 </style>
diff --git a/src/router/index.ts b/src/router/index.ts
index dd337cb..63523f4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -281,9 +281,7 @@ const routes: RouteRecordRaw[] = [
   // groupbuy + seckill 走真数据, 其它 4 个后端未实现走占位
   {
     path: '/product/shop',
-    name: 'ShopList',
-    component: () => import('@/modules/product/shop/ShopListView.vue'),
-    meta: { title: '商品店铺' }
+    redirect: '/supplier/good'
   },
   {
     path: '/supplier/good',
@@ -293,9 +291,7 @@ const routes: RouteRecordRaw[] = [
   },
   {
     path: '/supplier/servicegood',
-    name: 'ServiceGoodList',
-    component: () => import('@/modules/supplier/servicegood/ServiceGoodListView.vue'),
-    meta: { title: '服务商品' }
+    redirect: '/supplier/good'
   },
   {
     path: '/other/groupbuy',
@@ -311,9 +307,7 @@ const routes: RouteRecordRaw[] = [
   },
   {
     path: '/api/feedback',
-    name: 'FeedbackList',
-    component: () => import('@/modules/api/feedback/FeedbackListView.vue'),
-    meta: { title: '意见反馈' }
+    redirect: '/other/operateguide'
   },
 
   // W3.1 通用通配占位 — 覆盖菜单 70 个 url(两层路径,如 /admin/user/finance/recharge)