Skip to content

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

color

parent 4815ec39
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 264 deletions
src/pages/activity/activityConfirm/activityConfirm.html
View file @ a5e3f5fa
...@@ -6,37 +6,40 @@ ...@@ -6,37 +6,40 @@
<ion-content class="content"> <ion-content class="content">
<div class="content-container"> <div class="content-container">
<ion-item class="content-title"> <ion-item class="content-title">
<ion-label>活动名称</ion-label> <span>活动名称</span>
<span float-right>{{activity?.activityName}}</span>
</ion-item> </ion-item>
<ion-item> <ion-item>
<span>选择批次</span> <span class="padding-left-16">选择批次</span>
<span float-right></span> <span float-right>{{batch?.batchName}}</span>
</ion-item> </ion-item>
<div class="confirm-item margin-top-10"> <div class="confirm-item margin-top-10">
<ion-label>出行结果</ion-label> <ion-label>出行结果</ion-label>
<div class="confirm-type"> <div class="confirm-type">
<span class="{{order.orderstate == 1? 'selected':''}}" (click)="changeType(1)">成功出行</span> <span class="{{order.orderstate == 4? 'selected':''}}" (click)="changeType(4)">成功出行</span>
<span class="{{order.orderstate == 2? 'selected':''}}" (click)="changeType(2)">未出行</span> <span class="{{order.orderstate == 3? 'selected':''}}" (click)="changeType(3)">未出行</span>
</div> </div>
</div> </div>
<ng-container *ngIf="order.orderstate == 4">
<div class="margin-top-10 confirm-item"> <div class="margin-top-10 confirm-item">
<ion-label>评价反馈</ion-label> <ion-label>评价反馈</ion-label>
<button class="submit-btn submit1">非常满意 <button (click)="selectLevel(4)" class="submit-btn submit1">非常满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon> <ion-icon *ngIf="orderStatisfyLevel == 4" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button> </button>
<button class="submit-btn submit2">满意 <button (click)="selectLevel(3)" class="submit-btn submit2">满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon> <ion-icon *ngIf="orderStatisfyLevel == 3" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button> </button>
<button class="submit-btn submit3">一般 <button (click)="selectLevel(2)" class="submit-btn submit3">一般
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon> <ion-icon *ngIf="orderStatisfyLevel == 2" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button> </button>
<button class="submit-btn submit4">不满意 <button (click)="selectLevel(1)" class="submit-btn submit4">不满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon> <ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button> </button>
</div> </div>
</ng-container>
</div> </div>
<button class="submit-btn submit" (click)="submitOrder()">提交确认</button> <button class="submit-btn submit" (click)="commit()">提交确认</button>
</ion-content> </ion-content>
<!--<ion-header>--> <!--<ion-header>-->
<!--<ion-toolbar>--> <!--<ion-toolbar>-->
......
src/pages/activity/activityConfirm/activityConfirm.scss
View file @ a5e3f5fa
...@@ -14,6 +14,7 @@ page-activityConfirm { ...@@ -14,6 +14,7 @@ page-activityConfirm {
.content-container{ .content-container{
background-color: #fff; background-color: #fff;
padding-bottom: 20px;
} }
.item1{ .item1{
......
src/pages/activity/activityConfirm/activityConfirm.ts
View file @ a5e3f5fa
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams, AlertController, ToastController } from 'ionic-angular'; import {IonicPage, NavController, NavParams, AlertController, ToastController} from 'ionic-angular';
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 '../../mine/myActivityList/myActivityList'; import {MyActivityListPage} from '../../mine/myActivityList/myActivityList';
import { JoinPersonsPage } from '../../joinPersons/joinPersons'; import {JoinPersonsPage} from '../../joinPersons/joinPersons';
@IonicPage() @IonicPage()
...@@ -16,14 +16,17 @@ import { JoinPersonsPage } from '../../joinPersons/joinPersons'; ...@@ -16,14 +16,17 @@ import { JoinPersonsPage } from '../../joinPersons/joinPersons';
export class ActivityConfirmPage { export class ActivityConfirmPage {
picture: string; picture: string;
isLoad:boolean = false; isLoad: boolean = false;
onebatch:any; onebatch: any;
activity:any; activity: any;
orderInfo:any; orderInfo: any;
order = { order = {
orderfgconent:'', orderfgconent: '',
orderstate:1 orderstate: 4,
activityid: '',
orderid: ''
}; };
batch;
//页面按钮为默认取消报名和重选批次 //页面按钮为默认取消报名和重选批次
modelflag = 1; modelflag = 1;
showParticipantBtn: boolean = false; showParticipantBtn: boolean = false;
...@@ -40,13 +43,12 @@ export class ActivityConfirmPage { ...@@ -40,13 +43,12 @@ export class ActivityConfirmPage {
isSuccess: boolean = false; //是否提交成功 isSuccess: boolean = false; //是否提交成功
isError: boolean = false; //是否提交失败 isError: boolean = false; //是否提交失败
activityTypeFlag:Array<String> = ['未知','体检','疗休养','培训','工会活动']; activityTypeFlag: Array<String> = ['未知', '体检', '疗休养', '培训', '工会活动'];
orderStatisfyLevel; orderStatisfyLevel;
noticeArry: object[]; noticeArry: object[];
constructor( constructor(public navCtrl: NavController,
public navCtrl: NavController,
public navParams: NavParams, public navParams: NavParams,
public alertCtrl: AlertController, public alertCtrl: AlertController,
public http: Http, public http: Http,
...@@ -57,55 +59,30 @@ export class ActivityConfirmPage { ...@@ -57,55 +59,30 @@ export class ActivityConfirmPage {
//跳转人员参与情况列表页面 //跳转人员参与情况列表页面
joinPeople(order) { joinPeople(order) {
this.navCtrl.push("JoinPersonsPage",{ this.navCtrl.push("JoinPersonsPage", {
batchid:order.batchid, batchid: order.batchid,
batch:order.batch, batch: order.batch,
}); });
} }
ngOnInit():void{ ngOnInit(): void {
this.activity = this.navParams.get('activity'); this.activity = this.navParams.get('order').activity;
this.order = this.navParams.get('order'); this.order = this.navParams.get('order');
console.log(this.order); this.batch = this.navParams.get('order').batch;
// this.orderInfo = this.navParams.get("lookOrderDetails"); console.log(this.activity);
// console.log("order:"+this.orderInfo);
// this.activity = this.orderInfo["activity"];
//
// if (this.activity.activityIMG) {
// this.picture = AppGlobal.picture + this.activity.activityIMG;
// this.isLoad = true;
// }
//
// this.onebatch = this.orderInfo["batch"];
//
// this.noticeArry = this.strSplit(this.onebatch.batchNotice);
//
// this.subIntroduce(this.activity["activityIntro"]) ;
// if(this.orderInfo["orderstate"]==1){ //批次报名截止日期小于当前日期
// let signflag = Date.parse(this.orderInfo.batch.batchEndDate.toString())<Date.parse(new Date().toString());
// if(signflag){
// this.showParticipantBtn = true;
// }
// }
// //页面按钮为确认评价
// if(this.orderInfo["orderstate"]==2){
// this.modelflag = 2;
// }
// if(this.orderInfo["orderstate"]==3){
// this.modelflag = 3;
// }
// if(this.orderInfo["orderstate"]==4){
// this.modelflag = 4;
// }
} }
selectLevel(type) {
this.orderStatisfyLevel = type;
}
//分隔字符串 //分隔字符串
strSplit(str):object[]{ strSplit(str): object[] {
let temp = str.split(/[\n]/g); let temp = str.split(/[\n]/g);
for(let i =0;i<temp.length;i++){ for (let i = 0; i < temp.length; i++) {
if(temp[i] == ""){ if (temp[i] == "") {
temp.splice(i, 1); temp.splice(i, 1);
//删除数组索引位置应保持不变 //删除数组索引位置应保持不变
i--; i--;
...@@ -118,6 +95,7 @@ export class ActivityConfirmPage { ...@@ -118,6 +95,7 @@ export class ActivityConfirmPage {
this.isCover = false; this.isCover = false;
this.isIntroduce = false; this.isIntroduce = false;
} }
show() { show() {
this.isCover = true; this.isCover = true;
this.isIntroduce = true; this.isIntroduce = true;
...@@ -126,25 +104,25 @@ export class ActivityConfirmPage { ...@@ -126,25 +104,25 @@ export class ActivityConfirmPage {
//重选批次（更新订单） //重选批次（更新订单）
reelectBatch(order): void { reelectBatch(order): void {
this.navCtrl.push('ActivityApplyPage', { changeOrderInfo: order, item: order.activity }); this.navCtrl.push('ActivityApplyPage', {changeOrderInfo: order, item: order.activity});
} }
//确认评价按钮,第一层弹框 //确认评价按钮,第一层弹框
evaluation(item) { evaluation(item) {
this.isCover =true; this.isCover = true;
this.first =true; this.first = true;
this.order["orderid"] = item["orderid"]; this.order["orderid"] = item["orderid"];
this.order["batchid"] = item["batchid"]; this.order["batchid"] = item["batchid"];
this.order["activityid"] = item["activityid"]; this.order["activityid"] = item["activityid"];
// this.order["orderstate"] = '2'; //确认状态 // this.order["orderstate"] = '2'; //确认状态
this.order["personnumber"] = item["personnumber"]==null?0:item["personnumber"]; //携带人数 this.order["personnumber"] = item["personnumber"] == null ? 0 : item["personnumber"]; //携带人数
this.order["orderbz"] = item["orderbz"]; //备注说明 this.order["orderbz"] = item["orderbz"]; //备注说明
} }
changeType(type){ changeType(type) {
this.order.orderstate = type; this.order.orderstate = type;
} }
...@@ -166,19 +144,19 @@ export class ActivityConfirmPage { ...@@ -166,19 +144,19 @@ export class ActivityConfirmPage {
this.isCover = false; this.isCover = false;
//未出行（更改订单状态为：报名未出行；确认方式为app） //未出行（更改订单状态为：报名未出行；确认方式为app）
// this.order["orderstate"] = '3'; //报名未出行 // this.order["orderstate"] = '3'; //报名未出行
this.order["orderconfirm"] = '1' ; //手机app确认 this.order["orderconfirm"] = '1'; //手机app确认
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",this.order) this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder", this.order)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let resultback = res.json(); let resultback = res.json();
if(resultback.status == '200'){ if (resultback.status == '200') {
//待确认列表移除，全部列表移除该订单 //待确认列表移除，全部列表移除该订单
//let orderid = this.order["orderid"]; //let orderid = this.order["orderid"];
//this.allOrder.splice(this.allOrder.indexOf(orderid),0)["orderstate"] = '3'; //this.allOrder.splice(this.allOrder.indexOf(orderid),0)["orderstate"] = '3';
//this.allOrder.splice(this.allOrder.indexOf(orderid),1) //this.allOrder.splice(this.allOrder.indexOf(orderid),1)
//this.waitSureOrder.splice(this.waitSureOrder.indexOf(orderid),1) //this.waitSureOrder.splice(this.waitSureOrder.indexOf(orderid),1)
this.navCtrl.push("MyActivityListPage"); this.navCtrl.push("MyActivityListPage");
}else{ } else {
//失败 //失败
} }
}, error => { }, error => {
...@@ -202,22 +180,28 @@ export class ActivityConfirmPage { ...@@ -202,22 +180,28 @@ export class ActivityConfirmPage {
} }
//提交建议 (确认出行) //提交建议 (确认出行)
commit(orderfgconent: HTMLInputElement){ commit() {
//确认出行：更改订单状态为完成，订单满意度评价，意见，确认方式 //确认出行：更改订单状态为完成，订单满意度评价，意见，确认方式
// this.order["orderstate"] = '4'; //已完成 // this.order["orderstate"] = '4'; //已完成
this.order["orderconfirm"] = '1' ; //手机app确认 this.order["orderconfirm"] = '1'; //手机app确认
let temp_Orderbz = encodeURIComponent(this.order["orderbz"]) ;
this.order["orderbz"] = temp_Orderbz;
// let temp_orderfgconent = encodeURIComponent(this.order.orderfgconent) ;
// this.order["orderfgconent"] = temp_orderfgconent;
let temp_orderfgconent = encodeURIComponent(orderfgconent.value) ;
this.order["orderfgconent"] = temp_orderfgconent;
const data = {
orderid: this.order.orderid,
batchid: this.batch.id,
activityid: this.order.activityid,
orderpjlevel: this.orderStatisfyLevel,
orderstate: '4',
orderconfirm: '1'
};
if (this.order.orderstate == 3) {
data.orderstate = '3';
} else if (this.order.orderstate == 4) {
data.orderstate = '4';
}
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",this.order) console.log(data);
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/confirmEvaluationOrder",data)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let resultback = res.json(); let resultback = res.json();
if(resultback.status == '200'){ if(resultback.status == '200'){
...@@ -226,15 +210,6 @@ export class ActivityConfirmPage { ...@@ -226,15 +210,6 @@ export class ActivityConfirmPage {
//this.allOrder.splice(this.allOrder.indexOf(orderid),1) //this.allOrder.splice(this.allOrder.indexOf(orderid),1)
//this.waitSureOrder.splice(this.waitSureOrder.indexOf(orderid),1) //this.waitSureOrder.splice(this.waitSureOrder.indexOf(orderid),1)
this.navCtrl.push("MyActivityListPage"); this.navCtrl.push("MyActivityListPage");
if(true){
this.fourth =false;
this.isSuccess=true;
setTimeout(() => {
this.isCover=false;
this.isSuccess=false;
}, 2000);
}
}else{ }else{
//失败 //失败
} }
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ a5e3f5fa
...@@ -4,6 +4,7 @@ import {ActivityApplyPage} from "../activityApply/activityApply"; ...@@ -4,6 +4,7 @@ import {ActivityApplyPage} from "../activityApply/activityApply";
import {Response} from "@angular/http"; import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService"; import {AppService} from "../../../service/appHttpService";
import { DomSanitizer } from "@angular/platform-browser"; import { DomSanitizer } from "@angular/platform-browser";
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
declare var Swiper; declare var Swiper;
@IonicPage() @IonicPage()
...@@ -113,4 +114,5 @@ export class BatchDetailPage { ...@@ -113,4 +114,5 @@ export class BatchDetailPage {
); );
} }
} }
src/pages/activity/order-detail/order-detail.html
View file @ a5e3f5fa
...@@ -6,45 +6,40 @@ ...@@ -6,45 +6,40 @@
<ion-content class="content"> <ion-content class="content">
<div class="content"> <div class="content">
<div class="sign-info"> <div class="sign-info">
<p class="info-title">报名信息</p> <p class="info-title">活动名称:{{activity?.activityName}}</p>
<div class="content-item"> <div class="content-item">
<p> <span>携带人数：</span><span>{{order?.personnumber}}</span> </p> <p>{{activity?.activityIntro}}</p>
<p> <span>报名备注：</span><span>{{order?.orderfgconent}}</span> </p>
</div> </div>
</div> </div>
<div class="feedback-info"> <div class="sign-info">
<p class="info-title">出行反馈</p> <p class="info-title">报名信息</p>
<div class="content-item"> <div class="content-item">
<p> <p><span>携带人数：</span><span>{{order?.personnumber}}</span></p>
<span>出行结果：</span> <p><span>报名备注：</span><span>{{order?.orderbz}}</span></p>
<span *ngIf="order?.orderstate == 1">待出行</span>
<span *ngIf="order?.orderstate == 2">待确认</span>
<span *ngIf="order?.orderstate == 3">报名未出行</span>
<span *ngIf="order?.orderstate == 4">已评价</span>
</p>
<p>
<span>评价反馈：</span>
<span *ngIf="order?.orderpjlevel == 1">非常满意</span>
<span *ngIf="order?.orderpjlevel == 2">满意</span>
<span *ngIf="order?.orderpjlevel == 3">一般</span>
<span *ngIf="order?.orderpjlevel == 4">不满意</span>
</p>
</div> </div>
</div> </div>
<div class="batch-info"> <div class="batch-info">
<p class="info-title">批次:{{batch?.batchName}}</p>
<div class="content-item"> <div class="content-item">
<p> <span>报名截止：</span><span>{{batch?.batchEndDate}}</span> </p> <p><span>报名截止：</span><span>{{batch?.batchEndDate}}</span></p>
<p> <span>出行日期：</span><span>{{batch?.batchGoDate}}</span> </p> <p><span>出行日期：</span><span>{{batch?.batchGoDate}}</span></p>
<p> <span>可携带人数：</span><span>{{batch?.batchPerNumber}}</span> </p> <p><span>集合时间：</span><span>{{batch?.batchSetTime}}</span></p>
<p> <span>集合时间：</span><span>{{batch?.batchSetTime}}</span> </p> <p><span>集合地点：</span><span>{{batch?.batchSetAddress}}</span></p>
<p> <span>集合地点：</span><span>{{batch?.batchSetAddress}}</span> </p> <p><span>活动须知：</span><span>{{batch?.batchNotice}}</span></p>
<p> <span>活动须知：</span><span>{{batch?.batchNotice}}</span> </p>
</div> </div>
</div> </div>
<div class="content-button"> <div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span></div> <div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span>
<div class="button-right" > </div>
<!--时间是否截止->人数是否满了->是否报名了--> <div class="button-right">
<ng-container *ngIf="order.orderstate == '1'">
<span class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
</ng-container>
<ng-container *ngIf="order.orderstate == '2'">
<span (click)="orderConform()" class="button-btn button-btn1">订单确认</span>
</ng-container>
</div> </div>
</div> </div>
</div> </div>
......
src/pages/activity/order-detail/order-detail.ts
View file @ a5e3f5fa
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService";
@IonicPage() @IonicPage()
...@@ -8,23 +10,53 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; ...@@ -8,23 +10,53 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
templateUrl: 'order-detail.html', templateUrl: 'order-detail.html',
}) })
export class OrderDetailPage { export class OrderDetailPage {
order; //订单信息 order = {
orderstate: '',
orderpjlevel: '',
}; //订单信息
activity = { activity = {
activityName:'', activityName: '',
activityIntro:'' activityIntro: ''
}; //活动 }; //活动
batch; //批次 batch; //批次
isCover = false; isCover = false;
isIntroduce = false; isIntroduce = false;
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService) {
} }
ionViewDidLoad() { ionViewDidEnter() {
this.order = this.navParams.get('item'); this.order = this.navParams.get('item');
this.activity = this.navParams.get('item').activity; this.activity = this.navParams.get('item').activity;
this.batch = this.navParams.get('item').batch; this.batch = this.navParams.get('item').batch;
console.log(this.navParams.get('item')); console.log(this.order);
}
//取消报名（订单）
sureCancelOrder(): void {
this.appService.alert('确定取消报名么？', res => {
this.cancelOrder();
});
}
cancelOrder(): void {
this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": this.batch.order.orderid })
.subscribe((res: Response) => {
this.appService.alert('报名已取消！');
this.navCtrl.pop();
}, error => {
this.appService.alert('网络异常！');
}
);
}
//订单确认
orderConform(){
this.navCtrl.push('ActivityConfirmPage',{activity:this.activity,order:this.order});
} }
hidden() { hidden() {
......
src/pages/mine/myActivityList/myActivityList.html
View file @ a5e3f5fa
...@@ -4,18 +4,6 @@ ...@@ -4,18 +4,6 @@
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content class="bgc-e7e8ed"> <ion-content class="bgc-e7e8ed">
<div class="pageMenuSlides">
<div *ngFor="let item of menus;let i=index;" tappable (click)="selectPageMenu(i)">
<span class=" {{swiperIndex == i? 'swiper-title':''}} ">{{item}}</span>
<span *ngIf="i == 1" class="menu-index" >
{{waitgoOrderCount}}
</span>
<span *ngIf="i == 2" class="menu-index">
{{waitsureOrderCount}}
</span>
</div>
</div>
<ng-container *ngIf="swiperIndex == 0">
<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)">
...@@ -28,12 +16,12 @@ ...@@ -28,12 +16,12 @@
<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>
<div class="content-box"> <div class="content-box">
<div class="content-item-box"> <div class="content-item-box">
<label class="left-title">批次名称：</label> <label class="left-title">批次名称：</label>
...@@ -59,118 +47,12 @@ ...@@ -59,118 +47,12 @@
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<button disabled class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消订单</button> <button disabled class="cancel" *ngIf="item.orderstate == 1" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
<button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">修改订单</button> <button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="reelectBatch(item);$event.stopPropagation();">订单确认</button>
<button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">已报名</button>
<button disabled class="cancel" *ngIf="item.orderstate == 2" (click)="joinPeople(item);$event.stopPropagation();">已报名</button>
<button disabled class="reselection" *ngIf="item.orderstate == 2" (click)="evaluation(item);$event.stopPropagation();">确认评价</button>
<button disabled class="reselection" *ngIf="item.orderstate == 3||item.orderstate == 4">查看详情</button>
</div>
</div>
</ion-item>
</ion-list>
</ng-container>
<ng-container *ngIf="swiperIndex == 1">
<ion-list>
<ion-item class="margin-top-10" *ngFor="let item of waitGoOrder">
<div class="item" (click)="goConfirmActivity(item)">
<div class="item-header">
<div class="item-header-style">
<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-px.png" class="icon" *ngIf="item.activity.activityType==3">
<img src="./assets/imgs/icon-gh.png" class="icon" *ngIf="item.activity.activityType==4">
<span class="item-title">{{item.activity.activityName}}</span>
</div>
<button style="border-radius: 4px" ion-button round class="btn color1">待进行</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?.batchEndDate}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">联络人员：</label>
<div class="data">
{{item.batch?.liamand}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">联络电话：</label>
<div class="data">
{{item.batch?.liamantel}}
</div>
</div>
</div>
<div class="right">
<button disabled class="cancel" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="sureCancelOrder(item.orderid);$event.stopPropagation();">取消报名</button>
<button disabled class="reselection" *ngIf="item.orderstate == 1 && !item.showParticipantBtn" (click)="reelectBatch(item);$event.stopPropagation();">重选批次</button>
<button disabled class="cancel" *ngIf="item.orderstate == 1 && item.showParticipantBtn" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
</div>
</div>
</ion-item>
</ion-list>
</ng-container>
<ng-container *ngIf="swiperIndex == 2">
<ion-list>
<ion-item class="margin-top-10" *ngFor="let item of waitSureOrder">
<div class="item" (click)="goConfirmActivity(item)">
<div class="item-header">
<div class="item-header-style">
<!-- <ion-icon name="md-contact" class="icon"></ion-icon> -->
<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-px.png" class="icon" *ngIf="item.activity.activityType==3">
<img src="./assets/imgs/icon-gh.png" class="icon" *ngIf="item.activity.activityType==4">
<span class="item-title">{{item.activity.activityName}}</span>
</div>
<button style="border-radius: 4px" ion-button round class="btn color2">待确认</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?.batchEndDate}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">联络人员：</label>
<div class="data">
{{item.batch?.liamand}}
</div>
</div>
<div class="content-item-box">
<label class="left-title">联络电话：</label>
<div class="data">
{{item.batch?.liamantel}}
</div>
</div>
</div>
<div class="right">
<button class="cancel" (click)="joinPeople(item);$event.stopPropagation();">参与人员</button>
<button class="reselection" (click)="evaluation(item);$event.stopPropagation();">确认评价</button>
</div> </div>
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
</ng-container>
</ion-content> </ion-content>
<div class="cover" *ngIf="isCover"> <div class="cover" *ngIf="isCover">
......
src/pages/mine/myActivityList/myActivityList.scss
View file @ a5e3f5fa
...@@ -134,10 +134,10 @@ page-myActivityList { ...@@ -134,10 +134,10 @@ page-myActivityList {
} }
.reselection{ .reselection{
background-color: #4a89fa; background-color: #19b5ff;
height: 27px; height: 27px;
width: 70px; width: 70px;
// margin-top: 43px; border: 1px solid #19b5ff;
margin-right: 2px; margin-right: 2px;
margin-left: 2px; margin-left: 2px;
border-radius: 2px; border-radius: 2px;
...@@ -145,24 +145,24 @@ page-myActivityList { ...@@ -145,24 +145,24 @@ page-myActivityList {
} }
.cancel{ .cancel{
background-color: white; background-color: #e15c5e;
color: #ffffff;
height: 27px; height: 27px;
width: 70px; width: 70px;
// margin-top: 43px;
margin-right: 2px; margin-right: 2px;
margin-left: 2px; margin-left: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #cccccc border: 1px solid #e15c5e
} }
.color1{ .color1{
border-color: #f3d88a; border-color: #19b5ff;
color: #f3d88a; color: #19b5ff;
} }
.color2{ .color2{
border-color: #8fcde5; border-color: #fdac51;
color: #8fcde5; color: #fdac51;
} }
.color3{ .color3{
......
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