icon

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="0.0.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>智慧组工</name>
+<widget id="io.ionic.starter" version="0.0.8" 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>
     <content src="index.html" />

src/pages/contact/add-block/add-block.html

@@ -15,9 +15,9 @@
   <div class="item">
     <input class="input" type="text" [(ngModel)]="groupName" placeholder="分组名称">
   </div>
-  <div class="common">
-    组内成员
-  </div>
+  <!--<div class="common">-->
+    <!--组内成员-->
+  <!--</div>-->
   <!--<div class="item" (click)="goSelectmodal()">-->
       <!--<span class="icon-span">-->
         <!--<ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>-->

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

@@ -33,7 +33,7 @@
           </div>
         </ion-item>
         <ion-item-options>
-          <button danger (click)="removeItem(contactPerson)"> Delete</button>
+          <button ion-button color="danger" (click)="removeItem(contactPerson)">删除</button>
         </ion-item-options>
     </ion-item-sliding>
 

src/pages/tabs/contact/contact.html

@@ -23,15 +23,20 @@
         <span class="icon-span">
                     <ion-icon ios="ios-add" class="add-icon-contact" md="md-add"></ion-icon>
         </span>
-        <span class="contact-title color-999">添加分组</span>
-    </div>
-    <div class="item item-border" *ngFor="let item of ownerList" (click)="usualContactBlockPersons(item)">
-        <img src="./assets/imgs/orgn.png" class="contact-img" >
-        <span class="contact-title">{{item?.usergroupName}}</span>
-        <ion-item-options>
-            <button danger (click)="deleteItem(item)">删除</button>
-        </ion-item-options>
+        <span class="contact-title color-999">新建分组</span>
     </div>
+    <ion-list class="myItem">
+            <ion-item-sliding *ngFor="let item of ownerList">
+                <ion-item (click)="usualContactBlockPersons(item)">
+                    <img src="./assets/imgs/orgn.png" class="contact-img" >
+                    <span class="contact-title">{{item?.usergroupName}}</span>
+                </ion-item>
+                <ion-item-options>
+                    <button ion-button color="danger" (click)="removeItem(item)">删除</button>
+                </ion-item-options>
+            </ion-item-sliding>
+    </ion-list>
+
     <div class="common">
         上海市委组织部组织架构
         <!--<span float-right class="margin-right-10" >A~Z字母排序<ion-icon class="margin-left-5 color-666" name="md-arrow-dropdown"></ion-icon></span>-->

src/pages/tabs/contact/contact.scss

 page-contact {
-
+    .list-ios .item-block .item-inner{
+        padding: 0;
+    }
+    .myItem{
+        margin: 0;
+        .contact-img {
+            width: 3rem;
+            margin-right: 1rem;
+        }
+        .item{
+            margin: 0px 0 1px 15px;
+        }
+        .label-ios{
+            margin: 0;
+            display: flex;
+            align-items: center;
+        }
+    }
+    ion-item-options{
+        z-index: 5;
+        top:-2px;
+    }
     .search{
         width: 18px;
         height: 18px;
@@ -70,4 +91,6 @@ page-contact {
         width: 30px;
         height: 30px;
     }
+
+
 }

src/pages/tabs/contact/contact.ts

 import {Component} from '@angular/core';
-import {NavController, NavParams, ToastController} from 'ionic-angular';
+import {AlertController, NavController, NavParams, ToastController} from 'ionic-angular';
 import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 import {AppService} from '../../../service/appHttpService';
@@ -23,7 +23,8 @@ export class ContactPage {
                 public navParams: NavParams,
                 public storage: Storage,
                 public appService: AppService,
-                public toast: ToastController,) {
+                public toast: ToastController,
+                public alertCtrl: AlertController) {
 
     }
 
@@ -57,9 +58,10 @@ export class ContactPage {
             );
     }
 
+    //我的分组
     initOwnerList() {
         const data = {
-            pageSize: '10',
+            pageSize: '100',
             pageNumber: '1'
         };
         this.appService.ObserverHttpGetData("/wisdomgroup/modules/telpBook", data)
@@ -97,8 +99,32 @@ export class ContactPage {
         this.navCtrl.push('AddBlockPage');
     }
 
-    deleteItem(item) {
-
+    removeItem(item) {
+        let alert = this.alertCtrl.create({
+            title: '删除分组',
+            message: '确定删除该分组及分组下的联系人?',
+            buttons: [
+                {
+                    text: '取消',
+                    role: 'cancel',
+                    handler: () => {
+                        console.log('Cancel clicked');
+                    }
+                },
+                {
+                    text: '确定',
+                    handler: () => {
+                        this.appService.ObserverHttpDeteleteOption('/wisdomgroup/modules/telpBook/',item.id)
+                            .subscribe((res)=>{
+                                if(res.json().errcode == '0'){
+                                    this.initOwnerList();
+                                }
+                            })
+                    }
+                }
+            ]
+        });
+        alert.present();
     }
 
 }

src/pages/tabs/home/home.ts

@@ -83,12 +83,10 @@ export class HomePage {
 
 
   goActivity() {
-      this.badge.clear();
     this.navCtrl.push('ActivityListPage', {});
   }
 
   goAnnouncement() {
-      this.badge.clear();
     this.navCtrl.push("AnnouncementPage");
   }
 
@@ -105,20 +103,15 @@ export class HomePage {
           console.log(this.noticeList);
         }, error => {
           this.appService.alert('系统错误！');
-        })
+        });
+
+
   }
 
   ionViewDidEnter() {
-    setTimeout(() => {
-      if (this.slidersItems.length > 0) {
-        // this.slides.freeMode = true;
-        // this.slides.autoplay = 2000;
-        // this.slides.speed = 500;
-        // this.slides.loop = true;
-        // this.slides.autoplayDisableOnInteraction=false;
-        // this.slides.startAutoplay();
-      }
-    }, 1000)
+
+      //获取消息数量
+      this.getNewCount();
   }
 
   ionViewWillEnter() {
@@ -284,7 +277,6 @@ export class HomePage {
 
   //消息通知
     gotoNotice(){
-        this.badge.clear();
         this.navCtrl.setRoot(NoticePage);
         this.navCtrl.parent.select(2);
     }
@@ -295,7 +287,6 @@ export class HomePage {
 
   //外出报备跳转
   goOutGoingReportAboutAll() {
-      this.badge.clear();
     this.navCtrl.push("OutGoingReportPage", {
       type: 1
     });
@@ -322,7 +313,6 @@ export class HomePage {
     this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/hasNewActivity", null)
       .subscribe((res: Response) => {
         let data = res.json();
-        this.badge.set(1);
         this.hasNewActivity = data;
       }, error => {
         this.appService.alert('网络异常！');
@@ -335,7 +325,6 @@ export class HomePage {
     this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/hasNewNotice", null)
     .subscribe((res: Response) => {
       let data = res.json();
-      this.badge.set(2);
       this.hasNewNotice = data;
     }, error => {
       this.appService.alert('网络异常！');
@@ -348,7 +337,6 @@ export class HomePage {
     this.appService.ObserverHttpGet("/wisdomgroup/modules/premanager/hasNewPremanager", null)
     .subscribe((res: Response) => {
       let data = res.json();
-       this.badge.set(1);
       this.hasNewPremanager = data;
     }, error => {
       this.appService.alert('网络异常！');
@@ -356,6 +344,20 @@ export class HomePage {
     );
   }
 
+  getNewCount(){
+    this.appService.ObserverHttpGetData('/wisdomgroup/modules/activity/hasNewCount',null)
+        .subscribe((res)=>{
+            let data = Number(res.json());
+            if( data > 0 ){
+                this.badge.set(data);
+                console.log('角标：'+data);
+            }else{
+                console.log('角标清除');
+              this.badge.clear();
+            }
+        })
+  }
+
 }
 //定义星期实体
 export class Week {

src/service/appHttpService.ts

@@ -104,6 +104,12 @@ export class AppService {
     }
 
     //delete
+    ObserverHttpDeteleteOption(url, params): Observable<any> {
+        return this.http.get(AppGlobal.domain+url+this.encode(params,"get"))    //app
+        // return this.http.delete(url + params); //本地
+    }
+
+    //delete
     ObserverHttpDeteleteData(url, params,data): Observable<any> {
         return this.http.get(AppGlobal.domain+url+params,{    //app
         // return this.http.delete(url + params,{