color

src/pages/activity-track/activity-search/activity-search.html

@@ -46,7 +46,7 @@
 
             <ng-container *ngIf="item.isActivityNo == 1">
               <div class="text-right">
-                <span  (click)="sayNo(item)"  ion-button round class="btn color6">不参加</span>
+                <span  (click)="confirmSayNo(item)"  ion-button round class="btn color6">不参加</span>
               </div>
             </ng-container>
 

src/pages/activity-track/activity-search/activity-search.ts

@@ -33,6 +33,12 @@ export class ActivitySearchPage {
         this.navCtrl.push('ReplaceApplyPage', {id: this.id, personInfo: item})
     }
 
+    confirmSayNo(item){
+        this.appService.alert('确定设置该用户不参加？',(res)=>{
+            this.sayNo(item);
+        })
+    }
+
     //不参加
     sayNo(item) {
         const data = {

src/pages/activity-track/joinDetail/joinDetail.html

@@ -16,19 +16,19 @@
     <div class="content-box">
         <div class="content-box-item {{type == 1?'bgc-34b4fc':''}} " (click)="changeType(1)">
             <span class="item-title">全部</span>
-            <span class="item-count">{{allPerson}}人</span>
+            <span class="item-count">{{allList.length}}人</span>
         </div>
         <div class="content-box-item {{type == 2?'bgc-34b4fc':''}}" (click)="changeType(2)">
             <span class="item-title">未报名</span>
-            <span class="item-count">{{notSign}}人</span>
+            <span class="item-count">{{notSignList.length}}人</span>
         </div>
         <div class="content-box-item {{type == 3?'bgc-34b4fc':''}}" (click)="changeType(3)">
             <span class="item-title">已报名</span>
-            <span class="item-count">{{signUp}}人</span>
+            <span class="item-count">{{signList.length}}人</span>
         </div>
         <div class="content-box-item {{type == 4?'bgc-34b4fc':''}}" (click)="changeType(4)">
             <span class="item-title">不参加</span>
-            <span class="item-count">{{noJoin}}人</span>
+            <span class="item-count">{{noJoinList.length}}人</span>
         </div>
     </div>
 
@@ -61,7 +61,7 @@
                                 <div class="margin-top-5">
                                 <span  (click)="goSignUp(item)" ion-button round class="btn color3 blue-btn">代报名
                                 </span>
-                                    <span  (click)="sayNo(item)" ion-button round class="btn color3 red-btn">不参加</span>
+                                    <span  (click)="confirmSayNo(item)" ion-button round class="btn color3 red-btn">不参加</span>
                                 </div>
                             </ng-container>
 
@@ -81,7 +81,7 @@
                 </ion-item>
             </ng-container>
             <ng-container *ngIf="type == 2">
-                <ion-item *ngFor="let item of signList">
+                <ion-item *ngFor="let item of notSignList">
                 <div class="group">
                     <div class="inner-group">
                         <img src="./assets/imgs/head.png" class="person-photo">
@@ -100,14 +100,14 @@
                         </div>
                         <div class="margin-top-5">
                             <span  (click)="goSignUp(item)" ion-button round class="btn color3 blue-btn">代报名</span>
-                            <span (click)="sayNo(item)" ion-button round class="btn color3 red-btn">不参加</span>
+                            <span (click)="confirmSayNo(item)" ion-button round class="btn color3 red-btn">不参加</span>
                         </div>
                     </div>
                 </div>
                 </ion-item>
             </ng-container>
             <ng-container *ngIf="type == 3">
-                <ion-item *ngFor="let item of items">
+                <ion-item *ngFor="let item of signList">
                 <div class="group">
                     <div class="inner-group">
                         <img src="./assets/imgs/head.png" class="person-photo">
@@ -118,7 +118,7 @@
                                 <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'"
                                           name="female"></ion-icon>
                             </p>
-                            <span class="person-batch">批次：{{item?.batchNames}}</span>
+                            <span class="person-batch">批次：{{item?.batchnames}}</span>
                         </div>
                     </div>
                     <button disabled ion-button round class="btn color2" *ngIf="item?.orderstate	== 1">已报名</button>

src/pages/activity-track/joinDetail/joinDetail.ts

@@ -89,19 +89,19 @@ export class JoinDetailPage {
     }
 
     getList(){
+        this.notSignList = [];
+        this.noJoinList = [];
+        this.signList = [];
+        this.allList = this.items;
         this.items.forEach((res)=>{
             if(res.isSignUp == 0 && res.isActivityNo == 0){
-                this.allList.push(res);
+                this.notSignList.push(res);
             }else if( res.isActivityNo == 1 ){
                 this.noJoinList.push(res);
             }else if(res.isSignUp == 1){
                 this.signList.push(res);
             }
         });
-
-        console.log(this.allList);
-        console.log(this.noJoinList);
-        console.log(this.signList);
     }
 
     //未报名
@@ -159,8 +159,15 @@ export class JoinDetailPage {
         this.navCtrl.push('ReplaceApplyPage', {id: this.acitivityid, personInfo: item})
     }
 
+    confirmSayNo(item){
+        this.appService.alert('确定设置该用户不参加？',(res)=>{
+            this.sayNo(item);
+        })
+    }
+
     //不参加
     sayNo(item) {
+
         let msg = this.toast.create(message);
         const data = {
             'userId': item.id,
@@ -170,8 +177,7 @@ export class JoinDetailPage {
             .subscribe((res: Response) => {
                     msg.setMessage('已保存该用户不参加');
                     msg.present();
-                    // this.signAll();
-                    this.notJoinService();
+                    this.signAllService();
                 }, error => {
                     this.appService.alert('网络异常！');
                 }