提交 b628bb6d 编写于 作者: J jinlong12

除参与方外其他bug修改

上级 82668698
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>browser</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
bin @ 4bd3696c
Subproject commit 4bd3696c009e0ab2001c45669148572cb8a2e330
......@@ -18,7 +18,7 @@ export default class BlockCollapse extends Component {
// const { activeData = [] } = this.state;
const { title,children} = this.props;
return (
<Collapse bordered={false} expandIcon={({ isActive }) => <Icon type="double-right" rotate={isActive ? 90 : -90} />}>
<Collapse bordered={false} expandIcon={({ isActive }) => <Icon type="double-left" rotate={isActive ? 90 : -90} />}>
<Panel header={title} key="1" className=' blockCollapse '>
{children}
</Panel>
......
......@@ -20,7 +20,7 @@ export default class BlockCollapseSmall extends Component {
// const { activeData = [] } = this.state;
const { title,sign,children} = this.props;
return (
<Collapse defaultActiveKey="1" bordered={false} expandIcon={({ isActive }) => <Icon type="double-right" rotate={isActive ? 90 : -90} />}>
<Collapse defaultActiveKey="1" bordered={false} expandIcon={({ isActive }) => <Icon type="double-left" rotate={isActive ? 90 : -90} />}>
<Panel header={<div style={customPanelStyle}>{title}<br/>{sign}</div>} key="1" className='blockCollapse blockCollapsesmall'>
<div>
{children}
......
......@@ -98,7 +98,7 @@ export default class Header extends Component {
},
{
title: '参与方地址',
dataIndex: 'address',
dataIndex: 'address.value',
key:'address'
},
{
......
......@@ -60,7 +60,7 @@
<fj-Col l=2 s=4 xs=12>最大成块时间
</fj-Col>
<fj-Col l=4 s=8 xs=12>
{common.ledgerinfo.consensusSettings.commitBlockSettings.maxDelayMilliSecondsPerBlock}毫秒
{common.ledgerinfo.consensusSettings.commitBlockSettings.maxDelayMilliSecondsPerBlock && (common.ledgerinfo.consensusSettings.commitBlockSettings.maxDelayMilliSecondsPerBlock + "毫秒") || ''}
</fj-Col>
</fj-Row>
<fj-Row class="gl">
......
......@@ -10,6 +10,7 @@ import {tranBase58,stringToBase58,byteToLong,byteToString,Bytes2Str,Int32ToStr}
import { BlockCollapse,BlockCollapseSmall,BlockCollapsePanel } from '../../components/blockCollapse';
import styles from './transactionInfo.m.scss';
import tmpls from './transactionInfo.t.html';
import moment from 'moment';
//页面容器组件
@registerTmpl('TransactionInfo')
......@@ -85,6 +86,7 @@ export default class TransactionInfo extends Component {
data,
visible,
tranBase58,
moment: moment
});
}
}
\ No newline at end of file
......@@ -12,6 +12,9 @@
<div class="{styles.option}">
交易哈希:{data.transactionContent.hash.value}
</div>
<div class="{styles.option}">
交易时间:{data.transactionContent.timestamp && moment(+data.transactionContent.timestamp).format('YYYY-MM-DD hh:mm:ss')}
</div>
<div class="{styles.option}">
执行状态: {data.executionState}
</div>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册