Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/views/login/index.vue

@@ -510,10 +510,10 @@ $dark_gray:#889aa4;
   }
 }
 .submit-btn {
-  padding: 0 15px 20px 0px;
+  padding: 0 0px 20px 45px;
   .el-button {
     height: 40px;
-    width: 330px;
+    width: 400px;
   }
 }
 .el-dialog__body {
@@ -524,6 +524,7 @@ $dark_gray:#889aa4;
     display: flex;
     flex-flow: wrap;
     justify-content: center;
+    margin-left: 30px !important;
   }
   ::v-deep .el-form-item {
     margin-bottom: 20px;