Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

@@ -64,7 +64,6 @@
    tabTaggle (taggleMenu, num) {
      this.currentTab = taggleMenu
      this.active = num
      // debugger
    },
    current (currentTab) {
      if (this.$attrs.value === 'feishui') {
@@ -72,7 +71,6 @@
      } else {
        currentTab = 'ECharts'
      }
      debugger
      return currentTab
    }
  }