Authored by 郭成尧

Merge branch 'feature/usercenter' of git.yoho.cn:fe/yohobuywap-node into feature/usercenter

@@ -26,7 +26,45 @@ exports.orderDetail = (req, res, next) => { @@ -26,7 +26,45 @@ exports.orderDetail = (req, res, next) => {
26 page: 'index', 26 page: 'index',
27 title: 'Yoho!Buy 有货', 27 title: 'Yoho!Buy 有货',
28 pageHeader: headerData, 28 pageHeader: headerData,
29 - pageFooter: true 29 + pageFooter: true,
  30 + orderDetail: [
  31 + {
  32 + 'orderNum': '1111',
  33 + 'pay_expire': '2016-07-28 17:26:28',
  34 + 'user_confirm_paid': 'N',
  35 + 'payment_type_str': '在线支付',
  36 + 'use_limit_code': 'Y',
  37 + 'is_cancel': 'N',
  38 + 'uid': '20000266',
  39 + 'update_time': '0',
  40 + 'name': '张三',
  41 + 'phoneNum': '15999999999',
  42 + 'isVirtual': false,
  43 + 'mobile': '15999999999',
  44 + 'orderNum': '1606688700',
  45 + 'address': '测试地址测试地址测试地址测试地址',
  46 + 'orderStatus': '已取消',
  47 + 'orderTime': '2016-08-17 11:24:28',
  48 + 'logisticsUrl': '#',
  49 + 'logisticsCompany': '顺丰',
  50 + 'logisticsNum': '111111',
  51 + 'yohoCoin': '999',
  52 + 'invoice': {
  53 + 'title': '有货',
  54 + 'contentValue': '有货',
  55 + 'pdfUrl': '#'
  56 + },
  57 + 'qrcode': '#',
  58 + 'orderBalance': [{
  59 + 'promotion': '商品总金额',
  60 + 'account': '100.00'
  61 + }, {
  62 + 'promotion': '运费',
  63 + 'account': '10.00'
  64 + }],
  65 + 'price': '999.99'
  66 + }
  67 + ]
30 })); 68 }));
31 } 69 }
32 }).catch(next); 70 }).catch(next);
1 -/**  
2 - * Created by PhpStorm.  
3 - * User: Targaryen  
4 - * Date: 2016/8/10  
5 - * Time: 13:43  
6 - */  
7 -  
8 -'use strict';  
9 -  
10 -const api = global.yoho.API;  
11 -const singleAPI = global.yoho.SingleAPI;  
12 -const helpers = global.yoho.helpers;  
13 -const camelCase = global.yoho.camelCase;  
14 -  
15 -/**  
16 - * 个人详情数据  
17 - */  
18 -const _viewOrderData = (orderCode, uid, sessionKey) => {  
19 - return api.get('', {  
20 - method: 'app.SpaceOrders.detail',  
21 - orderCode: orderCode,  
22 - uid: uid,  
23 - sessionKey: sessionKey  
24 - }, {code: 200});  
25 -};  
26 -  
27 -const orderDetail = (orderCode, uid, sessionKey) => {  
28 - let result = {  
29 -  
30 - };  
31 -  
32 - return api.all([  
33 - _viewOrderData(1, 10851797, 1)  
34 - ]).then(result => {  
35 - console.log(result[0].data);  
36 - return result;  
37 - });  
38 -};  
39 -  
40 -module.exports = {  
41 - orderDetail  
42 -};  
1 -test  
2 <div class="order-detail-page yoho-page"> 1 <div class="order-detail-page yoho-page">
3 {{# orderDetail}} 2 {{# orderDetail}}
4 <div id="order-detail" data-id="{{orderNum}}"> 3 <div id="order-detail" data-id="{{orderNum}}">