Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/cms/home.vue

@@ -3,8 +3,8 @@
     <Header></Header>
     <div class="main d-flex">
       <div class="img">
-
-        <video id="videoPlayer" src="./assets/01.mp4" style="width: 90%"  controls  loop></video>
+        <!--首页视频文件 已删除-->
+        <!--        <video id="videoPlayer" src="./assets/01.mp4" style="width: 90%"  controls  loop></video>-->
       </div>
       <div class="lanmu">
         <div class="title d-flex">
@@ -118,23 +118,28 @@ export default {
 
 <style scoped lang="less">
 @import "./assets/reset.css";
+
 .home {
   text-align: center;
 }
+
 .header {
   background: #2080f7;
 }
+
 .main {
   width: 1620px;
   margin: 0 auto;
   margin-top: -250px;
   z-index: 99;
   position: relative;
+
   .img {
     width: 1073px;
     height: 547px;
     /*background: #d9d9d9;*/
   }
+
   .lanmu {
     width: 519px;
     height: 547px;
@@ -143,14 +148,17 @@ export default {
     box-shadow: 0px 0px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 4px 4px 4px 4px;
     padding: 50px;
+
     .title {
       border-bottom: 1px solid #d9d9d9;
+
       .l {
         font-size: 18px;
         padding: 20px 0;
         color: #000000;
         border-bottom: 4px solid #000;
       }
+
       .r {
         font-size: 16px;
         padding: 20px 0;
@@ -158,17 +166,23 @@ export default {
         cursor: pointer;
       }
     }
+
     .itemList {
       padding: 20px 0;
+
       .item {
         padding: 6px;
         cursor: pointer;
+
         .name {
           width: 70%;
           color: #555555;
           font-size: 16px;
-          overflow: hidden;text-overflow: ellipsis;white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
+
         .time {
           width: 30%;
           color: #cccccc;
@@ -178,14 +192,17 @@ export default {
     }
   }
 }
+
 .title {
   margin-top: 20px;
+
   .title1 {
     font-size: 42px;
     font-weight: 500;
     color: #333333;
     margin-bottom: 20px;
   }
+
   .title2 {
     font-size: 20px;
     font-weight: 400;