Skip to content

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

活动报名

parent e5236803
Show whitespace changes
Inline Side-by-side
Showing with 636 additions and 509 deletions
src/app/app.scss
View file @ ee78a33f
...@@ -20,3 +20,17 @@ ...@@ -20,3 +20,17 @@
line-height: 20px; line-height: 20px;
font-size: 3rem; font-size: 3rem;
} }
.submit-btn{
height: 40px;
margin-bottom: 15px;
width: 80%;
margin-left: 10%;
margin-right: 10%;
color: #fff;
font-size: 15px;
position: relative;
text-align: center;
white-space: nowrap;
border-radius: 3px;
}
\ No newline at end of file
src/pages/activity/activityApply/activityApply.html
View file @ ee78a33f
<ion-header> <ion-header>
<ion-toolbar> <ion-navbar>
<div class="searchToolBar"> <ion-title text-center>报名订单</ion-title>
<button ion-button clear small navPop style="padding: 0;"> </ion-navbar>
<img class="back-btn" src="./assets/imgs/back.png" />
</button>
<ion-title text-center>活动报名</ion-title>
</div>
</ion-toolbar>
</ion-header> </ion-header>
<ion-content class="content"> <ion-content class="content">
<ion-item class="content-title">
<!-- <ion-refresher (ionRefresh)="doRefresh($event)"> <ion-label>活动名称</ion-label>
<ion-refresher-content
pullingIcon="arrow-dropdown" pullingText="Pull to refresh"
refreshingSpinner="circles"refreshingText="Refreshing...">
</ion-refresher-content>
</ion-refresher> -->
<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>
<!-- <div class="item1-title" *ngIf="activity?.activityFbObject==2">{{activity.activityName}}（用户组）</div>
<div class="item1-title" *ngIf="activity?.activityFbObject==3">{{activity.activityName}}（处事部门）</div> -->
<div class="item1-content-box">
<ion-icon name="md-contact" class="item1-icon"></ion-icon>
<span class="item-type">{{activityType[activity.activityType]}}</span>
</div>
</div>
<div class="item1-introduction">
{{introduce}}
<button class="btn-introduce" (click)="show()">具体介绍</button>
</div>
</div>
</div>
<div class="item2 item-margin">
<ion-list class="item-list">
<ion-item>
<label class="item-label">
<span class="item-title">
可选批次
</span>
</label>
</ion-item>
<ion-item class="item2-content">
<div *ngFor="let batch of batches" (click)="batch.noRegistrationFalg ? '': showBatchDetails(batch)" class="item2-box {{batch.noRegistrationFalg ?'zero':''}} {{isSelected == batch.id?'selected':''}}">
<span class="time">{{batch.batchName|slice:0:6}}</span>
<!--{{"2017-01-20 15:16:30"|limitTo:10}}-->
<span *ngIf="!batch.hasOverdueflag" class="quantity">剩余{{batch.onebatchSurplusQuota}}名</span>
<span *ngIf="batch.hasOverdueflag" class="quantity">报名已截止</span>
</div>
</ion-item>
</ion-list>
</div>
<div class="item3 item-margin">
<ion-list class="item-list">
<ion-item>
<label class="item-label">
<span class="item-title">
附加信息
</span>
</label>
</ion-item>
<ion-item *ngIf=" onebatch!=null && onebatch?.batchPerNumber != 0">
<div class="item3-box">
<div class="item3-1">
<label class="little-title-box">
<span class="little-title">携带人数</span>
</label>
<div class="change" id="next" (click)="next()">-</div>
<input class="number" readonly="readonly" id="text" type="number" size="1" [(ngModel)]="order.Personnumber">
<div class="change" id="add" (click)="add()">+</div>
</div>
<!-- <div class="item3-box-count">
最多{{onebatch?.batchPerNumber == null?0:onebatch?.batchPerNumber}}人
</div> -->
</div>
</ion-item>
<ion-item>
<div class="item3-2">
<label class="little-title-box">
<span class="little-title">报名备注</span>
</label>
<div>
<textarea class="remark" rows="4" [(ngModel)]="order.orderbz_end">
</textarea>
</div>
</div>
</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>
<div *ngIf="onebatch!=null">
<ion-item> <ion-item>
<label class="little-title-box"> <ion-label>选择批次</ion-label>
<span class="little-title">活动日期</span> <ion-select [(ngModel)]="gender">
</label> <ion-option value="f">Female</ion-option>
<label class="item4-content">{{onebatch.batchGoDate}}</label> <ion-option value="m">Male</ion-option>
</ion-select>
</ion-item> </ion-item>
<ion-item> <ion-item class="margin-top-10">
<label class="little-title-box"> <ion-label>报名用户</ion-label>
<span class="little-title">集合地点</span> <span class="lettr-space-1" item-right></span>
</label>
<label class="item4-content">{{onebatch.batchSetAddress}}</label>
</ion-item> </ion-item>
<ion-item> <ion-item class="margin-top-10">
<label class="little-title-box"> <ion-label>携带人数</ion-label>
<span class="little-title">集合时间</span> <span class="lettr-space-1" item-right></span>
</label>
<label class="item4-content">{{onebatch.batchSetTime}}</label>
</ion-item> </ion-item>
<ion-item> <ion-item class="margin-top-10">
<label class="little-title-box"> <ion-label>报名备注</ion-label>
<span class="little-title">报名截止</span> <ion-textarea class="content-textarea"></ion-textarea>
</label>
<label class="item4-content">{{onebatch.batchEndDate}}</label>
</ion-item> </ion-item>
</div>
</ion-list>
</div>
<div class="item5 item-margin">
<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">
<!-- {{onebatch.batchNotice}} -->
<p>{{notice}}</p>
</ion-item>
</ion-list>
</div>
<button class="confirmBtn" ion-button block (click)="confirmOrder(order.Orderid)" *ngIf="!pageflag">确认报名</button>
<button class="confirmBtn" ion-button block (click)="confirmOrder(order.Orderid)" *ngIf="pageflag">确认修改</button>
<button class="submit-btn submit" (click)="submitOrder()">提交订单</button>
</ion-content> </ion-content>
<div class="cover" *ngIf="isCover"> <!--<div class="cover" *ngIf="isCover">-->
<div class="cover-content"> <!--<div class="cover-content">-->
<div class="cover-content-box"> <!--<div class="cover-content-box">-->
<h4 class="cover-content-title">具体介绍</h4> <!--<h4 class="cover-content-title">具体介绍</h4>-->
<div class="cover-content-info"> <!--<div class="cover-content-info">-->
<p> <!--<p>-->
{{activity.activityIntro}} <!--{{activity.activityIntro}}-->
</p> <!--</p>-->
</div> <!--</div>-->
<button ion-button block (click)="hidden()"> <!--<button ion-button block (click)="hidden()">-->
关闭 <!--关闭-->
</button> <!--</button>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div class="cover" *ngIf="isSuccess"> <!--<div class="cover" *ngIf="isSuccess">-->
<div class="cover-content cover-content-result"> <!--<div class="cover-content cover-content-result">-->
<div class="cover-content-box"> <!--<div class="cover-content-box">-->
<img class="result-img" src="./assets/imgs/success.png"> <!--<img class="result-img" src="./assets/imgs/success.png">-->
<h4 class="result-msg">报名成功</h4> <!--<h4 class="result-msg">报名成功</h4>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<div class="cover" *ngIf="isError"> <!--<div class="cover" *ngIf="isError">-->
<div class="cover-content cover-content-result"> <!--<div class="cover-content cover-content-result">-->
<div class="cover-content-box"> <!--<div class="cover-content-box">-->
<img class="result-img" src="./assets/imgs/error.png"> <!--<img class="result-img" src="./assets/imgs/error.png">-->
<h4 class="result-msg">报名失败</h4> <!--<h4 class="result-msg">报名失败</h4>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
\ No newline at end of file \ No newline at end of file
src/pages/activity/activityApply/activityApply.scss
View file @ ee78a33f
...@@ -285,4 +285,84 @@ page-activityApply { ...@@ -285,4 +285,84 @@ page-activityApply {
height: 30px; height: 30px;
} }
//新
.content{
text-align: left;
margin-top: 6px;
}
.sign-info,.feedback-info{
border-bottom: 1px solid #ddd;
margin-bottom: 20px;
}
.info-title{
padding-left: 10px;
position: relative;
}
.info-title::after{
content: '';
position: absolute;
left: 0;
top: 0;
width: 5px;
height: 25px;
background-color: #24bafc;
}
.content-item{
font-size: 16px;
padding: 0 20px;
p{
padding: 10px 0;
span:first-child{
color: #333;
}
span:last-child{
color: #666;
}
}
p + p{
border-top: 1px solid #ddd;
}
}
.content-button{
position: absolute;
bottom: 10px;
left: 0;
display: flex;
align-items: center;
width: 100%;
height: 60px;
font-size: 16px;
background-color: #e3f6fe;
div:first-child{
width: 65%;
padding-left: 20px;
}
}
.item-ios.item-block .item-inner{
margin-right: 16px;
}
.content .item-ios.item-block:nth-child(5) .item-inner{
border: none;
}
.content-title{
padding: 0;
}
.content-title .item-inner{
padding-left: 16px;
margin: 0 !important;
}
.label-ios + ion-input .text-input, .label-ios + ion-textarea .text-input, .label-ios + .input + .cloned-input{
padding: 10px;
height: 100px;
border: 1px solid #ddd;
}
.submit{
margin-top: 20px;
border: 1px solid #34b4fc;
background-color: #34b4fc;
}
} }
src/pages/activity/activityApply/activityApply.ts
View file @ ee78a33f
...@@ -5,6 +5,7 @@ import { MyActivityListPage } from '../../myActivityList/myActivityList'; ...@@ -5,6 +5,7 @@ import { MyActivityListPage } from '../../myActivityList/myActivityList';
import { Http, Response } from '@angular/http'; import { Http, Response } from '@angular/http';
import { AppService, AppGlobal } from '../../../service/appHttpService'; import { AppService, AppGlobal } from '../../../service/appHttpService';
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -70,17 +71,17 @@ export class ActivityApplyPage { ...@@ -70,17 +71,17 @@ export class ActivityApplyPage {
//初始化显示活动列表 //初始化显示活动列表
ngOnInit(): void { ngOnInit(): void {
this.activity = this.navParams.get("item"); // this.activity = this.navParams.get("item");
//
if (this.activity.activityIMG) { // if (this.activity.activityIMG) {
this.picture = AppGlobal.picture + this.activity.activityIMG; // this.picture = AppGlobal.picture + this.activity.activityIMG;
this.isLoad = true; // this.isLoad = true;
} // }
//
this.subIntroduce(this.activity.activityIntro); //处理活动详情字数显示问题 // this.subIntroduce(this.activity.activityIntro); //处理活动详情字数显示问题
//订单的活动id // //订单的活动id
this.order.Activityid = this.activity.id; // this.order.Activityid = this.activity.id;
this.initBatchList(this.navParams.get("changeOrderInfo")); // this.initBatchList(this.navParams.get("changeOrderInfo"));
} }
...@@ -304,4 +305,8 @@ confirmOrder(orderId) { ...@@ -304,4 +305,8 @@ confirmOrder(orderId) {
}, 2000); }, 2000);
} }
submitOrder(){
this.navCtrl.push('ActivityConfirmPage');
}
} }
src/pages/activity/activityConfirm/activityConfirm.html 0 → 100644
View file @ ee78a33f
<ion-header>
<ion-navbar>
<ion-title text-center>订单确认</ion-title>
</ion-navbar>
</ion-header>
<ion-content class="content">
<div class="content-container">
<ion-item class="content-title">
<ion-label>活动名称</ion-label>
</ion-item>
<ion-item>
<ion-label>选择批次</ion-label>
<ion-select [(ngModel)]="gender">
<ion-option value="f">Female</ion-option>
<ion-option value="m">Male</ion-option>
</ion-select>
</ion-item>
<div class="confirm-item margin-top-10">
<ion-label>出行结果</ion-label>
<div class="confirm-type">
<span>成功出行</span>
<span>未出行</span>
</div>
</div>
<div class="margin-top-10 confirm-item">
<ion-label>评价反馈</ion-label>
<button class="submit-btn submit1" (click)="submitOrder()">非常满意</button>
<button class="submit-btn submit2" (click)="submitOrder()">满意</button>
<button class="submit-btn submit3" (click)="submitOrder()">一般</button>
<button class="submit-btn submit4" (click)="submitOrder()">不满意</button>
</div>
</div>
<button class="submit-btn submit" (click)="submitOrder()">提交确认</button>
</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/activityConfirm/activityConfirm.scss → src/pages/activity/activityConfirm/activityConfirm.scss
View file @ ee78a33f
...@@ -12,11 +12,9 @@ page-activityConfirm { ...@@ -12,11 +12,9 @@ page-activityConfirm {
background-color: #f1f1f1 background-color: #f1f1f1
} }
// .item1-icon{ .content-container{
// font-size: 24px; background-color: #fff;
// color: #81a8ef; }
// margin-right: 5px;
// }
.item1{ .item1{
background-color: white; background-color: white;
...@@ -415,5 +413,130 @@ page-activityConfirm { ...@@ -415,5 +413,130 @@ page-activityConfirm {
width: 30px; width: 30px;
height: 30px; height: 30px;
} }
//新
.confirm-item{
margin: 16px;
font-size: 1.7rem;
}
.confirm-item + .confirm-item{
border-top: 1px solid #dddddd;
}
.content{
text-align: left;
margin-top: 6px;
}
.sign-info,.feedback-info{
border-bottom: 1px solid #ddd;
margin-bottom: 20px;
}
.info-title{
padding-left: 10px;
position: relative;
}
.info-title::after{
content: '';
position: absolute;
left: 0;
top: 0;
width: 5px;
height: 25px;
background-color: #24bafc;
}
.content-item{
font-size: 16px;
padding: 0 20px;
p{
padding: 10px 0;
span:first-child{
color: #333;
}
span:last-child{
color: #666;
}
}
p + p{
border-top: 1px solid #ddd;
}
}
.content-button{
position: absolute;
bottom: 10px;
left: 0;
display: flex;
align-items: center;
width: 100%;
height: 60px;
font-size: 16px;
background-color: #e3f6fe;
div:first-child{
width: 65%;
padding-left: 20px;
}
}
.item-ios.item-block .item-inner{
margin-right: 16px;
}
.content .item-ios.item-block:nth-child(5) .item-inner{
border: none;
}
.content-title{
padding: 0;
}
.content-title .item-inner{
padding-left: 16px;
margin: 0 !important;
}
.label-ios + ion-input .text-input, .label-ios + ion-textarea .text-input, .label-ios + .input + .cloned-input{
padding: 10px;
height: 100px;
border: 1px solid #ddd;
}
.submit{
border: 1px solid #34b4fc;
background-color: #34b4fc;
margin-top: 20px;
}
.submit1{
border: 1px solid #40cf4f;
background-color: #40cf4f;
}
.submit2{
border: 1px solid #23c9b2;
background-color: #23c9b2;
}
.submit3{
border: 1px solid #f19f42;
background-color: #f19f42;
}
.submit4{
border: 1px solid #e14447;
background-color: #e14447;
}
.confirm-type span{
width: 50%;
display: inline-block;
text-align: center;
padding: 8px;
font-size: 1.6rem;
}
.confirm-type {
font-size: 0;
span:first-child {
background-color: #24bafc;
color: #fff;
}
span:last-child{
background-color: #ececec;
}
}
} }
src/pages/activityConfirm/activityConfirm.ts → src/pages/activity/activityConfirm/activityConfirm.ts
View file @ ee78a33f
...@@ -3,9 +3,9 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController } ...@@ -3,9 +3,9 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController }
import { Http, Response, } from '@angular/http'; import { Http, Response, } from '@angular/http';
import { AppService, AppGlobal } from '../../service/appHttpService'; import { AppService, AppGlobal } from '../../../service/appHttpService';
import { MyActivityListPage } from '../myActivityList/myActivityList'; import { MyActivityListPage } from '../../myActivityList/myActivityList';
import { JoinPersonsPage } from '../joinPersons/joinPersons'; import { JoinPersonsPage } from '../../joinPersons/joinPersons';
@IonicPage() @IonicPage()
...@@ -74,36 +74,36 @@ export class ActivityConfirmPage { ...@@ -74,36 +74,36 @@ export class ActivityConfirmPage {
ngOnInit():void{ ngOnInit():void{
this.orderInfo = this.navParams.get("lookOrderDetails"); // this.orderInfo = this.navParams.get("lookOrderDetails");
console.log("order:"+this.orderInfo); // console.log("order:"+this.orderInfo);
this.activity = this.orderInfo["activity"]; // this.activity = this.orderInfo["activity"];
//
if (this.activity.activityIMG) { // if (this.activity.activityIMG) {
this.picture = AppGlobal.picture + this.activity.activityIMG; // this.picture = AppGlobal.picture + this.activity.activityIMG;
this.isLoad = true; // this.isLoad = true;
} // }
//
this.onebatch = this.orderInfo["batch"]; // this.onebatch = this.orderInfo["batch"];
//
this.noticeArry = this.strSplit(this.onebatch.batchNotice); // this.noticeArry = this.strSplit(this.onebatch.batchNotice);
//
this.subIntroduce(this.activity["activityIntro"]) ; // this.subIntroduce(this.activity["activityIntro"]) ;
if(this.orderInfo["orderstate"]==1){ //批次报名截止日期小于当前日期 // if(this.orderInfo["orderstate"]==1){ //批次报名截止日期小于当前日期
let signflag = Date.parse(this.orderInfo.batch.batchEndDate.toString())<Date.parse(new Date().toString()); // let signflag = Date.parse(this.orderInfo.batch.batchEndDate.toString())<Date.parse(new Date().toString());
if(signflag){ // if(signflag){
this.showParticipantBtn = true; // this.showParticipantBtn = true;
} // }
} // }
//页面按钮为确认评价 // //页面按钮为确认评价
if(this.orderInfo["orderstate"]==2){ // if(this.orderInfo["orderstate"]==2){
this.modelflag = 2; // this.modelflag = 2;
} // }
if(this.orderInfo["orderstate"]==3){ // if(this.orderInfo["orderstate"]==3){
this.modelflag = 3; // this.modelflag = 3;
} // }
if(this.orderInfo["orderstate"]==4){ // if(this.orderInfo["orderstate"]==4){
this.modelflag = 4; // this.modelflag = 4;
} // }
} }
......
src/pages/activity/activityList/activityList.ts
View file @ ee78a33f
...@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams, AlertController} from 'ionic-angul ...@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams, AlertController} from 'ionic-angul
import { Http,Response } from '@angular/http'; import { Http,Response } from '@angular/http';
import { ActivityApplyPage } from '../activityApply/activityApply' import { ActivityApplyPage } from '../activityApply/activityApply'
import { ActivityConfirmPage } from '../../activityConfirm/activityConfirm'; import { ActivityConfirmPage } from '../activityConfirm/activityConfirm';
import { AppService } from '../../../service/appHttpService'; import { AppService } from '../../../service/appHttpService';
import {ActivityDetailPage} from "../activityDetail/activityDetail"; import {ActivityDetailPage} from "../activityDetail/activityDetail";
@IonicPage() @IonicPage()
......
src/pages/activityConfirm/activityConfirm.html deleted 100644 → 0
View file @ e5236803
<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">
<!-- <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> -->
<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>
<!-- <div class="item1-title" *ngIf="activity?.activityFbObject==2">{{activity.activityName}}（用户组）</div>
<div class="item1-title" *ngIf="activity?.activityFbObject==3">{{activity.activityName}}（处事部门）</div> -->
<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>
<!-- <label class="item4-content">{{onebatch.batchPerNumber}}</label> -->
<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">
<!-- {{onebatch.batchNotice}} -->
<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>
<!-- [(ngModel)]="order.orderfgconent" -->
<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/myActivityList/myActivityList.ts
View file @ ee78a33f
...@@ -4,7 +4,7 @@ import { IonicPage, NavController, Slides } from 'ionic-angular'; ...@@ -4,7 +4,7 @@ import { IonicPage, NavController, Slides } from 'ionic-angular';
import { Response } from '@angular/http'; import { Response } from '@angular/http';
import { AppService } from '../../service/appHttpService'; import { AppService } from '../../service/appHttpService';
import { ActivityConfirmPage } from '../activityConfirm/activityConfirm'; import { ActivityConfirmPage } from '../activity/activityConfirm/activityConfirm';
import { JoinPersonsPage } from '../joinPersons/joinPersons'; import { JoinPersonsPage } from '../joinPersons/joinPersons';
import { ActivityStatisticService } from '../../service/activityStatisticService'; import { ActivityStatisticService } from '../../service/activityStatisticService';
......
src/pages/tabs/home/home.ts
View file @ ee78a33f
...@@ -7,7 +7,7 @@ import { MyActivityListPage } from '../../myActivityList/myActivityList'; ...@@ -7,7 +7,7 @@ import { MyActivityListPage } from '../../myActivityList/myActivityList';
import { AppService, AppGlobal } from '../../../service/appHttpService'; import { AppService, AppGlobal } from '../../../service/appHttpService';
import { Calendar } from '@ionic-native/calendar'; import { Calendar } from '@ionic-native/calendar';
import { ActivityApplyPage } from '../../activity/activityApply/activityApply' import { ActivityApplyPage } from '../../activity/activityApply/activityApply'
import { ActivityConfirmPage } from '../../activityConfirm/activityConfirm'; import { ActivityConfirmPage } from '../../activity/activityConfirm/activityConfirm';
import { OutGoingReportPage } from '../../outGoingReport/outGoingReport'; import { OutGoingReportPage } from '../../outGoingReport/outGoingReport';
import { OperationListPage } from '../../operation-list/operation-list'; import { OperationListPage } from '../../operation-list/operation-list';
import { AnnouncementPage } from '../../announcement/announcement'; import { AnnouncementPage } from '../../announcement/announcement';
......
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