联合丽格V1.0.2

src/main/resources/static/js/pay/caimei-paylist.js

@@ -18,6 +18,7 @@ var payContainer = new Vue({
         isRequest:false,
         orderIdentificationId:'',
         orderId:0,
+        shopOrderId:0,
         userId:0,
         isPayBigAlert:false, // 线下转账弹窗
         obligation:0,
@@ -36,7 +37,7 @@ var payContainer = new Vue({
     methods: {
         PayOrderShoporders(){//初始化订单数据
             const _self = this;
-            PayApi.PayOrderShoporders({orderId:_self.orderId},function(response){
+            PayApi.PayOrderShoporders({orderId:_self.orderId,shopOrderId:_self.shopOrderId},function(response){
                 if(response.code === 0){
                     // console.log(response);
                     _self.list = response.data;
@@ -84,8 +85,8 @@ var payContainer = new Vue({
     mounted: function () {
         var _self = this;
         _self.orderId = CAIMEI.getUrlParam('orderId');
-        _self.orderIdentificationId = '#'+ _self.orderId+'#';
-        console.log(_self.payInfo.payType);
+        _self.shopOrderId = CAIMEI.getUrlParam('shopOrderId');
+        // _self.orderIdentificationId = '#'+ _self.orderId+'#';
         _self.cmGetBankTypeLists();
         _self.PayOrderShoporders();
     }

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

@@ -221,7 +221,7 @@ const orderPage = new Vue({
                 if (response.code === 0) {
                     const data = _self.payModelData = response.data;
                     if (data.balanceFlag === 1) {// 0可以走余额抵扣，1不能走余额抵扣
-                        window.location.href = '/pay/caimei-paylist.html?&orderId=' + _self.orderId;
+                        window.location.href = '/pay/caimei-paylist.html?&shopOrderId=' + _self.shopOrderId;
                     } else {
                         switch (data.code) {
                             case 1:
@@ -258,7 +258,7 @@ const orderPage = new Vue({
                                 CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
                                 break;
                             default:
-                                window.location.href = '/pay/caimei-paylist.html?&orderId=' + _self.orderId;
+                                window.location.href = '/pay/caimei-paylist.html?&shopOrderId=' + _self.shopOrderId;
                         }
                     }
                 } else {
@@ -273,7 +273,7 @@ const orderPage = new Vue({
                     if (modelType === 2) {
                         window.location.href = '/pay/success.html?pageType=www&type=success&payAmount=' + _self.payModelData.obligation;
                     } else {
-                        window.location.href = '/pay/caimei-paylist.html?&orderId=' + _self.orderId;
+                        window.location.href = '/pay/caimei-paylist.html?&shopOrderId=' + _self.shopOrderId;
                     }
                 } else {
                     CAIMEI.Alert(response.msg, '确定', false);
@@ -281,7 +281,7 @@ const orderPage = new Vue({
             });
         },
         hanldCancelConfirm() {//不使用余额抵扣直接跳转收银台
-            window.location.href = '/pay/caimei-paylist.html?&orderId=' + this.orderId;
+            window.location.href = '/pay/caimei-paylist.html?&shopOrderId=' + this.shopOrderId;
         },
         hidePaymentConfirm() {//隐藏弹窗
             this.modelType = 0;

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

@@ -236,7 +236,7 @@ var orderPage = new Vue({
                 if(response.code === 0){
                     var data = _self.payModelData = response.data;
                     if(data.balanceFlag === 1){// 0可以走余额抵扣，1不能走余额抵扣
-                        window.location.href = '/pay/caimei-paylist.html?&orderId='+order.orderId;
+                        window.location.href = '/pay/caimei-paylist.html?&shopOrderId='+shopOrderId;
                     }else{
                         switch(data.code){
                             case 1:
@@ -273,7 +273,7 @@ var orderPage = new Vue({
                                 CAIMEI.Alert('订单已申请全部退款，无需再付款！', '确定', false);
                                 break;
                             default:
-                                window.location.href = '/pay/caimei-paylist.html?orderId='+order.orderId;
+                                window.location.href = '/pay/caimei-paylist.html?shopOrderId='+shopOrderId;
                         }
                     }
                 }else{
@@ -288,7 +288,7 @@ var orderPage = new Vue({
                     if (modelType === 2) {
                         window.location.href = '/pay/success.html?pageType=www&type=success&payAmount='+_self.payModelData.obligation;
                     } else {
-                        window.location.href = '/pay/caimei-paylist.html?orderId='+_self.hanldOrderData.orderId;
+                        window.location.href = '/pay/caimei-paylist.html?shopOrderId='+_self.hanldOrderData.shopOrderId;
                     }
                 } else {
                     CAIMEI.Alert(response.msg, '确定', false);
@@ -296,7 +296,7 @@ var orderPage = new Vue({
             });
         },
         hanldCancelConfirm(){//不使用余额抵扣直接跳转收银台
-            window.location.href = '/pay/caimei-paylist.html?orderId='+this.hanldOrderData.orderId;
+            window.location.href = '/pay/caimei-paylist.html?shopOrderId='+this.hanldOrderData.shopOrderId;
         },
         hidePaymentConfirm(){//隐藏弹窗
             this.modelType = 0;