Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/resources/static/js/shopping/confirm.js

@@ -424,6 +424,8 @@ var shoppingConfirm = new Vue({
                     CAIMEI.dialog('请输入银行账号');return false;
                 }
             }
+            // 禁用按钮
+            this.submitLoading = true;
             // 发票信息
             if(this.invoice.type*1 === 0){
                 this.invoice = Object.assign(this.invoice,'',{type:0});
@@ -466,7 +468,6 @@ var shoppingConfirm = new Vue({
                     payInfo: _payInfo,               // 订单信息
                     orderInvoice: this.invoice           // 发票信息
             };
-            this.submitLoading = true;
             OrderApi.ConfirmOrder({'params':JSON.stringify(params)},function (r) {
                 if(r.code === 0){
                     var _data = r.data;
@@ -485,11 +486,12 @@ var shoppingConfirm = new Vue({
                         CAIMEI.Storage.removeItem('confirmOrderInfo');
                         CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
                         window.location.href = '/pay/caimei-paycash.html?type=confirm&orderID='+_data.orderID;
-                        _self.submitLoading = false;
                     }
                 }else{
                     CAIMEI.Alert(r.msg,'确定',true, function(){
-                        _self.submitLoading = false;
+                        setTimeout(function(){
+                            _self.submitLoading = false;
+                        },500);
                     });
                 }
             });