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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/tabbar/index/home.vue

@@ -916,7 +916,7 @@
   .video-info {
     width: 70%;
     position: absolute;
     bottom: 70px;
     bottom: 20px;
     left: 20px;
     color: #f8f8f8;
     z-index: 10;