Skip to content

T
token
Commit 024abdcd authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'feature/optimize' into 'master'

fix See merge request !220
parents 6c6a2cff b00d99ba
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
api/controllers/CoinController.php
View file @ 024abdcd
...@@ -45,8 +45,8 @@ class CoinController extends BaseController ...@@ -45,8 +45,8 @@ class CoinController extends BaseController
$data = $ret[0]; $data = $ret[0];
$nickname = json_decode($data['nickname'], true); $nickname = json_decode($data['nickname'], true);
$introduce = json_decode($data['introduce'], true); $introduce = json_decode($data['introduce'], true);
$data['nickname'] = $nickname[$this->lang]; $data['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
$data['introduce'] = $introduce[$this->lang]; $data['introduce'] = isset($introduce[$this->lang]) ? $introduce[$this->lang] : '';
return $data; return $data;
} }
} }
...@@ -314,7 +314,7 @@ class CoinController extends BaseController ...@@ -314,7 +314,7 @@ class CoinController extends BaseController
} }
foreach ($data as $key => &$value) { foreach ($data as $key => &$value) {
$nickname = json_decode($value['nickname'], true); $nickname = json_decode($value['nickname'], true);
$value['nickname'] = $nickname[$this->lang]; $value['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
$value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0; $value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0;
$value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0; $value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0;
} }
...@@ -370,7 +370,7 @@ class CoinController extends BaseController ...@@ -370,7 +370,7 @@ class CoinController extends BaseController
} }
foreach ($result as $key => &$value) { foreach ($result as $key => &$value) {
$nickname = json_decode($value['nickname'], true); $nickname = json_decode($value['nickname'], true);
$value['nickname'] = $nickname[$this->lang]; $value['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
$value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0; $value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0;
$value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0; $value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment