Merge branch 'push-dev' into 'master'

Push dev

See merge request !3

src/app/app.component.ts

@@ -31,8 +31,8 @@ export class AppComponent {
 
   initializeApp() {
     this.platform.ready().then(() => {
-      this.statusBar.styleDefault();
-      this.statusBar.backgroundColorByHexString('#6B7072');
+      this.statusBar.styleLightContent();
+      this.statusBar.backgroundColorByHexString('#000000');
       this.statusBar.show();
       this.statusBar.overlaysWebView(false);
       this.splashScreen.hide();
@@ -69,7 +69,6 @@ export class AppComponent {
           this.appMinimize.minimize();
           this.backBtnPressed = false;
           window.history.pushState('forward', null, this.url);
-          // window.history.forward();
           return;
         } else {
           this.backBtnPressed = true;

src/app/home/home.page.ts

@@ -4,7 +4,7 @@ import 'web-animations-js/web-animations.min';
 import { toLeft } from '../animations/toLeftAndBack';
 import { toRight } from '../animations/toRightAndBack';
 import { fadeIn } from '../animations/fade-in';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-home',
@@ -14,6 +14,10 @@ import { Router, ActivatedRoute } from '@angular/router';
 })
 export class HomePage implements OnInit {
   @ViewChild(IonSlides) slides;
+  @ViewChild('page_one') page_one;
+  @ViewChild('page_two') page_two;
+  @ViewChild('page_three') page_three;
+  @ViewChild('page_four') page_four;
   options = {
     speed: 1000,
     allowTouchMove: false
@@ -45,6 +49,13 @@ export class HomePage implements OnInit {
     });
   }
 
+  ionViewWillEnter () {
+    this.page_one.ngOnInit();
+    this.page_two.ngOnInit();
+    this.page_three.ngOnInit();
+    this.page_four.ngOnInit();
+  }
+
   slideOnChange() {
     this.slides.getActiveIndex().then((index) => {
       this.changeIndex(index);

src/app/main/page-four/page-four.component.ts

 import { Component, OnInit } from '@angular/core';
-import { ApiService } from '../../service/api.service';
-import { TransferService } from '../../service/transfer.service';
+import {ApiService} from '../../service/api.service';
+import {TransferService} from '../../service/transfer.service';
 
 @Component({
-  selector: 'app-page-four',
-  templateUrl: './page-four.component.html',
-  styleUrls: ['./page-four.component.scss'],
+    selector: 'app-page-four',
+    templateUrl: './page-four.component.html',
+    styleUrls: ['./page-four.component.scss'],
 })
 export class PageFourComponent implements OnInit {
 
-  user: any = {};
-  constructor(private api: ApiService, private tf: TransferService) { }
+    user: any = {};
 
-  ngOnInit() {
-    this.getSelfInfo();
-  }
+    constructor(private api: ApiService, private tf: TransferService) {
+    }
 
-  getSelfInfo() {
-    this.api.user.getSelfInfo(['', (data) => {
-      if (data) {
-        this.user = data;
-      } else {
-        this.api.presentMsgToast(data && data.message ? data.message : '登录失败');
-      }
-    }]);
-  }
+    ngOnInit() {
+        this.getSelfInfo();
+    }
 
-  loginOut() {
-    this.api.login.logout(['', (data) => {
-      if (data) {
-        window.localStorage.removeItem('token');
-        this.tf.transfer({
-          to: 'app-extra',
-          from: 'app-home',
-          url: '/extra',
-          hash: '',
-          query: ''
-        });
-      } else {
-        this.api.presentMsgToast(data && data.message ? data.message : '登录失败');
-      }
-    }]);
-  }
+    getSelfInfo() {
+        this.api.user.getSelfInfo(['', (data) => {
+            if (data) {
+                this.user = data;
+            } else {
+                this.api.presentMsgToast(data && data.message ? data.message : '登录失败');
+            }
+        }]);
+    }
+
+    loginOut() {
+        this.api.login.logout(['', (data) => {
+            if (data) {
+                window.localStorage.removeItem('token');
+                this.tf.transfer({
+                    to: 'app-extra',
+                    from: 'app-home',
+                    url: '/extra',
+                    hash: '',
+                    query: ''
+                });
+            } else {
+                this.api.presentMsgToast(data && data.message ? data.message : '登录失败');
+            }
+        }]);
+    }
 }