Bläddra i källkod

Merge branch 'master' of git.beswell.com:duanchangpeng/flyLong

duanchangpeng 5 år sedan
förälder
incheckning
836c6997ef
1 ändrade filer med 5 tillägg och 4 borttagningar
  1. 5 4
      tv/src/views/Wait.vue

+ 5 - 4
tv/src/views/Wait.vue

@@ -91,7 +91,7 @@
                 title="提示"
                 title="提示"
                 :visible.sync="dialogVisible"
                 :visible.sync="dialogVisible"
                 width="30%"
                 width="30%"
-                :before-close="handleClose">
+               >
             <span>{{dialogText}}</span>
             <span>{{dialogText}}</span>
             <span slot="footer" class="dialog-footer">
             <span slot="footer" class="dialog-footer">
     <el-button type="primary" @click="dialogVisible = false">知道了</el-button>
     <el-button type="primary" @click="dialogVisible = false">知道了</el-button>
@@ -491,8 +491,8 @@
     }
     }
 
 
     .recordMain {
     .recordMain {
-        /*height: 6rem;*/
-        height: 100%;
+        height: 6rem;
+        /*height: 100%;*/
         overflow: hidden;
         overflow: hidden;
     }
     }
 
 
@@ -861,12 +861,13 @@
     .bottom {
     .bottom {
         position: relative;
         position: relative;
         width: 100%;
         width: 100%;
+        height: 4rem;
         padding-top: 0.1rem;
         padding-top: 0.1rem;
         bottom: 0.2rem;
         bottom: 0.2rem;
     }
     }
 
 
     /deep/ .el-carousel__indicators--horizontal {
     /deep/ .el-carousel__indicators--horizontal {
-        /*display: none;*/
+        display: none;
     }
     }
 
 
     /deep/ .el-carousel {
     /deep/ .el-carousel {