Skip to content

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

color

parent f4e9831d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 276 deletions
src/pages/activity/activityApply/activityApply.ts
View file @ dcdb5016
...@@ -144,7 +144,6 @@ export class ActivityApplyPage { ...@@ -144,7 +144,6 @@ export class ActivityApplyPage {
applyNum ++; applyNum ++;
} }
}); });
console.log(applyNum);
//报名次数 applyCount 1,2,3,4,5,0-> 不限 //报名次数 applyCount 1,2,3,4,5,0-> 不限
if(this.activity.applyCount > 0){ if(this.activity.applyCount > 0){
if(applyNum >= this.activity.applyCount){ if(applyNum >= this.activity.applyCount){
......
src/pages/activity/activityConfirm/activityConfirm.html
View file @ dcdb5016
...@@ -41,274 +41,3 @@ ...@@ -41,274 +41,3 @@
<button class="submit-btn submit" (click)="commit()">提交确认</button> <button class="submit-btn submit" (click)="commit()">提交确认</button>
</ion-content> </ion-content>
<!--<ion-header>-->
<!--<ion-toolbar>-->
<!--<div class="searchToolBar">-->
<!--<button ion-button clear small navPop style="padding: 0;">-->
<!--<img class="back-btn" src="./assets/imgs/back.png" />-->
<!--</button>-->
<!--<ion-title *ngIf="modelflag==1" text-center>活动订单</ion-title>-->
<!--<ion-title *ngIf="modelflag==2" text-center>活动确认</ion-title>-->
<!--<ion-title *ngIf="modelflag==3||modelflag==4" text-center>订单详情</ion-title>-->
<!--</div>-->
<!--</ion-toolbar>-->
<!--</ion-header>-->
<!--<ion-content class="content">-->
<!--&lt;!&ndash; <div class="item1">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<ion-icon name="ios-contact" class="item1-icon"></ion-icon>-->
<!--2018年体检活动（处级以下）-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div> &ndash;&gt;-->
<!--<div class="item1">-->
<!--<div class="img-box" *ngIf="isLoad">-->
<!--<img class="item1-image" src="{{picture}}">-->
<!--</div>-->
<!--<div class="item1-content">-->
<!--<div class="item1-content-header">-->
<!--<div class="item1-title" *ngIf="activity?.activityFbObject==1">{{activity.activityName}}</div>-->
<!--&lt;!&ndash; <div class="item1-title" *ngIf="activity?.activityFbObject==2">{{activity.activityName}}（用户组）</div>-->
<!--<div class="item1-title" *ngIf="activity?.activityFbObject==3">{{activity.activityName}}（处事部门）</div> &ndash;&gt;-->
<!--<div class="item1-content-box">-->
<!--<ion-icon name="md-contact" class="item1-icon"></ion-icon>-->
<!--<span class="item-type">{{activityTypeFlag[activity.activityType]}}</span>-->
<!--</div>-->
<!--</div>-->
<!--<div class="item1-introduction">-->
<!--{{introduce}}-->
<!--<button class="btn-introduce" (click)="show()">具体介绍</button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="item4 item-margin">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--报名信息-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">报名批次</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.batchName}}</label>-->
<!--</ion-item>-->
<!--<ion-item *ngIf=" onebatch!=null && onebatch?.batchPerNumber != 0">-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">携带人数</span>-->
<!--</label>-->
<!--&lt;!&ndash; <label class="item4-content">{{onebatch.batchPerNumber}}</label> &ndash;&gt;-->
<!--<label class="item4-content">{{orderInfo.personnumber}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">报名时间</span>-->
<!--</label>-->
<!--<label class="item4-content">{{orderInfo.createtime}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">报名备注</span>-->
<!--</label>-->
<!--<label class="item4-content">{{orderInfo.orderbz}}</label>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<div class="item4 item-margin">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--活动说明-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">活动日期</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.batchGoDate}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">集合地点</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.batchAddress}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">集合时间</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.batchSetTime}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">报名截止</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.batchEndDate}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">联络人员</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.liamand}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">联络电话</span>-->
<!--</label>-->
<!--<label class="item4-content">{{onebatch.liamantel}}</label>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<div class="item-margin {{modelflag==1?'item5':''}} {{modelflag==2?'item5':''}}">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--活动须知-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item class="item5-content" *ngFor="let notice of noticeArry">-->
<!--&lt;!&ndash; {{onebatch.batchNotice}} &ndash;&gt;-->
<!--<p>{{notice}}</p>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<div *ngIf="modelflag == 3||modelflag == 4" class="item4 item-margin">-->
<!--<ion-list class="item-list">-->
<!--<ion-item>-->
<!--<label class="item-label">-->
<!--<span class="item-title">-->
<!--确认评价-->
<!--</span>-->
<!--</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">出行确认</span>-->
<!--</label>-->
<!--<label class="item4-content" *ngIf="modelflag == 3">报名未出行</label>-->
<!--<label class="item4-content" *ngIf="modelflag == 4">确认已出行</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">评价等级</span>-->
<!--</label>-->
<!--<label class="item4-content level1" *ngIf="orderInfo.orderpjlevel==1">{{orderStatisfyLevel[orderInfo.orderpjlevel]}}</label>-->
<!--<label class="item4-content level2" *ngIf="orderInfo.orderpjlevel==2">{{orderStatisfyLevel[orderInfo.orderpjlevel]}}</label>-->
<!--<label class="item4-content level3" *ngIf="orderInfo.orderpjlevel==3">{{orderStatisfyLevel[orderInfo.orderpjlevel]}}</label>-->
<!--<label class="item4-content level4" *ngIf="orderInfo.orderpjlevel==4">{{orderStatisfyLevel[orderInfo.orderpjlevel]}}</label>-->
<!--</ion-item>-->
<!--<ion-item>-->
<!--<label class="little-title-box">-->
<!--<span class="little-title">意见反馈</span>-->
<!--</label>-->
<!--<label class="item4-content">{{orderInfo.orderfgconent}}</label>-->
<!--</ion-item>-->
<!--</ion-list>-->
<!--</div>-->
<!--<div class="btn-box" *ngIf="(modelflag == 1 && !showParticipantBtn)||modelflag == 2">-->
<!--<button *ngIf="modelflag == 2" class="bottom-btn bottom-btn-left" ion-button inline (click)="joinPeople(orderInfo)" color="light">参与人员</button>-->
<!--<button *ngIf="modelflag == 2" class="bottom-btn " ion-button inline (click)="evaluation(orderInfo)">确认评价</button>-->
<!--<button *ngIf="modelflag == 1" class="bottom-btn bottom-btn-left" ion-button inline (click)="sureCancelOrder(orderInfo.orderid)"-->
<!--color="light">取消报名</button>-->
<!--<button *ngIf="modelflag == 1" class="bottom-btn " ion-button inline (click)="reelectBatch(orderInfo)">重选批次</button>-->
<!--</div>-->
<!--</ion-content>-->
<!--<div class="cover" *ngIf="isCover">-->
<!--<div class="cover-content" *ngIf="isIntroduce">-->
<!--<div class="cover-content-box">-->
<!--<h4 class="cover-content-title">具体介绍</h4>-->
<!--<div class="cover-content-info">-->
<!--<p>-->
<!--{{activity.activityIntro}}-->
<!--</p>-->
<!--</div>-->
<!--<button ion-button block (click)="hidden()">-->
<!--关闭-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<!--<div class="cover-content c1" *ngIf="first">-->
<!--<div class="cover-content-box">-->
<!--<h5 class="cover-content-title">您是否确认已参加本次活动？</h5>-->
<!--<button class="cover-btn btn-yes" (click)="yes()">-->
<!--是，我已参加-->
<!--</button>-->
<!--<button class="cover-btn btn-no" (click)="no()">-->
<!--否，我未参加-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<!--<div class="cover-content c2" *ngIf="second">-->
<!--<div class="cover-content-box">-->
<!--<h5 class="cover-content-title">您对本次活动是否满意？</h5>-->
<!--<button class="cover-btn btn1" (click)="next(1)">-->
<!--非常满意-->
<!--</button>-->
<!--<button class="cover-btn btn2" (click)="next(2)">-->
<!--满意-->
<!--</button>-->
<!--<button class="cover-btn btn3" (click)="next(3)">-->
<!--一般-->
<!--</button>-->
<!--<button class="cover-btn btn4" (click)="next(4)">-->
<!--不满意-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<!--<div class="cover-content c3" *ngIf="third">-->
<!--<div class="cover-content-box">-->
<!--<h5 class="cover-content-title">是否确认未出行</h5>-->
<!--<div class="third-btn-box">-->
<!--<button class="third-btn third-btn-left" (click)="sure()">-->
<!--是-->
<!--</button>-->
<!--<button class="third-btn third-btn-right" (click)="not()">-->
<!--否-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--&lt;!&ndash; [(ngModel)]="order.orderfgconent" &ndash;&gt;-->
<!--<div class="cover-content c4" *ngIf="fourth">-->
<!--<div class="cover-content-box">-->
<!--<h4 class="cover-content-title">您对本次活动的意见和建议</h4>-->
<!--<textarea class="suggest" rows="12" cols="30" #orderfgconent>-->
<!---->
<!--</textarea>-->
<!--<button class="commit" ion-button block (click)="commit(orderfgconent)">-->
<!--提交-->
<!--</button>-->
<!--</div>-->
<!--</div>-->
<!--<div class="cover-content cover-content-result c5" *ngIf="isSuccess">-->
<!--<div class="cover-content-box">-->
<!--<img class="result-img" src="./assets/imgs/success.png">-->
<!--<h4 class="result-msg">提交成功</h4>-->
<!--</div>-->
<!--</div>-->
<!--<div class="cover-content cover-content-result c5" *ngIf="isError">-->
<!--<div class="cover-content-box">-->
<!--<img class="result-img" src="./assets/imgs/error.png">-->
<!--<h4 class="result-msg">提交失败</h4>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
\ No newline at end of file
src/pages/activity/activityConfirm/activityConfirm.ts
View file @ dcdb5016
...@@ -22,7 +22,7 @@ export class ActivityConfirmPage { ...@@ -22,7 +22,7 @@ export class ActivityConfirmPage {
orderInfo: any; orderInfo: any;
order = { order = {
orderfgconent: '', orderfgconent: '',
orderstate: 4, orderstate: null,
activityid: '', activityid: '',
orderid: '', orderid: '',
personnumber:'', personnumber:'',
...@@ -72,8 +72,7 @@ export class ActivityConfirmPage { ...@@ -72,8 +72,7 @@ export class ActivityConfirmPage {
this.activity = this.navParams.get('order').activity; this.activity = this.navParams.get('order').activity;
this.order = this.navParams.get('order'); this.order = this.navParams.get('order');
this.batch = this.navParams.get('order').batch; this.batch = this.navParams.get('order').batch;
console.log(this.activity); this.order.orderstate = 4;
} }
selectLevel(type) { selectLevel(type) {
......
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