diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index 19ab0d6b..f59cca04 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -188,12 +188,28 @@ class Orders extends HD_Controller ? str_replace(" 00:00:00", "", $row['delry_time']) : ''; //获取车辆服务费 $srv_info = $this->orders_v2_entity->order_srv_money($row['id'], 2); + $fine_title = ''; + if($row['fines']){ + $fines = json_decode($row['fines'],true); + $split = $fine_title = ''; + foreach($fines as $key=>$val){ + $fine_title = $fine_title.$split.$val['txt'].$split; + $price = number_format(floatval($val['price']),2); + $fine_title = $fine_title.$split."{$val['txt']}:{$price}"; + $split = ' '; + } + } + $row['fine_title'] = $fine_title; $srv_info['total'] = number_format($srv_info['total'], 2); $srv_detail = ""; if ($srv_info['list']) { foreach ($srv_info['list'] as $key => $val) { $d = $srv_detail ? ',' : ''; - $srv_detail .= $d . $val['title'] . ":" . number_format(floatval($val['money']), 2); + if($val['key']=='price_fine_select' && $fine_title){ + $srv_detail .= $d . $val['title'] . ":" . number_format(floatval($val['money']), 2)."[$fine_title]"; + }else{ + $srv_detail .= $d . $val['title'] . ":" . number_format(floatval($val['money']), 2); + } } } $srv_info['detail'] = $srv_detail; diff --git a/admin/views/receiver/orderv2/get/index.php b/admin/views/receiver/orderv2/get/index.php index 32b64961..85e0aa21 100644 --- a/admin/views/receiver/orderv2/get/index.php +++ b/admin/views/receiver/orderv2/get/index.php @@ -166,6 +166,19 @@ +