From f687afe2cf0d786bc31d6bf2e5a46261086d89be Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 22 Nov 2018 18:10:45 +0800
Subject: [PATCH] pay

---
 alipay/pages/paytips/paytips.axml     |  2 +-
 alipay/pages/paytips/paytips.js       | 13 +++++++------
 alipay/pages/user-order/user-order.js |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/alipay/pages/paytips/paytips.axml b/alipay/pages/paytips/paytips.axml
index ac70c1711..810d8c32e 100755
--- a/alipay/pages/paytips/paytips.axml
+++ b/alipay/pages/paytips/paytips.axml
@@ -3,7 +3,7 @@
   <image class="pay-icon" a:else mode="widthFix" src="{{default_round_error_icon}}" />
   <text class="dis-block">{{params.msg}}</text>
   <view a:if="{{params.code == '9000'}}" class="price-box">
-    <text  class="sales-price">￥{{params.pay.total_amount}}</text>
+    <text  class="sales-price">￥{{params.total_price}}</text>
     <text class="price-unit cr-888">元</text>
   </view>
 </view>
diff --git a/alipay/pages/paytips/paytips.js b/alipay/pages/paytips/paytips.js
index a419571ac..be51ad1e3 100755
--- a/alipay/pages/paytips/paytips.js
+++ b/alipay/pages/paytips/paytips.js
@@ -39,9 +39,14 @@ Page({
         msg = '网络连接出错';
         break;
 
+      // 支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+      case '6004':
+        msg = '支付结果未知';
+        break;
+
       // 用户点击忘记密码导致快捷界面退出(only iOS)
       case '99' :
-        msg = '支付异常错误';
+        msg = '用户取消支付';
         break;
 
       // 默认错误
@@ -49,11 +54,7 @@ Page({
         msg = '其它异常错误';
     }
     options['msg'] = msg;
-
-    // 支付成功返回的信息
-    var pay = ((options.result || null) == null || options.result == 'undefined') ? {} : JSON.parse(options.result);
-    options['pay'] = pay.alipay_trade_app_pay_response;
-
+    
     // 设置信息
     this.setData({params: options});
   },
diff --git a/alipay/pages/user-order/user-order.js b/alipay/pages/user-order/user-order.js
index fb99eea9a..5473ec727 100755
--- a/alipay/pages/user-order/user-order.js
+++ b/alipay/pages/user-order/user-order.js
@@ -211,8 +211,8 @@ Page({
                   url:
                     "/pages/paytips/paytips?code=" +
                     res.resultCode +
-                    "&result=" +
-                    res.result
+                    "&total_price=" +
+                    temp_data_list[index]['total_price']
                 });
               },
               fail: res => {