Skip to content

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

color

parent 4815ec39
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 200 deletions
src/pages/activity/activityConfirm/activityConfirm.html
View file @ a5e3f5fa
......@@ -6,37 +6,40 @@
<ion-content class="content">
<div class="content-container">
<ion-item class="content-title">
<ion-label>活动名称</ion-label>
<span>活动名称</span>
<span float-right>{{activity?.activityName}}</span>
</ion-item>
<ion-item>
<span>选择批次</span>
<span float-right></span>
<span class="padding-left-16">选择批次</span>
<span float-right>{{batch?.batchName}}</span>
</ion-item>
<div class="confirm-item margin-top-10">
<ion-label>出行结果</ion-label>
<div class="confirm-type">
<span class="{{order.orderstate == 1? 'selected':''}}" (click)="changeType(1)">成功出行</span>
<span class="{{order.orderstate == 2? 'selected':''}}" (click)="changeType(2)">未出行</span>
<span class="{{order.orderstate == 4? 'selected':''}}" (click)="changeType(4)">成功出行</span>
<span class="{{order.orderstate == 3? 'selected':''}}" (click)="changeType(3)">未出行</span>
</div>
</div>
<div class="margin-top-10 confirm-item">
<ion-label>评价反馈</ion-label>
<button class="submit-btn submit1">非常满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit2">满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit3">一般
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button class="submit-btn submit4">不满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
</div>
<ng-container *ngIf="order.orderstate == 4">
<div class="margin-top-10 confirm-item">
<ion-label>评价反馈</ion-label>
<button (click)="selectLevel(4)" class="submit-btn submit1">非常满意
<ion-icon *ngIf="orderStatisfyLevel == 4" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button (click)="selectLevel(3)" class="submit-btn submit2">满意
<ion-icon *ngIf="orderStatisfyLevel == 3" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button (click)="selectLevel(2)" class="submit-btn submit3">一般
<ion-icon *ngIf="orderStatisfyLevel == 2" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
<button (click)="selectLevel(1)" class="submit-btn submit4">不满意
<ion-icon *ngIf="orderStatisfyLevel == 1" ios="ios-checkmark" md="md-checkmark"></ion-icon>
</button>
</div>
</ng-container>
</div>
<button class="submit-btn submit" (click)="submitOrder()">提交确认</button>
<button class="submit-btn submit" (click)="commit()">提交确认</button>
</ion-content>
<!--<ion-header>-->
<!--<ion-toolbar>-->
......
src/pages/activity/activityConfirm/activityConfirm.scss
View file @ a5e3f5fa
......@@ -14,6 +14,7 @@ page-activityConfirm {
.content-container{
background-color: #fff;
padding-bottom: 20px;
}
.item1{
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ a5e3f5fa
......@@ -4,6 +4,7 @@ import {ActivityApplyPage} from "../activityApply/activityApply";
import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService";
import { DomSanitizer } from "@angular/platform-browser";
import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
declare var Swiper;
@IonicPage()
......@@ -113,4 +114,5 @@ export class BatchDetailPage {
);
}
}
src/pages/activity/order-detail/order-detail.html
View file @ a5e3f5fa
......@@ -6,45 +6,40 @@
<ion-content class="content">
<div class="content">
<div class="sign-info">
<p class="info-title">报名信息</p>
<p class="info-title">活动名称:{{activity?.activityName}}</p>
<div class="content-item">
<p> <span>携带人数：</span><span>{{order?.personnumber}}</span> </p>
<p> <span>报名备注：</span><span>{{order?.orderfgconent}}</span> </p>
<p>{{activity?.activityIntro}}</p>
</div>
</div>
<div class="feedback-info">
<p class="info-title">出行反馈</p>
<div class="sign-info">
<p class="info-title">报名信息</p>
<div class="content-item">
<p>
<span>出行结果：</span>
<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>
<p><span>携带人数：</span><span>{{order?.personnumber}}</span></p>
<p><span>报名备注：</span><span>{{order?.orderbz}}</span></p>
</div>
</div>
<div class="batch-info">
<p class="info-title">批次:{{batch?.batchName}}</p>
<div class="content-item">
<p> <span>报名截止：</span><span>{{batch?.batchEndDate}}</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?.batchSetAddress}}</span> </p>
<p> <span>活动须知：</span><span>{{batch?.batchNotice}}</span> </p>
<p><span>报名截止：</span><span>{{batch?.batchEndDate}}</span></p>
<p><span>出行日期：</span><span>{{batch?.batchGoDate}}</span></p>
<p><span>集合时间：</span><span>{{batch?.batchSetTime}}</span></p>
<p><span>集合地点：</span><span>{{batch?.batchSetAddress}}</span></p>
<p><span>活动须知：</span><span>{{batch?.batchNotice}}</span></p>
</div>
</div>
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span></div>
<div class="button-right" >
<!--时间是否截止->人数是否满了->是否报名了-->
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span>
</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>
......
src/pages/activity/order-detail/order-detail.ts
View file @ a5e3f5fa
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {Response} from "@angular/http";
import {AppService} from "../../../service/appHttpService";
@IonicPage()
@Component({
selector: 'page-order-detail',
templateUrl: 'order-detail.html',
selector: 'page-order-detail',
templateUrl: 'order-detail.html',
})
export class OrderDetailPage {
order; //订单信息
activity = {
activityName:'',
activityIntro:''
}; //活动
batch; //批次
order = {
orderstate: '',
orderpjlevel: '',
}; //订单信息
activity = {
activityName: '',
activityIntro: ''
}; //活动
batch; //批次
isCover = false;
isIntroduce = false;
constructor(public navCtrl: NavController, public navParams: NavParams) {
}
ionViewDidLoad() {
this.order = this.navParams.get('item');
this.activity = this.navParams.get('item').activity;
this.batch = this.navParams.get('item').batch;
console.log(this.navParams.get('item'));
}
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService) {
}
ionViewDidEnter() {
this.order = this.navParams.get('item');
this.activity = this.navParams.get('item').activity;
this.batch = this.navParams.get('item').batch;
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() {
this.isCover = false;
......
src/pages/mine/myActivityList/myActivityList.html
View file @ a5e3f5fa
......@@ -4,18 +4,6 @@
</ion-navbar>
</ion-header>
<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-item *ngFor="let item of allOrder" class="margin-top-10">
<div class="item" (click)="goConfirmActivity(item)">
......@@ -28,12 +16,12 @@
<span class="item-title">{{item.activity.activityName}}</span>
</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 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>
</div>
<div class="content-box">
<div class="content-item-box">
<label class="left-title">批次名称：</label>
......@@ -59,118 +47,12 @@
</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>
<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>
<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>
</ng-container>
</ion-content>
<div class="cover" *ngIf="isCover">
......
src/pages/mine/myActivityList/myActivityList.scss
View file @ a5e3f5fa
......@@ -134,10 +134,10 @@ page-myActivityList {
}
.reselection{
background-color: #4a89fa;
background-color: #19b5ff;
height: 27px;
width: 70px;
// margin-top: 43px;
border: 1px solid #19b5ff;
margin-right: 2px;
margin-left: 2px;
border-radius: 2px;
......@@ -145,24 +145,24 @@ page-myActivityList {
}
.cancel{
background-color: white;
background-color: #e15c5e;
color: #ffffff;
height: 27px;
width: 70px;
// margin-top: 43px;
margin-right: 2px;
margin-left: 2px;
border-radius: 2px;
border: 1px solid #cccccc
border: 1px solid #e15c5e
}
.color1{
border-color: #f3d88a;
color: #f3d88a;
border-color: #19b5ff;
color: #19b5ff;
}
.color2{
border-color: #8fcde5;
color: #8fcde5;
border-color: #fdac51;
color: #fdac51;
}
.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