Commit 6dff60f7 authored by shajiaiming's avatar shajiaiming

Merge branch 'feature/ticker' into 'master'

fix See merge request !147
parents b629db17 bd589543
......@@ -144,7 +144,7 @@ class ApplicationController extends BaseController
$coin_items = CoinImage::getItemsByIds($coin_ids);
}
$app_cate = CoinAppCate::getAppCate($category_id, $id);
if ($applicate['icon']) {
if ($applicate['icon'] && isset($coin_items[$applicate['icon']])) {
$icon_info = $coin_items[$applicate['icon']];
$applicate['icon_url'] = $icon_info['base_url'] . $icon_info['file_url'];
} else {
......
......@@ -11,7 +11,7 @@
width: 100px;
}
</style>
<h4>所属应用---<?= $applicate->name ?></h4>
<h4>所属应用---<?= $applicate->name["zh-CN"] ?></h4>
<div class="layui-row" style="padding: 5px;">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
......
......@@ -38,14 +38,14 @@ class ExchangeBusiness
9 => 'Go',
10 => 'Zhaobi',
11 => 'Gdpro',
12 => 'Boc',
13 => 'Ex',
14 => 'Zt',
15 => 'Tsc',
16 => 'Binance',
17 => 'Ceohk',
18 => 'Biki',
19 => 'Bilaxy'
12 => 'Ex',
13 => 'Zt',
14 => 'Tsc',
15 => 'Binance',
16 => 'Ceohk',
17 => 'Biki',
18 => 'Bilaxy',
19 => 'Boc'
];
/**
......
......@@ -64,7 +64,7 @@ class Boc extends Exchange implements ExchangeInterface
$response = iconv('UTF-8', 'GBK//TRANSLIT',$response);
$html = HtmlDomParser::str_get_html($response);
$div = ($html->find('div.BOC_main'))[0];
$div = ($html->find('div.BOC_main'));
foreach ($div->find('td') as $key => $e){
if($key == 5){
$key = $this->quotation_prefix . 'CNY_JPY';
......
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