Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf

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 })

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 { }

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,
+    }
   ],
 };
 /** 用户表单类型 */

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);
 }

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)

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",
     },