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

peng

4 天以前 5027240f2bbc9a7f74b8cc661c265eb9d52eb43a

 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;