From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/product/shopPage.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 9269be2..f7774bc 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -81,29 +81,29 @@
</scroll-view>
<!-- 鍩虹搴楅摵妯″紡 -->
- <div v-if="basePageData">
+<!-- <div v-if="basePageData">
<u-tabs :list="tabs" :active-color="mainColor" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
<div class="content" v-if="current == 0">
<u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='鏆傛棤鍟嗗搧淇℃伅'></u-empty>
<goodsTemplate style="width:100%;" v-else :res="goodsList" :storeName="false" />
- </div>
+ </div> -->
<!-- 鍏ㄩ儴鍒嗙被 -->
- <div class="category" v-if="current == 1">
+<!-- <div class="category" v-if="current == 1">
<div class="category-item" v-for="(item,index) in categoryList" :key="index">
<div class="flex" @click="getCategoryGoodsList(item)">
<div>{{item.labelName}}</div>
<div>
<u-icon color="#999" name="arrow-right"></u-icon>
</div>
- </div>
+ </div> -->
<!-- 鍒嗙被瀛愮骇 -->
- <div class="child-list" v-if="item.children && item.children.length!=0">
+<!-- <div class="child-list" v-if="item.children && item.children.length!=0">
<div class="child" @click="getCategoryGoodsList(child)" :key='i' v-for="(child,i) in item.children">{{child.labelName}}
</div>
</div>
</div>
</div>
- </div>
+ </div> -->
<!-- 妤煎眰瑁呬慨妯″紡 -->
<div v-if="enablePageData">
--
Gitblit v1.8.0