commit

src/assets/css/general.scss

@@ -96,7 +96,7 @@ span {
 
   .el-form-item {
     ::v-deep .el-form-item__label {
-      font-family: "SRL";
+      font-family: "SRL" !important;
     }
   }
 }
@@ -144,13 +144,12 @@ input[type="number"] {
   -moz-appearance: textfield;
 }
 
-::v-deep .el-dialog__title {
-  font-size: 14px !important;
-}
-
-
 .el-select {
   ::v-deep .el-input__inner {
     font-family: "SRL" !important;
   }
+}
+
+::v-deep .el-input__inner{
+  font-family: 'SRL' !important;
 }

src/components/FecrMessage.vue

@@ -53,10 +53,6 @@ export default {
   z-index: 99;
 }
 
-// ::v-deep .el-dialog__header {
-//   display: none;
-// }
-
 ::v-deep .el-dialog__body {
   display: flex;
   justify-content: center;

src/components/FecrMiddle.vue

@@ -60,10 +60,6 @@ export default {
   border-radius: 10px;
 }
 
-// ::v-deep .el-dialog__header {
-//   display: none;
-// }
-
 ::v-deep .el-dialog__body {
   display: flex;
   justify-content: center;

src/components/FecrPrivacy.vue

@@ -114,10 +114,9 @@ export default {
   border-radius: 10px !important;
 }
 ::v-deep .el-dialog__title {
-  font-family: "SR";
-  font-size: 22px;
   display: block;
   margin-top: 20px;
+  font-size: 22px !important;
 }
 
 ::v-deep .el-dialog__body {
@@ -130,7 +129,7 @@ p {
   font-family: "SRL";
   margin-bottom: 30px;
   line-height: 40px;
-  font-size: 18px;
+  font-size: 16px;
 }
 
 .content {

src/view/appraisal/credit/stepState.vue

@@ -285,7 +285,7 @@ p {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
 }
 
 ::v-deep .el-dialog {

src/view/appraisal/index.vue

@@ -290,6 +290,6 @@ span {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
 }
 </style>

src/view/company/index.vue

@@ -411,6 +411,6 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
 }
 </style>

src/view/company/stepCreditAppraisal.vue

@@ -335,6 +335,6 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
 }
 </style>

src/view/user/index.vue

@@ -95,10 +95,12 @@ export default {
 ::v-deep .el-tabs__item {
   width: 50% !important;
   text-align: center;
+  font-family: 'SRL';
 }
 
 ::v-deep .el-tabs__nav-scroll {
   width: 100% !important;
   @include flex(nowrap);
 }
+
 </style>

src/view/user/login/index.vue

@@ -240,6 +240,18 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
+}
+
+::v-deep .el-form-item__label{
+  font-family: 'SRL';
+}
+
+::v-deep .el-input__inner{
+  font-family: 'SRL';
+}
+
+::v-deep .el-form-item__error{
+font-family: 'SRL';
 }
 </style>

src/view/user/login/reset.vue

@@ -45,7 +45,7 @@
             </el-form-item>
             <el-form-item label="请输入邮箱验证码" prop="verify_code">
               <el-input v-model="form.code"
-                ><el-button slot="append" @click="mail" v-if="!flag"
+                ><el-button slot="append" @click="mail" v-if="!flag" :disabled="checkEmail()"
                   >发送验证码</el-button
                 ><el-button slot="append" disabled v-if="flag"
                   >验证码已发送({{ this.timing }})</el-button
@@ -153,6 +153,17 @@ export default {
     this.$wow();
   },
   methods: {
+    checkEmail(){
+      const reg = new RegExp(
+          "^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"
+        );
+        if (!reg.test(this.form.email)) {
+          return true
+        }else{
+          return false
+        }
+    },
+
     //注册按钮，显示滑块
     register(formName) {
       this.$refs[formName].validate((valid) => {
@@ -299,6 +310,18 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
+}
+
+::v-deep .el-form-item__label{
+  font-family: 'SRL' !important;
+}
+
+::v-deep .el-input__inner{
+  font-family: 'SRL';
+}
+
+::v-deep .el-form-item__error {
+  font-family: "SRL";
 }
 </style>

src/view/user/register/index.vue

@@ -59,7 +59,7 @@
                   v-model="form.code"
                   readonly
                   onfocus="this.removeAttribute('readonly')"
-                  ><el-button slot="append" @click="mail" v-if="!flag"
+                  ><el-button slot="append" @click="mail" :disabled="checkEmail()" v-if="!flag"
                     >发送验证码</el-button
                   ><el-button slot="append" disabled v-if="flag"
                     >验证码已发送({{ this.timing }})</el-button
@@ -183,6 +183,17 @@ export default {
       });
     },
 
+    checkEmail(){
+      const reg = new RegExp(
+          "^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"
+        );
+        if (!reg.test(this.form.email)) {
+          return true
+        }else{
+          return false
+        }
+    },
+
     getDialog(val) {
       this.service_dialog = val;
       this.service_flag = true;
@@ -311,6 +322,18 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
+}
+
+::v-deep .el-form-item__label{
+  font-family: 'SRL' !important;
+}
+
+::v-deep .el-input__inner{
+  font-family: 'SRL';
+}
+
+::v-deep .el-form-item__error {
+  font-family: "SRL";
 }
 </style>

src/view/userInfo/account.vue

@@ -461,6 +461,6 @@ export default {
 }
 
 ::v-deep .el-dialog__title {
-  font-size: 14px !important;
+  font-size: 14px;
 }
 </style>