diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 191daac0..cbd55dc6 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -46,6 +46,8 @@ class Orders extends HD_Controller{ $row['cf_title'] = $customers['cf_title']; $row['payway'] = intval($row['payway']); $row['item_id'] = intval($row['item_id']); + $row['cardid'] = $row['info_json']['cardid'] ? $row['info_json']['cardid'] : $row['info_json']['c_cardid']; + $row['addr'] = $row['info_json']['address'] ? $row['info_json']['address'] : ''; //获取车信息 $brand = $this->auto_brand_model->get(['id'=>$row['brand_id']],'name'); $serie = $this->auto_series_model->get(['id'=>$row['s_id']],'name'); diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php index 42b63941..b789b98e 100644 --- a/admin/controllers/receiver/order/Sign.php +++ b/admin/controllers/receiver/order/Sign.php @@ -56,6 +56,7 @@ class Sign extends HD_Controller{ if($params['brand_id']){//品牌 $where["{$t2}.brand_id"] = $params['brand_id']; } else { + $where["brand_id<>3"] = null; $params['brand_id'] = ''; } if($params['s_id']){//车系 @@ -123,7 +124,7 @@ class Sign extends HD_Controller{ foreach($rows as $key=>$val){ $admin = $map_admin[$val['admin_id']]; - $admin_name = $admin ? "{$map_biz[$admin['biz_id']]}门店 {$admin['uname']}": ''; + $admin_name = $admin ? "{$map_biz[$admin['biz_id']]} {$admin['uname']}": ''; $val['brand_name'] = isset($brands[$val['brand_id']]) ? $brands[$val['brand_id']][0]['name'] : ''; $val['series_name'] = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : ''; $val['v_name'] = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : ''; @@ -131,6 +132,8 @@ class Sign extends HD_Controller{ $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; $val['admin_name'] = $admin_name; + $val['price'] = $val['price'] > 1 ? number_format($val['price']) : number_format($val['price'], 2); + $val['deposit'] = $val['deposit'] > 1 ? number_format($val['deposit']) : number_format($val['deposit'], 2); $lists[] = $val; } } diff --git a/admin/views/receiver/order/sign/lists.php b/admin/views/receiver/order/sign/lists.php index 29963988..8585873c 100644 --- a/admin/views/receiver/order/sign/lists.php +++ b/admin/views/receiver/order/sign/lists.php @@ -102,12 +102,13 @@