Skip to content

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

Merge branch 'master' into develop

parents 65be4ec7 49f32d09
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
api/controllers/WalletController.php
View file @ 450098f5
...@@ -161,7 +161,7 @@ class WalletController extends BaseController ...@@ -161,7 +161,7 @@ class WalletController extends BaseController
$service = new Chain33Service($node); $service = new Chain33Service($node);
if (false == $switch) { if (false == $switch) {
$result = $service->getTokenBalance([$token], $execer, $symbol); $result = $service->getTokenBalance($token, $execer, $symbol);
} else { } else {
$result = $service->getBalance($token, $execer = ''); $result = $service->getBalance($token, $execer = '');
} }
......
common/models/psources/CoinIssueCoin.php
View file @ 450098f5
...@@ -52,7 +52,7 @@ class CoinIssueCoin extends CommonActiveRecord ...@@ -52,7 +52,7 @@ class CoinIssueCoin extends CommonActiveRecord
[['name', 'symbol', 'total', 'owner', 'introduction', 'category', 'type', 'platform_id', 'chain_id', 'charge_unit', 'charge', 'template'], 'required'], [['name', 'symbol', 'total', 'owner', 'introduction', 'category', 'type', 'platform_id', 'chain_id', 'charge_unit', 'charge', 'template'], 'required'],
[['total', 'category', 'type', 'platform_id', 'chain_id'], 'integer'], [['total', 'category', 'type', 'platform_id', 'chain_id'], 'integer'],
[['introduction', 'charge_unit'], 'string', 'length' => [1, 100]], [['introduction', 'charge_unit'], 'string', 'length' => [1, 100]],
['symbol', 'string', 'length' => [6, 128]], ['symbol', 'string', 'length' => [3, 128]],
['name', 'string', 'length' => [3, 50]], ['name', 'string', 'length' => [3, 50]],
['nickname', 'string', 'length' => [0, 10]], ['nickname', 'string', 'length' => [0, 10]],
[['token_type', 'nickname'], 'safe'], [['token_type', 'nickname'], 'safe'],
......
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