Merge branch 'wz' of http://git.jd.com/jd-blockchain/explorer into wz

src/web/components/accountInfo/accountInfo.t.html

@@ -2,9 +2,9 @@
   <h3>数据详情</h3>
   <div class="{styles.info}">
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1>数据账户根哈希
+      <fj-Col l=1  s=4  xs=12>数据账户根哈希
       </fj-Col>
-      <fj-Col l=5>
+      <fj-Col l=5  s=8  xs=12>
         <#if {{accountData && accountData.rootHash && accountData.rootHash.value}}>
           {accountData.rootHash.value}
           <#elseif {{accountData && accountData.address && accountData.address.value}}>
@@ -15,19 +15,19 @@
           </#else>
         </#if>
       </fj-Col>
-       <fj-Col l=1>数据账户地址
+       <fj-Col l=1  s=4  xs=12>数据账户地址
       </fj-Col>
-      <fj-Col l=5>{accountData && accountData.address && accountData.address.value || ''}
+      <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>数据账户公钥
+      <fj-Col l=1  s=4  xs=12>数据账户公钥
       </fj-Col>
-      <fj-Col l=5>{accountData && accountData.pubKey && accountData.pubKey.value || ''}
+      <fj-Col l=5  s=4  xs=12>{accountData && accountData.pubKey && accountData.pubKey.value || ''}
       </fj-Col>
-       <fj-Col l=1>KV数量
+       <fj-Col l=1  s=4  xs=12>KV数量
       </fj-Col>
-      <fj-Col l=5><KvCount address={accountData.address.value} key={accountData.address.value} />
+      <fj-Col l=5  s=4  xs=12><KvCount address={accountData.address.value} key={accountData.address.value} />
       </fj-Col>
     </fj-Row>
     <h3>数据写入</h3>

src/web/components/blockInfo/blockInfo.m.scss

@@ -29,3 +29,8 @@ h3 {
   margin: 40px 0 24px 0;
 }
 
+@media screen and (max-width: 992px) {
+  .hidden_s {
+    display: none !important;
+  }
+}

src/web/components/blockInfo/blockInfo.t.html

@@ -2,62 +2,62 @@
   <h3>概览</h3>
   <div>
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1>区块高度
+      <fj-Col l=1 s=4 xs=12>区块高度
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.height || 0 }
+      <fj-Col l=3 s=8 xs=12>{blockdata && blockdata.height || 0 }
       </fj-Col>
-       <fj-Col l=1>区块哈希
+      <fj-Col l=1 s=4 xs=12>区块哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.hash && blockdata.hash.value || ''}
+      <fj-Col l=3 s=8 xs=12>{blockdata && blockdata.hash && blockdata.hash.value || ''}
       </fj-Col>
-      <fj-Col l=1>前置区块哈希
+      <fj-Col l=1 s=4 xs=12>前置区块哈希
       </fj-Col>
-      <fj-Col l=3>
+      <fj-Col l=3 s=8 xs=12>
         <span  style="cursor: pointer;" onClick={goBlock}>
           {blockdata && blockdata.previousHash && blockdata.previousHash.value || ''}
         </span>
       </fj-Col>
     </fj-Row>
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1>交易数量
+      <fj-Col l=1 s=4  xs=12>交易数量
       </fj-Col>
-      <fj-Col l=3>{txCount || 0}
+      <fj-Col l=3 s=8  xs=12>{txCount || 0}
       </fj-Col>
-       <fj-Col l=1>交易集哈希
+       <fj-Col l=1 s=4  xs=12>交易集哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.transactionSetHash && blockdata.transactionSetHash.value || ''} 
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.transactionSetHash && blockdata.transactionSetHash.value || ''} 
       </fj-Col>
-      <fj-Col l=1>账本哈希
+      <fj-Col l=1 s=4  xs=12>账本哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.ledgerHash && blockdata.ledgerHash.value || ''}
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.ledgerHash && blockdata.ledgerHash.value || ''}
       </fj-Col>
     </fj-Row>
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1>用户集哈希
+      <fj-Col l=1 s=4  xs=12>用户集哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.userAccountSetHash && blockdata.userAccountSetHash.value || ''} 
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.userAccountSetHash && blockdata.userAccountSetHash.value || ''} 
       </fj-Col>
-      <fj-Col l=1>合约集哈希
+      <fj-Col l=1 s=4  xs=12>合约集哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.contractAccountSetHash && blockdata.contractAccountSetHash.value || ''} 
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.contractAccountSetHash && blockdata.contractAccountSetHash.value || ''} 
       </fj-Col>
-      <fj-Col l=1>配置集哈希
+      <fj-Col l=1 s=4  xs=12>配置集哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.adminAccountHash && blockdata.adminAccountHash.value || ''}  
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.adminAccountHash && blockdata.adminAccountHash.value || ''}  
       </fj-Col>
     </fj-Row>
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1>数据账户集哈希
+      <fj-Col l=1 s=4  xs=12>数据账户集哈希
       </fj-Col>
-      <fj-Col l=3>{blockdata && blockdata.dataAccountSetHash && blockdata.dataAccountSetHash.value || ''}  
+      <fj-Col l=3 s=8  xs=12>{blockdata && blockdata.dataAccountSetHash && blockdata.dataAccountSetHash.value || ''}  
       </fj-Col>
-      <fj-Col l=1>
+      <fj-Col l=1 class="{styles.hidden_s}">
       </fj-Col>
-      <fj-Col l=3> 
+      <fj-Col l=3 class="{styles.hidden_s}"> 
       </fj-Col>
-      <fj-Col l=1>
+      <fj-Col l=1 class="{styles.hidden_s}">
       </fj-Col>
-      <fj-Col l=3> 
+      <fj-Col l=3 class="{styles.hidden_s}"> 
       </fj-Col>
     </fj-Row>
   </div>
@@ -66,7 +66,8 @@
     columns={toJS(tableColumns)}
     dataSource={toJS(transactionList)}
     :pagination="{showQuickJumper:true}"
-    bordered />
+    bordered 
+    />
   <TransactionInfo data={transactioninfoData} visible={show} onClose={onClose}/>
 </div>
 </template>
\ No newline at end of file

src/web/components/transactionInfo/transactionInfo.js

@@ -63,7 +63,7 @@ export default class TransactionInfo extends Component {
       styles,
       data,
       visible,
-      tranBase58
+      tranBase58,
     });
   }
 }
\ No newline at end of file

src/web/components/transactionInfo/transactionInfo.m.scss

 .transaction {
   .option {
-    height: 56px;
+    min-height: 56px;
     line-height: 56px;
     border-bottom: 1px solid #ccc;
   }

src/web/components/transactionInfo/transactionInfo.t.html

 <template name="container">
   <ant-Drawer
     title="交易详情"
-    width={600}
+    width="100%"
     placement="right"
     closable={true}
     visible={visible}

src/web/css/app.scss

@@ -235,6 +235,7 @@ div.fj-area-chart-area {
   line-height: 52px;
   border-top: 1px solid #e8e8e9;
   margin: 0 30px;
+  word-break: break-word !important;
 }
 
 #app,
@@ -365,4 +366,8 @@ div.fj-area-chart-area {
 
 .swiper-button-next {
   right: 0 !important;
+}
+
+.ant-drawer-content-wrapper {
+  max-width: 600px !important;
 }
\ No newline at end of file

src/web/pages/block/block.m.scss

@@ -49,11 +49,23 @@
     }
 
   }
+
+  .input_blcok {
+    max-width: 200px;
+    margin: 10px;
+  }
+
+  .blockswiper {
+    background: #fff;
+    padding: 40px;
+    box-sizing: border-box;
+    margin-top: 32px;
+  }
 }
 
 :global {
-  .swiper-slide{
-    &::after{
+  .swiper-slide {
+    &::after {
       content: '';
       position: absolute;
       background: #C5CBD5;

src/web/pages/block/block.t.html

@@ -3,15 +3,10 @@
     <h2>区块</h2>
     <div>
       <span>区块高度：</span>
-      <ant-Input style="width:200px;margin:32px 20px 0 10px" value={block.inputRole} onChange={onInputRole} onPressEnter={onPressEnterInputRole}/>
-      <ant-Button icon="search" type="primary" class="{styles.btn}" onClick={onPressEnterInputRole}>查询</ant-Button>
+      <ant-Input class="{styles.input_blcok}" value={block.inputRole} onChange={onInputRole} onPressEnter={onPressEnterInputRole}/>
+      <ant-Button icon="search" type="primary" onClick={onPressEnterInputRole}>查询</ant-Button>
     </div>
-    <div style="background:#fff;padding:40px;box-sizing:border-box;margin-top:32px;" id="blockswiper">
-      <!-- <div class="swiper-container" >
-        <div class="swiper-wrapper"></div>
-        <div class="swiper-button-prev"></div>
-        <div class="swiper-button-next"></div>
-      </div> -->
+    <div class="{styles.blockswiper}" id="blockswiper">
     </div>
     <BlockInfo  txCount={block.txCount} transactionList={block.transactionList} blockinfo={block.blockInformation}  goPrev={goPrev}/>
   </div>

src/web/pages/search/search.m.scss

@@ -3,7 +3,9 @@
 
   .main{
     margin: 100px auto 0 auto;
-
+    @media (max-width:527px){
+      margin: 10px auto 0 auto;
+    }
     .headtitle{
       font-size: 36px;
       font-weight: bold;
@@ -11,8 +13,8 @@
     }
 
     .action{
-      width:1000px;
       height:100px;  
+      max-width: 1000px;
       margin: 15px auto 0 auto;
       border-radius: 5px;
       box-shadow: 0px 0px 14px #5a77d3;
@@ -27,17 +29,23 @@
         .title{
           font-size: 14px;
           color: #fff;
+          min-width: 100px;
+          text-align: center;
+          @media (max-width:400px){
+           display: none;
+          }
         }
 
         .input{
-          width: 676px;
-          margin: 0 15px;
+          max-width: 676px;
+          margin: 0 10px;
         }
 
         .btn{
           background-color: #3c4c9c;
           color: #fff;
           border: 1px solid #819df3;
+          margin: 0 10px;
         }
       }
     }
@@ -46,14 +54,19 @@
       width: 100%;
       display: flex;
       flex-direction: row;
+      flex-wrap: wrap;
       justify-content: center;
       margin-top: 100px; 
       margin-bottom: 30px;
+      @media (max-width:400px){
+        margin-top: 10px; 
+       }
       .link{
         &:hover{
           text-decoration: none;
         }
       }
+
       // 区块高度等页签样式
        .tabs {
           height: 132px;
@@ -62,6 +75,7 @@
           padding: 24px;
           box-shadow: 0 0 8px 0 rgba(0,0,0,0.08);
           border-radius: 4px;
+          margin: 10px;
           cursor: pointer;
           &:hover{
             box-shadow: 0 0 10px #5f5f5f;