From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/product/shopPage.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 7b04a74..f7774bc 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -2,14 +2,14 @@
<view>
<!-- 妤煎眰瑁呬慨搴楅摵淇℃伅 -->
<div>
- <u-navbar :border-bottom="false">
+<!-- <u-navbar :border-bottom="false">
<u-search
v-model="keyword"
@search="search"
@click="search"
placeholder="璇疯緭鍏ユ悳绱�"
></u-search>
- </u-navbar>
+ </u-navbar> -->
<div class="wrapper">
<!-- 搴楅摵淇℃伅妯″潡 -->
<div class="store flex">
@@ -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">
@@ -159,7 +159,7 @@
</template>
<script>
-import '@/uview-components/uview-ui'
+import '@/components/uview-components/uview-ui'
// 寮曠敤缁勪欢
import tpl_banner from "@/pages/tabbar/home/template/tpl_banner"; //瀵艰埅鏍忔ā鍧�
import tpl_title from "@/pages/tabbar/home/template/tpl_title"; //鏍囬鏍忔ā鍧�
--
Gitblit v1.8.0