确认订单，支付 review by 黄义

@@ -21,8 +21,9 @@
     "pages/orders/orderDetail/orderDetail",
     "pages/goodsList/newArrival",
     "pages/goodsDetail/goodsDetail",
-    "pages/shopCart/giftPage"
-    
+    "pages/shopCart/giftPage",
+    "pages/statements/statements",
+    "pages/invoice/invoceDetail"
   ],
   "window":{
     "navigationBarBackgroundColor": "#3a3a3a",

 export default {
     appid: 'wx207f18be42db9028',
     mini_app_type: '60',
-    payment_code: '45',
+    payment_code: '68',
     domains: {
         // production
         // api: 'https://api.yoho.cn',
@@ -10,13 +10,13 @@ export default {
         // api: 'http://apigray.yoho.cn',
 
         // test
-       api: 'http://api-test3.dev.yohocorp.com',
+        api: 'http://api-test3.dev.yohocorp.com',
 
         yasApi: 'https://analysis.yohobuy.com/yas_mobile',
         app_report_host: 'https://app.yoho.cn/collect/v3',
     },
     apiParams: {
-        client_type: 'miniapp',
+        client_type: 'ttminiapp',
         private_key: 'b43890b0a296ff3c7b8c260ca763980b',
         app_version: '2.9.1',
         miniapp_version: '0.0.9',

@@ -25,7 +25,7 @@ Page({
             delivery_way: 1,//发货方式(1:普通, 2顺丰)
             payment_id:15,//支付id 默认支付宝
             payment_type:1,//支付方式，1 在线支付 2 货到付款
-            receiverMobile:'',
+            receiverMobile:'15950485925',
             sale_channel:1,
             use_red_envelopes: 0,//使用的红包，单位元
             use_red_package: 0,//使用的红包，单位元
@@ -79,7 +79,7 @@ Page({
             is_support_apple_pay:'N',
             method:'app.Buynow.enhancedPayment',
             open_red_package:true,
-            product_sku:'474098',
+            product_sku:'1029813',
             sku_type:'I',
             uid:'600033236',
             yoho_coin_mode:0
@@ -159,13 +159,24 @@ Page({
     addNewAddress: function () {
         //新增收货地址，跳转到新增页面
     },
+    navigateToInvoice: function () {
+        tt.navigateTo({
+            url: 'pages/invoice/invoceDetail',
+            success (res) {
+                console.log(`${res}`);
+            },
+            fail (res) {
+                console.log(`navigateTo调用失败`);
+            }
+        });
+    },
     submit: function () {
+        debugger
         let params = this.data.submitparam;
         api.get({data: params})
             .then(json=>{
             if(json && json.code == 200){
                 let data =  json.data;
-                debugger
                 aliPay(data);
                 
             }

@@ -4,15 +4,15 @@ function pay(data) {
     let orderCode = data.order_code;
     let param = {
         order_code: orderCode,
-        payment_code: config.payment_code
+        payment_code: config.payment_code,
+        openid: "4g0Q-X0ny9uLHASv",
     }
     api.get({data: param,url:"/payment/alipay_data"})
         .then(json=>{
-
-            let data = json.data
+            let data = json.data;
             if(data){
                 let payParams = data.payParams;
-                
+                ttPayment(payParams);
             }
         
     })
@@ -37,30 +37,29 @@ function payConfirm(orderCode){
     })
 }
 
-function ttPayment(payParams){
+function ttPayment(data){
+    let paymentData = JSON.parse(data);
+    let timestampStr = paymentData.timestamp+"";
+    let total_amount = parseFloat(paymentData.total_amount);
+    //头条需要该字段为String
+    paymentData.timestamp = timestampStr;
+    //头条需要该字段为数字
+    paymentData.total_amount = total_amount;
+    // let aliPayParam = paymentData.params;
+    // let aliParam = JSON.parse(aliPayParam);
+    // let testUrl = '_input_charset=\"utf-8\"&body=\"novel\"&it_b_pay=\"30m\"&notify_url=\"https://tp-pay-test.snssdk.com/callback/ali_pay\"&out_trade_no=\"201808211755020406852103\"&partner=\"2088801374045154\"&payment_type=\"1\"&seller_id=\"adsense@bytedance.com\"&service=\"mobile.securitypay.pay\"&subject=\"测试的商品\"&total_fee=\"0.01\"&sign=\"RGdwAoCy5DsjdFBdtrN9WzdYtyZGlUHn8dbAQVQsIPidLTR9s%2BCVtAj%2BtYzL8oAHP0IXJZw8U6EGlyA2MG2ZxhJRI1N1RhDMZOz56eAXO%2FITZYiGSB01hkhx9yhqmWAUJQfUMRHJZswS1DEpwam1JfaoahZ%2Bf%2FEE%2FkvG6ma67t4%3D\"&sign_type=\"RSA\"'
+    // let testparam = {
+    //     url: testUrl,
+    // }
+    // let url = JSON.stringify(testparam);
     tt.requestPayment({
-        data: {
-            app_id: '1900006024',
-            method: 'tp.trade.confirm',
-            sign: 'i0amuwt0wganx7v1hsu0748uc8fb91zz1x96a8x5',
-            sign_type: 'MD5',
-            timestamp: '1534342228111',
-            trade_no: '20180821162045321823181631558207',
-            merchant_id: '800060248973',
-            uid: '6287430262',
-            total_amount: 12,
-            pay_channel: 'ALIPAY_NO_SIGN',
-            pay_type: 'ALIPAY_APP',
-            params: JSON.stringify({
-                // 如果是新版支付宝，url 示例：
-                url: 'app_id=2018041302549907&biz_content=%7B%22body%22%3A%22novel%22%2C%22subject%22%3A%22%E6%B5%8B%E8%AF%95%E7%9A%84%E5%95%86%E5%93%81%22%2C%22out_trade_no%22%3A%22201808211756233909095950%22%2C%22timeout_express%22%3A%2230m%22%2C%22total_amount%22%3A%220.01%22%2C%22seller_id%22%3A%22jrtoutiaoyxgs%40bytedance.com%22%2C%22product_code%22%3A%22QUICK_MSECURITY_PAY%22%7D&charset=utf-8&format=JSON&method=alipay.trade.app.pay&notify_url=https%3A%2F%2Ftp-pay-test.snssdk.com%2Fcallback%2Fali_pay&sign=ZfVkvu%2FSzBqFuqQMgr6MvsXomlr6BCuz7GYDnpsxd3SLVfCssV0q2cnxZyfjh%2FY%2Bk7PO1IeEl4rppQg%2FXgRuIqMXyKdhmigj4oPdQVJEkbSQEcCW4m8mwpXLNjlLH%2FHae3u3hjrMDVPuVXeIxjoq1NLPXy09GY5u1MX8E2lkn8xtmOxA2cXXRIrAa8gTplUoXWkSSkZMgvSTzQ9RjRmlKtK4nERdDWh5RBXLNDU%2FD2FfqIeZuLNZh%2BW8j4dYGtPDm9nWYRz0tLizJDm6E76aTM3qvLi0havCCrHgxZ5d8tVN7GNztA6olbGOiXubEGUq4yBqCojiALEEVpKqfQdZGQ%3D%3D&sign_type=RSA2&timestamp=2018-08-21+17%3A56%3A24&version=1.0'
-                }),
-        },
+        data:paymentData,
         success (res) {
-            console.log(res.errMsg);
+            //支付成功以后跳转到支付成功页
+            console.log("pay success"+res.errMsg);
         },
         fail (res) {
-            console.log(res.errMsg);
+            console.log("pay fail"+res.errMsg);
         }
     })
 }