color

src/pages/activity-track/block-modal/block-modal.html

@@ -5,12 +5,12 @@
     <ion-title>选择批次</ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" >取消</span>
+        <span ion-text class="color-fff" >取消</span>
       </button>
     </ion-buttons>
     <ion-buttons end>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" >确定</span>
+        <span ion-text class="color-fff" >确定</span>
       </button>
     </ion-buttons>
   </ion-navbar>

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

@@ -3,7 +3,7 @@
 
   <ion-navbar>
     <ion-title>添加分组</ion-title>
-    <span (click)="done()" float-right class="margin-right-10 color-999">完成</span>
+    <span (click)="done()" float-right class="margin-right-10 color-fff">完成</span>
   </ion-navbar>
 
 </ion-header>

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

@@ -15,8 +15,8 @@
   </div>
   <ion-list>
     <ion-item-sliding *ngFor="let contactPerson of contactPersons">
-        <ion-item >
-          <div class="contact-box">
+        <ion-item>
+          <div class="contact-box" (click)="contactPersonInfo(contactPerson)">
             <img src="./assets/imgs/head.png" class="contact-img" >
             <div class="contact-box-right">
               <div>

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

@@ -43,31 +43,34 @@ export class BlockListPage {
         const toast = this.toastCtrl.create(message);
         let peoModal = this.modalCtrl.create(PersonListPage);
         peoModal.onDidDismiss( res=>{
-            const data = {
-                'telpBookPersonList':[{
-                    'telpbookId':this.orgid,
-                    'linkUserid':res.id,
-                    'linkUsername':res.name
-                }]
-            };
-
-            this.appService.ObserverHttpPostData('/wisdomgroup/modules/telpBook',data)
-                .subscribe((res)=>{
-                    console.log(res.json());
-                    if( res.json().apiResult.errcode == '0' ){
-                        toast.setMessage('添加成功');
-                        toast.present();
-                        this.initList();
-                    }else{
-                        toast.setMessage(res.json().apiResult.data);
-                        toast.present();
-                    }
-                })
+            if(res){
+                const data = {
+                    'telpBookPersonList':[{
+                        'telpbookId':this.orgid,
+                        'linkUserid':res.id,
+                        'linkUsername':res.name
+                    }]
+                };
 
+                this.appService.ObserverHttpPostData('/wisdomgroup/modules/telpBook',data)
+                    .subscribe((res)=>{
+                        console.log(res.json());
+                        if( res.json().apiResult.errcode == '0' ){
+                            toast.setMessage('添加成功');
+                            toast.present();
+                            this.initList();
+                        }else{
+                            toast.setMessage(res.json().apiResult.data);
+                            toast.present();
+                        }
+                    })
+            }
         } );
         peoModal.present();
     }
 
+
+
     removeItem(item){
       const data = {
           userId:item.id
@@ -80,4 +83,9 @@ export class BlockListPage {
           })
     }
 
+    //人员详情
+    contactPersonInfo(contactPerson){
+        this.navCtrl.push("ContractPersoninfoPage",{"id":contactPerson.id});
+    }
+
 }

src/pages/contact/contact-modal/contact-modal.html

@@ -6,7 +6,7 @@
     </ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary">取消</span>
+        <span ion-text class="color-fff">取消</span>
       </button>
     </ion-buttons>
   </ion-toolbar>

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

@@ -3,13 +3,13 @@
   <ion-navbar>
     <ion-title>联系人</ion-title>
     <ion-buttons start>
-      <button ion-button (click)="dismiss()">
-        <span ion-text color="primary">取消</span>
+      <button  ion-button (click)="dismiss()">
+        <span class="color-fff" ion-text>取消</span>
       </button>
     </ion-buttons>
     <ion-buttons end>
-      <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" >确定</span>
+      <button class="color-fff" ion-button (click)="dismiss()">
+        <span class="color-fff" ion-text>确定</span>
       </button>
     </ion-buttons>
   </ion-navbar>

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

@@ -31,8 +31,7 @@ export class PersonListPage {
   }
 
     dismiss() {
-        let data = {  };
-        this.viewCtrl.dismiss(data);
+        this.viewCtrl.dismiss();
     }
 
     sure(item){

src/pages/mySurvey/question-detail/question-detail.html

@@ -5,7 +5,7 @@
     <ion-title>问卷结果</ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary">取消</span>
+        <span ion-text class="color-fff">取消</span>
       </button>
     </ion-buttons>
   </ion-navbar>

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -221,8 +221,10 @@ export class OutGoingReportEditPage {
             }
         }
 
-        this.userpre.userId = this.person.id;
-        this.userpre.userName = this.person.name;
+        if(this.person){
+            this.userpre.userId = this.person.id;
+            this.userpre.userName = this.person.name;
+        }
 
         //判断报备截止日期
         let signflag = Date.parse(this.temp_endTime.toString()) > Date.parse(new Date().toString());

src/pages/surveyManage/modal/person/person.html

@@ -5,12 +5,12 @@
     <ion-title>选择用户组</ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" >取消</span>
+        <span ion-textclass="color-fff" >取消</span>
       </button>
     </ion-buttons>
     <ion-buttons end>
       <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" >确定</span>
+        <span ion-text class="color-fff" >确定</span>
       </button>
     </ion-buttons>
   </ion-navbar>