Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-08 5c5712ee7cc9065b8257681c7ec5d92534166aac

 src/views/operate/fivepack/shop/components/header/index.vue

@@ -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'],