From 40f8ae4e1b0388676daa4d8360f182510d020756 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 29 Oct 2019 16:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E6=9D=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ToutiaoService.php        |  3 +-
 .../toutiao/pages/user-order/user-order.js    | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/application/service/ToutiaoService.php b/application/service/ToutiaoService.php
index f8856048e..e78aeec48 100644
--- a/application/service/ToutiaoService.php
+++ b/application/service/ToutiaoService.php
@@ -61,7 +61,7 @@ class ToutiaoService
             'trade_type'        => 'H5',
             'product_code'      => 'pay',
             'payment_type'      => 'direct',
-            'out_order_no'      => $order['order_no'],
+            'out_order_no'      => $order['order_no'].GetNumberCode(6),
             'uid'               => md5($params['user']['id']),
             'total_amount'      => $order['total_price']*100,
             'currency'          => 'CNY',
@@ -101,7 +101,6 @@ class ToutiaoService
             'is_online_pay' => $ret['data']['is_online_pay'],
         ];
         return DataReturn('success', 0, $result);
-        print_r($result);die;
     }
 }
 ?>
\ No newline at end of file
diff --git a/public/appmini/old/toutiao/pages/user-order/user-order.js b/public/appmini/old/toutiao/pages/user-order/user-order.js
index 41341a504..99b12c3e9 100755
--- a/public/appmini/old/toutiao/pages/user-order/user-order.js
+++ b/public/appmini/old/toutiao/pages/user-order/user-order.js
@@ -237,26 +237,28 @@ Page({
             console.log(res.data.data.order_info)
             tt.pay({
               orderInfo: res.data.data.order_info,
-              //service: res.data.data.service,
-              service: 1,
+              service: res.data.data.service,
               _debug: 1,
-              getOrderStatus(res) {
-                let { out_order_no } = res;
-                return new Promise(function(resolve, reject) {
-                  // 商户前端根据 out_order_no 请求商户后端查询微信支付订单状态
-                  console.log('getOrderStatus')
-                });
-              },
               success(res) {
-                console.log(res, 'pay-success')
                 if (res.code == 0) {
-                  // 支付成功处理逻辑，只有res.code=0时，才表示支付成功
-                  // 但是最终状态要以商户后端结果为准
+                  // 数据设置
+                  var temp_data_list = self.data.data_list;
+                  temp_data_list[index]['status'] = 2;
+                  temp_data_list[index]['status_name'] = '待发货';
+                  self.setData({ data_list: temp_data_list });
+
+                  // 跳转支付页面
+                  wx.navigateTo({
+                    url: "/pages/paytips/paytips?code=9000&total_price=" +
+                      self.data.data_list[index]['total_price']
+                  });
+                } else {
+                  app.showToast('支付失败');
                 }
               },
               fail(res) {
                 console.log(res, 'pay-fail')
-                // 调起收银台失败处理逻辑
+                app.showToast('调起收银台失败-'+res.data.code);
               }
             });
           }