日历

config.xml

@@ -89,6 +89,7 @@
     <plugin name="cordova-plugin-geolocation" spec="^4.0.1">
         <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="To locate you" />
     </plugin>
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <engine name="ios" spec="4.5.5" />
     <engine name="browser" spec="5.0.4" />
     <engine name="android" spec="7.0.0" />

plugins/android.json

@@ -42,6 +42,9 @@
     },
     "cordova-hot-code-push-plugin": {
       "PACKAGE_NAME": "io.ionic.starter"
+    },
+    "cordova-plugin-statusbar": {
+      "PACKAGE_NAME": "io.ionic.starter"
     }
   },
   "dependent_plugins": {}

src/app/app.component.ts

-import { Component,ViewChild } from '@angular/core';
+import {Component, ViewChild} from '@angular/core';
 import {Platform, AlertController, Content} from 'ionic-angular';
-import { StatusBar } from '@ionic-native/status-bar';
-import { SplashScreen } from '@ionic-native/splash-screen';
-import { Storage } from "@ionic/storage";
-import { LoginPage } from '../pages/login/login';
-import { AppVersion } from '@ionic-native/app-version';
-import { AppUpdateService } from '../service/appUpdateService';
-import { Keyboard } from '@ionic-native/keyboard';
-import { Badge } from '@ionic-native/badge';
+import {StatusBar} from '@ionic-native/status-bar';
+import {SplashScreen} from '@ionic-native/splash-screen';
+import {Storage} from "@ionic/storage";
+import {LoginPage} from '../pages/login/login';
+import {AppVersion} from '@ionic-native/app-version';
+import {AppUpdateService} from '../service/appUpdateService';
+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 {Geolocation} from "@ionic-native/geolocation";
 import {AppService} from "../service/appHttpService";
+
 @Component({
-  templateUrl: 'app.html'
+    templateUrl: 'app.html'
 })
 export class MyApp {
 
-  @ViewChild(Content) content: Content;
-  rootPage;
-
-  user;
-  constructor(platform: Platform, 
-    statusBar: StatusBar, 
-    splashScreen: SplashScreen,
-    alertCtrl: AlertController,
-    keyboard:Keyboard,
-    appUpdateService: AppUpdateService,
-    appVersion: AppVersion,
-     private geolocation: Geolocation,
-    badge:Badge,
-    // public navCtrl: NavController,
-    public storage: Storage,
-    public appService: AppService
-  ) {
-    platform.ready().then(() => {
+    @ViewChild(Content) content: Content;
+    rootPage;
 
-      statusBar.styleDefault();
-      splashScreen.hide();
-      //检测是否需要更新
-      appVersion.getVersionNumber().then((version: string) => {
-        appUpdateService.compariVersion().subscribe(res => {
-            let data = res.json();
-            if (data.code == 200) {
-              if (data.latestVersion != null && data.latestVersion != version) {
-                appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级
-              }
-          }
-        });
-      }).catch(err => {
-        console.log('getVersionNumber:' + err);
-      });
-    });
+    user;
 
+    constructor(platform: Platform,
+                public statusBar: StatusBar,
+                public splashScreen: SplashScreen,
+                alertCtrl: AlertController,
+                keyboard: Keyboard,
+                appUpdateService: AppUpdateService,
+                appVersion: AppVersion,
+                private geolocation: Geolocation,
+                badge: Badge,
+                // public navCtrl: NavController,
+                public storage: Storage,
+                public appService: AppService) {
+        platform.ready().then(() => {
 
+            this.splashScreen.hide();
+            this.statusBar.show();
+            this.statusBar.overlaysWebView(false);
+            this.statusBar.backgroundColorByHexString('#19b5ff');
+            this.statusBar.styleLightContent();
 
+            //检测是否需要更新
+            appVersion.getVersionNumber().then((version: string) => {
+                appUpdateService.compariVersion().subscribe(res => {
+                    let data = res.json();
+                    if (data.code == 200) {
+                        if (data.latestVersion != null && data.latestVersion != version) {
+                            appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级
+                        }
+                    }
+                });
+            }).catch(err => {
+                console.log('getVersionNumber:' + err);
+            });
+        });
 
 
-    this.loadLogin();
-  }
+        this.loadLogin();
+    }
 
 
-  loadLogin(){
-      this.storage.get("userLoginInfo").then((value)=>{
-          if(value!=null && value != ''){
-              this.user = value;
-              this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user)
-                  .subscribe((res: Response) => {
-                          let data = res.json();
-                          if (data["code"] == '200') {
-                              //将当前登录用户存进缓存，便于后期逻辑操作
-                              this.storage.set('user', data.data);
-                              this.user.userid = data.data.id;
-                              this.storage.set('userLoginInfo',this.user);
-                              // return this.navCtrl.setRoot(TabsPage, { "user": this.user });
-                              this.rootPage = TabsPage;
-                          } else {
-                              this.appService.alert('手机号或密码错误！');
-                              this.rootPage = LoginPage;
-                              // return this.navCtrl.setRoot(LoginPage);
-                          }
-                      }, error => {
+    loadLogin() {
+        this.storage.get("userLoginInfo").then((value) => {
+            if (value != null && value != '') {
+                this.user = value;
+                this.appService.ObserverHttpPost("/wisdomgroup/app/loginpost", this.user)
+                    .subscribe((res: Response) => {
+                            let data = res.json();
+                            if (data["code"] == '200') {
+                                //将当前登录用户存进缓存，便于后期逻辑操作
+                                this.storage.set('user', data.data);
+                                this.user.userid = data.data.id;
+                                this.storage.set('userLoginInfo', this.user);
+                                // return this.navCtrl.setRoot(TabsPage, { "user": this.user });
+                                this.rootPage = TabsPage;
+                            } else {
+                                this.appService.alert('手机号或密码错误！');
+                                this.rootPage = LoginPage;
+                                // return this.navCtrl.setRoot(LoginPage);
+                            }
+                        }, error => {
                             this.rootPage = LoginPage;
-                          this.appService.alert('网络异常！');
-                      }
-                  );
-          }
-          else{
-              this.rootPage = LoginPage;
-          }
-      });
-  }
+                            this.appService.alert('网络异常！');
+                        }
+                    );
+            }
+            else {
+                this.rootPage = LoginPage;
+            }
+        });
+    }
 
 }

src/app/app.scss

@@ -11,20 +11,21 @@ p{
   padding-left: 10px;
 }
 .list-ios .item-block .item-inner {
-  border-bottom: 0.55px solid #dadada;
+  border-bottom: 1px solid #dadada;
 }
 .list-ios > .item-block:last-child,
 .list-ios > .item-block:first-child{
   border: none;
 }
 .list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
-  border-bottom: 0.55px solid #dadada;
+  border-bottom: 1px solid #dadada;
 }
 
 
 .back-button-icon-ios{
   line-height: 20px;
   font-size: 3rem;
+  color:#fff;
 }
 .bgc-e7e8ed{
   background-color: #e7e8ed;
@@ -129,3 +130,27 @@ ion-icon {
 .border-none{
   border: none !important;
 }
+
+
+//tabs
+.tabs-ios .tabbar{
+  border-top: 1px solid #eeeeee;
+  background-color: #f7f7f7;
+}
+
+
+//导航栏
+.toolbar-title-ios{
+  color: #ffffff;
+  font-weight: 400;
+}
+.toolbar-background-ios{
+  background-color: #19b5ff;
+}
+.header-ios .toolbar-ios:last-child .toolbar-background-ios{
+  border-bottom: 1px solid #e5e5e5;
+}
+.space{
+  background-color: #ebedf2;
+  height: 10px;
+}
\ No newline at end of file

src/pages/activity/order-edit/order-edit.scss

@@ -97,6 +97,6 @@ page-order-edit {
     width: 2rem;
   }
   .item-ios.item-block .item-inner {
-    border-bottom: 0.55px solid #c8c7cc;
+    border-bottom: 1px solid #c8c7cc;
   }
 }

src/pages/contact/block-list/block-list.scss

@@ -64,7 +64,7 @@ page-block-list {
     box-sizing: border-box;
   }
   .list-ios .item-block .item-inner {
-    border-bottom: 0.55px solid #dadada;
+    border-bottom: 1px solid #eeeeee;
   }
   .search{
     float: right;

src/pages/contact/contactList/contactList.scss

@@ -7,7 +7,7 @@ page-contactList {
         box-sizing: border-box;
     }
     .list-ios .item-block .item-inner {
-        border-bottom: 0.55px solid #dadada;
+        border-bottom: 1px solid #eeeeee;
     }
     .search{
         float: right;

src/pages/contact/contract-personinfo/contract-personinfo.scss

@@ -7,7 +7,7 @@ page-contract-personinfo {
         box-sizing: border-box;
     }
     .list-ios .item-block .item-inner {
-        border-bottom: 0.55px solid #c8c7cc;
+        border-bottom: 1px solid #c8c7cc;
     }
     .content{
         background-color: #f5f5f5;

src/pages/contact/person-list/person-list.scss

@@ -7,7 +7,7 @@ page-person-list {
     box-sizing: border-box;
   }
   .list-ios .item-block .item-inner {
-    border-bottom: 0.55px solid #c8c7cc;
+    border-bottom: 1px solid #c8c7cc;
   }
   .search{
     float: right;

src/pages/search/search.html → src/pages/contact/search/search.html

 <ion-header>
-  <!--<ion-toolbar>-->
-    <!--<div class="searchToolBar">-->
-      <!--<button ion-button clear small navPop style="padding: 0;">-->
-        <!--<img class="back-btn" src="./assets/imgs/back.png" />-->
-      <!--</button>-->
-      <!--<div class="search-header">-->
-        <!--<ion-input type="text" placeholder="按姓名搜索" [(ngModel)]="searchValue" (ionChange)="searchUser()"></ion-input>-->
-        <!--<ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon>-->
-      <!--</div>-->
-    <!--</div>-->
-  <!--</ion-toolbar>-->
   <ion-navbar>
     <ion-navbar>
       <div class="search-header">
@@ -26,8 +15,7 @@
   <ion-list>
     <ion-item *ngFor="let contactPerson of contactPersons" (click)="contactPersonInfo(contactPerson)">
       <div class="contact-box">
-        <img src="./assets/imgs/man.png" class="contact-img" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
-        <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
+        <img src="./assets/imgs/head.png" class="contact-img">
 
         <div class="contact-box-right">
           <div>

src/pages/search/search.module.ts → src/pages/contact/search/search.module.ts

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

src/pages/search/search.scss → src/pages/contact/search/search.scss

 page-search {
-
+    ion-input, ion-textarea{
+        color: #fff;
+    }
+    .header-ios .toolbar-ios:last-child .toolbar-background-ios{
+        border: none;
+    }
     .searchToolBar{
         display: flex;
         flex-direction: row;
@@ -17,7 +22,6 @@ page-search {
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
-        border-bottom: 1px solid #cccccc;
         width: 100%;
         margin-left: 5px;
     }
@@ -116,5 +120,9 @@ page-search {
         width: 30px;
         height: 30px;
     }
+    .text-input::-webkit-input-placeholder{
+        color:#fff;
+    }
+
 
 }

src/pages/search/search.ts → src/pages/contact/search/search.ts

 import { Component} from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { Response } from '@angular/http';
-import { AppService } from '../../service/appHttpService';
+import { AppService } from '../../../service/appHttpService';
 
 @IonicPage()
 @Component({
@@ -40,36 +40,44 @@ export class SearchPage {
 
   searchUser(){
     console.log("searchValue:"+this.searchValue);
-    let nameval =  encodeURIComponent(this.searchValue) ;
-    this.appService.ObserverHttpPost("/wisdomgroup/app/getUserByName",{"name":nameval,"orgId":this.orgId})
-    .subscribe((res: Response) => {
-        let data = res.json();
-        this.contactPersons = data;
-        if(this.orgId !=null && this.orgId !=''){
-            //同组织部门下
-            this.contactPersons.forEach(element => {
-              element["orgName"] = this.orgName; 
-              element["hasgeneralpersonsflag"] = false;      
-            });
-        }else{
-            this.contactPersons.forEach(element => {
-              this.getOrgName(element["id"],result=>{ 
-                element["orgName"] = result["orgName"];
-                element["hasgeneralpersonsflag"] = false;
-              });
-            });
-        }
-      }, error => {        
-        this.appService.alert('网络异常！');  
-      }   
-    );
+    // let nameval =  encodeURIComponent(this.searchValue) ;
+    // this.appService.ObserverHttpPost("/wisdomgroup/app/getUserByName",{"name":nameval,"orgId":this.orgId})
+    // .subscribe((res: Response) => {
+    //     let data = res.json();
+    //     this.contactPersons = data;
+    //     if(this.orgId !=null && this.orgId !=''){
+    //         //同组织部门下
+    //         this.contactPersons.forEach(element => {
+    //           element["orgName"] = this.orgName;
+    //           element["hasgeneralpersonsflag"] = false;
+    //         });
+    //     }else{
+    //         this.contactPersons.forEach(element => {
+    //           this.getOrgName(element["id"],result=>{
+    //             element["orgName"] = result["orgName"];
+    //             element["hasgeneralpersonsflag"] = false;
+    //           });
+    //         });
+    //     }
+    //   }, error => {
+    //     this.appService.alert('网络异常！');
+    //   }
+    // );
+      const data = {
+          name:this.searchValue,
+          pageNumber:1,
+          pageSize:100,
+      };
+      this.appService.ObserverHttpNoForm('/wisdomgroup/app/getUserByName',data)
+          .subscribe((res)=>{
+              this.contactPersons = res.json().list;
+          })
   }
 
 
   //跳转联系人信息页面
   contactPersonInfo(contactPerson){
-    console.log("contactPerson:"+JSON.stringify(contactPerson));
-    this.navCtrl.push("ContractPersoninfoPage",{"contactPerson":contactPerson});
+    this.navCtrl.push("ContractPersoninfoPage",{"id":contactPerson.id});
   }
 
   //根据用户id获取部门信息

src/pages/joinPersons/joinPersons.html

@@ -37,9 +37,7 @@
 		<ion-item *ngFor="let item of items">
 			<div class="group">
 				<div class="inner-group">
-					<!-- <img src="{{img}}" class="person-photo"> -->
-					<img src="./assets/imgs/woman.png" *ngIf="item.user?.gender == 0" class="img">
-					<img src="./assets/imgs/man.png" *ngIf="item.user?.gender == null || item.user?.gender == '1'" class="img">
+					<img src="./assets/imgs/head.png" class="img">
 					<p class="person-name">{{item.user?.name}}</p>
 					<p>&nbsp;&nbsp;&nbsp;{{item.user?.mobile}}</p>
 

src/pages/myReport/myReport.scss

@@ -338,7 +338,7 @@ page-myReport {
     }
 
     .item-ios{
-        margin-top: 1rem;
+        margin-top: 10px;
     }
     .list-ios .item-block .item-inner{
         border: none;

src/pages/mySurvey/my-survey/my-survey.scss

@@ -3,7 +3,7 @@ page-my-survey {
     border: none;
   }
   .content-button{
-    border-top: 0.55px solid #c8c7cc;
+    border-top: 1px solid #c8c7cc;
   }
   .look{
     background-color: #fcb164;

src/pages/person/editPersonInfo/editPersonInfo.html

@@ -19,8 +19,7 @@
     <ion-item>
       <div class="info-item">
         <span class="info-span">头像</span>
-        <img src="./assets/imgs/woman.png" *ngIf="gender == 0" class="img">
-        <img src="./assets/imgs/man.png" *ngIf="gender == null || gender == '1'" class="img">
+        <img src="./assets/imgs/head.png" class="img">
       </div>
     </ion-item>
     <ion-item>

src/pages/person/personInfo/personInfo.html

@@ -13,9 +13,7 @@
       <div class="info-item">
         <span class="info-span">头像</span>
         <div class="photo-box">
-          <img src="./assets/imgs/woman.png" *ngIf="gender == 0" class="img">
-          <img src="./assets/imgs/man.png" *ngIf="gender == null || gender == '1'" class="img">
-          <!-- <ion-icon name="ios-arrow-forward" class="icon-more"></ion-icon> -->
+          <img src="./assets/imgs/head.png" class="img">
         </div>
       </div>
     </ion-item>

src/pages/report/reportDetail/reportDetail.html

@@ -28,8 +28,7 @@
 		<ion-item *ngFor="let item of items">
 			<div class="group">
 				<div class="inner-group">
-					<img *ngIf="item.gender === 1" src="./assets/imgs/man.png" class="person-photo">
-					<img *ngIf="item.gender === 0" src="./assets/imgs/woman.png" class="person-photo">
+					<img src="./assets/imgs/head.png" class="person-photo">
 					<div class="item-box">
 						<p class="person-name">{{item.name}}
 							<ion-icon class="person-sex-male" *ngIf="item.gender === 1" name="male"></ion-icon>

src/pages/surveyManage/list/list.scss

@@ -89,7 +89,7 @@ page-list {
     text-align: center;
     padding: 12px 0;
     background-color: #f8f8f8;
-    border-bottom: 1px solid #dadada;
+    border-bottom: 1px solid #eeeeee;
     box-shadow: 0px -2px 5px #bbb;
   }
   .btn1{

src/pages/tabs/contact/contact.html

 <ion-header>
   <ion-toolbar>
       <ion-title text-center>通讯录</ion-title>
-      <img class="search" (click)="search()" src="./assets/imgs/search.png"/>
+      <ion-buttons end>
+          <button ion-button (click)="search()" class="search">
+              <ion-icon ios="ios-search" md="md-search"></ion-icon>
+          </button>
+      </ion-buttons>
   </ion-toolbar>
 </ion-header>
 

src/pages/tabs/contact/contact.scss

@@ -26,10 +26,9 @@ page-contact {
         top:-2px;
     }
     .search{
-        width: 18px;
-        height: 18px;
-        float: right;
-        margin-right: 15px;
+        color: #fff;
+        font-size: 2rem;
+        margin-right: 10px;
     }
 
     .common{
@@ -83,12 +82,12 @@ page-contact {
     }
 
     .item-border{
-        border-bottom: 1px solid #dadada;
+        border-bottom: 1px solid #eeeeee;
         padding-bottom: 10px;
         margin: 15px 0px 0px;
         padding-left: 15px;
         .contact-img{
-            width: 3rem;
+            width: 3.5rem;
             margin-right: 1rem;
         }
     }

src/pages/tabs/contact/contact.ts

@@ -4,7 +4,7 @@ import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 import {AppService} from '../../../service/appHttpService';
 
-import {SearchPage} from '../../search/search';
+import {SearchPage} from '../../contact/search/search';
 import {ContactListPage} from '../../contact/contactList/contactList';
 import {AddBlockPage} from "../../contact/add-block/add-block";
 import {BlockListPage} from "../../contact/block-list/block-list";

src/pages/tabs/home/home.html

@@ -7,13 +7,13 @@
 
   <ion-slides #slides *ngIf="slidersItems.length>0" pager autoplay="2000" loop=true>
     <ion-slide *ngFor="let item of slidersItems">
-      <div style="height:135px;width: 100%;position: relative">
+      <div style="height:160px;width: 100%;position: relative">
           <img src="{{picture+item.pictureId}}" class="slide-image" (click)="go(item)">
         <p class="slides-title">{{item.title}}</p>
       </div> 
     </ion-slide>
   </ion-slides>
-  <div class="item2">
+  <div class="item2" style="padding: 0px;">
     <div class="item2-2">
       <div class="card" (click)="goActivity()">
         <img src="./assets/imgs/home/icon-bm.png" alt="">
@@ -52,7 +52,7 @@
       </div>
     </div>
   </div>
-  <div class="item3">
+  <div class="item3" style="padding-top: 0px;">
     <div class="item3-2" (click)="gotoNotice()">
       <div class="card3" style="width: 15%;">
         <span class="img-tips"></span>

src/pages/tabs/home/home.scss

 page-home {
     ion-slides{  
         width: 100%;  
-        height: 135px;  
+        height: 160px;
     }  
     .slide-image{  
         width: 100%;  
-        height: 135px;  
+        height: 160px;
      } 
      .swiper-container{
-        height: 135px;
+        height: 160px;
         width: 100%;
     }
 
@@ -114,7 +114,7 @@ page-home {
         box-sizing: border-box;
         padding:3px;
         position: relative;
-       font-size: 1rem;
+       font-size: 1.1rem;
      }
     .img-tips{
       position: absolute;

src/pages/tabs/mine/mine.html

@@ -7,8 +7,7 @@
     <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">
+                <img src="./assets/imgs/head.png" class="head-photo">
             </div>
             <div class="mine-header-right">
                 <h2 class="name">{{user?.userName}}</h2>

src/pages/version/version.scss

@@ -48,7 +48,7 @@ page-version {
         margin-top: 20px;
     }
     .list-ios .item-block .item-inner {
-        border-bottom: 0.55px solid #c8c7cc;
+        border-bottom: 1px solid #c8c7cc;
     }
     .red-span{
         background-color: red;