From c889c9e4792506e0a7f457560c0d4110645fae93 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 26 十月 2022 09:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/fivepack/shop/components/header/index.vue |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/operate/fivepack/shop/components/header/index.vue b/src/views/operate/fivepack/shop/components/header/index.vue
index 280fe26..bdda097 100644
--- a/src/views/operate/fivepack/shop/components/header/index.vue
+++ b/src/views/operate/fivepack/shop/components/header/index.vue
@@ -6,10 +6,10 @@
                     <span>杈撳叆鏌ヨ:</span>
                     <el-input placeholder="搴楅摵(闂ㄥ簵)鍚嶇О" v-model="search"></el-input>
                 </div>
-                <div class="status">
+                <!-- <div class="status">
                     <span>搴楅摵鐘舵��:</span>
                     <el-input placeholder="閫夋嫨搴楅摵鐘舵��" v-model="shopStatus"></el-input>
-                </div>
+                </div> -->
                 <div class="findBtn">
                     <el-button type="primary" @click="setSearch" icon="el-icon-search">鏌ヨ</el-button>
                     <el-button icon="el-icon-delete-solid" @click="clearSearch">閲嶇疆</el-button>
@@ -59,13 +59,12 @@
                 done();
             })
             .catch(err=>{
-                console.log(err)
             })
         },
         // 娓呯┖search
         clearSearch(){
             this.search = '';
-            // this.$emit('getSearch',{text:this.search});
+            this.$emit('getSearch',{text:this.search});
         },
     },
     props: ['setDialog', 'getSearch', 'flag'],

--
Gitblit v1.8.0