From 5247bf926bb0e6f09fe3685b62ea09d40d4c1a09 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Sun, 28 Jul 2019 16:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/OrderService.php                     | 4 ++--
 public/appmini/old/alipay/pages/user-order/user-order.js | 2 +-
 public/appmini/old/baidu/pages/user-order/user-order.js  | 3 +--
 public/appmini/old/weixin/pages/user-order/user-order.js | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 45c3d025b..41a2f9402 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 cb62f68ef..626dbdf0d 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 ac534cb49..49821547f 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 64664acb6..e6cae05b4 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,
-- 
GitLab