Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

 Conflicts:
	src/views/Knowledge/Glossary.vue

src/views/Djwh/comps/footer.vue

@@ -35,7 +35,8 @@ export default {
     border-top: 1px solid red;
     font-size: 12px;
     margin-bottom: 20px;
-    margin-top: 15px;
-
+  p{
+    margin: 12px 0;
+  }
 }
 </style>

src/views/Djwh/index.vue

@@ -273,8 +273,9 @@ export default {
     return {
         animate:false,
         items:[ //消息列表对应的数组
-        {name:"学习贯彻十九届五中全会精神"},
-        {name:"学习贯彻十九届五中全会精神"},
+        {name:"学习贯彻十九届五中全会精神1"},
+        {name:"学习贯彻十九届五中全会精神2"},
+        {name:"学习贯彻十九届五中全会精神3"},
         ],
         marginTop:0
     };
@@ -296,13 +297,13 @@ export default {
   },
   methods: {
    scroll(){
-      this.marginTop='-56';
+      this.marginTop='-60';
       this.animate=!this.animate;
       var that = this; // 在异步函数中会出现this的偏移问题，此处一定要先保存好this的指向
         setTimeout(function(){
           that.items.push(that.items[0]);
           that.items.shift();
-          this.marginTop='0';
+          that.marginTop='0';
           that.animate=!that.animate; // 这个地方如果不把animate 取反会出现消息回滚的现象，此时把ul 元素的过渡属性取消掉就可以完美实现无缝滚动的效果了
         },1000)
       },
@@ -333,6 +334,7 @@ export default {
         img{
           height: 60px!important;
         }
+        
      }
     
     
@@ -368,6 +370,8 @@ html{
         padding: 10px;
         box-sizing: border-box;
         a{
+          font-size: 16px;
+          text-decoration: underline;
           color:#fff;
         }
      }
@@ -378,6 +382,7 @@ html{
      border:1px solid #BADFF2;
    }
    .djwh-container{
+     margin-top: 20px;
      .left-img{
       img{
         width: 100%;
@@ -415,7 +420,7 @@ html{
           width: 138px;
           text-align: center;
           color: #fff;
-          font-size: 14px;
+          font-size: 16px;
           font-weight: 800;
           line-height: 26px;
         }
@@ -463,7 +468,7 @@ html{
      margin-top: 10px;
      
      img{
-       padding: 5px;
+       padding:0 5px 5px 5px;
        width: 100%;
      }
    }
@@ -474,13 +479,20 @@ html{
      float: right;
       width: 78%;
       height: 60px;
-      line-height: 40px;
+      
       overflow: hidden;
       padding-left: 4px;
       border: 1px solid #ccc;
       // transition: all 1s linear 0s;
       color: #000066;
       font-size: 12px;
+      #con1{
+        height: 60px;
+        p{
+          height: 60px;
+          line-height: 35px;
+        }
+      }
     }
     .anim{
       transition: all 1s ;
@@ -492,10 +504,10 @@ html{
         text-align: center;
         line-height: 30px;
         letter-spacing: 4px;
-        background: -moz-linear-gradient(to top, #F64108, #B80908);
-        background: -ms-linear-gradient(to top, #F64108, #B80908);
-        background: -webkit-linear-gradient(to top, #F64108, #B80908);
-        background: linear-gradient(to top, #F64108, #B80908);
+        background: -moz-linear-gradient(to bottom, #F64108, #B80908);
+        background: -ms-linear-gradient(to bottom, #F64108, #B80908);
+        background: -webkit-linear-gradient(to bottom, #F64108, #B80908);
+        background: linear-gradient(to bottom, #F64108, #B80908);
         font-weight: 800;
 
       }
@@ -533,7 +545,7 @@ html{
         padding: 0;
         margin-top: 15px;
         .middle-list{
-         padding: 5px;
+         padding: 5px 0;
         }
         ul{
           padding: 0;
@@ -551,7 +563,9 @@ html{
             overflow: hidden;
             text-overflow: ellipsis;  
             white-space:nowrap;
+            text-decoration: underline;
             // line-height: 28px;
+            color: #0000ee;
             
 
         }
@@ -561,6 +575,7 @@ html{
             content: "\25CF"; 
              margin-right: 5px;
              float: left;
+             font-size: 10px;
           }
         
       }

src/views/Knowledge/Glossary.vue

@@ -7,7 +7,7 @@
             <span v-for="(item, i) in chaxun.keyArr" :key="i">{{item}}</span>
           </div>
           <div class="knowledge-top-form  col-lg-12">
-            <el-select class="col-lg-3"
+            <el-select class="col-lg-2"
                 v-model="chaxun.type"
                 placeholder="请选择"
                 clearable
@@ -20,7 +20,7 @@
                 >
                 </el-option>
               </el-select>
-            <el-input class="col-lg-7" placeholder="请输入内容" clearable v-model="chaxun.keywords"></el-input>
+            <el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords"></el-input>
             <div class="top-form-btn col-lg-2" >
               <img src="../../assets/image/home/sousuo-ico1.png" alt="" />
             </div>
@@ -53,7 +53,6 @@ import Title from "../comps/title.vue";
 
 export default {
   components: {
-    // eslint-disable-next-line vue/no-unused-components
     Title,
   },
   data() {

src/views/comps/left2.vue

@@ -156,7 +156,7 @@ export default {
       line-height: 22px;
       color: #6b6a6a;
       background: transparent;
-      white-space: pre-wrap;
+      // white-space: pre-wrap;
       // font-size: 16px;
       i {
         color: $side-bg-color;