政治生日弹窗

src/app/app.component.ts

@@ -7,13 +7,14 @@ import {LoginPage} from '../pages/login/login';
 import {AppVersion} from '@ionic-native/app-version';
 import {AppUpdateService} from "../service/appUpdate.service";
 import {Keyboard} from '@ionic-native/keyboard';
-import {Badge} from '@ionic-native/badge';
 import {Response} from "@angular/http";
 import {TabsPage} from "../pages/tabs/tabs";
-import {Geolocation} from "@ionic-native/geolocation";
 import {AppService} from "../service/http.service";
 import {EmitService} from "../provide/emit.service";
 import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
+import {FileOpener} from "@ionic-native/file-opener";
+import {FileTransfer, FileTransferObject} from "@ionic-native/file-transfer";
+import {File} from "@ionic-native/file";
 
 @Component({
     templateUrl: 'app.html'
@@ -32,7 +33,10 @@ export class MyApp {
                 keyboard: Keyboard,
                 appUpdateService: AppUpdateService,
                 appVersion: AppVersion,
-                private geolocation: Geolocation,
+                private fileOpener: FileOpener,
+                private fileTransfer: FileTransfer,
+                private fileTransferObject: FileTransferObject,
+                private file: File,
                 public emitSer:EmitService,
                 public storage: Storage,
                 public mobileAccess:MobileAccessibility,
@@ -65,6 +69,19 @@ export class MyApp {
 
 
         this.loadLogin();
+        // this.apk();
+    }
+
+    apk(){
+        const fileName = 'temp.apk';
+        let path = this.file.externalDataDirectory;
+        alert(path);
+        this.fileOpener.open(
+            path + fileName,
+            'application/vnd.android.package-archive'
+        ).catch((err) => {
+            this.appService.alert('打开apk失败！'+err);
+        })
     }
 
 

src/app/app.scss

@@ -303,7 +303,6 @@ p {
     left: 10%;
     width: 80%;
     height: 45%;
-    background-color: #fff;
     border-radius: 5px;
     background: url(../assets/imgs/home/signBgc.png) repeat;
     background-size: cover;
@@ -325,6 +324,30 @@ p {
       font-size: 2.5rem;
     }
   }
+  .mask-content-bir{
+    position: absolute;
+    top: 20%;
+    left: 10%;
+    width: 80%;
+    height: 270px;
+    background-color: #fff;
+    border-radius: 5px;
+    .title{
+      background-color: #e12724;
+      color: #ffffff;
+      text-align: center;
+      font-size: 2rem;
+      padding: .5rem 0
+    }
+    .record-content{
+      background: url(../assets/imgs/home/bir-bg.png) repeat;
+      background-size: cover;
+      padding: 1rem;
+      letter-spacing: 1px;
+      line-height: 2rem;
+      height: 170px;
+    }
+  }
 }
 a[disabled], button[disabled], [ion-button][disabled],
 .bar-button-default-ios.activated, .bar-button-default.bar-button-ios-default.activated, .bar-button-clear-ios-default.activated{

src/pages/tabs/home/home.html

@@ -86,6 +86,20 @@
         </ng-container>
     </div>
 </ion-content>
+<!--政治生日-->
+<div *ngIf="isBir" class="signMask">
+    <div class="mask-content-bir">
+        <p class="title">政治生日</p>
+        <div class="record-content">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="main-color">{{partyObj?.name}}</span>同志，欢迎您，今天是<span class="main-color">{{partyObj?.now | date:'yyyy年MM月dd日'}}</span>，是您加入中国共产党的第<span class="main-color">{{partyObj?.partytime}}</span>天，希望您不忘初心，牢记使命，永远奋斗。
+        </div>
+        <div class="mask-button">
+            <button class="submit-btn submit" (click)="start()">确定</button>
+        </div>
+    </div>
+</div>
+
+<!--签到-->
 <div *ngIf="isSign" class="signMask">
     <div class="mask-content">
         <ion-icon class="close" (click)="isSign = false" name="close"></ion-icon>

src/pages/tabs/home/home.ts

@@ -40,7 +40,8 @@ export class HomePage {
         {name: "本市部署", type: 4, index: 3}
     ];
     index = 0;
-    isSign = false;
+    isSign = false;   //签到弹窗
+    isBir = false;  //政治生日弹窗
 
     newList = [];
     noReadNum;
@@ -133,17 +134,17 @@ 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.start();
-                    });
+                    this.isBir = true;
                 }
             );
         })
     }
 
-    //横向跑马灯
+
+
+    //关闭弹窗 开启跑马灯
     start() {
+        this.isBir = false;
         this.homeMiddleTips.nativeElement.style.height = "80px";
         this.homeMiddleTips.nativeElement.style.padding = "1rem";
         let child_div = this.verticaLamp.nativeElement.children;

src/pages/tabs/serve/serve.scss

@@ -62,7 +62,6 @@ page-serve {
   }
 
   .card3-item {
-    margin: 3px 0;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;