From a7e775f5e75d2528b44dc89b5fea53f081403697 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 10 Mar 2025 16:36:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue              | 2 +-
 src/views/product/indexconfig/content.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 083a7b0..464bc59 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -113,7 +113,7 @@ function handleSwitchChange(data: any) {
   let obj = {
     type: data.isGrounding ? 'sku' : 'product',
     id: data.id,
-    isSale: data.status
+    isSale: data.isSale
   }
   UserAPI.onOff(obj);
 }
diff --git a/src/views/product/indexconfig/content.ts b/src/views/product/indexconfig/content.ts
index 2131e43..508aacd 100644
--- a/src/views/product/indexconfig/content.ts
+++ b/src/views/product/indexconfig/content.ts
@@ -82,7 +82,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     {
       label: "上架",
       align: "center",
-      prop: "status",
+      prop: "isSale",
       templet: "custom",
       slotName: "shangjia",
     },

From deec807c9831b1370964b9b4d259085914c2e81f Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 11 Mar 2025 10:42:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mycomponents/shopList.vue |  6 +++++-
 src/views/product/categoryconfig/add.ts  |  9 +++++++++
 src/views/product/categoryconfig/edit.ts | 11 ++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/mycomponents/shopList.vue b/src/components/mycomponents/shopList.vue
index 1de4d7a..dbbab7a 100644
--- a/src/components/mycomponents/shopList.vue
+++ b/src/components/mycomponents/shopList.vue
@@ -3,7 +3,8 @@
     <myDialog title="选择商品" width="50%" ref="myDialogRef" @Confirm="subitgood">
         <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
             @reset-click="handleResetClick" />
-        <page-content ref="contentRef" :content-config="contentConfig" @filter-change="handleFilterChange">
+        <page-content ref="contentRef" v-if="switchref" :content-config="contentConfig"
+            @filter-change="handleFilterChange">
             <template #status="scope">
                 <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
                     {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -43,13 +44,16 @@ const {
     handleFilterChange,
 } = usePage();
 let myDialogRef: any = ref(null)
+let switchref = ref(false)
 function opens() {
+    switchref.value = true
     myDialogRef.value.open()
 }
 const emit = defineEmits(['success'])
 // 添加商品的回调
 function subitgood() {
     emit('success', contentRef.value?.getselectTable())
+    switchref.value = false
     myDialogRef.value.close()
 }
 defineExpose({ opens })
diff --git a/src/views/product/categoryconfig/add.ts b/src/views/product/categoryconfig/add.ts
index 4ad923e..8ec3c50 100644
--- a/src/views/product/categoryconfig/add.ts
+++ b/src/views/product/categoryconfig/add.ts
@@ -45,6 +45,15 @@ const modalConfig: IModalConfig<UserForm> = {
       },
       initialValue: 1,
     },
+    {
+      label: "排序",
+      prop: "sort",
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+      initialValue: 1,
+    }
   ],
 };
 export interface UserForm { }
diff --git a/src/views/product/categoryconfig/edit.ts b/src/views/product/categoryconfig/edit.ts
index 321f5ed..ebd6d9f 100644
--- a/src/views/product/categoryconfig/edit.ts
+++ b/src/views/product/categoryconfig/edit.ts
@@ -15,7 +15,7 @@ const modalConfig: IModalConfig<UserForm> = {
 
   pk: "id",
   formAction: function (data) {
-    return UserAPI.update({ ...data, sort: '1' });
+    return UserAPI.update({ ...data });
   },
   beforeSubmit(data) {
     console.log("提交之前处理", data);
@@ -49,6 +49,15 @@ const modalConfig: IModalConfig<UserForm> = {
       },
       initialValue: 1,
     },
+    {
+      label: "排序",
+      prop: "sort",
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+      initialValue: 1,
+    }
   ],
 };
 /** 用户表单类型 */

From e70154f9bda83211379c1693874bd86057016f0b Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 11 Mar 2025 11:22:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=95=86=E5=93=81=E5=90=8E=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/indexconfig/addgoods.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 9200ca8..4460af7 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -771,10 +771,11 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           "title": "新增商品",
           "path": "/product/addgoods",
           "fullPath": "/product/addgoods",
-          "query": {}
         })
-        router.push('/product/index');
       }, 500);
+      setTimeout(() => {
+        router.push({ path: '/product/index' });
+      }, 1000);
     } else {
       ElMessage.error("请填写完整信息");
       console.log('error submit!', fields)