order detail status

@@ -955,7 +955,7 @@
     //订单
     //订单
     {
     {
         orderNum: '',
         orderNum: '',
-        tradingStatus: '',
+        orderStatus: '',
         goods: [
         goods: [
             {
             {
                 id: '',
                 id: '',
@@ -1014,11 +1014,10 @@
                     ... //订单商品
                     ... //订单商品
                 }
                 }
             ],
             ],
-            sumPrice: ''
-            salePrice: ''
-            freight: ''
-            coupon: ''
-            yohoCoin: ''
+            sumPrice: '',
+            salePrice: '',
+            freight: '',
+            yohoCoin: '',
             price: ''
             price: ''
         }
         }
     }
     }

@@ -15,6 +15,30 @@
         }
         }
     }
     }
 
 
+    .sub {
+        position: relative;
+
+        .iconfont {
+            left: 0;
+        }
+    }
+
+    .logistics {
+        display: block;
+
+        .icon-right {
+            right: 25rem / $pxConvertRem;
+            left: auto;
+            color: #b0b0b0;
+        }
+
+        .sub-content {
+            border-top: 1px solid #e0e0e0;
+            margin-top: 20rem / $pxConvertRem;
+            padding-top: 20rem / $pxConvertRem;
+        }
+    }
+
     .owner-info {
     .owner-info {
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
         line-height: 1.5;
         line-height: 1.5;
@@ -41,6 +65,7 @@
         margin: 20rem / $pxConvertRem 0;
         margin: 20rem / $pxConvertRem 0;
         border-top: 1px solid #e0e0e0;
         border-top: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
+        padding-right: 0;
     }
     }
 
 
     .sub-content span {
     .sub-content span {

@@ -18,7 +18,7 @@
             border-bottom: 1px solid #e0e0e0;
             border-bottom: 1px solid #e0e0e0;
         }
         }
 
 
-        .trading-status {
+        .order-status {
             float: right;
             float: right;
         }
         }
 
 

@@ -32,7 +32,7 @@
                             <span>物流公司：{{logisticsCompany}}</span>
                             <span>物流公司：{{logisticsCompany}}</span>
                             <span>快递单号：{{logisticsNum}}</span>
                             <span>快递单号：{{logisticsNum}}</span>
                         </p>
                         </p>
-                        <span class="iconfont">&#xe614;</span>
+                        <span class="iconfont icon-right">&#xe614;</span>
                     </a>
                     </a>
                 {{/if}}
                 {{/if}}
             </section>
             </section>
@@ -57,10 +57,6 @@
                     <span>+¥{{freight}}</span>
                     <span>+¥{{freight}}</span>
                 </li>
                 </li>
                 <li>
                 <li>
-                    优惠券
-                    <span>-¥{{coupon}}</span>
-                </li>
-                <li>
                     YOHO币
                     YOHO币
                     <span>-¥{{yohoCoin}}</span>
                     <span>-¥{{yohoCoin}}</span>
                 </li>
                 </li>

 <div class="order" data-id="{{orderNum}}">
 <div class="order" data-id="{{orderNum}}">
     <header class="header">
     <header class="header">
         订单编号：{{orderNum}}
         订单编号：{{orderNum}}
-        <span class="trading-status">{{tradingStatus}}</span>
+        <span class="order-status">{{orderStatus}}</span>
     </header>
     </header>
     <section class="order-goods">
     <section class="order-goods">
         {{# goods}}
         {{# goods}}

@@ -407,11 +407,14 @@ class HomeController extends AbstractAction
             'name' => '毛毛莉Lydia',
             'name' => '毛毛莉Lydia',
             'phoneNum' => '18600001133',
             'phoneNum' => '18600001133',
             'address' => '南京市建邺区嘉陵江东街18号国家广告产业园5栋17楼',
             'address' => '南京市建邺区嘉陵江东街18号国家广告产业园5栋17楼',
-            'orderStatus' => '订单取消',
+            'orderStatus' => '待收货',
             'orderNum' => '418358063',
             'orderNum' => '418358063',
             'orderTime' => '2014-03-10 17:25:10',
             'orderTime' => '2014-03-10 17:25:10',
 
 
-            'orderCancel' => true,
+            'unreceived' => true,
+            'logisticsUrl' => '',
+            'logisticsCompany' => '顺丰',
+            'logisticsNum' => '51537443456',
 
 
             'goods' => array(
             'goods' => array(
                 array(
                 array(
@@ -438,7 +441,6 @@ class HomeController extends AbstractAction
             'sumPrice' => 799,
             'sumPrice' => 799,
             'salePrice' => 80,
             'salePrice' => 80,
             'freight' => 5,
             'freight' => 5,
-            'coupon' => 0,
             'yohoCoin' => 5,
             'yohoCoin' => 5,
             'price' => 719
             'price' => 719
         );
         );