diff --git a/admin/controllers/Common.php b/admin/controllers/Common.php index beb772b3..4ae75880 100644 --- a/admin/controllers/Common.php +++ b/admin/controllers/Common.php @@ -1140,7 +1140,7 @@ class Common extends CI_Controller if ($type == 1) { $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择品牌'); $res = array(); - $rows = $this->mdAutoBrand->select($where, 'status desc, id asc', 0, 0, 'id,name'); + $rows = $this->mdAutoBrand->select($where, 'initial asc', 0, 0, 'id,name'); foreach ($rows as $v) { $res[] = array( 'id' => strlen($status) > 0 ? $v['id'] : " " . $v['id'], @@ -1149,10 +1149,10 @@ class Common extends CI_Controller } } else if ($type == 2) { $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择车系'); - $res = $this->mdAutoSeries->select(array_merge($where, ['brand_id' => $pid]), 'id desc', 0, 0, 'id,name'); + $res = $this->mdAutoSeries->select(array_merge($where, ['brand_id' => $pid]), 'id asc', 0, 0, 'id,name'); } else if ($type == 3) { $tp == 0 && $lists[] = array('id' => 0, 'name' => $name ? $name : '选择车型'); - $res = $this->mdAutoCar->select(array_merge($where, ['series_id' => $pid]), 'id desc', 0, 0, 'id,name'); + $res = $this->mdAutoCar->select(array_merge($where, ['series_id' => $pid]), 'id asc', 0, 0, 'id,name'); } foreach ($res as $key => $value) { $lists[] = array('id' => $value['id'], 'name' => $value['name']); diff --git a/admin/controllers/auto/Cars.php b/admin/controllers/auto/Cars.php index e44b9475..697f1a7f 100644 --- a/admin/controllers/auto/Cars.php +++ b/admin/controllers/auto/Cars.php @@ -80,7 +80,6 @@ class Cars extends HD_Controller 'brand' => $map_brand[$v['brand_id']], 'series' => $map_series[$v['series_id']], 'name' => $v['name'], - 'third_car_id' => $v['third_car_id'], 'status' => $v['status'], ); } diff --git a/admin/controllers/autohome/Customer.php b/admin/controllers/autohome/Customer.php index 65e41da9..fd44574c 100644 --- a/admin/controllers/autohome/Customer.php +++ b/admin/controllers/autohome/Customer.php @@ -22,7 +22,7 @@ class Customer extends HD_Controller '10491' => '厦门-蔡文彬', '10492' => '厦门-李怀松', '10493' => '厦门-哪吒', - '10494' => '厦门-古维天', + '10494' => '厦门-古惟天', '10495' => '厦门-7', '10496' => '厦门-8', '10497' => '厦门-9', @@ -405,15 +405,15 @@ class Customer extends HD_Controller continue; } - if($v['brand_id']){ - $brand = $this->auto_brand_model->get(['id' => $v['brand_id']]); - $brand_id = $brand['ah_id']; - } - - if($v['series_id']){ - $series = $this->auto_series_model->get(['id' => $v['series_id']]); - $series_id = $series['ah_id']; - } +// if($v['brand_id']){ +// $brand = $this->auto_brand_model->get(['id' => $v['brand_id']]); +// $brand_id = $brand['ah_id']; +// } +// +// if($v['series_id']){ +// $series = $this->auto_series_model->get(['id' => $v['series_id']]); +// $series_id = $series['ah_id']; +// } $push_data = array( 'pushAppKey' => $this->pushAppKey, @@ -428,9 +428,9 @@ class Customer extends HD_Controller 'keyOrderCityId' => $v['city_id'] ? $v['city_id'] : '110100', 'keyName' => '客户'.$v['id'], 'keyPhone' => $v['mobile'], - 'keyPurposeBrandId' => $brand_id ? $brand_id : null, + 'keyPurposeBrandId' => $v['brand_id'] ? $v['brand_id'] : null, 'keyPurposeFactoryId' => null, - 'keyCarAudiId' => $series_id ? $series_id : null, + 'keyCarAudiId' => $v['series_id'] ? $v['series_id'] : null, 'keyCarTypeId' => null, 'keyCardCityId' => $v['city_id'] ? $v['city_id'] : '110100', 'keyNewCarRentSupplierId' => 10 diff --git a/admin/views/auto/cars/lists.php b/admin/views/auto/cars/lists.php index 9ae231d4..16d7a410 100644 --- a/admin/views/auto/cars/lists.php +++ b/admin/views/auto/cars/lists.php @@ -56,8 +56,7 @@