diff --git a/application/service/OrderService.php b/application/service/OrderService.php index 45c3d025b9627ba1815fbb7b7b5ac07f6ba49cb8..41a2f9402367940085ac86e6533ad58d709857d1 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -172,8 +172,8 @@ class OrderService // 支付信息返回 $ret['data'] = [ - // 是否为线下支付类型 - 'is_under_line' => in_array($payment[0]['payment'], config('shopxo.under_line_list')) ? 1 : 0, + // 是否为在线支付类型 + 'is_online_pay' => ($payment[0]['payment'] == 'WalletPay' || in_array($payment[0]['payment'], config('shopxo.under_line_list'))) ? 0 : 1, // 支付模块处理数据 'data' => $ret['data'], diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js index cb62f68efe3681935f7762f70e69870ea90ef22c..626dbdf0dc87b163b1f1812b2b1b876f6449e042 100755 --- a/public/appmini/old/alipay/pages/user-order/user-order.js +++ b/public/appmini/old/alipay/pages/user-order/user-order.js @@ -240,7 +240,7 @@ Page({ my.hideLoading(); if (res.data.code == 0) { // 线下支付成功 - if (res.data.data.is_under_line == 1) { + if (res.data.data.is_online_pay == 0) { var temp_data_list = this.data.data_list; temp_data_list[index]['status'] = 2; temp_data_list[index]['status_name'] = '待发货'; diff --git a/public/appmini/old/baidu/pages/user-order/user-order.js b/public/appmini/old/baidu/pages/user-order/user-order.js index ac534cb4961445659b74f1ae911c8dde29a2df6a..49821547f42c608687d1be30543040dc386e4d3b 100755 --- a/public/appmini/old/baidu/pages/user-order/user-order.js +++ b/public/appmini/old/baidu/pages/user-order/user-order.js @@ -214,7 +214,7 @@ Page({ swan.hideLoading(); if (res.data.code == 0) { // 线下支付成功 - if (res.data.data.is_under_line == 1) { + if (res.data.data.is_online_pay == 0) { var temp_data_list = this.data.data_list; temp_data_list[index]['status'] = 2; temp_data_list[index]['status_name'] = '待发货'; @@ -222,7 +222,6 @@ Page({ app.showToast("支付成功", "success"); } else { - console.log(res.data.data.data) swan.requestPolymerPayment({ orderInfo: res.data.data.data, success: function (res) { diff --git a/public/appmini/old/weixin/pages/user-order/user-order.js b/public/appmini/old/weixin/pages/user-order/user-order.js index 64664acb690056112e403344ee7ed42193c4a6f9..e6cae05b4fc00d6197e206ff49135c58fda62544 100755 --- a/public/appmini/old/weixin/pages/user-order/user-order.js +++ b/public/appmini/old/weixin/pages/user-order/user-order.js @@ -226,7 +226,7 @@ Page({ wx.hideLoading(); if (res.data.code == 0) { // 线下支付成功 - if (res.data.data.is_under_line == 1) { + if (res.data.data.is_online_pay == 0) { var temp_data_list = this.data.data_list; temp_data_list[index]['status'] = 2; temp_data_list[index]['status_name'] = '待发货'; @@ -234,7 +234,6 @@ Page({ app.showToast("支付成功", "success"); } else { - console.log(res.data.data.data) wx.requestPayment({ timeStamp: res.data.data.data.timeStamp, nonceStr: res.data.data.data.nonceStr,