diff --git a/src/assets/img/qrcode.png b/src/assets/img/qrcode.png new file mode 100644 index 0000000..6d146c1 Binary files /dev/null and b/src/assets/img/qrcode.png differ diff --git a/src/pages/wallet-detail/wallet-detail.html b/src/pages/wallet-detail/wallet-detail.html index b8f3ade..2b3da23 100644 --- a/src/pages/wallet-detail/wallet-detail.html +++ b/src/pages/wallet-detail/wallet-detail.html @@ -1,30 +1,44 @@ - My Wallet + Personal Wallet + + +
-

{{ wallet.balance }} sky

+

{{ wallet.balance || 0 }} sky

+ $0.00 ($0.00) + {{ wallet.hours || 0 }} SKY Hours +
ID
Address
-
Hours
+
SKY Hours
Balance
- - + + +
{{ i + 1 }}
+
+ + {{ address.address | address }}
+
{{ address.hours }}
+
{{ address.balance }}
+
+ + + +
diff --git a/src/pages/wallet-detail/wallet-detail.scss b/src/pages/wallet-detail/wallet-detail.scss index a27500b..32c5d38 100644 --- a/src/pages/wallet-detail/wallet-detail.scss +++ b/src/pages/wallet-detail/wallet-detail.scss @@ -3,22 +3,40 @@ .-header { min-height: 170px; - padding: 80px 0 0 0; + padding: 60px 0 0 0; width: 100%; } h1 span { - font-size: 20px; + font-size: 13px; + margin: 0 0 0 -10px; + } + + .first-subt{ + width: 100%; + font-size: 12px; + color: #FAFAFA; + float: left; + text-align: center; + } + .second-subt{ + color: #171A1D; + font-size: 12px; + width: 100%; + float: left; + text-align: center; + margin-top: 16px; } ion-item-divider { + font-size: 12px; + line-height: 14px; min-height: 50px; - padding-right: 32px; } - button.item .item-inner { + ion-item { font-size: 13px; - min-height: 69px; + min-height: 70px; } .-action-buttons { @@ -32,7 +50,7 @@ color: $text-color-normal; font-size: 13px; margin: 0 5px; - min-width: 140px; + min-width: 160px; img { height: 28px; @@ -75,3 +93,7 @@ margin: 100px auto 0; background: #fff; } + +.redColor{ + background-color: #FF004E; +} diff --git a/src/pages/wallet-detail/wallet-detail.ts b/src/pages/wallet-detail/wallet-detail.ts index 66bebd8..1104964 100644 --- a/src/pages/wallet-detail/wallet-detail.ts +++ b/src/pages/wallet-detail/wallet-detail.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import {ModalController, NavParams, Platform, ToastController} from 'ionic-angular'; +import {ModalController, NavParams, Platform, ToastController, ItemSliding} from 'ionic-angular'; import { WalletProvider } from '../../providers/wallet/wallet.provider'; import { Subscription } from 'rxjs/Subscription'; import { AddressModel } from '../../models/address.model'; @@ -61,4 +61,8 @@ export class WalletDetailPage implements OnInit, OnDestroy { addAddress() { this.walletProvider.addAddress(this.wallet); } + + delAddress(slidingItem: ItemSliding) { + slidingItem.close(); + } }