Skip to content

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

Merge branch 'feature/optimize' into 'master'

fix See merge request !311
parents 183a62a7 a373bf13
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 28 deletions
api/controllers/RecommendCoinController.php
View file @ cf41cb88
...@@ -34,37 +34,25 @@ class RecommendCoinController extends BaseController ...@@ -34,37 +34,25 @@ class RecommendCoinController extends BaseController
$recommend_coin = WalletRecommendCoin::find()->where(['category_id' => $category['id']])->all(); $recommend_coin = WalletRecommendCoin::find()->where(['category_id' => $category['id']])->all();
$items = []; $items = [];
foreach ($recommend_coin as $coin) { if (!empty($recommend_coin)) {
$temp['id'] = $coin->coin['id']; foreach ($recommend_coin as $coin) {
$temp['icon'] = $coin->coin['icon']; $temp['id'] = $coin->coin['id'];
$temp['name'] = $coin->coin['name']; $temp['icon'] = $coin->coin['icon'];
$temp['platform'] = $coin->coin['platform']; $temp['name'] = $coin->coin['name'];
$temp['chain'] = $coin->coin['chain']; $temp['platform'] = $coin->coin['platform'];
$temp['treaty'] = $coin->coin['treaty']; $temp['chain'] = $coin->coin['chain'];
$nickname = json_decode($coin->coin['nickname'], true); $temp['treaty'] = $coin->coin['treaty'];
$temp['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : ''; $nickname = json_decode($coin->coin['nickname'], true);
$introduce = json_decode($coin->coin['introduce'], true); $temp['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
$temp['introduce'] = isset($introduce[$this->lang]) ? $introduce[$this->lang] : ''; $introduce = json_decode($coin->coin['introduce'], true);
array_push($items, $temp); $temp['introduce'] = isset($introduce[$this->lang]) ? $introduce[$this->lang] : '';
array_push($items, $temp);
}
} }
$category['items'] = $items; $category['items'] = $items;
} }
$this->data = $recommend_category[0]['items']; $this->data = $recommend_category[0]['items'];
// //获取行情信息
// $coin_names = array_column($result, 'name');
// $coin_names = array_merge($coin_names, array_column($result, 'chain'));
// $coin_quotations = ExchangeBusiness::getQuatationByNames($coin_names);
//
// $ticker = ['low' => 0, 'high' => 0, 'last' => 0, 'open' => 0, 'vol' => 0, 'rmb' => 0, 'usd' => 0];
// foreach ($result as $key => &$val) {
// $val['chain_quotation'] = isset($coin_quotations[strtoupper($val['chain'])]) ? $coin_quotations[strtoupper($val['chain'])] : [];
// $result[$key] = array_merge($val, isset($coin_quotations[strtoupper($val['name'])]) ? $coin_quotations[strtoupper($val['name'])] : $ticker);
// $val['chain_rmb'] = isset($val['chain_quotation']['rmb']) ? $val['chain_quotation']['rmb'] : 0;
// $val['chain_usd'] = isset($val['chain_quotation']['usd']) ? $val['chain_quotation']['usd'] : 0;
// }
//
// $this->data = $result;
doEnd : doEnd :
return ['code' => $this->code, 'data' => $this->data, 'msg' => $this->msg]; return ['code' => $this->code, 'data' => $this->data, 'msg' => $this->msg];
......
common/models/psources/WalletCoin.php
View file @ cf41cb88
...@@ -15,7 +15,7 @@ class WalletCoin extends BaseActiveRecord ...@@ -15,7 +15,7 @@ class WalletCoin extends BaseActiveRecord
public static function tableName() public static function tableName()
{ {
return '{{wallet_coin}}'; return '{{coin}}';
} }
public function attributes() public function attributes()
......
common/models/psources/WalletRecommendCoin.php
View file @ cf41cb88
...@@ -19,6 +19,6 @@ class WalletRecommendCoin extends BaseActiveRecord ...@@ -19,6 +19,6 @@ class WalletRecommendCoin extends BaseActiveRecord
public function getCoin() public function getCoin()
{ {
return $this->hasOne(WalletCoin::className(), ['id' => 'cid'])->select(['id', 'icon', 'name', 'introduce', 'nickname', 'platform', 'chain', 'treaty'])->asArray(); return $this->hasOne(Coin::className(), ['id' => 'cid'])->select(['id', 'icon', 'name', 'introduce', 'nickname', 'platform', 'chain', 'treaty'])->asArray();
} }
} }
\ No newline at end of file
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