Merge branch 'master' into feature/issue_coin

backend/controllers/ApplicationController.php

@@ -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 {

backend/views/application/image-index.php

@@ -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">

common/business/ApplicationBusiness.php

@@ -117,7 +117,7 @@ class ApplicationBusiness
         $cate_app_item = [];
         foreach($data as &$value){
             if($value['icon']){
-                $value['icon'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
+                $value['icon'] = isset($icon_Infos[$value['icon']]) ? $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'] : '';
             }else{
                 $value['icon'] = '';
             }

common/business/ExchangeBusiness.php

@@ -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'
     ];
 
     /**

common/models/psources/CoinApplication.php

@@ -100,7 +100,7 @@ class CoinApplication extends BaseActiveRecord
         $recommendItems = CoinApplicateRecommend::getRecommendItemsByType(2);
         foreach($data as $key => &$value){
             if($value['icon']){
-                $value['icon_url'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
+                $value['icon_url'] = isset($icon_Infos[$value['icon']]) ? $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'] : '';
             }else{
                 $value['icon_url'] = '';
             }

common/service/exchange/Boc.php

@@ -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';