Merge branch 'master' into feature/issue_coin

api/controllers/TickerController.php

@@ -67,7 +67,8 @@ class TickerController extends BaseController
         $res = $curl->post('https://b.biqianbao.net/interface/coin/coin-index', true);
         $res = json_decode($res, true);
         foreach ($res['data'] as $val) {
-            $this->basic_price[$val['name']] = $val['rmb'];
+            $this->basic_price[$val['name']]['rmb'] = $val['rmb'];
+            $this->basic_price[$val['name']]['usd'] = $val['usd'];
         }
 
         $code = -1;

console/controllers/CrossChainController.php

@@ -195,10 +195,17 @@ class CrossChainController extends Controller
         static $result = [];
         $service = new Chain33Service($node_params);
         $result = $service->QueryTransaction($send_result);
+        if (isset($result['result']['receipt']) && is_array($result['result']['receipt']['logs'])) {
+            foreach ($result['result']['receipt']['logs'] as $log) {
+                if (isset($log['tyName']) && 'logerr' == strtolower($log['tyName'])) {
+                    return $result;
+                }
+            }
+        }
+
         if (isset($result['result']['tx']['next'])) {
             $this->queryTransaction($node_params, $result['result']['tx']['next']);
         }
-
         return $result;
 
 //        if (isset($result['result']['actionName']) && 'unknown' == $result['result']['actionName']) {