Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

src/assets/js/utils/validator.js

@@ -50,7 +50,8 @@ Validator.extend('required', {
 Validator.extend('email', {
   getMessage: () => '邮箱格式错误',
   validate(value) {
-    return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(value);
+    //return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(value);
+    return /^([a-z0-9_\.-]+)@([0-9A-Za-z\.-]+)\.([a-z\.]{2,6})$/.test(value);
   }
 });
 

src/views/ebiz/sale/PayMent.vue

@@ -205,7 +205,7 @@ export default {
     async payMentWx(orderNo){
       const res = await payFlag({ orderNo: orderNo })
       console.dir(res)
-      if (res.content.payFlag == 'Y') {
+      if (res.result == '0' && res.content.payFlag == 'Y') {
         this.getAcceptInsurance()
       } else {
         this.$toast(res.resultMessage)