Merge branch 'feature/jira_462_consensus_timestamp' of...

Merge branch 'feature/jira_462_consensus_timestamp' of https://git.jd.com/jd-blockchain/explorer into feature/jira-465-transaction-status

data-explorer/src/web/components/blockInfo/blockInfo.js

@@ -10,6 +10,7 @@ import 'flarej/lib/components/antd/table';
 import Message from 'flarej/lib/components/antd/message';
 import styles from './blockInfo.m.scss';
 import tmpls from './blockInfo.t.html';
+import moment from 'moment';
 
 //页面容器组件
 @registerTmpl('BlockInfo')
@@ -90,6 +91,7 @@ export default class BlockInfo extends Component {
       blockdata:blockinfo,
       txCount:txCount,
       transactionList:transactionList,
+      moment,
     });
   }
 }
\ No newline at end of file

data-explorer/src/web/components/blockInfo/blockInfo.t.html

@@ -56,14 +56,20 @@
       </fj-Col>
       <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.userEventSetHash && blockdata.userEventSetHash.value || ''}  
       </fj-Col>
+
+      <fj-Col l=1 s=4  xs=12>区块创建时间
+      </fj-Col>
+            <fj-Col l=3 s=8  xs=12>{blockdata.timestamp && moment(blockdata.timestamp).format('YYYY-MM-DD HH:mm:ss') || ''}  
+      <!-- <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.timestamp && moment(blockdata.timestamp).format('YYYY-MM-DD hh:mm:ss') || ''}   -->
+      </fj-Col>
       <!-- <fj-Col l=1 class="{styles.hidden_s}">
       </fj-Col>
       <fj-Col l=3 class="{styles.hidden_s}"> 
       </fj-Col> -->
-      <fj-Col l=1 class="{styles.hidden_s}">
+      <!-- <fj-Col l=1 class="{styles.hidden_s}">
       </fj-Col>
       <fj-Col l=3 class="{styles.hidden_s}"> 
-      </fj-Col>
+      </fj-Col> -->
     </fj-Row>
   </div>
   <h3>交易</h3>

data-explorer/src/web/components/transactionInfo/transactionInfo.t.html

@@ -14,7 +14,7 @@
       交易哈希：{data.transactionContent.hash.value}
     </div>
     <div class="{styles.option}">
-      交易时间：{data.transactionContent.timestamp && moment(+data.transactionContent.timestamp).format('YYYY-MM-DD hh:mm:ss')}
+      交易时间：{data.transactionContent.timestamp && moment(+data.transactionContent.timestamp).format('YYYY-MM-DD HH:mm:ss')}
     </div>
     <div class="{styles.option}">
       执行状态： {data.executionState}