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

徐旺旺

2021-04-07 682bfa52d2697aaf79a3815e99558cf07623bc7c

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

@@ -31,10 +31,10 @@
  border: 1px solid #396d83;
  padding: 6px;
  //.main-video {
    height: 378px;
    height: 432px;
    video {
      width: 100%;
      height: 378px;
      height: 432px;
      outline: none;
    }
  //}