order status

@@ -994,10 +994,13 @@
             orderNum: '',
             orderNum: '',
             orderTime: '',
             orderTime: '',
             
             
-            orderCancel: true, //是否是取消的订单
-            orderCompleted: true, //是否是已完成订单
+            //订单状态
+            canceled: true, //是否是取消的订单
+            completed: true, //是否是已完成订单
+            unpaid: true, //是否是未支付订单
+            unreceived: true, //是否是未收货订单
 
 
-            //如果是取消订单，以下物流信息参数不用传
+            //如果是待收货（未发货和未收货），传物流信息参数
             logisticsUrl: '',
             logisticsUrl: '',
             logisticsCompany: '',
             logisticsCompany: '',
             logisticsNum: '',
             logisticsNum: '',
@@ -1013,9 +1016,7 @@
             freight: ''
             freight: ''
             coupon: ''
             coupon: ''
             yohoCoin: ''
             yohoCoin: ''
-            price: '',
-
-            assessUrl: '' //对于已经完成的订单 传评价url
+            price: ''
         }
         }
     }
     }
 
 

@@ -24,7 +24,7 @@
                         <span>下单时间：{{orderTime}}</span>
                         <span>下单时间：{{orderTime}}</span>
                     </p>
                     </p>
                 </div>
                 </div>
-                {{#unless orderCancel}}
+                {{#if unreceived}}
                     <a class="logistics sub" href="{{logisticsUrl}}">
                     <a class="logistics sub" href="{{logisticsUrl}}">
                         <span class="iconfont">&#xe630;</span>
                         <span class="iconfont">&#xe630;</span>
                         <p class="beside-icon sub-content">
                         <p class="beside-icon sub-content">
@@ -34,7 +34,7 @@
                         </p>
                         </p>
                         <span class="iconfont">&#xe614;</span>
                         <span class="iconfont">&#xe614;</span>
                     </a>
                     </a>
-                {{/unless}}
+                {{/if}}
             </section>
             </section>
 
 
             <section class="goods block">
             <section class="goods block">
@@ -71,11 +71,22 @@
             </ul>
             </ul>
 
 
             <div class="opt block">
             <div class="opt block">
+                {{#unless unreceived}}
+                    {{#unless unpaid}}
                         <span class="btn btn-del">删除订单</span>
                         <span class="btn btn-del">删除订单</span>
+                    {{/unless}}
+                {{/unless}}
+
+                {{#if unpaid}}
+                    <span class="btn btn-cancel">取消订单</span>
+                    <a href="{{payUrl}}">
+                        <span class="btn btn-pay">立即付款</span>
+                    </a>
+                {{/if}}
 
 
-                {{#if orderCompleted}}
-                    <a href="{{assessUrl}}">
-                        <span class="btn btn-assess">评价商品</span>
+                {{#if unreceived}}
+                    <a href="{{logisticsUrl}}">
+                        <span class="btn btn-check-logistics">查看物流</span>
                     </a>
                     </a>
                 {{/if}}
                 {{/if}}
             </div>
             </div>