order status

@@ -976,8 +976,11 @@
         completed: true, //已完成
         canceled: true, //已取消
         unpaid: true, //or 未支付
-        unshipped: '', //or 未发货，查看物流URL
-        unreceived: '', //or 未收货，查看物流URL
+        unreceived: '', //or 待收货(未发货/未收货)，查看物流URL
+        
+        //待收货时传递物流参数
+        logisticsUrl: ''
+
     }
 
 ### 订单详情页
@@ -993,7 +996,7 @@
             orderStatus: '订单成功', //订单取消...等订单状态
             orderNum: '',
             orderTime: '',
-            
+    
             //订单状态
             canceled: true, //是否是取消的订单
             completed: true, //是否是已完成订单

@@ -13,6 +13,16 @@
     </footer>
 
     {{!-- 对应订单状态的操作逻辑 --}}
+
+    {{!-- 完成和取消订单显示删除按钮 --}}
+    {{#unless unpaid}}
+        {{#unless unreceived}}
+            <div class="order-opt">
+                <span class="btn del">删除订单</span>
+            </div>
+        {{/unless}}
+    {{/unless}}
+
     {{#if unpaid}}
         <div class="order-opt">
             <span class="btn cancel">取消订单</span>
@@ -20,27 +30,9 @@
         </div>
     {{/if}}
 
-    {{#with unreceived}}
-        <div class="order-opt">
-            <a class="check-logistics" href="{{.}}">查看物流</a>
-        </div>
-    {{/with}}
-
-    {{#with unshipped}}
-        <div class="order-opt">
-            <a class="check-logistics" href="{{.}}">查看物流</a>
-        </div>
-    {{/with}}
-
-    {{#if canceled}}
-        <div class="order-opt">
-            <span class="btn del">删除订单</span>
-        </div>
-    {{/if}}
-
-    {{#if completed}}
+    {{#if unreceived}}
         <div class="order-opt">
-            <span class="btn del">删除订单</span>
+            <a class="check-logistics" href="{{logisticsUrl}}">查看物流</a>
         </div>
     {{/if}}
 </div>
\ No newline at end of file