From 03367933d0bc676ac037c250531d0186cae308ac Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Sun, 9 Jul 2023 00:35:00 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=AF=B9=E9=87=91=E9=A2=9D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/goods-category/index.wxml      |  3 +-
 .../components/goods-category/index.wxss      |  7 ++++
 pages/goods/category/index.js                 |  4 +--
 pages/goods/category/index.wxml               |  3 +-
 services/good/fetchCategoryList.js            | 33 ++++++++++---------
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/pages/goods/category/components/goods-category/index.wxml b/pages/goods/category/components/goods-category/index.wxml
index 1b0b83f..610868f 100644
--- a/pages/goods/category/components/goods-category/index.wxml
+++ b/pages/goods/category/components/goods-category/index.wxml
@@ -11,6 +11,7 @@
 		<c-tabbar
 		  wx:if="{{isSlotRight}}"
 		  activeKey="{{subActiveKey}}"
+      tabList="{{category[activeKey].children}}"
 		  bindchange="onChildChange"
 		  showMore
 		>
@@ -47,7 +48,7 @@
 						  bindtap="changCategory"
 						  data-item="{{item}}"
 						>
-							<t-image src="{{item.thumbnail}}" t-class="image" />
+							<image src="{{item.thumbnail}}" class="item-image" />
 							<view class="flex goods-category-normal-item-container-item-title">
 								{{item.name}}
 							</view>
diff --git a/pages/goods/category/components/goods-category/index.wxss b/pages/goods/category/components/goods-category/index.wxss
index fbf4569..42d6419 100644
--- a/pages/goods/category/components/goods-category/index.wxss
+++ b/pages/goods/category/components/goods-category/index.wxss
@@ -100,3 +100,10 @@
   font-size: 24rpx;
   color: #222427;
 }
+
+.item-image{
+  width: 180rpx;
+  height: 180rpx;
+  object-fit: contain;
+  overflow: hidden;
+}
\ No newline at end of file
diff --git a/pages/goods/category/index.js b/pages/goods/category/index.js
index e8c56ac..43944d7 100644
--- a/pages/goods/category/index.js
+++ b/pages/goods/category/index.js
@@ -1,11 +1,11 @@
-import { getCategoryList } from '../../../services/good/fetchCategoryList';
+import { getGoodsCategoryTreeList } from '../../../services/good/fetchCategoryList';
 Page({
   data: {
     list: [],
   },
   async init() {
     try {
-      const result = await getCategoryList();
+      const result = await getGoodsCategoryTreeList();
       this.setData({
         list: result,
       });
diff --git a/pages/goods/category/index.wxml b/pages/goods/category/index.wxml
index 2d8cab1..f65e236 100644
--- a/pages/goods/category/index.wxml
+++ b/pages/goods/category/index.wxml
@@ -1,6 +1,7 @@
 <view class="wrap">
   <goods-category
-    level="{{3}}"
+    level="{{2}}"
+    isSlotRight="{{false}}"
     custom-class="goods-category-class"
     category="{{list}}"
     bind:changeCategory="onChange"
diff --git a/services/good/fetchCategoryList.js b/services/good/fetchCategoryList.js
index adf6ba4..ceb1c7e 100644
--- a/services/good/fetchCategoryList.js
+++ b/services/good/fetchCategoryList.js
@@ -1,18 +1,21 @@
-import { config } from '../../config/index';
+import {
+  request
+} from '../_utils/request';
 
-/** 获取商品列表 */
-function mockFetchGoodCategory() {
-  const { delay } = require('../_utils/delay');
-  const { getCategoryList } = require('../../model/category');
-  return delay().then(() => getCategoryList());
-}
-
-/** 获取商品列表 */
-export function getCategoryList() {
-  if (config.useMock) {
-    return mockFetchGoodCategory();
-  }
-  return new Promise((resolve) => {
-    resolve('real api');
+/** 获取经营类目列表 */
+export function getGoodsCategoryTreeList() {
+  return new Promise((resolve, reject) => {
+    request({
+      url: `GoodsCategoryApi/getGoodsCategoryTreeList`,
+      method: 'GET',
+      success: function (res) {
+        let list = res.data;
+    
+        resolve(list);
+      },
+      fail: function (error) {
+        reject(error);
+      }
+    });
   });
 }