fix conflict

src/utils/myValidate.js

@@ -72,7 +72,7 @@ export function chinaIdentityValid(rule, value, callback) {
   callback()
 }
 //银行卡号检测
-export function bankAccountValid  (rule, value, callback) {
+export function bankAccountValid(rule, value, callback) {
   const strBin = '10,18,30,35,37,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,58,60,62,65,68,69,84,87,88,94,95,98,99'
   if (!value) {
     return callback(new Error('收款账户不能为空'))
@@ -87,44 +87,40 @@ export function bankAccountValid  (rule, value, callback) {
   }
 }
 // 电话号码验证
-export function  checkPhone (rule, value, callback) {
+export function checkPhone(rule, value, callback) {
   if (!value) {
     console.log(1)
     return callback(new Error('手机号不能为空'));
   } else {
     const reg = /(^1\d{10}$)|(^[0-9]\d{7}$)/
     if (!reg.test(value)) {
-     
+
       callback(new Error('手机号格式不对'));
-    }else{
+    } else {
       callback();
     }
 
   }
 };
 //路径校验
-export function pathValid (rule, value, callback) {
+export function pathValid(rule, value, callback) {
   const RegExp = /^\/.*/
-  if(!value) {
+  if (!value) {
     return callback(new Error('路劲不能为空'))
-  }else if(!RegExp.test(value)){
+  } else if (!RegExp.test(value)) {
     callback(new Error("路径必须已‘/’开头"))
-  }else{
+  } else {
     callback();
   }
 
 }
 //定义金额校验
 export function money(rule, value, callback) {
-<<<<<<< HEAD
   let RegExp = /(^([-]?)[1-9]([0-9]+)?(\.[0-9]{1,6})?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]([0-9])?$)/;
-  if (RegExp.test(value)) {
-=======
-  let RegExp = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
-  if(value === null || value === undefined || value === '') {
+
+  if (value === null || value === undefined || value === '') {
     callback(new Error('金额不能为空'))
-  }else if (RegExp.test(value)) {
->>>>>>> 4d6bb737cd8f5c1dac548efd85ccb5f2d8bff4da
+  } else if (RegExp.test(value)) {
     callback();
   } else {
     callback(new Error("金额格式错误"));
@@ -132,23 +128,23 @@ export function money(rule, value, callback) {
 };
 
 //校验账号密码，只允许数字和字母
-export function account_password_valid(rule, value, callback){
-    let reg = /^[a-zA-Z0-9]*$/
-    if(value === null || value === undefined || value === '') {
-      callback(new Error('请填写正确信息，不能为空'))
-    }else if (reg.test(value)) {
-      callback();
-    } else {
-      callback(new Error("格式错误，只允许输入数字和字母"));
-    }
+export function account_password_valid(rule, value, callback) {
+  let reg = /^[a-zA-Z0-9]*$/
+  if (value === null || value === undefined || value === '') {
+    callback(new Error('请填写正确信息，不能为空'))
+  } else if (reg.test(value)) {
+    callback();
+  } else {
+    callback(new Error("格式错误，只允许输入数字和字母"));
+  }
 }
 
 //只允许数字
-export function number_valid(rule, value, callback){
+export function number_valid(rule, value, callback) {
   let reg = /^[0-9]*$/
-  if(value === null || value === undefined || value === '') {
+  if (value === null || value === undefined || value === '') {
     return callback(new Error('不能为空'))
-  }else if (reg.test(value)) {
+  } else if (reg.test(value)) {
     callback();
   } else {
     callback(new Error("只允许输入数字"));