From 9106a8e95000a7d2341cb52c7c698cd67b91d70d Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Tue, 28 Apr 2020 17:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=A4=B4=E6=9D=A1=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/membershiplevelvip/order/order.js | 26 +++++++++------
 .../wallet/user-recharge/user-recharge.js     | 26 +++++++++------
 .../toutiao/pages/user-order/user-order.js    | 32 +++++++++++--------
 sourcecode/weixin/app.js                      |  1 -
 4 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
index f25d87bc3..9b6946ee6 100644
--- a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
+++ b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
@@ -248,16 +248,22 @@ Page({
             orderInfo: res.data.data.order_info,
             service: res.data.data.service,
             success(res) {
-              if (res.code == 0) {
-                // 数据设置
-                self.order_item_pay_success_handle(index); // 跳转支付页面
-
-                tt.navigateTo({
-                  url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['price']
-                });
-              } else {
-                app.showToast('支付失败');
-              }
+              // if (res.code == 0) {
+              //   // 数据设置
+              //   self.order_item_pay_success_handle(index); // 跳转支付页面
+
+              //   tt.navigateTo({
+              //     url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['price']
+              //   });
+              // } else {
+              //   app.showToast('支付失败');
+              // }
+
+              // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
+              self.setData({
+                data_page: 1
+              });
+              self.get_data_list(1);
             },
             fail(res) {
               console.log(res, 'pay-fail')
diff --git a/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
index 8913c81d5..b4f3d796b 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -242,16 +242,22 @@ Page({
             orderInfo: res.data.data.order_info,
             service: res.data.data.service,
             success(res) {
-              if (res.code == 0) {
-                // 数据设置
-                self.order_item_pay_success_handle(index); // 跳转支付页面
-
-                tt.navigateTo({
-                  url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['money']
-                });
-              } else {
-                app.showToast('支付失败');
-              }
+              // if (res.code == 0) {
+              //   // 数据设置
+              //   self.order_item_pay_success_handle(index); // 跳转支付页面
+
+              //   tt.navigateTo({
+              //     url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['money']
+              //   });
+              // } else {
+              //   app.showToast('支付失败');
+              // }
+
+              // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
+              self.setData({
+                data_page: 1
+              });
+              self.get_data_list(1);
             },
             fail: function (res) {
               console.log(res, 'pay-fail')
diff --git a/sourcecode/toutiao/pages/user-order/user-order.js b/sourcecode/toutiao/pages/user-order/user-order.js
index c0b658deb..a991ddf7b 100755
--- a/sourcecode/toutiao/pages/user-order/user-order.js
+++ b/sourcecode/toutiao/pages/user-order/user-order.js
@@ -242,21 +242,27 @@ Page({
                 orderInfo: res.data.data.order_info,
                 service: res.data.data.service,
                 success(res) {
-                  if (res.code == 0) {
-                    // 数据设置
-                    self.order_item_pay_success_handle(index);
-
-                    // 跳转支付页面
-                    wx.navigateTo({
-                      url: "/pages/paytips/paytips?code=9000&total_price=" +
-                        self.data.data_list[index]['total_price']
-                    });
-                  } else {
-                    app.showToast('支付失败');
-                  }
+                  // if (res.code == 0) {
+                  //   // 数据设置
+                  //   self.order_item_pay_success_handle(index);
+
+                  //   // 跳转支付页面
+                  //   wx.navigateTo({
+                  //     url: "/pages/paytips/paytips?code=9000&total_price=" +
+                  //       self.data.data_list[index]['total_price']
+                  //   });
+                  // } else {
+                  //   app.showToast('支付失败');
+                  // }
+
+                  // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
+                  self.setData({
+                    data_page: 1
+                  });
+                  self.get_data_list(1);
                 },
                 fail(res) {
-                  console.log(res, 'pay-fail')
+                  console.log(res, 'pay-fail');
                   app.showToast('调起收银台失败-'+res.data.code);
                 }
               });
diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js
index e47eadab3..484adfda0 100755
--- a/sourcecode/weixin/app.js
+++ b/sourcecode/weixin/app.js
@@ -76,7 +76,6 @@ App({
 
     // 价格符号
     price_symbol: "{{price_symbol}}",
-    price_symbol: "￥",
   },
 
   /**
-- 
GitLab