From 74c91e61bba6c08c6ef528b5737e62f711068a4d Mon Sep 17 00:00:00 2001
From: dt_2916866708 <>
Date: Thu, 11 Jan 2024 10:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product/productAttr.js              |  9 +++-
 src/utils/validate.js                       | 17 ++++++-
 src/views/product/productAttr/index.vue     | 13 +++---
 src/views/product/productClassify/index.vue | 52 +++++++++------------
 4 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/api/product/productAttr.js b/src/api/product/productAttr.js
index f060248..843d5cb 100644
--- a/src/api/product/productAttr.js
+++ b/src/api/product/productAttr.js
@@ -1,6 +1,13 @@
 import request from '@/utils/request'
 var service_name = 'oil-mall' 
 export default {
+  classifyGetByPage(page) { // 分页查询
+    return request({
+      url: `/${service_name}/mallProductClassification/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },     
     typeFindByPage(page) { // 分页查询
     return request({
       url: `/${service_name}/mallProductAttributesType/getByPage`,
@@ -49,7 +56,7 @@ delete(page) {
       data: page
     })
   },  
-  delete(page) {  
+  typeDelete(page) {  
     return request({
       url: `/${service_name}/mallProductAttributesType/delete`,
       method: 'post',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index c9b2fb9..4201a1e 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,5 +1,5 @@
 /**
- * Created by PanJiaChen on 16/11/18.
+ * Created by CAOLIANCUN on 2024/1/11.
  */
 
 /**
@@ -150,3 +150,18 @@ export function isArray(arg) {
   }
   return Array.isArray(arg)
 }
+export function isStrictPromise(value) {
+  return !!value
+      && typeof value === 'object'
+      && typeof value.then === 'function'
+      && typeof value.finally === 'function';
+}
+export function loadingFn(_loading,callback) {
+  console.log(isStrictPromise(callback),_loading,'isStrictPromise(callback)')
+  _loading = true;
+  if (isStrictPromise(callback)) {
+      callback.finally(() => {
+          // _loading = false;
+      })
+  };
+}
\ No newline at end of file
diff --git a/src/views/product/productAttr/index.vue b/src/views/product/productAttr/index.vue
index eba22d4..a220b99 100644
--- a/src/views/product/productAttr/index.vue
+++ b/src/views/product/productAttr/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
+    <!-- <el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
       <div class="padding-add">
         <el-form ref="artFrom" :model="artFrom" label-width="80px" label-position="right" class="tabform"
           @submit.native.prevent inline>
@@ -12,11 +12,11 @@
           </el-form-item>
         </el-form>
       </div>
-    </el-card>
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16">
+    </el-card> -->
+    <el-card :bordered="false" shadow="never" class="ivu-mt-16">
       <el-button type="primary" @click="addType">添加类型</el-button>
       <el-button type="primary" @click="addAttr('save')">添加商品规格</el-button>
-      <el-button @click="del(null, '批量删除规格')">批量删除</el-button>
+      <!-- <el-button @click="del(null, '批量删除规格')">批量删除</el-button> -->
       <el-table @current-change="tableCurrentChange" ref="table" :data="tableList" v-loading="loading"
         highlight-current-row :row-key="getRowKey" @selection-change="handleSelectRow" empty-text="暂无数据" class="mt14">
         <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
@@ -61,8 +61,7 @@
 <script>
 import addAttr from './addAttr';
 import productApi from '@/api/product/productAttr.js';
-import attrList from './components/attrList.vue'
-import object from 'element-resize-detector/src/detection-strategy/object';
+import attrList from './components/attrList.vue' 
 export default {
   name: 'productAttr',
   components: { addAttr, attrList },
@@ -168,7 +167,7 @@ export default {
         confirmButtonText: '确定',
         callback: action => {
           if (action == "confirm") {
-            productApi.delete(row).then(res => {
+            productApi.typeDelete(row).then(res => {
               if (res.code == 20000) {
                 this.$message.success("操作成功！")
                 this.handleCurrentChange()
diff --git a/src/views/product/productClassify/index.vue b/src/views/product/productClassify/index.vue
index 46dd396..cf98278 100644
--- a/src/views/product/productClassify/index.vue
+++ b/src/views/product/productClassify/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
+    <!-- <el-card :bordered="false" shadow="never" class="ivu-mt-16" :body-style="{ padding: 0 }">
       <div class="padding-add">
         <el-form ref="artFrom" :model="artFrom" inline label-width="80px" label-position="right" @submit.native.prevent>
           <el-form-item label="商品分类：" prop="pid" label-for="pid">
@@ -26,11 +26,10 @@
           </el-form-item>
         </el-form>
       </div>
-    </el-card>
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16">
+    </el-card> -->
+    <el-card :bordered="false" shadow="never" class="ivu-mt-16">
       <el-button type="primary" class="bnt" @click="addClass">添加分类</el-button>
-      <el-table class="mt14" highlight-hover-row :loading="loading" header-row-class-name="false"
-        :tree-config="{ children: 'children' }" :data="tableData">
+      <el-table class="mt14" :loading="loading"  :data="tableData">
         <el-table-column field="id" label="ID" tooltip width="80"></el-table-column>
         <el-table-column field="cate_name" tree-node label="分类名称" min-width="250"></el-table-column>
         <el-table-column field="pic" label="分类图标" min-width="100">
@@ -66,11 +65,10 @@
 </template>
 
 <script>
-import edit from '@/components/Category/edit'
-
-import { mapState } from 'vuex';
-// import { productListApi, productCreateApi, productEditApi, setShowApi, treeListApi } from '@/api/product';
+import edit from '@/components/Category/edit'  
 import editFrom from '../../../components/from/from';
+import productApi from '@/api/product/productAttr.js'; 
+ import {loadingFn} from "@/utils/validate"
 export default {
   name: 'product_productClassify',
   components: {
@@ -92,40 +90,31 @@ export default {
         xs: 24,
       },
       loading: false,
-      artFrom: {
-        pid: 0,
-        is_show: '',
-        page: 1,
-        cate_name: '',
-        limit: 15,
+      page: {
+        "currentPage": 1,
+        "pageSize": 10,
+        "params": {},
+        totalCount: 0
       },
       total: 0,
       tableData: [],
     };
-  },
-  computed: {
-    ...mapState('admin/userLevel', ['categoryId']),
-  },
+  }, 
   mounted() {
-    this.goodsCategory();
-    this.getList();
+    // this.goodsCategory();
+    // this.getList();
   },
   methods: {
     // 商品分类；
-    goodsCategory() {
-      // treeListApi(0)
-      //   .then((res) => {
-      //     this.treeSelect = res.data;
-      //   })
-      //   .catch((res) => {
-      //     this.$message.error(res.msg);
-      //   });
+    goodsCategory() { 
     },
     // 列表
     getList() {
       this.loading = true;
-      this.artFrom.is_show = this.artFrom.is_show || '';
-      this.artFrom.pid = this.artFrom.pid || '';
+      // console.log(,'loadingFn')
+      // loadingFn(this.loading,productApi.classifyGetByPage(this.page))
+      // this.artFrom.is_show = this.artFrom.is_show || '';
+      // this.artFrom.pid = this.artFrom.pid || '';
       // productListApi(this.artFrom)
       //   .then(async (res) => {
       //     let data = res.data;
@@ -137,6 +126,7 @@ export default {
       //     this.loading = false;
       //     this.$message.error(res.msg);
       //   });
+      // productApi.classifyGetByPage()
     },
     pageChange(index) {
       this.artFrom.page = index;