From f0f8f489982a314b92b343bf5583478910c46be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Fri, 16 Oct 2026 15:15:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91):=20?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=84=E6=A0=BC=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实物编辑 items 兼容中台 {name,values} 与采集 {value,detail} 双轨格式
- 网盘 restoreManySku 形参改名避免遮蔽同名 ref（原规格编辑区拿不到数据、保存 items 提交空数组）；单规格值 SKU 也回显
- add/:id? 同路由复用实例，监听 editId 变化重载编辑数据或重置新增表单，清除编辑残留
---
 .../src/pages/plugin/normal/add/index.vue     |  7 +-
 .../src/pages/plugin/virtual/product/Add.vue  | 78 +++++++++++++++++--
 2 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/frontend/admin/src/pages/plugin/normal/add/index.vue b/frontend/admin/src/pages/plugin/normal/add/index.vue
index a6d2307d2..26938f9ea 100644
--- a/frontend/admin/src/pages/plugin/normal/add/index.vue
+++ b/frontend/admin/src/pages/plugin/normal/add/index.vue
@@ -755,11 +755,12 @@ function getUploadType() {
 function infoData(data, isCopy) {
   let cate_id = data.cate_id.map(Number);
   let label_id = data.label_id.map(Number);
-  // 兼容两种 items 来源：编辑回填 detail 为字符串数组；采集回填 detail 为 [{value, pic}] 对象数组，规格名统一在 value 键
+  // 兼容两种 items 来源：中台编辑回填为 {name, values}（规格名在 name、规格值为字符串数组）；
+  // 采集回填为 {value, detail}（detail 为字符串数组或 [{value, pic}] 对象数组），规格名统一归一到 value 键
   attrs.value = Array.isArray(data.items)
     ? data.items.map((item) => ({
-        value: item.value,
-        detail: (item.detail ?? []).map((v) =>
+        value: item.value ?? item.name,
+        detail: (item.detail ?? item.values ?? []).map((v) =>
           typeof v === 'string' ? { value: v, pic: '' } : { value: v.value ?? '', pic: v.pic ?? '' },
         ),
         add_pic: item.add_pic ?? 0,
diff --git a/frontend/admin/src/pages/plugin/virtual/product/Add.vue b/frontend/admin/src/pages/plugin/virtual/product/Add.vue
index a80e1ec6e..b04c28cf8 100644
--- a/frontend/admin/src/pages/plugin/virtual/product/Add.vue
+++ b/frontend/admin/src/pages/plugin/virtual/product/Add.vue
@@ -210,7 +210,7 @@
 </template>
 
 <script setup>
-import { computed, getCurrentInstance, nextTick, onMounted, ref } from 'vue';
+import { computed, getCurrentInstance, nextTick, onMounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { virtualApi } from '../api';
@@ -534,8 +534,8 @@ async function loadProduct() {
       oneFormValidate.value[0].stock = data.stock || 0;
       oneFormValidate.value[0].pic = formValidate.value.image;
     }
-    // 多规格回显：重建规格组与表格数据（含各 SKU 网盘信息）
-    if (data.spec_type === 1 && Array.isArray(data.attrs) && data.attrs.length > 1) {
+    // 多规格回显：重建规格组与表格数据（含各 SKU 网盘信息）；单规格值也会只有一条 SKU，不设下限会漏回显
+    if (data.spec_type === 1 && Array.isArray(data.attrs) && data.attrs.length >= 1) {
       restoreManySku(data.attrs);
     }
     // 商品详情回显
@@ -977,9 +977,10 @@ function generateAttrBatch(data, combinations, val) {
   return rows;
 }
 // 多规格编辑回显：根据后端返回的 SKU 列表（含规格映射 detail 与网盘信息）重建规格组与表格
-function restoreManySku(attrs) {
+function restoreManySku(skuRows) {
+  // 注意：形参不能叫 attrs，否则遮蔽外层同名 ref，规格编辑区拿不到数据、保存时 items 也会提交空数组
   const specMap = {};
-  attrs.forEach((a) => {
+  skuRows.forEach((a) => {
     const detail = a.detail || {};
     Object.keys(detail).forEach((name) => {
       if (!specMap[name]) specMap[name] = [];
@@ -1000,7 +1001,7 @@ function restoreManySku(attrs) {
   // 回填各 SKU 的价格/库存/网盘信息
   rows.forEach((row) => {
     const values = row.attr_arr || [];
-    const match = attrs.find((a) => {
+    const match = skuRows.find((a) => {
       const detailValues = a.detail ? Object.values(a.detail) : [];
       return arraysEqual(detailValues, values);
     });
@@ -1393,6 +1394,71 @@ onMounted(() => {
   getproductLabelUseListApi();
   if (props.editId) loadProduct();
 });
+
+// add/:id? 是同一路由记录，「新增」与「编辑」共用组件实例，路由参数变化不会重新走 onMounted；
+// 不监听 editId 的话，长会话里编辑页会显示上一个页面（新增表单/另一单）残留的规格与表格数据
+watch(
+  () => props.editId,
+  (val) => {
+    if (val) {
+      loadProduct();
+    } else {
+      resetAddForm();
+    }
+  },
+);
+
+// 恢复新增态：清掉编辑残留的商品与规格数据
+function resetAddForm() {
+  Object.assign(formValidate.value, {
+    store_name: '',
+    store_info: '',
+    price: 0,
+    ot_price: 0,
+    cost: 0,
+    stock: 0,
+    ficti: 0,
+    unit_name: '件',
+    sort: 0,
+    is_show: 1,
+    keyword: '',
+    give_integral: 0,
+    is_sub: 0,
+    spec_type: 0,
+    cate_id: [],
+    label_list: [],
+    recommend_list: [],
+    slider_image: [],
+    image: '',
+    custom_form: [],
+    params_list: [],
+    protection_list: [],
+    attrs: [],
+    items: [],
+    header: [],
+  });
+  attrs.value = [];
+  manyFormValidate.value = [];
+  oneFormValidate.value = [
+    {
+      pic: '',
+      price: 0,
+      cost: 0,
+      ot_price: 0,
+      stock: 0,
+      bar_code: '',
+      bar_code_number: '',
+      weight: 0,
+      volume: 0,
+      brokerage: 0,
+      brokerage_two: 0,
+      vip_price: 0,
+      download_url: '',
+      download_password: '',
+    },
+  ];
+  contents.value = '';
+}
 </script>
 
 <style scoped></style>