Skip to content

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

日历

parent a01da16d
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 54 deletions
src/pages/activity-track/activityTrack/activityTrack.ts
View file @ f887ebde
...@@ -33,7 +33,7 @@ export class ActivityTrackPage { ...@@ -33,7 +33,7 @@ export class ActivityTrackPage {
} }
goDetail(item) { goDetail(item) {
this.navCtrl.push("JoinDetailPage",{id:item.id}); this.navCtrl.push("JoinDetailPage",{id:item.id,name:item.activityName});
} }
goBack(){ goBack(){
......
src/pages/activity-track/joinDetail/joinDetail.html
View file @ f887ebde
...@@ -5,31 +5,25 @@ ...@@ -5,31 +5,25 @@
</ion-header> </ion-header>
<ion-content class="content"> <ion-content class="content">
<div class="activity-title"> <div class="activity-title">
2018年体检活动处级以下 {{this.acitivityName}}
</div> </div>
<div class="content-box"> <div class="content-box">
<div class="content-box-item {{type == '1'?'bgc-34b4fc':''}} " (click)="noSign()"> <div class="content-box-item {{type == '1'?'bgc-34b4fc':''}} " (click)="noSign()">
<span class="item-title">未报名</span> <span class="item-title">全部</span>
<span class="item-count">{{notSign}}人</span> <span class="item-count">{{notSign}}人</span>
</div> </div>
<div class="content-box-item {{type == '2'?'bgc-34b4fc':''}}" (click)="hasSign()"> <div class="content-box-item {{type == '2'?'bgc-34b4fc':''}}" (click)="noSign()">
<span class="item-title">已报名</span> <span class="item-title">未报名</span>
<span class="item-count">{{waitgoOrder}}人</span> <span class="item-count">{{waitgoOrder}}人</span>
</div> </div>
<div class="content-box-item {{type == '3'?'bgc-34b4fc':''}}" (click)="waitSure()"> <div class="content-box-item {{type == '3'?'bgc-34b4fc':''}}" (click)="sign()">
<span class="item-title">待确认</span> <span class="item-title">已报名</span>
<span class="item-count">{{waitSureOrder}}人</span> <span class="item-count">{{waitSureOrder}}人</span>
</div> </div>
</div> <div class="content-box-item {{type == '4'?'bgc-34b4fc':''}}" (click)="notJoin()">
<div class="content-box"> <span class="item-title">不参加</span>
<div class="content-box-item {{type == '4'?'bgc-34b4fc':''}}" (click)="hasgo()"> <span class="item-count">{{waitSureOrder}}人</span>
<span class="item-title">已出行</span>
<span class="item-count">{{hasgoOrder}}人</span>
</div>
<div class="content-box-item {{type == '5'?'bgc-34b4fc':''}}" (click)="notgo()">
<span class="item-title">未出行</span>
<span class="item-count">{{notgoOrder}}人</span>
</div> </div>
</div> </div>
...@@ -41,7 +35,7 @@ ...@@ -41,7 +35,7 @@
<img *ngIf="item.user?.gender == '1'||item.user?.gender == null" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item.user?.gender == '1'||item.user?.gender == null" src="./assets/imgs/head.png" class="person-photo">
<img *ngIf="item.user?.gender == '0'" src="./assets/imgs/head.png" class="person-photo"> <img *ngIf="item.user?.gender == '0'" src="./assets/imgs/head.png" class="person-photo">
<div class="item-box"> <div class="item-box">
<p class="person-name">{{item.username}} <p class="person-name">{{item.userName}}
<ion-icon class="person-sex-male" *ngIf="item.user?.gender == '1'||item.user?.gender == null" name="male"></ion-icon> <ion-icon class="person-sex-male" *ngIf="item.user?.gender == '1'||item.user?.gender == null" name="male"></ion-icon>
<ion-icon class="person-sex-female" *ngIf="item.user?.gender == '0'" name="female"></ion-icon> <ion-icon class="person-sex-female" *ngIf="item.user?.gender == '0'" name="female"></ion-icon>
</p> </p>
......
src/pages/activity-track/joinDetail/joinDetail.ts
View file @ f887ebde
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 } from '../../../service/appHttpService'; import {AppService} from '../../../service/appHttpService';
import { ActivityStatisticService } from '../../../service/activityStatisticService'; import {ActivityStatisticService} from '../../../service/activityStatisticService';
import {ReplaceApplyPage} from "../replace-apply/replace-apply"; import {ReplaceApplyPage} from "../replace-apply/replace-apply";
@IonicPage() @IonicPage()
...@@ -14,26 +14,27 @@ import {ReplaceApplyPage} from "../replace-apply/replace-apply"; ...@@ -14,26 +14,27 @@ import {ReplaceApplyPage} from "../replace-apply/replace-apply";
}) })
export class JoinDetailPage { export class JoinDetailPage {
items:object[]; items: object[];
users:object[]; users: object[];
isNoSignFlag:boolean = false; isNoSignFlag: boolean = false;
acitivityid:string; acitivityid: string;
acitivityName: string;
type = '1'; type = '1';
//待出行 //待出行
waitgoOrder:number; waitgoOrder: number;
//待确认 //待确认
waitSureOrder:number; waitSureOrder: number;
//未出行 //未出行
notgoOrder:number; notgoOrder: number;
//已出行 //已出行
hasgoOrder:number; hasgoOrder: number;
//未报名 //未报名
notSign:number; notSign: number;
constructor(public navCtrl: NavController, constructor(public navCtrl: NavController,
public navParams: NavParams, public navParams: NavParams,
...@@ -44,21 +45,22 @@ export class JoinDetailPage { ...@@ -44,21 +45,22 @@ export class JoinDetailPage {
public activityStatisticService: ActivityStatisticService) { public activityStatisticService: ActivityStatisticService) {
} }
ionViewDidEnter(){
ionViewDidEnter() {
/** 订单状态 （1.待出行(已报名)、2.待确认（已报名未确认）、3.报名未出行、4.已完成 （3，4均为确认状态））*/ /** 订单状态 （1.待出行(已报名)、2.待确认（已报名未确认）、3.报名未出行、4.已完成 （3，4均为确认状态））*/
this.acitivityid = this.navParams.get("id"); //活动id this.acitivityid = this.navParams.get("id"); //活动id
this.acitivityName = this.navParams.get("name"); //活动名称
//初始化加载未报备 //初始化加载未报备
this.items = []; this.items = [];
//this.role = this.navParams.get("role");
this.activityStatisticService.activityOrderCount(this.acitivityid,(data) => { this.activityStatisticService.activityOrderCount(this.acitivityid, (data) => {
this.waitgoOrder = data["waitgoOrder"]; this.waitgoOrder = data["waitgoOrder"];
this.waitSureOrder = data["waitSureOrder"]; this.waitSureOrder = data["waitSureOrder"];
this.notgoOrder = data["notgoOrder"]; this.notgoOrder = data["notgoOrder"];
this.hasgoOrder = data["hasgoOrder"]; this.hasgoOrder = data["hasgoOrder"];
}); });
this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/notSignActivityList",{activityid:this.acitivityid}) this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activity/signAll/", this.acitivityid)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let resultback = res.json(); let resultback = res.json();
this.items = resultback; this.items = resultback;
...@@ -71,11 +73,14 @@ export class JoinDetailPage { ...@@ -71,11 +73,14 @@ export class JoinDetailPage {
} }
conmon(state_value){ conmon(state_value) {
this.isNoSignFlag = true; this.isNoSignFlag = true;
this.items = []; this.items = [];
this.appService.ObserverHttpPost("/wisdomgroup/modules/order/orderWaitGoWithActivityid",{id:this.acitivityid,state:state_value}) this.appService.ObserverHttpPost("/wisdomgroup/modules/order/orderWaitGoWithActivityid", {
id: this.acitivityid,
state: state_value
})
.subscribe((res: Response) => { .subscribe((res: Response) => {
let resultback = res.json(); let resultback = res.json();
this.items = resultback; this.items = resultback;
...@@ -87,35 +92,63 @@ export class JoinDetailPage { ...@@ -87,35 +92,63 @@ export class JoinDetailPage {
} }
//报名待出行 //报名待出行
hasSign(){ hasSign() {
this.type = '2'; this.type = '2';
this.conmon(1); this.conmon(1);
} }
//待确认 //待确认
waitSure(){ waitSure() {
this.type = '3'; this.type = '3';
this.conmon(2); this.conmon(2);
} }
//不参加
notJoin() {
this.isNoSignFlag = true;
this.type = '4';
this.appService.ObserverHttpGet("/wisdomgroup/modules/activityNon", null)
.subscribe((res: Response) => {
this.items = res.json().data;
}, error => {
this.appService.alert('网络异常！');
}
);
}
//已确认未出行 //已确认未出行
notgo(){ notgo() {
this.type = '5'; this.type = '5';
this.conmon(3); this.conmon(3);
} }
//已确认出行 //已确认出行
hasgo(){ hasgo() {
this.type = '4'; this.type = '4';
this.conmon(4); this.conmon(4);
} }
//未报名 //未报名
noSign(){ noSign() {
this.type = '1'; this.type = '2';
this.items = [];
this.isNoSignFlag = false;
this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/notSignActivityList", {activityid: this.acitivityid})
.subscribe((res: Response) => {
let resultback = res.json();
this.items = resultback;
}, error => {
this.appService.alert('网络异常！');
}
);
}
//已报名
sign() {
this.type = '3';
this.items = []; this.items = [];
this.isNoSignFlag = false; this.isNoSignFlag = false;
this.appService.ObserverHttpPost("/wisdomgroup/modules/activity/notSignActivityList",{activityid:this.acitivityid}) this.appService.ObserverHttpGetAdd("/wisdomgroup/modules/activity/signActivityList/", this.acitivityid)
.subscribe((res: Response) => { .subscribe((res: Response) => {
let resultback = res.json(); let resultback = res.json();
this.items = resultback; this.items = resultback;
...@@ -126,13 +159,13 @@ export class JoinDetailPage { ...@@ -126,13 +159,13 @@ export class JoinDetailPage {
} }
//代报名 //代报名
goSignUp(item){ goSignUp(item) {
this.navCtrl.push('ReplaceApplyPage',{id:this.acitivityid,personInfo:item}) this.navCtrl.push('ReplaceApplyPage', {id: this.acitivityid, personInfo: item})
} }
//不参加 //不参加
sayNo(item){ sayNo(item) {
this.appService.ObserverHttpPost("/wisdomgroup/modules/activityNon/",item.id) this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/", item.id)
.subscribe((res: Response) => { .subscribe((res: Response) => {
}, error => { }, error => {
......
src/pages/tabs/home/home.html
View file @ f887ebde
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
<img src="./assets/imgs/home/icon-bbgz.png" alt=""> <img src="./assets/imgs/home/icon-bbgz.png" alt="">
<label class="label2-2">报备跟踪</label> <label class="label2-2">报备跟踪</label>
</div> </div>
<div class="card" (click)="goToSurveyManage()"> <div class="card" (click)="goToMySurvey()">
<img src="./assets/imgs/home/icon-wjgl.png" alt=""> <img src="./assets/imgs/home/icon-wjtc.png" alt="">
<label class="label2-2 more2-2">问卷管理</label> <label class="label2-2 more2-2">问卷调查</label>
</div> </div>
<div class="card" (click)="gotoMore()"> <div class="card" (click)="gotoMore()">
<img src="./assets/imgs/home/icon-more.png" alt=""> <img src="./assets/imgs/home/icon-more.png" alt="">
......
src/pages/tabs/home/home.scss
View file @ f887ebde
...@@ -310,7 +310,7 @@ page-home { ...@@ -310,7 +310,7 @@ page-home {
content: ''; content: '';
position: absolute; position: absolute;
top: 23%; top: 23%;
left: -10px; left: -11px;
width:8px; width:8px;
height:8px; height:8px;
border-radius:50%; border-radius:50%;
......
src/pages/tabs/home/home.ts
View file @ f887ebde
...@@ -280,6 +280,11 @@ export class HomePage { ...@@ -280,6 +280,11 @@ export class HomePage {
}); });
} }
//问卷调查
goToMySurvey(){
this.navCtrl.push('MySurveyPage');
}
goDuty(){ goDuty(){
this.navCtrl.push("DutyPage"); this.navCtrl.push("DutyPage");
} }
......
src/pages/tabs/mine/mine.scss
View file @ f887ebde
page-mine { page-mine {
.mine-header{ .mine-header{
background-color: #2eb4fc; background-color: #34b4fc;
padding: 25px 16px padding: 25px 16px
} }
...@@ -100,7 +100,7 @@ page-mine { ...@@ -100,7 +100,7 @@ page-mine {
height: 15px; height: 15px;
} }
.list-ios .item-block .item-inner { .list-ios .item-block .item-inner {
border-bottom: 0.55px solid #c8c7cc !important; border-bottom: 0.55px solid #dddddd !important;
} }
......
src/service/appHttpService.ts
View file @ f887ebde
...@@ -134,6 +134,18 @@ export class AppService { ...@@ -134,6 +134,18 @@ export class AppService {
}) })
} }
ObserverHttpPostAdd(url, params) {
// return this.http.post(AppGlobal.domain+url,params,{ //app
return this.http.post(url+ params, { //本地
headers: new Headers({
// "Accept": "application/json",
"Content-Type": "application/json"
// 'Content-Type':'application/x-www-form-urlencoded,charset=UTF-8'
})
})
}
ObserverHttpPostOption(url,data) { ObserverHttpPostOption(url,data) {
// return this.http.post(AppGlobal.domain+url,null,{ //app // return this.http.post(AppGlobal.domain+url,null,{ //app
return this.http.post(url, null,{ return this.http.post(url, null,{
......
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