From 14e1d696e7696a4e6f35d8de815493dc4fe04442 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Mon, 26 Nov 2018 12:01:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=92=E6=9D=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=80=92=E8=AE=A1=E6=97=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/model/order/StoreOrder.php | 4 ++- .../admin/view/ump/store_seckill/index.php | 32 ++++++++++++------- application/wap/view/first/index/index.html | 4 ++- .../wap/view/first/store/seckill_index.html | 2 ++ public/wap/first/crmeb/css/style.css | 4 +-- 5 files changed, 30 insertions(+), 16 deletions(-) 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"} +