From 8247a73d438909ddf61b8f8f8ecd8f8fd5d77d03 Mon Sep 17 00:00:00 2001 From: lccsw <1127794702@qq.com> Date: Sat, 2 Apr 2022 21:31:43 +0800 Subject: [PATCH] edit-admin-order_status --- admin/libraries/Ordersv2List.php | 4 +--- common/models/receiver/order/Receiver_orders_v2_model.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php index 2f1e8429..48d2ff8a 100644 --- a/admin/libraries/Ordersv2List.php +++ b/admin/libraries/Ordersv2List.php @@ -262,10 +262,8 @@ class Ordersv2List $open_url = '/receiver/orderv2/orders/get?id='; $fields['name'] = $size > 1000 ? $name : '' . $name . '
' . $mobile . ''; - }else{ $open_url = '/receiver/orders/get?id='; - $name = $val['name']; $mobile = $val['mobile']; $o_tp = '(旧订单)'; $fields['name'] = $size > 1000 ? $val['name'] @@ -276,7 +274,7 @@ class Ordersv2List $fields['price'] = number_format($money_json['price_car'], 2); $fields['payway_name'] = $this->paywayAry[$val['payway']]; $fields['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; - if(strlen($params['status_pid']) && $params['status_pid']!=5){ + if(strlen($params['status_pid']) && $params['status_pid']!=5 && $val['status']!=2){ $fields['status_name'] = $this->ci->orders_status_entity->last_status_cn($val['id'],$params['status_pid']); }else{ $fields['status_name'] = $order_status_cn[$val['status']]; diff --git a/common/models/receiver/order/Receiver_orders_v2_model.php b/common/models/receiver/order/Receiver_orders_v2_model.php index a28d5189..0954a72c 100644 --- a/common/models/receiver/order/Receiver_orders_v2_model.php +++ b/common/models/receiver/order/Receiver_orders_v2_model.php @@ -12,7 +12,7 @@ class Receiver_orders_v2_model extends HD_Model { private $table_name = 'lc_receiver_orders_v2'; - private $status_arr = [0 => '进行中', 1 => '已完成']; + private $status_arr = [0 => '进行中', 1 => '已完成',2 => '已退款']; public function __construct() {