提交 3f799476 编写于 作者: I imuge

add user state

上级 0861e1c1
...@@ -1393,7 +1393,7 @@ router.get('/:ledger/users/address/:address', function (req, res) { ...@@ -1393,7 +1393,7 @@ router.get('/:ledger/users/address/:address', function (req, res) {
"data": { "data": {
"address": "LdeP1sCDKrf9LHKhBkqNUj3sHjHeUyvnaAj8j", "address": "LdeP1sCDKrf9LHKhBkqNUj3sHjHeUyvnaAj8j",
"certificate": "-----BEGIN CERTIFICATE-----\nMIIBtzCCAWkCFDcbdELMFmrppAdda8X+sHUFGJNcMAUGAytlcDB4MQswCQYDVQQGEwJDTjELMAkG\nA1UECAwCQkoxCzAJBgNVBAcMAkJKMQwwCgYDVQQKDANKRFQxDzANBgNVBAsMBkxFREdFUjERMA8G\nA1UEAwwISkQgQ2hhaW4xHTAbBgkqhkiG9w0BCQEWDmpkY2hhaW5AamQuY29tMB4XDTIxMDgzMDAz\nMjIxNFoXDTMxMDgyODAzMjIxNFowgYMxCzAJBgNVBAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UE\nBwwCQkoxDDAKBgNVBAoMA0pEVDENMAsGA1UECwwEUEVFUjELMAkGA1UECwwCR1cxETAPBgNVBAMM\nCEpEIENoYWluMR0wGwYJKoZIhvcNAQkBFg5qZGNoYWluQGpkLmNvbTAqMAUGAytlcAMhAN86LUi7\n1rnq+QAABCLfzTcbMRK0LcEyhxWG/AafJGR5MAUGAytlcANBAFW9bs4wfM799Lg3ueSGTnJFGBgE\nKkznVvzlMKDKWvgGf2FhWaqHUNiHxe1I3zY8OqUvwYuv6Y39XfWaJuGqQQw=\n-----END CERTIFICATE-----", "certificate": "-----BEGIN CERTIFICATE-----\nMIIBtzCCAWkCFDcbdELMFmrppAdda8X+sHUFGJNcMAUGAytlcDB4MQswCQYDVQQGEwJDTjELMAkG\nA1UECAwCQkoxCzAJBgNVBAcMAkJKMQwwCgYDVQQKDANKRFQxDzANBgNVBAsMBkxFREdFUjERMA8G\nA1UEAwwISkQgQ2hhaW4xHTAbBgkqhkiG9w0BCQEWDmpkY2hhaW5AamQuY29tMB4XDTIxMDgzMDAz\nMjIxNFoXDTMxMDgyODAzMjIxNFowgYMxCzAJBgNVBAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UE\nBwwCQkoxDDAKBgNVBAoMA0pEVDENMAsGA1UECwwEUEVFUjELMAkGA1UECwwCR1cxETAPBgNVBAMM\nCEpEIENoYWluMR0wGwYJKoZIhvcNAQkBFg5qZGNoYWluQGpkLmNvbTAqMAUGAytlcAMhAN86LUi7\n1rnq+QAABCLfzTcbMRK0LcEyhxWG/AafJGR5MAUGAytlcANBAFW9bs4wfM799Lg3ueSGTnJFGBgE\nKkznVvzlMKDKWvgGf2FhWaqHUNiHxe1I3zY8OqUvwYuv6Y39XfWaJuGqQQw=\n-----END CERTIFICATE-----",
"revoked": false, "state": "NORMAL",
"pubKey": "7VeRN4fSHB5Nb4yP7eiezxPerjH3QToYGtk4g9EagGDjR7a8" "pubKey": "7VeRN4fSHB5Nb4yP7eiezxPerjH3QToYGtk4g9EagGDjR7a8"
}, },
"success": true "success": true
......
...@@ -387,13 +387,17 @@ export default class TransactionInfo extends Component { ...@@ -387,13 +387,17 @@ export default class TransactionInfo extends Component {
</table> </table>
</BlockCollapsePanel> </BlockCollapsePanel>
) || null, ) || null,
userAddress && !certificate && ( userAddress && state && (
<BlockCollapsePanel title = "撤销用户(证书)"> <BlockCollapsePanel title = "更新用户(证书)状态">
<table style = {{lineHeight: '41px'}}> <table style = {{lineHeight: '41px'}}>
<tr> <tr>
<td>用户地址:</td> <td>用户地址:</td>
<td>{userAddress}</td> <td>{userAddress}</td>
</tr> </tr>
<tr>
<td>用户状态:</td>
<td>{state}</td>
</tr>
</table> </table>
</BlockCollapsePanel> </BlockCollapsePanel>
) || null, ) || null,
......
...@@ -20,10 +20,10 @@ export default class UserCert extends Component { ...@@ -20,10 +20,10 @@ export default class UserCert extends Component {
user.getUserInfo(leader, address) user.getUserInfo(leader, address)
]).then((data) => { ]).then((data) => {
if (data && data[0].certificate) { if (data && data[0].certificate) {
if (!data[0].revoked) { if (data[0].state == "NORMAL") {
this.usercert = data[0].certificate; this.usercert = data[0].certificate;
} else { } else {
this.usercert = "REVOKED"; this.usercert = data[0].state;
} }
} }
}); });
......
...@@ -129,7 +129,7 @@ export default class User extends Component { ...@@ -129,7 +129,7 @@ export default class User extends Component {
title: '证书', title: '证书',
dataIndex: 'address', dataIndex: 'address',
key:'certificate', key:'certificate',
width: 200, width: 150,
render: (text, record, index) => nj` render: (text, record, index) => nj`
<UserCert address=${text} key=${text}/> <UserCert address=${text} key=${text}/>
`() `()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册