homepage

src/views/threeViolations/homePage/index.vue

@@ -616,31 +616,18 @@ export default {
       justify-content: center;
       align-items: center;
       position: absolute;
-<<<<<<< HEAD
-      height:70px;
-      width:100%;
-      background-color: rgba(0,0,0,0.7);
-=======
       height: 117px;
       width: 100%;
       background-color: rgba(0, 0, 0, 0.7);
->>>>>>> 07d9e85 (hompage)
       z-index: 999;
       bottom: 0;
       overflow: hidden;
       text-overflow: ellipsis;
-<<<<<<< HEAD
-      .infor{
-         color: #fff;
-         line-height: 25px;
-         font-size: 12px;
-=======
 
       .infor {
         color: #fff;
         line-height: 25px;
         font-size: 14px;
->>>>>>> 07d9e85 (hompage)
       }
     }
   }