Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

 web_src/src/components/channelList.vue

@@ -110,7 +110,7 @@
        if (this.autoList) {
            this.updateLooper = setInterval(this.initData, 5000);
        }
        

    },
    destroyed() {
        this.$destroy('videojs');