diff --git a/src/app/pages/blogdetail/blogdetail.page.html b/src/app/pages/blogdetail/blogdetail.page.html index 463c312..abdf921 100644 --- a/src/app/pages/blogdetail/blogdetail.page.html +++ b/src/app/pages/blogdetail/blogdetail.page.html @@ -57,10 +57,10 @@
- {{blogData.post_date}} + {{blogData.post_date | date}}
- + diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index 38e4ae3..8fbd605 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -38,7 +38,7 @@ - + Members ({{total_family}}) @@ -46,14 +46,15 @@ Tasks ({{family_active}}) - Pending {{suggestion_total}} + Pending ({{suggestion_total}})
+
-
+
{{item.firstname}} {{item.lastname}} ({{item.age}}) @@ -64,6 +65,7 @@
+
@@ -94,7 +96,7 @@
-
+
@@ -120,31 +122,48 @@
-
-
-
-
-
- {{item.title}} -
-
-
-
- - {{item.status_text}} -
- +
+
+
+ +
+ {{item.firstname}} + {{item.title}} + {{item.description}} + Added: {{item.added}} + Status: {{item.status_text}}
- {{item.description}} - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/app/pages/family/family.page.scss b/src/app/pages/family/family.page.scss index c42354b..91ae28b 100644 --- a/src/app/pages/family/family.page.scss +++ b/src/app/pages/family/family.page.scss @@ -1,14 +1,13 @@ ion-content { .name_bg_text{ - background-color:aliceblue;; - font-size: 10px; - padding-right: 5px; + color: #8b198e; font-weight: bolder; } .back_image { + margin-top: 10px; width: 100%; - height: 230px; + height: 200px; .back { font-size: 25px; @@ -16,6 +15,16 @@ ion-content { } } + +.extra_text{ + font-size: 11px; + + margin-left: 20px; + .title{ + font-weight: bolder; + color: #030728; + } +} .due_date{ color: red; font-size: 12px; diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html index 3014503..309e2fe 100644 --- a/src/app/pages/familymember/familymember.page.html +++ b/src/app/pages/familymember/familymember.page.html @@ -40,7 +40,7 @@
- + Task @@ -86,7 +86,7 @@
-
+
{{item.amount*0.01 | number : '1.2-2'}} {{item.description}}
@@ -187,12 +187,13 @@ {{member_pin}}
- - - +
+ + +
diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss index cd8a5b0..a4232ef 100644 --- a/src/app/pages/familymember/familymember.page.scss +++ b/src/app/pages/familymember/familymember.page.scss @@ -45,6 +45,11 @@ ion-content { ion-icon { font-size: 22px; } + qr-div{ + width: 100%; + text-align: center; + margin: 0px auto 0px auto; + } } .row { @@ -122,6 +127,7 @@ ion-content { height: 50px; width: 50px; border-radius: 100%; + color: #3dc2ff; } .bold { diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.scss index d6464b3..0120ece 100644 --- a/src/app/pages/home/home.page.scss +++ b/src/app/pages/home/home.page.scss @@ -39,7 +39,7 @@ ion-header { } } .top-tool{ - --background: #f1eeeb; + --background: #eceae9; border-radius: 10px; ion-buttons{ ion-button{ @@ -383,6 +383,7 @@ ion-content { text-align: center; height: 38px; width: 100%; + overflow: hidden; .ovf{ overflow: hidden; } diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html index 0abac39..1f7302f 100644 --- a/src/app/pages/marketdetail/marketdetail.page.html +++ b/src/app/pages/marketdetail/marketdetail.page.html @@ -34,7 +34,7 @@
- + Details diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html index a11680d..4422bd6 100644 --- a/src/app/pages/my-course/my-course.page.html +++ b/src/app/pages/my-course/my-course.page.html @@ -12,7 +12,7 @@
- + Available diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html index ac50141..7835b5f 100644 --- a/src/app/pages/mycoupons/mycoupons.page.html +++ b/src/app/pages/mycoupons/mycoupons.page.html @@ -39,7 +39,7 @@
- + Pending diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index 871800d..fbda92c 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -13,7 +13,7 @@
- + Active diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index 3bb25f6..f08ac70 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -13,7 +13,7 @@ Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}} - + To Bank diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html index e887e6e..da10f71 100644 --- a/src/app/pages/transaction/transaction.page.html +++ b/src/app/pages/transaction/transaction.page.html @@ -48,7 +48,7 @@
-
+
{{item.description}} diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index 6237841..889da8a 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -65,6 +65,7 @@ export class SessionDataProviderService { isPedningJob: number = 0; isOfferJob: number = 0; profile_pic:string=''; + profile_pic_url:string=''; member_uid:string; user_state:string; city:string; @@ -98,6 +99,7 @@ export class SessionDataProviderService { this.balance = loginResult.balance; this.ccard=loginResult.ccard; this.profile_pic=loginResult.profile_pic; + this.profile_pic_url = loginResult.profile_pic_url; this.isPedningJob = loginResult.pedningjob; this.isOfferJob = loginResult.offerjob; this.user_state=loginResult.state; @@ -186,8 +188,9 @@ export class SessionDataProviderService { profilePicture(){ var defualtProfilePicture = "https://www.wrenchboard.com/assets/images/profile.jpg"; var profile_p = ''; - if (this.profile_pic !=''){ - profile_p="https://www.wrenchboard.com/smedia/LIVE/profile/"+this.profile_pic; + if (this.profile_pic_url !=''){ + //profile_p="https://www.wrenchboard.com/smedia/LIVE/profile/"+this.profile_pic; + profile_p = this.profile_pic_url; } else{ profile_p = defualtProfilePicture; diff --git a/src/global.scss b/src/global.scss index a8d9b5d..ff315d2 100644 --- a/src/global.scss +++ b/src/global.scss @@ -233,4 +233,14 @@ ion-content{ .scan_login_button{ font-size: 16px; font-weight: bolder; -} \ No newline at end of file +} +.common_segment{ + background-color: #3dc2ff; + font-weight: bolder; + ion-segment-button{ + ion-label{ + font-weight: bolder; + } + } +} +