Merge branch 'dev' of http://8.210.146.143:18866/yzd/trustypay into dev

src/utils/config.js

@@ -1,5 +1,5 @@
 export const emailConfig = {
-    PUBLIC_KEY: '46mxfxbF_jfi_rN0U',
-    SERVICE_ID: 'service_8ep1eof',
-    TEMPLATE_ID: 'template_ezifkte',
+    PUBLIC_KEY: 'cMwqRiU-zRWs7A6IJ',
+    SERVICE_ID: 'service_3fnj48h',
+    TEMPLATE_ID: 'template_ppcf3pw',
 }

src/utils/el-validate.js

@@ -1,7 +1,6 @@
 import { isEmail, isValidPhone } from "./validate"
 
 export function elIsEmail(rule, value, callback) {
-    console.log('value',value);
     if (!value) {
         return callback(new Error('Please enter your email'))
     }

src/utils/validate.js

@@ -5,7 +5,6 @@ export function validMobile(str) {
     return /^1[3-9][0-9]{9}$/.test(str)
 }
 export function isEmail(str) {
-    console.log(str);
     return /^([a-zA-Z0-9]+[-_\.]?)+@[a-zA-Z0-9]+\.[a-z]+$/.test(str)
 }
 export function isValidPhone(str) {

src/views/ContactUs.vue

@@ -177,7 +177,7 @@ export default {
               emailConfig.SERVICE_ID,
               emailConfig.TEMPLATE_ID,
               {
-                from_name: "test",
+                from_name: this.form.name,
                 name: this.form.name,
                 businessName: this.form.businessName,
                 mobile: this.form.mobile,