Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

wl

2022-10-28 a654c8fd0b7ff9920eada1edf80438338ca3f5fa

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