From 079fbff846524df0890f6cda3ce8d4b548d1a05a Mon Sep 17 00:00:00 2001
From: jinlong12 <jinlong@jd.com>
Date: Tue, 24 Nov 2020 13:48:47 +0800
Subject: [PATCH] repair jira-562

---
 .../components/accountInfo/accountInfo.t.html | 28 +++++++++++++-----
 .../src/web/pages/account/account.js          | 29 ++++++++++---------
 .../src/web/pages/contract/contract.js        | 28 +++++++++---------
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/data-explorer/src/web/components/accountInfo/accountInfo.t.html b/data-explorer/src/web/components/accountInfo/accountInfo.t.html
index e721d4e8..7735959b 100644
--- a/data-explorer/src/web/components/accountInfo/accountInfo.t.html
+++ b/data-explorer/src/web/components/accountInfo/accountInfo.t.html
@@ -2,11 +2,11 @@
   <h3>数据详情</h3>
   <div class="{styles.info}">
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1  s=4  xs=12>数据账户根哈希
+      <fj-Col l=1  s=4  xs=12>头根哈希
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>
-        <#if {{accountData && accountData.rootHash && accountData.rootHash}}>
-          {accountData.rootHash}
+        <#if {{accountData && accountData.headerRootHash && accountData.headerRootHash}}>
+          {accountData.headerRootHash}
           <#elseif {{accountData && accountData.address && accountData.address.value}}>
             <AccountRootHash  address={accountData.address.value}/>
           </#elseif>
@@ -15,17 +15,31 @@
           </#else>
         </#if>
       </fj-Col>
-       <fj-Col l=1  s=4  xs=12>数据账户地址
+      <fj-Col l=1  s=4  xs=12>数据根哈希
+      </fj-Col>
+      <fj-Col l=5  s=8  xs=12>
+        <#if {{accountData && accountData.dataRootHash && accountData.dataRootHash}}>
+          {accountData.dataRootHash}
+          <#elseif {{accountData && accountData.address && accountData.address.value}}>
+            <AccountRootHash  address={accountData.address.value}/>
+          </#elseif>
+          <#else>
+            ''
+          </#else>
+        </#if>
+      </fj-Col>
+      <fj-Col l=1  s=4  xs=12>数据账户地址
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>{accountData && accountData.address && accountData.address.value || ''}
       </fj-Col>
-    </fj-Row>
-    <fj-Row class="{styles.gl}">
       <fj-Col l=1  s=4  xs=12>数据账户公钥
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>{accountData && accountData.pubKey && accountData.pubKey || ''}
       </fj-Col>
-       <fj-Col l=1  s=4  xs=12>KV数量
+    </fj-Row>
+    <fj-Row class="{styles.gl}">
+      
+      <fj-Col l=1  s=4  xs=12>KV数量
       </fj-Col>
       <fj-Col l=5  s=8  xs=12><KvCount address={accountData.address.value} key={accountData.address.value} />
       </fj-Col>
diff --git a/data-explorer/src/web/pages/account/account.js b/data-explorer/src/web/pages/account/account.js
index 16ff4173..00ac15e2 100644
--- a/data-explorer/src/web/pages/account/account.js
+++ b/data-explorer/src/web/pages/account/account.js
@@ -176,20 +176,21 @@ export default class Account extends Component {
       render: (text, record, index) => nj`
        ${text}<br/>算法：${tranBase58(text)}
       `()
-    }, {
-      title: '默克尔树根哈希',
-      dataIndex: 'rootHash',
-      key: 'rootHash',
-      width: '25%',
-      render: (text, record, index) => nj`
-        <#if ${text}>
-          ${text}
-          <#else>
-            <AccountRootHash address=${record.address}/>
-          </#else>
-        </#if>
-      `()
-    },
+    }, 
+    // {
+    //   title: '默克尔树根哈希',
+    //   dataIndex: 'rootHash',
+    //   key: 'rootHash',
+    //   width: '25%',
+    //   render: (text, record, index) => nj`
+    //     <#if ${text}>
+    //       ${text}
+    //       <#else>
+    //         <AccountRootHash address=${record.address}/>
+    //       </#else>
+    //     </#if>
+    //   `()
+    // },
     {
       title: 'KV',
       dataIndex: 'address.value',
diff --git a/data-explorer/src/web/pages/contract/contract.js b/data-explorer/src/web/pages/contract/contract.js
index 59ef9855..fdcb1beb 100644
--- a/data-explorer/src/web/pages/contract/contract.js
+++ b/data-explorer/src/web/pages/contract/contract.js
@@ -131,19 +131,21 @@ export default class Contract extends Component {
       render: (text, record, index) => nj `
       ${text}<br/>算法：${tranBase58(text)}
       `()
-    }, {
-      title: '合约根哈希',
-      dataIndex: 'rootHash',
-      key:'rootHash',
-      render: (text, record, index) => nj `
-        <#if ${text}>
-          ${text}
-          <#else>
-            <ContractsRootHash address=${record.address.value}/>
-          </#else>
-        </#if>
-      `()
-    },{
+    }, 
+    // {
+    //   title: '合约根哈希',
+    //   dataIndex: 'rootHash',
+    //   key:'rootHash',
+    //   render: (text, record, index) => nj `
+    //     <#if ${text}>
+    //       ${text}
+    //       <#else>
+    //         <ContractsRootHash address=${record.address.value}/>
+    //       </#else>
+    //     </#if>
+    //   `()
+    // },
+    {
       title: '操作',
       dataIndex: 'address.value',
       key:'chainCode',
-- 
GitLab