fix固定tabs菜单

src/app/app.scss

@@ -300,11 +300,11 @@ p {
     background: url(../assets/imgs/home/signBgc.png) repeat;
     background-size: cover;
     .record-conten{
-      margin-left: 25%;
+      margin-left: 18%;
       margin-top: 30%;
       color: #333333;
       font-size: 1.4rem;
-      line-height: 1.8rem;
+      line-height: 2rem;
       padding-right: 1rem;
       height: 50%;
       overflow: scroll;
@@ -334,6 +334,5 @@ a[disabled], button[disabled], [ion-button][disabled],
   padding-top: 4rem;
   height: 100%;
   background-image: url('../assets/imgs/login-bg.png');
-  background-repeat: repeat;
   background-size: cover;
 }
\ No newline at end of file

src/pages/discover-pages/publish/publish.html

 <ion-header>
-
   <ion-navbar>
     <ion-title>发布</ion-title>
-
     <ion-buttons end>
       <button ion-button icon-only (click)="publish()" class="toolbar-icon">
         <ion-icon name="share-alt"></ion-icon>
@@ -10,7 +8,6 @@
       </button>
     </ion-buttons>
   </ion-navbar>
-
 </ion-header>
 
 

src/pages/tabs/discover/discover.html

@@ -23,13 +23,13 @@
     </ion-buttons>
   </ion-navbar>
 </ion-header>
-<ion-content>
+<div class="tabs-fixed">
   <div class="scroll-tab">
     <div class="news-content">
       <div #tabsParent class="tabs-parent">
-          <div #tabsChildren *ngFor="let item of tabsList;" (click)="changeParent(item)" class="tabs-children">
-            <span #tabSpan [style.color]="indexParent == item.indexParent ? '#e12724':''">{{item.name}}</span>
-          </div>
+        <div #tabsChildren *ngFor="let item of tabsList;" (click)="changeParent(item)" class="tabs-children">
+          <span #tabSpan [style.color]="indexParent == item.indexParent ? '#e12724':''">{{item.name}}</span>
+        </div>
         <span #tips id="tips"></span>
       </div>
     </div>
@@ -43,7 +43,8 @@
       </div>
     </div>
   </div>
-
+</div>
+<ion-content>
   <div class="search-content">
     <ng-container *ngFor="let item of newList">
       <div class="search-item" (click)="goToDetail(item)">

src/pages/tabs/discover/discover.scss

@@ -59,6 +59,7 @@ page-discover {
   //新闻区
   .search-content{
     padding: 0 1rem;
+    margin-top: 88px;
     .search-item{
       padding: .8rem 0;
       .item-info{
@@ -82,7 +83,7 @@ page-discover {
         }
         .news-end{
           align-self: flex-end;
-          color: #999999;
+          color: #bbbbbb;
           font-size: 1.5rem;
           margin-top: .8rem;
           span{
@@ -110,7 +111,7 @@ page-discover {
       color: #777777;
       border-radius: 5px;
       margin-right: 10px;
-      width: 6rem;
+      width: 8rem;
       padding: 3px 0;
       text-align: center;
       font-size: 1.4rem;
@@ -122,4 +123,17 @@ page-discover {
       border: 1px solid #e12724;
     }
   }
+
+  .tabs-fixed{
+    position: fixed;
+    top: 52px;
+    left: 0px;
+    width: 100%;
+    z-index: 1;
+    background-color: #ffffff;
+    border-bottom: 1px solid #ffffff;
+    .tabs-parent{
+      background-color: #ffffff;
+    }
+  }
 }

src/pages/tabs/home/home.html

@@ -23,7 +23,7 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <div class="home-middle-tips">
+    <div [hidden]="isTips" class="home-middle-tips">
         <ion-row>
             <ion-col col-2 class="middle-left">
                 <img src="./assets/imgs/flag.png">
@@ -89,7 +89,7 @@
     <div class="mask-content">
         <ion-icon class="close" (click)="isSign = false" name="close"></ion-icon>
         <div class="record-conten">
-            {{signObj.text}}
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{signObj.text}}
         </div>
         <div class="mask-button">
             <button *ngIf="signObj.isSign == 'no'" [disabled]="disabledClick" class="submit-btn submit" (click)="signUp()">签到{{signText}}</button>

src/pages/tabs/home/home.ts

 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {NavController, IonicPage, Slides} from 'ionic-angular';
-import {ActivityListPage} from "../../home/activity/activityList/activityList";
 import {Http, Response} from '@angular/http';
 import {AppService, AppGlobal} from '../../../service/http.service';
-import {Calendar} from '@ionic-native/calendar';
-import {ActivityApplyPage} from "../../home/activity/activityApply/activityApply";
-import {ActivityDetailPage} from "../../home/activity/activityDetail/activityDetail";
-import {OutGoingReportPage} from "../../home/report/outGoingReport/outGoingReport";
-import {AnnouncementPage} from '../../home/announcement/announcementList/announcement';
 import {Storage} from '@ionic/storage';
-import {OutGoingReportEditPage} from "../../home/report/outGoingReportEdit/outGoingReportEdit";
-import {AnnouncementViewPage} from '../../home/announcement/announcementView/announcementView';
-import {CalendarComponentOptions, DayConfig} from "ion2-calendar";
 import {NoticePage} from "../notice/notice";
 import {Badge} from '@ionic-native/badge';
 import {TabsService} from "../tabs.service";
@@ -20,8 +11,7 @@ import {CommonService} from "../../../provide/common.service";
 import {SearchNewPage} from "../../home-pages/search-new/search-new";
 import {StuffDetailPage} from "../../home-pages/stuff-detail/stuff-detail";
 import {EmitService} from "../../../provide/emit.service";
-
-declare var Swiper;
+import {DatePipe} from "@angular/common";
 
 @IonicPage()
 @Component({
@@ -41,16 +31,17 @@ export class HomePage {
     //1党章党规,2系列讲话,3中央精神,4本市部署,5通知公告,6党建动态,7工作提示,8党务参考
     //9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶
     tabsList = [
-        {name: "系列讲话", type: 2,index:0},
-        {name: "党章党规", type: 1,index:1},
-        {name: "中央精神", type: 3,index:2},
-        {name: "本市部署", type: 4,index:3}
-        ];
+        {name: "系列讲话", type: 2, index: 0},
+        {name: "党章党规", type: 1, index: 1},
+        {name: "中央精神", type: 3, index: 2},
+        {name: "本市部署", type: 4, index: 3}
+    ];
     index = 0;
     isSign = false;
 
     newList = [];
     noReadNum;
+    isTips = true;
 
     signObj = {
         'text': '',
@@ -69,7 +60,7 @@ export class HomePage {
     tmpH = 0;
 
 
-    constructor(public navCtrl: NavController, public tts: TextToSpeech,
+    constructor(public navCtrl: NavController, public tts: TextToSpeech, public datePipe: DatePipe,
                 public commonSer: CommonService, public emitSer: EmitService,
                 public appService: AppService, public http: Http, public storage: Storage,
                 public badge: Badge, public tabsSer: TabsService) {
@@ -106,7 +97,6 @@ export class HomePage {
         } else {
             this.tmpH = 0;
             this.lineChangeEle.nativeElement.appendChild(this.lineChangeEle.nativeElement.children[0]);
-            // this.lineChangeEle.nativeElement.scrollTop = 0;
             setTimeout(() => {
                 this.start()
             }, this.stopTime);//stopTime = 3000 ; scrollTime = 30 每移动一个单位延时30ms
@@ -123,7 +113,6 @@ export class HomePage {
         this.change(this.tabsList[0]);
         this.getBanner();
         this.getInfo();
-        this.lineChange();
     }
 
     //获取轮播图
@@ -163,6 +152,11 @@ export class HomePage {
             this.tabsSer.getInfo(userid).subscribe(
                 (res) => {
                     this.partyObj = res.apiResult.data;
+                    let message = this.partyObj.name + "同志，欢迎您，今天是" + this.datePipe.transform(this.partyObj.now, 'yyyy年MM月dd日') + "，是您加入中国共产党的第" + this.partyObj.partytime + "天，希望您不忘初心，牢记使命，永远奋斗。";
+                    this.commonSer.alert2(message,'',()=>{
+                        this.isTips = false;
+                        this.lineChange();
+                    });
                 }
             );
         })

src/pages/tabs/mine/mine.ts

@@ -131,7 +131,8 @@ export class MinePage {
     }
 
     goSet() {
-        this.app.getRootNav().push('VersionPage');
+        // this.app.getRootNav().push('VersionPage');
+        this.navCtrl.push('VersionPage');
     }
 
     goDuty() {

src/pages/version/version.html

 <ion-header>
-	<ion-navbar>
-			<ion-title text-center>设置</ion-title>
-	</ion-navbar>
+    <ion-navbar>
+        <ion-title text-center>设置</ion-title>
+    </ion-navbar>
 </ion-header>
 <ion-content class="bgc-e7e8ed">
-	<ion-list>
-		<ion-item>
-			<ion-label>是否接受推送消息</ion-label>
-			<ion-toggle [(ngModel)]="pusNumber" (ionChange)="savePush()"></ion-toggle>
-		</ion-item>
-		<ion-item class="margin-top-20">
-			<span>当前版本</span>
-			<span float-right (click)="update()"><span *ngIf="!isLatest" class="red-span"></span>{{version}}</span>
-		</ion-item>
-	</ion-list>
-	<button class="submit-btn submit" (click)="logoutApp()">退出</button>
+    <ion-list>
+        <ion-item>
+            <ion-label>是否接受推送消息</ion-label>
+            <ion-toggle [(ngModel)]="pusNumber" (ionChange)="savePush()"></ion-toggle>
+        </ion-item>
+        <ion-item class="margin-top-20">
+            <span>当前版本</span>
+            <span float-right (click)="update()"><span *ngIf="!isLatest" class="red-span"></span>{{version}}</span>
+        </ion-item>
+    </ion-list>
+    <button class="submit-btn submit" (click)="logoutApp()">退出</button>
 </ion-content>
\ No newline at end of file

src/pages/version/version.scss

@@ -43,8 +43,8 @@ page-version {
         font-size: 16px;
     }
     .submit{
-        border: 1px solid #34b4fc;
-        background-color: #34b4fc;
+        border: 1px solid #e12724;
+        background-color: #e12724;
         margin-top: 20px;
     }
     .list-ios .item-block .item-inner {

src/pages/version/version.ts

@@ -5,7 +5,7 @@ import {AppVersion} from '@ionic-native/app-version';
 import {AppUpdateService} from "../../service/appUpdate.service";
 import {Storage} from "@ionic/storage";
 import {LoginPage} from "../login/login";
-import {HomePage} from "../tabs/home/home";
+import {App} from "ionic-angular";
 
 @IonicPage()
 @Component({
@@ -25,6 +25,7 @@ export class VersionPage {
                 private appUpdateService: AppUpdateService,
                 private appVersion: AppVersion,
                 private storage: Storage,
+                private app:App,
                 private alertCtrl: AlertController) {
 
     }
@@ -46,17 +47,11 @@ export class VersionPage {
         this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush', null)
             .subscribe(
                 (res) => {
-                    if(res._body == ""){
+                    if (res._body == "") {
                         this.pusNumber = true;
-                    }else{
+                    } else {
                         this.pusNumber = res.json();
                     }
-                    // if(res.json() == false){
-                    //     this.pusNumber = res.json();
-                    // }else{
-                    //     this.pusNumber = true;
-                    // }
-
                 }
             )
     }
@@ -126,8 +121,7 @@ export class VersionPage {
         this.storage.clear();
         this.appService.ObserverHttpGet("/wisdomgroup/app/logout", null)
             .subscribe((res: Response) => {
-                    let data = res.json();
-                    this.navCtrl.push('LoginPage');
+                    this.app.getRootNav().setRoot(LoginPage);
                 }, error => {
                 }
             );

src/provide/common.service.ts

@@ -66,7 +66,6 @@ export class CommonService{
      * @param callback  如果有回调方法 就有确定、取消两个按钮，没有回调方法 则只有确认一个按钮
      */
     alert(message, callback?) {
-        console.log(message)
         if (callback) {
             let alert = this.alertCtrl.create({
                 title: '提示',
@@ -81,7 +80,31 @@ export class CommonService{
             alert.present();
         } else {
             let alert = this.alertCtrl.create({
-                title: '提示',
+                title: '',
+                message: message,
+                buttons: ["确定"]
+            });
+            alert.present();
+        }
+    }
+
+    alert2(message,title,callback?){
+        if (callback) {
+            let alert = this.alertCtrl.create({
+                title: title,
+                message: message,
+                buttons: [
+                    {
+                    text: "确定",
+                    handler: data => {
+                        callback();
+                    }
+                }]
+            });
+            alert.present();
+        } else {
+            let alert = this.alertCtrl.create({
+                title: title,
                 message: message,
                 buttons: ["确定"]
             });