From 34cb3b4a2908371a4dae8340035f5db489213d04 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Tue, 11 Jul 2023 11:45:29 +0800
Subject: [PATCH] =?UTF-8?q?style:=20:lipstick:=20=E4=BC=98=E5=8C=96PC?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E4=B8=AD=E6=90=9C=E7=B4=A2=E5=95=86=E5=93=81=E6=9C=AA?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/Search.vue      | 26 +++++++++++++++-----------
 buyer/src/components/nav/CateNav.vue |  2 +-
 buyer/src/pages/GoodsList.vue        |  4 ++--
 buyer/src/pages/Merchant.vue         |  4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
index fe987258..e5843007 100644
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -21,10 +21,6 @@
             <Icon type="ios-search" size="21"/>
           </div>
         </i-input>
-        <div v-if="store" class="btn-div">
-          <Button class="store-search" type="warning" @click="searchStore">搜本店</Button>
-          <Button class="store-search" type="primary" @click="search">搜全站</Button>
-        </div>
         <template v-if="showTag">
           <div style="height:12px" v-if="promotionTags.length === 0"></div>
           <div v-else class="history-list flex">
@@ -57,9 +53,9 @@ export default {
       type: Boolean,
       default: true
     },
-    store: { // 是否为店铺页面
-      type: Boolean,
-      default: false
+    storeId: { // 是否为店铺页面
+      type: String,
+      default: ""
     },
     hover: {
       type: Boolean,
@@ -85,10 +81,14 @@ export default {
       if(url == '/goodsList'){
         this.$emit('search', this.searchData)
       }else{
-        this.$router.push({
-          path: '/goodsList',
-          query: { keyword: this.searchData }
-        });
+        const pushData = {
+          path:'/goodsList',
+          query: { keyword: this.searchData },
+        }
+        if(this.storeId) pushData.query.storeId = this.storeId
+
+
+        this.$router.push(pushData);
       }
     },
     searchStore() { // 店铺搜索商品
@@ -130,6 +130,10 @@ export default {
   height: 113px;
   background: #fff;
 }
+.search-icon{
+  width: 100%;
+  height: 100%;
+}
 .small-search-box{
   height: 60px;
 
diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue
index ae425c09..7c1ffa37 100644
--- a/buyer/src/components/nav/CateNav.vue
+++ b/buyer/src/components/nav/CateNav.vue
@@ -16,7 +16,7 @@
           @click="linkTo(item.url)"
         >
           {{ item.name }}
-          <div class="colum"></div>
+          <div class="colum" v-if="index !== navList.list.length - 1"></div>
         </li>
       </ul>
     </div>
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 9c671ad7..746a8760 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -2,7 +2,7 @@
   <div class="wrapper">
     <BaseHeader></BaseHeader>
     <Search @search="handleSearch"></Search>
-    <cateNav class="cate-nav" useClass="background-white"></cateNav>
+
     <div class="container">
       <!-- 商品筛选栏 -->
       <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@@ -289,7 +289,7 @@ export default {
   vertical-align: middle;
 }
 .container {
-  margin: 15px auto;
+  margin:25px auto 15px auto;
   width: 1184px;
   min-width: 1000px;
   position: relative;
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index d773cdfe..714a4bc9 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -2,11 +2,11 @@
   <div class="merchant">
     <BaseHeader/>
     <!-- 搜索栏 -->
-    <Search :store="true" @search="search"></Search>
+    <Search  :storeId="storeMsg.storeId" @search="search"></Search>
     <!-- 店铺logo -->
     <div class="shop-logo">
       <div>
-        <p>{{ storeMsg.storeName || 'xx店铺' }}</p>
+        <p>{{ storeMsg.storeName || '店铺' }}</p>
         <p :alt="storeMsg.storeDesc" class="ellipsis" v-html="storeMsg.storeDesc"></p>
       </div>
       <div>