diff --git a/app/controller/CarTypeController.php b/app/controller/CarTypeController.php index bb022a0..1dec007 100644 --- a/app/controller/CarTypeController.php +++ b/app/controller/CarTypeController.php @@ -18,9 +18,13 @@ class CarTypeController $list = CarType::getAll(); if($request->user['language'] != 'zh_CN'){ - foreach ($list as $key => &$value) { + foreach ($list as &$value) { $value['name'] = $value['name_en']; } + }elseif ($request->user['language'] == 'ru'){ + foreach ($list as &$value) { + $value['name'] = $value['name_ru']; + } } return Util::success($list); diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index c19eb4b..9024264 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -78,9 +78,13 @@ class CustomerController $list = Channel::getAll(); if($request->user['language'] != 'zh_CN'){ - foreach ($list as $key => &$value) { + foreach ($list as &$value) { $value['name'] = $value['name_en']; } + }elseif ($request->user['language'] == 'ru'){ + foreach ($list as &$value) { + $value['name'] = $value['name_ru']; + } } return Util::success($list); diff --git a/app/model/Customer.php b/app/model/Customer.php index d4bd4fa..6c3d2b7 100644 --- a/app/model/Customer.php +++ b/app/model/Customer.php @@ -96,7 +96,7 @@ class Customer extends Model // $customer['updated_at'] = Util::timeTotDate($customer['updated_at']); $customer = Util::formatDate($customer,['follow_last']); - $nameLang = $language=='en'?'name_en':'name'; + $nameLang = $language=='en'?'name_en':($language=='ru'?'name_ru':'name'); $countryLang = $language=='en'?'en_addr':'cn_addr'; $customer['car_type_name'] = empty($customer['car_type_id'])?'':CarType::where(['id'=>$customer['car_type_id']])->value($nameLang); $customer['country_name'] = empty($customer['country_id'])?'':Country::where(['id'=>$customer['country_id']])->value($countryLang);