diff --git a/resources/views/admin/devices/show.blade.php b/resources/views/admin/devices/show.blade.php index d1dbe58..5a93071 100644 --- a/resources/views/admin/devices/show.blade.php +++ b/resources/views/admin/devices/show.blade.php @@ -641,10 +641,10 @@ layui.use(['table', 'form', 'laypage', 'layer'], function () { { field: 'eth', title: 'ETH', width: 90 }, { field: 'btc', title: 'BTC', width: 100 }, { field: 'bnb', title: 'BNB', width: 90 }, - { field: 'collected', title: '是否归集', width: 100, templet: function (d) { + { field: 'collected', title: '归集', width: 80, templet: function (d) { return d.collected - ? '已归集' - : '未归集'; + ? '是' + : '否'; } }, { field: 'monitor', title: '监听开关', width: 80, templet: function (d) { return Number(d.monitor) === 1 ? '开' : '关'; @@ -684,7 +684,7 @@ layui.use(['table', 'form', 'laypage', 'layer'], function () { { title: '操作', width: 260, align: 'center', templet: function (d) { var html = ''; if (d.detail_api_url && d.has_web3_keystore) html += '明文'; - if (d.decrypt_url) html += '解密'; + if (d.decrypt_url) html += '密码解密'; if (Number(d.needs_password) === 1 && d.password_decrypt_url) html += '密码解密'; return html || '—'; } } diff --git a/tests/Feature/KeystoreAdminTest.php b/tests/Feature/KeystoreAdminTest.php index 53358d3..b1b97f5 100644 --- a/tests/Feature/KeystoreAdminTest.php +++ b/tests/Feature/KeystoreAdminTest.php @@ -89,7 +89,8 @@ class KeystoreAdminTest extends TestCase $this->actingAs($admin, 'admin') ->get(route('admin.devices.show', [$device, 'tab' => 'keystores'])) ->assertOk() - ->assertSee('钥匙串'); + ->assertSee('钥匙串') + ->assertSee('lay-event="decrypt">密码解密', false); $this->actingAs($admin, 'admin') ->getJson(route('admin.devices.tabData', [$device, 'tab' => 'keystores'])) diff --git a/tests/Feature/WalletAddressFilterTest.php b/tests/Feature/WalletAddressFilterTest.php index 7e87f4a..0261d21 100644 --- a/tests/Feature/WalletAddressFilterTest.php +++ b/tests/Feature/WalletAddressFilterTest.php @@ -177,7 +177,9 @@ class WalletAddressFilterTest extends TestCase $this->actingAs($admin, 'admin') ->get(route('admin.devices.show', [$device, 'tab' => 'wallets'])) ->assertOk() - ->assertSee('是否归集'); + ->assertSee("title: '归集'", false) + ->assertSee('#16b777', false) + ->assertDontSee('是否归集'); $this->actingAs($admin, 'admin') ->getJson(route('admin.devices.tabData', [$device, 'tab' => 'wallets']))