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

chenyabin

2021-04-08 44670fecb984ced41512446cdcd8a28a202a120f

 src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue

@@ -26,7 +26,7 @@
.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  height: 2.1rem;
  //height: 2rem;
}

.main {