提交订单

src/main/resources/static/css/pay/caimei-paycash.css

@@ -142,7 +142,7 @@ input::-webkit-outer-spin-button {
     .payment-transfer .label>p .red{color:#e15616}
     .payment-transfer .copy{display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%);border-radius:2px;color:#FFF;margin-left:2vw}
     .pay-button a{display:block;width:93.4vw;height:11.2vw;line-height:11.2vw;font-size:3.7vw;text-align:center;border-radius:2px;border:1px solid #e15616;margin:0 auto 2.6vw auto;color:#FFF;background:#e15616}
-
+    .pay-alert-content{display: none;}
 
 
 }

src/main/resources/static/css/shopping/shopping.css

@@ -85,7 +85,7 @@ li{list-style:none}
     .summaryWrap .summary .delete{margin-left:16px;color:#f55c5c}
     .summaryWrap .summary .right .item{position:relative;text-align:right}
     .summaryWrap .summary .right .item em{color:#f55c5c}
-    .summaryWrap .summary .submit{display:inline-block;width:232px;height:50px;line-height:50px;text-align:center;background-color:#e15616;border-radius:2px;color:#FFF}
+    .summaryWrap .summary .submit{display:inline-block;width:232px;height:50px;line-height:50px;text-align:center;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius:2px;color:#FFF}
     .summaryWrap .summary .submit.dis{background:#999;}
     .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:99999;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
     .summaryWrap .summary .item .del{position:absolute;right:0;top:-20px;cursor:pointer;height:24px;font-size:14px}

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

@@ -470,21 +470,25 @@ var shoppingConfirm = new Vue({
             console.log(params);
             this.submitLoading = true;
             OrderApi.ConfirmOrder({'params':JSON.stringify(params)},function (r) {
-                if(r.code === 1){
-                    var data = { payableAmount: _self.deductMoney };
-                    CAIMEI.Storage.removeItem('confirmOrderInfo');
-                    CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
-                    window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payInfo.orderShouldPayFee;
-                }else if(r.code === 2){
-                    var data = {
-                        orderID:r.data.orderID,
-                        orderNo:r.data.orderNo,
-                        orderMark:r.data.orderMark,
-                        payableAmount:r.data.payableAmount
-                    };
-                    CAIMEI.Storage.removeItem('confirmOrderInfo');
-                    CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
-                    window.location.href = '/pay/caimei-paycash.html?type=confirm&orderID='+r.data.orderID;
+                if(r.code === 0){
+                    var _data = r.data;
+                    if(Number(_data.code) === 1){//余额抵扣全部订单金额
+                        var data = { payableAmount: _self.deductMoney };
+                        CAIMEI.Storage.removeItem('confirmOrderInfo');
+                        CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
+                        window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_data.payTotalFee;
+                    }else{//余额抵扣部分订单金额或者未支付的
+                        var data = {
+                                orderID:_data.orderID,
+                                orderNo:_data.orderNo,
+                                orderMark:_data.orderMark,
+                                payableAmount:_data.payableAmount
+                            };
+                        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;
@@ -505,9 +509,9 @@ var shoppingConfirm = new Vue({
                 // 获取列表数据
                 this.getConfirmList(null);
             }else if(this.type === 2){
-                this.productId = getUrlParam("id");
+                this.productIds = getUrlParam("id");
                 var count = getUrlParam("count");
-                if(this.productId && count) {
+                if(this.productIds && count) {
                     // 获取列表数据
                     this.getConfirmList(count);
                 }else{

src/main/resources/static/js/user-center/order/detail.js

@@ -160,11 +160,11 @@ var orderPage = new Vue({
                             _self.modelType = 1;
                             CAIMEI.Popup({
                                 content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(r.data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<em>￥'+toFloat(r.data.pendingPayments)+'</em></div>',
-                                confitmBtnText: '抵扣',
+                                confitmBtnText: '抵扣,继续付款',
                                 cancelBtnText: '不抵扣,继续付款'
                             },function(){
                                 // 抵扣,继续付款
-                                _self.hanldCancelConfirm(1)
+                                _self.hanldPaymentConfirm(1)
                             },function(){
                                 // 不抵扣,继续付款
                                 _self.hanldCancelConfirm()
@@ -177,8 +177,8 @@ var orderPage = new Vue({
                                 confitmBtnText: '抵扣',
                                 cancelBtnText: '不抵扣,继续付款'
                             },function(){
-                                // 抵扣,继续付款
-                                _self.hanldCancelConfirm(1);
+                                // 抵扣全款
+                                _self.hanldPaymentConfirm(2);
                             },function(){
                                 // 不抵扣,继续付款
                                 _self.hanldCancelConfirm();

src/main/resources/static/js/user-center/order/list.js

@@ -245,11 +245,11 @@ var orderPage = new Vue({
                             _self.modelType = 1;
                             CAIMEI.Popup({
                                 content: '<div class="payAlert">您有采美余额<em>￥'+toFloat(r.data.ableUserMoney)+'</em>暂未使用，是否需要抵扣订单？ 抵扣后您只需再支付<em>￥'+toFloat(r.data.pendingPayments)+'</em></div>',
-                                confitmBtnText: '抵扣',
+                                confitmBtnText: '抵扣,继续付款',
                                 cancelBtnText: '不抵扣,继续付款'
                             },function(){
                                 // 抵扣,继续付款
-                                _self.hanldCancelConfirm(1)
+                                _self.hanldPaymentConfirm(1)
                             },function(){
                                 // 不抵扣,继续付款
                                 _self.hanldCancelConfirm()
@@ -262,11 +262,11 @@ var orderPage = new Vue({
                                 confitmBtnText: '抵扣',
                                 cancelBtnText: '不抵扣,继续付款'
                             },function(){
-                                // 抵扣,继续付款
-                                _self.hanldCancelConfirm(1);
+                                // 抵扣全款
+                                _self.hanldPaymentConfirm(2);
                             },function(){
                                 // 不抵扣,继续付款
-                                _self.hanldCancelConfirm();
+                                _self.hanldCancelConfirm()
                             });
                             break;
                         case -1: