diff --git a/application/admin/model/order/StoreOrder.php b/application/admin/model/order/StoreOrder.php index 1e82e39b..6f89e13e 100644 --- a/application/admin/model/order/StoreOrder.php +++ b/application/admin/model/order/StoreOrder.php @@ -116,9 +116,11 @@ class StoreOrder extends ModelBasic }else if($item['paid']==1 && $item['status']==1 && $item['refund_status']==0){ $item['status_name']='待收货'; }else if($item['paid']==1 && $item['status']==2 && $item['refund_status']==0){ - $item['status_name']='待评价'; + $item['status_name']='已收货'; }else if($item['paid']==1 && $item['status']==3 && $item['refund_status']==0){ $item['status_name']='待评价'; + }else if($item['paid']==1 && $item['status']==4 && $item['refund_status']==0){ + $item['status_name']='已完成'; }else if($item['paid']==1 && $item['refund_status']==1){ $item['status_name']=<<申请退款
diff --git a/application/admin/view/ump/store_seckill/index.php b/application/admin/view/ump/store_seckill/index.php index 3a6a01cc..fc39be2a 100644 --- a/application/admin/view/ump/store_seckill/index.php +++ b/application/admin/view/ump/store_seckill/index.php @@ -89,6 +89,26 @@ {block name="script"} +