Skip to content

W
wisdom-ces
Commit e2982502 authored by wangqinghua's avatar wangqinghua
Browse files
Options

color

parent b7d0db55
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 24 deletions
src/pages/activity-track/joinDetail/joinDetail.html
View file @ e2982502
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
<div class="inner-group"> <div class="inner-group">
<img src="./assets/imgs/head.png" class="person-photo"> <img src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item?.name}}
<ion-icon class="person-sex-male" *ngIf="item.gender == '1'||item.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
</div> </div>
</div> </div>
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<div class="inner-group"> <div class="inner-group">
<img src="./assets/imgs/head.png" class="person-photo"> <img src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item?.name}}
<ion-icon class="person-sex-male" *ngIf="item.gender == '1'||item.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
</div> </div>
</div> </div>
...@@ -75,18 +75,18 @@ ...@@ -75,18 +75,18 @@
<div class="inner-group"> <div class="inner-group">
<img src="./assets/imgs/head.png" class="person-photo"> <img src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item?.name}}
<ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
<span class="person-batch">批次：{{item.batch?.batchName}}</span> <span class="person-batch">批次：{{item.batch?.batchName}}</span>
</div> </div>
</div> </div>
<button disabled ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button> <button disabled ion-button round class="btn color2" *ngIf="item?.orderstate == 1">已报名</button>
<button disabled ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button> <button disabled ion-button round class="btn color1" *ngIf="item?.orderstate == 2">待确认</button>
<button disabled ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button> <button disabled ion-button round class="btn color5" *ngIf="item?.orderstate == 3">未出行</button>
<button disabled ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button> <button disabled ion-button round class="btn color4" *ngIf="item?.orderstate == 4">已出行</button>
<button disabled ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button> <button disabled ion-button round class="btn color3" *ngIf="item?.orderstate == 0">未报名</button>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="type == '4'"> <ng-container *ngIf="type == '4'">
...@@ -94,17 +94,17 @@ ...@@ -94,17 +94,17 @@
<div class="inner-group"> <div class="inner-group">
<img src="./assets/imgs/head.png" class="person-photo"> <img src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.name}} <p class="person-name">{{item?.name}}
<ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item?.gender == '1'||item?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item?.gender == '0'" name="female"></ion-icon>
</p> </p>
</div> </div>
</div> </div>
<button disabled ion-button round class="btn color2" *ngIf="item.orderstate == 1">已报名</button> <button disabled ion-button round class="btn color2" *ngIf="item?.orderstate == 1">已报名</button>
<button disabled ion-button round class="btn color1" *ngIf="item.orderstate == 2">待确认</button> <button disabled ion-button round class="btn color1" *ngIf="item?.orderstate == 2">待确认</button>
<button disabled ion-button round class="btn color5" *ngIf="item.orderstate == 3">未出行</button> <button disabled ion-button round class="btn color5" *ngIf="item?.orderstate == 3">未出行</button>
<button disabled ion-button round class="btn color4" *ngIf="item.orderstate == 4">已出行</button> <button disabled ion-button round class="btn color4" *ngIf="item?.orderstate == 4">已出行</button>
<button disabled ion-button round class="btn color3" *ngIf="item.orderstate == 0">未报名</button> <button disabled ion-button round class="btn color3" *ngIf="item?.orderstate == 0">未报名</button>
</div> </div>
</ng-container> </ng-container>
</ion-item> </ion-item>
......
src/pages/activity-track/joinDetail/joinDetail.ts
View file @ e2982502
...@@ -41,7 +41,8 @@ export class JoinDetailPage { ...@@ -41,7 +41,8 @@ export class JoinDetailPage {
public http: Http, public http: Http,
public appService: AppService, public appService: AppService,
public toast: ToastController, public toast: ToastController,
public activityStatisticService: ActivityStatisticService) {} public activityStatisticService: ActivityStatisticService) {
}
ionViewDidEnter() { ionViewDidEnter() {
/** 订单状态 （1.待出行(已报名)、2.待确认（已报名未确认）、3.报名未出行、4.已完成 （3，4均为确认状态））*/ /** 订单状态 （1.待出行(已报名)、2.待确认（已报名未确认）、3.报名未出行、4.已完成 （3，4均为确认状态））*/
...@@ -56,7 +57,7 @@ export class JoinDetailPage { ...@@ -56,7 +57,7 @@ export class JoinDetailPage {
} }
//全部 //全部
signAll(){ signAll() {
this.type = '1'; this.type = '1';
this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activity/signAll/", this.acitivityid) this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activity/signAll/", this.acitivityid)
.subscribe((res: Response) => { .subscribe((res: Response) => {
...@@ -105,6 +106,10 @@ export class JoinDetailPage { ...@@ -105,6 +106,10 @@ export class JoinDetailPage {
notJoin() { notJoin() {
this.isNoSignFlag = true; this.isNoSignFlag = true;
this.type = '4'; this.type = '4';
this.notJoinService();
}
notJoinService() {
this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activityNon/", this.acitivityid) this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activityNon/", this.acitivityid)
.subscribe((res: Response) => { .subscribe((res: Response) => {
this.items = res.json().data; this.items = res.json().data;
...@@ -124,15 +129,15 @@ export class JoinDetailPage { ...@@ -124,15 +129,15 @@ export class JoinDetailPage {
sayNo(item) { sayNo(item) {
let msg = this.toast.create(message); let msg = this.toast.create(message);
const data = { const data = {
'userId':item.id, 'userId': item.id,
'userName':item.name 'userName': item.name
}; };
this.appService.ObserverHttpForm("/wisdomgroup/modules/activityNon/", this.acitivityid,data) this.appService.ObserverHttpForm("/wisdomgroup/modules/activityNon/", this.acitivityid, data)
.subscribe((res: Response) => { .subscribe((res: Response) => {
msg.setMessage('已保存该用户不参加'); msg.setMessage('已保存该用户不参加');
msg.present(); msg.present();
this.signAll(); this.signAll();
this.notJoin(); this.notJoinService();
}, error => { }, error => {
this.appService.alert('网络异常！'); this.appService.alert('网络异常！');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment