From be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:59:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/product/shopPage.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 7b04a74..9269be2 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">
@@ -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