From 81c6991c43cbe97ba0053f6b536015c2ad8c26ae Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 23 Jun 2024 22:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/category/index.js       | 7 ++++++-
 ext.json                    | 2 +-
 pages/shopList/shopPage.vue | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/api/category/index.js b/api/category/index.js
index c51e87f..91b1402 100644
--- a/api/category/index.js
+++ b/api/category/index.js
@@ -4,7 +4,8 @@ import request from '@/utils/request'
 const api = {
   list: 'category/list',
   sonList:'goods/list',
-	listmerchant: 'category/listmerchant'
+  listmerchant: 'category/listmerchant',
+  getShopCategory: 'merchant/getShopCategory'
 }
 
 
@@ -23,4 +24,8 @@ export const childrenList = (param, option) => {
 // 获取商户下商品分类列表
 export const listmerchant = (param, option) => {
   return request.get(api.listmerchant, param, option)
+}
+// 获取商户下商品分类列表
+export const getShopCategory = (param, option) => {
+  return request.get(api.getShopCategory, param, option)
 }
\ No newline at end of file
diff --git a/ext.json b/ext.json
index f2b22b7..d1f4139 100644
--- a/ext.json
+++ b/ext.json
@@ -1,6 +1,6 @@
 {
 	"extEnable": true,
-	"extAppid": "wx9f7e94fe11dc0c23",
+	"extAppid": "wxa3127ed5c3542a28",
 	"ext": {
 		"store_id": 10048
 	}
diff --git a/pages/shopList/shopPage.vue b/pages/shopList/shopPage.vue
index 3867896..6223169 100644
--- a/pages/shopList/shopPage.vue
+++ b/pages/shopList/shopPage.vue
@@ -45,13 +45,13 @@
 				</button>
 			</view>
 			<view v-if="firstCate" class="shop-goods">
-				<view v-if="goodsCate.filter(v => v.category_id === firstCate)[0].children.length > 0" class="second-cate">
+			<!-- 	<view v-if="goodsCate.filter(v => v.category_id === firstCate)[0].children.length > 0" class="second-cate">
 					<scroll-view class="second-cate-tabs" scroll-x>
 						<view v-for="(item, index) in goodsCate.filter(v => v.category_id === firstCate)[0].children" :key="index"  class="cate-item" :class="{active: secondCate === item.category_id}" @click="secondCate = item.category_id">
 							{{ item.name }}
 						</view>
 					</scroll-view>
-				</view>
+				</view> -->
 				<view class="goods-content">
 					<view class="first-cate">
 						<scroll-view class="first-cate-tabs" scroll-y>
@@ -238,7 +238,7 @@
 			getGoodsTypeList() {
 				const that = this;
 				return new Promise((resolve, reject) => {
-					cstegory.listmerchant({
+					cstegory.getShopCategory({
 							merchantId: this.id
 						})
 						.then(res => {
@@ -460,7 +460,7 @@
 			margin-top: 30rpx;
 			background: #F0F4F3;
 			border-radius: 20rpx 20rpx 0 0;
-			padding-top: 24rpx;
+			// padding-top: 24rpx;
 			.second-cate {
 				padding: 0 24rpx;
 				margin-bottom: 24rpx;