订单列表修改

resources/views/user/order.blade.php

@@ -200,9 +200,10 @@
             <div class="td w239">{{value.shipping_address}}</div>
             <div class="td w239">{{value.shipping_address}}</div>
             <div class="td w150">
             <div class="td w150">
                 <!-- <div class="btnsi">Buy Again</div> -->
                 <!-- <div class="btnsi">Buy Again</div> -->
-                {{if (value.status==1||value.status==-1)}}
+                {{if (value.status==1)}}
                 <div class="btnsi cancelbtn" guid="{{value.order_id}}">Cancel Order</div>
                 <div class="btnsi cancelbtn" guid="{{value.order_id}}">Cancel Order</div>
-                {{else}}
+                {{/if}}
+                {{if (value.status!=1&&value.status!=-1)}}
                 <div class="btnsi paybtn" merchandise_pay="{{value.merchandise_total}}" shipping_pay="{{value.shipping}}" ps_pay="{{value.payment_surcharge}}" goods_num_pay="{{value.goods_name_arr.length}}" subtotal_pay="{{value.sub_total}}" >Pay</div>
                 <div class="btnsi paybtn" merchandise_pay="{{value.merchandise_total}}" shipping_pay="{{value.shipping}}" ps_pay="{{value.payment_surcharge}}" goods_num_pay="{{value.goods_name_arr.length}}" subtotal_pay="{{value.sub_total}}" >Pay</div>
                 {{/if}}
                 {{/if}}
 
 

resources/views/user/orderDetail.blade.php

@@ -187,7 +187,7 @@
             <div class="ht">Settlement Information</div>
             <div class="ht">Settlement Information</div>
             <div class="hcon">
             <div class="hcon">
                 <p>Merchandise Total：${{merchandise_total}} <span class="ml20">Shipping：${{shipping}} </span> <span class="ml20">Payment Surcharge：${{payment_surcharge}}</span></p>
                 <p>Merchandise Total：${{merchandise_total}} <span class="ml20">Shipping：${{shipping}} </span> <span class="ml20">Payment Surcharge：${{payment_surcharge}}</span></p>
-                <p>Subtotal（3item）：${{sub_total}}</p>
+                <p>Subtotal（{{items.length}}item）：${{sub_total}}</p>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>