From ff9b44cac3ab889799793a9a4b462a70f9501f9e Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Mon, 13 Jan 2020 15:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/membershiplevelvip/order/order.js | 31 ++++++++++---------
 .../old/alipay/pages/user-order/user-order.js | 20 ++++++------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/order/order.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/order/order.js
index 7ff541b1c..7d1090cc1 100644
--- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/order/order.js
+++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/order/order.js
@@ -224,24 +224,25 @@ Page({
       success: res => {
         my.hideLoading();
         if (res.data.code == 0) {
-          my.requestPayment({
-            timeStamp: res.data.data.timeStamp,
-            nonceStr: res.data.data.nonceStr,
-            package: res.data.data.package,
-            signType: res.data.data.signType,
-            paySign: res.data.data.paySign,
-            success: function (res) {
+          my.tradePay({
+            tradeNO: res.data.data,
+            success: res => {
               // 数据设置
-              self.order_item_pay_success_handle(index);
+              if (res.resultCode == 9000) {
+                // 数据设置
+                self.order_item_pay_success_handle(index);
 
-              // 跳转支付页面
-              my.navigateTo({
-                url: "/pages/paytips/paytips?code=9000&total_price=" +
-                  self.data.data_list[index]['price']
-              });
+                // 跳转支付页面
+                my.navigateTo({
+                  url: "/pages/paytips/paytips?code=9000&total_price=" +
+                    self.data.data_list[index]['price']
+                });
+              } else {
+                app.showToast('支付失败');
+              }
             },
-            fail: function (res) {
-              app.showToast('支付失败');
+            fail: res => {
+              app.showToast('唤起支付模块失败');
             }
           });
         } else {
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 03b548c82..818917655 100644
--- a/public/appmini/old/alipay/pages/user-order/user-order.js
+++ b/public/appmini/old/alipay/pages/user-order/user-order.js
@@ -251,16 +251,18 @@ Page({
                   temp_data_list[index]['status'] = 2;
                   temp_data_list[index]['status_name'] = '待发货';
                   this.setData({ data_list: temp_data_list });
+                
+                  // 跳转支付页面
+                  my.navigateTo({
+                    url:
+                      "/pages/paytips/paytips?code=" +
+                      res.resultCode +
+                      "&total_price=" +
+                      this.data.data_list[index]['total_price']
+                  });
+                } else {
+                  app.showToast('支付失败');
                 }
-
-                // 跳转支付页面
-                my.navigateTo({
-                  url:
-                    "/pages/paytips/paytips?code=" +
-                    res.resultCode +
-                    "&total_price=" +
-                    this.data.data_list[index]['total_price']
-                });
               },
               fail: res => {
                 app.showToast('唤起支付模块失败');
-- 
GitLab