Skip to content

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

color

parent a5e3f5fa
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 56 deletions
src/pages/activity/activityApply/activityApply.ts
View file @ f4e9831d
...@@ -140,16 +140,21 @@ export class ActivityApplyPage { ...@@ -140,16 +140,21 @@ export class ActivityApplyPage {
let applyNum = 0; let applyNum = 0;
this.activity.batchList.forEach((res)=>{ this.activity.batchList.forEach((res)=>{
if(res.order){ if(res.order){
console.log(res.order);
applyNum ++; applyNum ++;
} }
}); });
if(applyNum >= this.activity.applyCount){ console.log(applyNum);
this.appService.popToastView("提交失败，报名批次达到上限",'middle',1000); //报名次数 applyCount 1,2,3,4,5,0-> 不限
return; if(this.activity.applyCount > 0){
} if(applyNum >= this.activity.applyCount){
if (Number(this.order.Personnumber +1) > Number(this.item.batchLimitNumber)) { this.appService.popToastView("提交失败，报名批次达到上限",'middle',1000);
this.appService.popToastView("报名人数超过了该批次的剩余人数",'middle',1000); return;
return; }
if (Number(this.order.Personnumber +1) > Number(this.item.batchLimitNumber)) {
this.appService.popToastView("报名人数超过了该批次的剩余人数",'middle',1000);
return;
}
} else { //报名（新增） } else { //报名（新增）
this.submitOrder(); this.submitOrder();
} }
......
src/pages/activity/activityConfirm/activityConfirm.ts
View file @ f4e9831d
...@@ -24,7 +24,9 @@ export class ActivityConfirmPage { ...@@ -24,7 +24,9 @@ export class ActivityConfirmPage {
orderfgconent: '', orderfgconent: '',
orderstate: 4, orderstate: 4,
activityid: '', activityid: '',
orderid: '' orderid: '',
personnumber:'',
orderbz:''
}; };
batch; batch;
//页面按钮为默认取消报名和重选批次 //页面按钮为默认取消报名和重选批次
...@@ -187,12 +189,15 @@ export class ActivityConfirmPage { ...@@ -187,12 +189,15 @@ export class ActivityConfirmPage {
const data = { const data = {
orderfgconent:'',
orderid: this.order.orderid, orderid: this.order.orderid,
batchid: this.batch.id, batchid: this.batch.id,
activityid: this.order.activityid, activityid: this.order.activityid,
orderpjlevel: this.orderStatisfyLevel, orderpjlevel: this.orderStatisfyLevel,
orderstate: '4', orderstate: '',
orderconfirm: '1' orderconfirm: '1',
personnumber:this.order.personnumber,
orderbz:this.order.orderbz
}; };
if (this.order.orderstate == 3) { if (this.order.orderstate == 3) {
data.orderstate = '3'; data.orderstate = '3';
......
src/pages/mine/myActivityList/myActivityList.html
View file @ f4e9831d
...@@ -4,55 +4,55 @@ ...@@ -4,55 +4,55 @@
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content class="bgc-e7e8ed"> <ion-content class="bgc-e7e8ed">
<ion-list> <ion-list>
<ion-item *ngFor="let item of allOrder" class="margin-top-10"> <ion-item *ngFor="let item of allOrder" class="margin-top-10">
<div class="item" (click)="goConfirmActivity(item)"> <div class="item" (click)="goConfirmActivity(item)">
<div class="item-header"> <div class="item-header">
<div class="item-header-style"> <div class="item-header-style">
<img src="./assets/imgs/icon-tj.png" class="icon" *ngIf="item.activity.activityType==1"> <img src="./assets/imgs/icon-tj.png" class="icon" *ngIf="item.activity.activityType==1">
<img src="./assets/imgs/icon-ly.png" class="icon" *ngIf="item.activity.activityType==2"> <img src="./assets/imgs/icon-ly.png" class="icon" *ngIf="item.activity.activityType==2">
<img src="./assets/imgs/icon-px.png" class="icon" *ngIf="item.activity.activityType==3"> <img src="./assets/imgs/icon-px.png" class="icon" *ngIf="item.activity.activityType==3">
<img src="./assets/imgs/icon-gh.png" class="icon" *ngIf="item.activity.activityType==4"> <img src="./assets/imgs/icon-gh.png" class="icon" *ngIf="item.activity.activityType==4">
<span class="item-title">{{item.activity.activityName}}</span> <span class="item-title">{{item.activity.activityName}}</span>
</div> </div>
<button disabled style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">已报名</button> <button disabled style="border-radius: 4px" ion-button round class="btn color1" *ngIf="item.orderstate == '1'">已报名</button>
<button disabled style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button> <button disabled style="border-radius: 4px" ion-button round class="btn color2" *ngIf="item.orderstate == '2'">待确认</button>
<button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">已评价</button> <button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '3'">已评价</button>
<button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button> <button disabled style="border-radius: 4px" ion-button round class="btn color3" *ngIf="item.orderstate == '4'">已完成</button>
</div>
<div class="content-box">
<div class="content-item-box">
<label class="left-title">批次名称：</label>
<div class="data">{{item.batch?.batchName}}</div>
</div>
<div class="content-item-box">
<label class="left-title">出行日期：</label>
<div class="data">
{{item.batch?.batchGoDate}}
</div> </div>
<div class="content-box"> </div>
<div class="content-item-box"> <div class="content-item-box">
<label class="left-title">批次名称：</label> <label class="left-title">活动地点：</label>
<div class="data">{{item.batch?.batchName}}</div> <div class="data">
</div> {{item.batch?.batchAddress}}
<div class="content-item-box">
<label class="left-title">出行日期：</label>
<div class="data">
{{item.batch?.batchGoDate}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">活动地点：</label>
<div class="data">
{{item.batch?.batchAddress}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">报名截止：</label>
<div class="data">
{{item.batch?.batchEndDate}}
</div>
</div>
</div> </div>
<div class="right"> </div>
<button disabled class="cancel" *ngIf="item.orderstate == 1" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button> <div class="content-item-box">
<button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="reelectBatch(item);$event.stopPropagation();">订单确认</button> <label class="left-title">报名截止：</label>
<div class="data">
{{item.batch?.batchEndDate}}
</div> </div>
</div> </div>
</ion-item> </div>
</ion-list> <div class="right">
<button disabled class="cancel" *ngIf="item.orderstate == 1" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
<button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="reelectBatch(item);$event.stopPropagation();">订单确认</button>
</div>
</div>
</ion-item>
</ion-list>
</ion-content> </ion-content>
<div class="cover" *ngIf="isCover"> <div class="cover" *ngIf="isCover">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<div class="cover-content-box"> <div class="cover-content-box">
<h4 class="cover-content-title">您对本次活动的意见和建议</h4> <h4 class="cover-content-title">您对本次活动的意见和建议</h4>
<textarea class="suggest" rows="12" [(ngModel)]="order.orderfgconent"> <textarea class="suggest" rows="12" [(ngModel)]="order.orderfgconent">
</textarea> </textarea>
<button class="commit" ion-button block (click)="commit()"> <button class="commit" ion-button block (click)="commit()">
提交 提交
...@@ -125,4 +125,6 @@ ...@@ -125,4 +125,6 @@
<h4 class="result-msg">提交失败</h4> <h4 class="result-msg">提交失败</h4>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
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