日历

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/app/app.component.ts

@@ -40,7 +40,8 @@ export class MyApp {
       splashScreen.hide();
       //检测是否需要更新
       appVersion.getVersionNumber().then((version: string) => {
-        appUpdateService.compariVersion().subscribe(data => {
+        appUpdateService.compariVersion().subscribe(res => {
+            let data = res.json();
             if (data.code == 200) {
               if (data.latestVersion != null && data.latestVersion != version) {
                 appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级

src/pages/editPersonInfo/editPersonInfo.module.ts → src/pages/person/editPersonInfo/editPersonInfo.module.ts

 import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
-import { EditPersonInfoPage } from '../editPersonInfo/editPersonInfo';
+import { EditPersonInfoPage } from './editPersonInfo';
 
 @NgModule({
   declarations: [

src/pages/editPersonInfo/editPersonInfo.scss → src/pages/person/editPersonInfo/editPersonInfo.scss

@@ -111,6 +111,7 @@ page-editPersonInfo {
  
     .content-box-group{
      border-bottom: 1px solid #cccccc;
+      min-height: 4rem;
     }
  
     .back-btn{

src/pages/editPersonInfo/editPersonInfo.ts → src/pages/person/editPersonInfo/editPersonInfo.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, ToastController } from 'ionic-angular';
 
 import { Storage } from '@ionic/storage';
-import { AppService } from '../../service/appHttpService';
+import { AppService } from "../../../service/appHttpService";
 
 @IonicPage()
 @Component({

src/pages/personInfo/personInfo.html → src/pages/person/personInfo/personInfo.html

 <ion-header>
-  <ion-toolbar>
-      <div class="searchToolBar">
-          <button ion-button clear small navPop style="padding: 0;" (click)="goBack()">
-              <img class="back-btn" src="./assets/imgs/back.png" />
-            </button>
-            <ion-title text-center>个人信息</ion-title>
-      </div>
-    
-    </ion-toolbar>
+  <ion-navbar>
+    <ion-title text-center>个人信息</ion-title>
+  </ion-navbar>
 </ion-header>
 <ion-content class="content">
 

src/pages/personInfo/personInfo.module.ts → src/pages/person/personInfo/personInfo.module.ts

 import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
-import { PersonInfoPage } from '../personInfo/personInfo';
+import { PersonInfoPage } from './personInfo';
 
 @NgModule({
   declarations: [

src/pages/personInfo/personInfo.scss → src/pages/person/personInfo/personInfo.scss

@@ -89,8 +89,8 @@ page-personInfo {
       justify-content: center;
       box-sizing: border-box;
      img{
-       width: 3rem;
-       height: 3rem;
+       width: 1.5rem;
+       height: 1.5rem;
      }
    }
   

src/pages/personInfo/personInfo.ts → src/pages/person/personInfo/personInfo.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, ToastController } from 'ionic-angular';
 
-import { ModifyPasswordPage } from '../modifyPassword/modifyPassword';
-
+import { ModifyPasswordPage } from "../../modifyPassword/modifyPassword";
 import { Storage } from '@ionic/storage';
-import { AppService } from '../../service/appHttpService';
+import { AppService } from "../../../service/appHttpService";
 import { EditPersonInfoPage } from '../editPersonInfo/editPersonInfo';
 
 @IonicPage()

src/pages/surveyManage/item/edit/edit.ts

 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ModalController, ToastController, AlertController} from 'ionic-angular';
 import {SelectTypePage} from "../select-type/select-type";
-import {AppService} from "../../../../service/appHttpService";
-import {message} from "../../../../app/main";
+import { AppService } from "../../../../service/appHttpService";
+import { message } from "../../../../app/main";
 import {MinePage} from "../../../tabs/mine/mine";
 
 @IonicPage()

src/pages/tabs/home/home.html

@@ -70,6 +70,10 @@
       </div>
     </div>
   </div>
+  <div class="calen-tab">
+    日程表：<span class="calen1">节假日</span> <span class="calen2">参加活动</span>
+          <span class="calen3">值班</span><span class="calen4">离沪</span>
+  </div>
     <ion-calendar [(ngModel)]="date"
                   (onChange)="onChange($event)"
                   [options]="optionsMulti"

src/pages/tabs/home/home.scss

@@ -291,5 +291,68 @@ page-home {
     text-align: left;
     padding: 3px 15px;
   }
+  .calen-tab{
+    margin: 16px 16px 0px 16px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #dddddd;
+  }
+  .calen1,
+  .calen2,
+  .calen3,
+  .calen4{
+    position: relative;
+    margin-left:1.8rem;
+  }
+  .calen1::after,
+  .calen2::after,
+  .calen3::after,
+  .calen4::after{
+    content: '';
+    position: absolute;
+    top: 23%;
+    left: -10px;
+    width:8px;
+    height:8px;
+    border-radius:50%;
+  }
+  .calen1::after{
+    border:1px solid #ddd;
+  }
+  .calen2::after{
+    background-color: #41afef;
+  }
+  .calen3::after{
+    background-color: #f53d3d;
+  }
+  .calen4::after{
+    background-color: #f7ce53;
+  }
+  ion-calendar-month button.days-btn.dayOff1{
+    border: 1px solid #dddddd;
+  }
+  ion-calendar-month button.days-btn.dayOff2{
+    background-color: #41afef;
+    border: 1px solid #41afef;
+  }
+  ion-calendar-month button.days-btn.dayOff3{
+    background-color: #f53d3d;
+    border: 1px solid #f53d3d;
+  }
+  ion-calendar-month button.days-btn.dayOff4{
+    background-color: #f7ce53;
+    border: 1px solid #f7ce53;
+  }
+  ion-calendar-month .primary .days .dayOff2 p,
+  ion-calendar-month .primary .days .dayOff3 p,
+  ion-calendar-month .primary .days .dayOff4 p{
+    color: white;
+  }
+ ion-calendar-month .primary .dayOff1.today p{
+    color: #333333;
+  }
+  button[disabled]{
+    opacity: 1;
+  }
+
 }
 

src/pages/tabs/home/home.ts

@@ -45,6 +45,31 @@ export class HomePage {
         weekdays: weekDay,
         monthPickerFormat:monthCh,
         weekStart: 1,
+        disableWeeks:[0,1,2,3,4,5,6],
+        daysConfig: [{
+            date: new Date(),
+            disable: true,
+            cssClass: 'dayOff1'
+        },
+            {
+                date: new Date('2018-10-11'),
+                disable:true,
+                marked:true,
+                cssClass: 'dayOff2'
+            },
+            {
+                date: new Date('2018-10-12'),
+                disable:true,
+                marked:true,
+                cssClass: 'dayOff3'
+            },
+            {
+                date: new Date('2018-10-13'),
+                disable:true,
+                marked:true,
+                cssClass: 'dayOff4'
+            }],
+
     };
 
   //待出行

src/pages/tabs/mine/mine.html

@@ -7,12 +7,15 @@
     <div class="mine-header" (click)="personInfo()">
         <div class="mine-header-box">
             <div class="mine-header-left">
+                <img src="./assets/imgs/woman.png" *ngIf="gender == 0" class="head-photo">
+                <img src="./assets/imgs/man.png" *ngIf="gender == null || gender == '1'" class="head-photo">
+            </div>
+            <div class="mine-header-right">
                 <h2 class="name">{{user?.userName}}</h2>
                 <label class="organization">{{orgName}}</label>
             </div>
-            <div class="mine-header-right">
-                <img src="./assets/imgs/woman.png" *ngIf="gender == 0" class="head-photo">
-                <img src="./assets/imgs/man.png" *ngIf="gender == null || gender == '1'" class="head-photo">
+            <div class="mine-header-float">
+                <ion-icon ios="ios-arrow-forward" md="md-arrow-forward"></ion-icon>
             </div>
         </div>
     </div>

src/pages/tabs/mine/mine.scss

 page-mine {
 
     .mine-header{
-        background: url("./../assets/imgs/bg.jpg");
-        padding: 40px 30px 
+        background-color: #2eb4fc;
+        padding: 25px 16px
     }
 
     .mine-header-box{
-       
+       display: flex;
+        ion-icon {
+            vertical-align: text-bottom;
+            margin-left: 4px;
+            color: #ffffff;
+        }
     }
 
     .mine-header-left{
-        display: inline-block;
+        width: 20%;
     }
 
     .name{
@@ -19,13 +24,19 @@ page-mine {
     }
 
     .organization{
-       color: #f6da30;
+       color: #dddddd;
        font-size: 16px;
     }
 
 .mine-header-right{
-    float: right;
+    width: 40%;
+    padding-left: 1.5rem;
 }
+    .mine-header-float{
+        width: 40%;
+        text-align: right;
+        line-height: 5.1rem;
+    }
 
     .head-photo{
         width: 60px;

src/pages/tabs/mine/mine.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import {  App, NavController, AlertController, NavParams } from 'ionic-angular';
 import { LoginPage } from '../../login/login';
 import { AppService } from '../../../service/appHttpService';
-import { PersonInfoPage } from '../../personInfo/personInfo';
+import { PersonInfoPage } from '../../person/personInfo/personInfo';
 import { MyActivityListPage } from '../../myActivityList/myActivityList';
 import { MyReportPage } from '../../myReport/myReport';
 import { OperationListPage } from '../../operation-list/operation-list';