Merge branch 'master' of http://111.203.232.171:8888/Song/xitiansenmall into dev_lqs

H5/src/views/bank.vue

@@ -110,7 +110,7 @@ export default {
         this.$toast.fail("请输入正确的身份证号");
         return;
       }
-      if(!/^[u4e00-u9fa5]{8}/.test(this.form.name)){
+      if(!/^[a-zA-Z\u4e00-\u9fa5]+$/.test(this.form.name)){
           this.$toast.fail("姓名仅支持中文或英文");
           return;
       }

H5/src/views/cashOut/cash-out.vue

@@ -245,7 +245,8 @@ export default {
       this.validCodeDialogShow = false;
       const params = {
         code: this.validCode,
-        money: this.money
+        money: this.money,
+        userId:JSON.parse(localStorage.getItem("user")).userId
       };
       cashOut(params)
         .then(res => {
@@ -256,7 +257,7 @@ export default {
             this.resultDialogImg = require("@/assets/images/成功.png");
           } else {
             this.resultDialogTitle = "提现失败";
-            this.resultDialogTip = "提现失败，验证码错误";
+            this.resultDialogTip = res.message;
             this.resultDialogImg = require("@/assets/images/叉号.png");
           }
         })