Merge branch 'yangqingjie' into '20210819'

Yangqingjie

See merge request vue-project/liangXing/frontEnd!48

src/pages/login.vue

@@ -84,8 +84,9 @@ height: 100%;
 background:url('../../static/images/login/32copy.png') no-repeat center;
 background-size:contain;
     .login-main{
-        width: 100%;
+        width: 1920px;
         height: 100%;
+        margin:0 auto;
         display: flex;
         .left ,.right{
             margin-left: 20px;
@@ -121,14 +122,13 @@ background-size:contain;
                 color: rgba(255, 255, 255, .8);
                 line-height: 24px;
                 text-align: center;
-                // margin:auto;
                 background: url('../../static/images/login/9.png') 0px 12px no-repeat;
             }
             .content{
                 width: 340px;
                 height: 215px;
                 margin-top: 20px;
-                background:url('../../static/images/login/312.png');
+                background:url('../../static/images/login/312.png') no-repeat;
                 background-size: 336px 213px;
                 display: flex;
                 .neirong{