From f62afa4636c67973163697f837d42bc6102f7716 Mon Sep 17 00:00:00 2001
From: xiaobinwu <xiaobin_wu@yahoo.com>
Date: Sun, 14 May 2017 22:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/order.js   |  4 +++-
 pages/order/order.wxml | 47 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/pages/order/order.js b/pages/order/order.js
index 6d81bfb..51a48ea 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -1,6 +1,8 @@
 // pages/order/order.js
 Page({
-  data:{},
+  data:{
+    orderList: []
+  },
   onLoad:function(options){
     // 页面初始化 options为页面跳转所带来的参数
   },
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 072f20a..30dcabf 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -1,2 +1,47 @@
 <!--pages/order/order.wxml-->
-<text>pages/order/order.wxml</text>
+<view class="orderlist">
+    <view class="order-list" wx:for="{{orderList}}">
+        <view class="list">
+
+            <view class="list-header" data-order-id="{{item.order_id}}" bindtap="goDetail()">
+                <span class="icon icon-store"></span>
+                <text class="store-name">{{item.store_name}}</text>
+                <text class="order-time">{{item.add_time}}</text>
+            </view>
+
+            <view class="item-list product-list" data-order-id="{{item.order_id}}" bindtap="goDetail()">
+                <view class="item" wx:for="{{item.goods_list}}" wx:for-item="product">
+                    <view class="item-img">
+                        <image src="{{product.goods_img}}"></image>
+                    </view>
+                    <view class="item-info">
+                        <view class="item-name">{{product.goods_name}}</view>
+                        <view class="item-price">¥ {{product.goods_price}}</view>
+                    </view>
+                    <view class="item-num">x {{product.goods_number}}</view>
+                </view>
+            </view>
+
+            <view class="list-footer">
+                <view class="order-status">
+                    <view class="status">
+                        <view class="{{index == item.progress.last_index-1 ? 'active' : ''}}" wx:for="item.progress.info" wx:for-item="icon">
+                            <span class="icon {{'icon-' + (icon.icon === 'cancel' ? 'refund' : icon.icon)}}"></span>
+                            <view></view>
+                            <text>{{icon.text}}</text>
+                            <view class="hint" wx:if="{{icon.icon == 'await_pay' && item.left_time > 0}}"> {{item.left_time}} </view>
+                        </view>
+                    </view>
+                    <view class="count">
+                        <text>合计：</text>
+                        <text>¥ {{item.order_amount}}</text>
+                    </view>
+                </view>
+                <view class="btn-wrap">
+                    
+                </view>
+            </view>
+
+        </view>
+    </view>
+</view>