Merge branch 'feature/optimize' into 'master'

api/controllers/CoinController.php

@@ -131,7 +131,7 @@ class CoinController extends BaseController
         if ($recommend) {
             $condition['recommend'] = $recommend;
         }
-        $select = ['id', 'sid', 'icon', 'name', 'optional_name', 'nickname', 'platform', 'chain', 'treaty'];
+        $select = ['id', 'sid', 'icon', 'name', 'introduce', 'optional_name', 'nickname', 'platform', 'chain', 'treaty'];
         $order_by = ['sort' => SORT_ASC];
         $datas = CoinRecommend::getList($page, $limit, $condition, $order_by, $select);
         //获取详细信息
@@ -143,6 +143,8 @@ class CoinController extends BaseController
             foreach ($coin_infos as $key => &$val) {
                 $nickname = json_decode($val['nickname'], true);
                 $val['nickname'] = $nickname[$this->lang];
+                $introduce = json_decode($val['introduce'], true);
+                $val['introduce'] = $introduce[$this->lang];
             }
             //获取行情信息
             $coin_names = array_column($coin_infos, 'name');
@@ -243,7 +245,9 @@ class CoinController extends BaseController
             }
             foreach ($result['data'] as $key => &$value) {
                 $nickname = json_decode($value['nickname'], true);
+                $introduce = json_decode($value['introduce'], true);
                 $value['nickname'] = $nickname[$this->lang];
+                $value['introduce'] = $introduce[$this->lang];
                 $value['chain_quotation'] = $chain_quotation[$value['chain']] ?: null;
                 $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;

backend/controllers/CoinController.php

@@ -92,7 +92,7 @@ class CoinController extends BaseController
                 if (isset($data['optional_name'])) {
                     $data['optional_name'] = strtoupper($data['optional_name']);
                 }
-                $data['name'] = strtoupper($data['name']);
+                $data['name'] = strtoupper(trim($data['name']));
                 $data['platform'] = strtolower($data['platform']);
                 $data['chain'] = strtoupper($data['chain']);
                 $lang = [
@@ -105,7 +105,7 @@ class CoinController extends BaseController
                 $nickname = [];
                 $introduce = [];
                 foreach ($nickname_arr as $key => $val) {
-                    $nickname[$lang[$key]] = $val;
+                    $nickname[$lang[$key]] = trim($val);
                 }
                 foreach ($introduce_arr as $key => $val) {
                     $introduce[$lang[$key]] = $val;