-
-
-
- Send Reward
-
-
-
-
-
-
-
+
+
+ Send Reward
+
+
+
+
+
+
+
+
+
+
+
@@ -178,13 +183,14 @@
(click)="backToToolBar()"
color="danger"
shape="round"
- size="small">Cancel
+ size="small">Return
Send
diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss
index b4149d0..28d4fa7 100644
--- a/src/app/pages/familymember/familymember.page.scss
+++ b/src/app/pages/familymember/familymember.page.scss
@@ -16,7 +16,8 @@ ion-content {
.send-grid{
background-color: #eff2f4;
border-radius: 10px;
- font-size: 14px;
+ padding: 10px;
+ font-size: 16px;
font-weight: bolder;
ion-select, ion-input{
border-radius: 10px;
@@ -193,8 +194,8 @@ ion-content {
border-radius: 100%;
}
.wallet-tools{
- background-color: white;
- background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue);
+ // background-color: white;
+ // background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue);
ion-toolbar{
--ion-background-color: white;
border-radius: 10px;
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index e155839..e8f4052 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -41,11 +41,15 @@ export class FamilymemberPage implements OnInit {
this.familyMemberData = this.router.getCurrentNavigation().extras.state;
//debugger;
+ if ( this.familyMemberData != undefined && this.familyMemberData.itemData != undefined ){
+ this.member_firstname= this.familyMemberData.itemData.firstname;
+ this.member_lastname = this.familyMemberData.itemData.lastname;
+ this.family_uid = this.familyMemberData.itemData.family_uid;
+ this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
+ }else{
+ this.onBack();
+ }
- this.member_firstname= this.familyMemberData.itemData.firstname;
- this.member_lastname = this.familyMemberData.itemData.lastname;
- this.family_uid = this.familyMemberData.itemData.family_uid;
- this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
this.etag = '' + Date.now();
// this.userWalletService.getWalletData();
}
@@ -250,7 +254,11 @@ familyTransfer(reqData){
sendResultData:any;
- sendReward(item){
+ async sendReward(item){
+ const loading = await this.loadingCtrl.create({
+ message: 'Sending...',
+ duration: 5500,
+ });
this.reqSend = {
action:22014,
@@ -266,8 +274,11 @@ familyTransfer(reqData){
family_transfer_mode: 100
};
+ await loading.present();
+
this.wrenchService.familyTransfer(this.reqSend).subscribe(
sendResultData => {
+ loading.dismiss();
this.sendResultData = sendResultData;
console.log("sendResultData RETURN->", this.sendResultData);