Skip to content

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

问卷

parent 4ac68ec6
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 62 deletions
src/app/app.scss
View file @ 80919d79
......@@ -20,7 +20,9 @@
line-height: 20px;
font-size: 3rem;
}
.bgc-e7e8ed{
background-color: #e7e8ed;
}
.submit-btn{
height: 40px;
margin-bottom: 15px;
......@@ -33,4 +35,10 @@
text-align: center;
white-space: nowrap;
border-radius: 3px;
}
.label-input .text-input{
padding: 5px;
border: 1px solid #ddd;
border-radius: 4px;
height: 35px;
}
\ No newline at end of file
src/pages/activity/activityDetail/activityDetail.ts
View file @ 80919d79
......@@ -42,7 +42,6 @@ export class ActivityDetailPage {
this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id":id})
.subscribe((res :Response) => {
this.activity = res.json();
console.log(this.activity);
this.batchList = this.activity.batchList;
}, error => {
this.appService.alert('网络异常！');
......@@ -60,11 +59,12 @@ export class ActivityDetailPage {
goJoinDetail(){
this.navCtrl.push("JoinDetailPage");
}
this.navCtrl.push("JoinDetailPage");
}
goBatchDetail(){
this.navCtrl.push('BatchDetailPage');
//批次详情
goBatchDetail(item){
this.navCtrl.push('BatchDetailPage',{batch:item});
}
//活动介绍限定65个字符串，多余以省略号代替
......
src/pages/activity/batch-detail/batch-detail.html
View file @ 80919d79
<ion-header>
<ion-navbar>
<ion-title>批次信息</ion-title>
<ion-title>{{batch.batchName}}</ion-title>
</ion-navbar>
<div class="pageMenuSlides">
<div class="swiper-container">
<div class="swiper-wrapper">
<!-- {{i==0?'bottomLine':''}}是初始化的时候默认选择第一个菜单 -->
<div class="swiper-slide" *ngFor="let item of menuList;let i=index;" tappable (click)="selectPageMenu(i)">
<span class=" {{swiperIndex == i? 'swiper-title':''}} ">{{item.name}}</span>
</div>
</div>
</div>
</div>
<!--<div class="pageMenuSlides">-->
<!--<div class="swiper-container">-->
<!--<div class="swiper-wrapper">-->
<!--<div class="swiper-slide" *ngFor="let item of batchList;let i=index;" tappable (click)="selectPageMenu(i)">-->
<!--<span class=" {{swiperIndex == i? 'swiper-title':''}} ">{{item.batchName}}</span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</ion-header>
......@@ -20,17 +19,17 @@
<ion-content>
<ion-slides #contentSlides class="height-190" (ionSlideDidChange)="slideChanged()" >
<ion-slide *ngFor="let item of menuList">
<ion-slide>
<ion-content direction="y" scrollbar-y="true">
<div class="content">
<div class="sign-info">
<div class="sign-info" *ngIf="batch.order">
<p class="info-title">报名信息</p>
<div class="content-item">
<p> <span>携带人数：</span><span>1</span> </p>
<p> <span>报名备注：</span><span>备注</span> </p>
</div>
</div>
<div class="feedback-info">
<div class="feedback-info" *ngIf="batch.order">
<p class="info-title">出行反馈</p>
<div class="content-item">
<p> <span>出行结果：</span><span>1</span> </p>
......@@ -39,7 +38,7 @@
</div>
<div class="batch-info">
<div class="content-item">
<p> <span>报名截止：</span><span>1</span> </p>
<p> <span>报名截止：</span><span>{{this.batch.batchEndDate}}</span> </p>
<p> <span>出行日期：</span><span>备注</span> </p>
<p> <span>可携带人数：</span><span>备注</span> </p>
<p> <span>集合时间：</span><span>备注</span> </p>
......@@ -50,9 +49,24 @@
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc">4/20</span></div>
<div class="button-right" (click)="goApply()">
<span class="button-btn button-btn1">立即报名</span>
<!--<span class="button-btn button-btn2">取消报名</span>-->
<!--<span class="button-btn button-btn3">报名截止</span>-->
<!--时间是否截止->人数是否满了->是否报名了-->
<ng-container *ngIf="batch.signUp">
<!--人数满-->
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
<span class="button-btn button-btn3">立即报名</span>
</ng-container>
<!--人数未满-->
<ng-container *ngIf="batch.hasSignUpCount < batch.batchLimitNumber">
<span *ngIf="!batch.order" class="button-btn button-btn1">立即报名</span>
<span *ngIf="batch.order" class="button-btn button-btn2">取消报名</span>
</ng-container>
</ng-container>
<ng-container *ngIf="!batch.signUp">
<span class="button-btn button-btn3">报名截止</span>
</ng-container>
<!--<span *ngIf="!item.order" class="button-btn button-btn1">立即报名</span> //未报名-->
<!--&lt;!&ndash;<span *ngIf="item.order" class="button-btn button-btn2">取消报名</span>&ndash;&gt; //已报名-->
<!--<span *ngIf="!item.signUp" class="button-btn button-btn3">报名截止</span> //时间截止-->
<!--<span class="button-btn button-btn3">立即报名</span>-->
</div>
</div>
......
src/pages/activity/batch-detail/batch-detail.ts
View file @ 80919d79
......@@ -12,19 +12,29 @@ declare var Swiper;
export class BatchDetailPage {
@ViewChild('contentSlides') contentSlides: Slides;
menuList = [
{name:'批次1',id:'1'},
{name:'批次2',id:'2'},
{name:'批次3',id:'3'},
{name:'批次4',id:'4'},
];
batch={
batchEndDate:'',
signUp:true,
order:null,
batchName:''
};
swiper;
swiperIndex = 0;
constructor(public navCtrl: NavController, public navParams: NavParams) {
}
ionViewDidLoad() {
this.initSwiper();
// this.initSwiper();
let now = new Date().getTime();
this.batch = this.navParams.get('batch');
console.log(this.batch);
let endDate = this.batch.batchEndDate + " 24:00:00";
endDate = new Date(endDate) +""; //判断是否过截止日期
if( now > Number(endDate) ){
this.batch.signUp = false;
}else{
this.batch.signUp = true;
}
}
initSwiper(){
......
src/pages/surveyManage/item/create/create.html
View file @ 80919d79
......@@ -7,12 +7,69 @@
<ion-header>
<ion-navbar>
<ion-title>{{qType}}</ion-title>
<ion-title *ngIf="qType == 1">判断题</ion-title>
<ion-title *ngIf="qType == 2">单选题</ion-title>
<ion-title *ngIf="qType == 3">多选题</ion-title>
<ion-title *ngIf="qType == 4">问答题</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<ion-content>
<ion-list>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>标题</ion-label>
<ion-input type="text" placeholder="请输入标题"></ion-input>
</ion-item>
<div class="create-content" *ngIf="qType != 4 && qType != 1">
<p>选项</p>
<ion-item *ngFor="let item of optionList;let i = index;">
<span (click)="removeOption(i)" class="color-red">-</span>
<input type="text" [(ngModel)]="item.desc" placeholder="请输入选项">
<ion-icon float-right ios="ios-more" md="md-more"></ion-icon>
</ion-item>
<p (click)="addOption()"><span>+</span>添加选项</p>
</div>
<div class="create-set">
<p>设置</p>
<!--问答题-->
<ng-container *ngIf="qType == 4">
<ion-item>
<ion-label>字数限制</ion-label>
<ion-select [(ngModel)]="set.more">
<ion-option value="1">1</ion-option>
<ion-option value="2">2</ion-option>
<ion-option value="3">3</ion-option>
</ion-select>
</ion-item>
</ng-container>
<ion-item>
<ion-label color="primary">必须回答</ion-label>
<ion-toggle checked="false"></ion-toggle>
</ion-item>
<!--多选题-->
<ng-container *ngIf="qType == 3">
<ion-item>
<ion-label>最少选择</ion-label>
<ion-select [(ngModel)]="lastchange">
<ion-option value="1">1</ion-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label>最多选择</ion-label>
<ion-select [(ngModel)]="morechange">
<ion-option value="1">1</ion-option>
<ion-option value="2">2</ion-option>
<ion-option value="3">3</ion-option>
</ion-select>
</ion-item>
</ng-container>
</div>
</ion-list>
<button class="submit-btn submit" (click)="submit()">确认</button>
</ion-content>
src/pages/surveyManage/item/create/create.scss
View file @ 80919d79
page-create {
.submit{
background-color: #24bafc;
}
}
src/pages/surveyManage/item/create/create.ts
View file @ 80919d79
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {EditPage} from "../edit/edit";
/**
* Generated class for the CreatePage page.
......@@ -15,7 +16,17 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class CreatePage {
qType
qType; //题目类型
lastchange;
morechange;
set:{ //设置
lastchange:'1',
morechange:'1',
isAns :''
};
optionList = [ //选项
{ desc:'' }
]
constructor(public navCtrl: NavController, public navParams: NavParams) {
}
......@@ -24,4 +35,17 @@ export class CreatePage {
console.log(this.qType);
}
addOption(){
const option = { desc:'' };
this.optionList.push(option);
}
removeOption(i){
this.optionList.splice(i,1);
}
submit(){
this.navCtrl.push('EditPage');
}
}
src/pages/surveyManage/item/desicr/desicr.html
View file @ 80919d79
......@@ -7,18 +7,18 @@
</ion-header>
<ion-content padding>
<ion-content>
<ion-list>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>问卷标题</ion-label>
<ion-input type="password" placeholder="请输入标题"></ion-input>
<ion-label stacked><span class="color-red">*</span>问卷标题</ion-label>
<ion-input class="label-input" type="password" placeholder="请输入标题"></ion-input>
</ion-item>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>参与用户组</ion-label>
<span>选择用户组 </span>
<span><span class="color-red">*</span>参与用户组</span>
<span (click)="selectPerson()" class="color-666" style="font-size: 1.5rem" float-right>选择用户组 <ion-icon style="vertical-align: text-bottom;" ios="ios-arrow-forward" md="md-arrow-forward"></ion-icon> </span>
</ion-item>
<ion-item>
<ion-label color="primary" stacked><span class="color-red">*</span>问卷说明</ion-label>
<ion-label stacked><span class="color-red">*</span>问卷说明</ion-label>
<ion-textarea></ion-textarea>
</ion-item>
</ion-list>
......
src/pages/surveyManage/item/desicr/desicr.scss
View file @ 80919d79
......@@ -2,4 +2,18 @@ page-desicr {
.submit{
background-color: #24bafc;
}
.list-ios .item-block .item-inner,
.list-ios > .item-block:first-child,
.list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
border: none;
}
.label-ios + ion-textarea .text-input{
padding: 10px;
min-height: 100px;
border: 1px solid #ddd;
border-radius: 4px;
}
.label-ios[stacked]{
font-size: 1.5rem;
}
}
src/pages/surveyManage/item/desicr/desicr.ts
View file @ 80919d79
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
import {EditPage} from "../edit/edit";
import {PersonPage} from "../../modal/person/person";
/**
* Generated class for the DesicrPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@IonicPage()
@Component({
......@@ -16,7 +11,8 @@ import {EditPage} from "../edit/edit";
})
export class DesicrPage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
constructor(public navCtrl: NavController, public navParams: NavParams,
public modalCtrl: ModalController) {
}
ionViewDidLoad() {
......@@ -27,4 +23,9 @@ export class DesicrPage {
this.navCtrl.push('EditPage');
}
selectPerson(){
let modal = this.modalCtrl.create(PersonPage);
modal.present();
}
}
src/pages/surveyManage/item/select-type/select-type.html
View file @ 80919d79
......@@ -9,9 +9,9 @@
<ion-content padding>
<p>请选择需要添加的题型</p>
<div>
<p><button class="submit-btn submit" (click)="select('判断题')">判断题</button></p>
<p><button class="submit-btn submit" (click)="select('单选题')">单选题</button></p>
<p><button class="submit-btn submit" (click)="select('多选题')">多选题</button></p>
<p><button class="submit-btn submit" (click)="select('问答题')">问答题</button></p>
<p><button class="submit-btn submit" (click)="select(1)">判断题</button></p>
<p><button class="submit-btn submit" (click)="select(2)">单选题</button></p>
<p><button class="submit-btn submit" (click)="select(3)">多选题</button></p>
<p><button class="submit-btn submit" (click)="select(4)">问答题</button></p>
</div>
</ion-content>
src/pages/surveyManage/list/list.html
View file @ 80919d79
......@@ -18,16 +18,48 @@
</ion-header>
<ion-content padding>
<ion-content>
<ion-slides #contentSlides class="height-190" (ionSlideDidChange)="slideChanged()" >
<ion-slide *ngFor="let item of menuList">
<ion-content direction="y" scrollbar-y="true">
<ion-content direction="y" scrollbar-y="true" class="bgc-e7e8ed">
<ion-list>
<ion-item>
<ion-item class="item-list">
<div class="item" (click)="showOpra(item)">
<div class="item-header">
<div class="item-header-style">
<span class="item-title">{{item.activityName}}</span>
<span class="item-title">疗休养调查</span>
</div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">未发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已过期</button>
</div>
<div class="content-button">
<span>参与人员:</span>
<span>最新批次名称</span>
</div>
</div>
</ion-item>
<ion-item class="item-list">
<div class="item" (click)="showOpra(item)">
<div class="item-header">
<div class="item-header-style">
<span class="item-title">疗休养调查</span>
</div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">未发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已过期</button>
</div>
<div class="content-button">
<span>参与人员:</span>
<span>最新批次名称</span>
</div>
</div>
</ion-item>
<ion-item class="item-list">
<div class="item" (click)="showOpra(item)">
<div class="item-header">
<div class="item-header-style">
<span class="item-title">疗休养调查</span>
</div>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">未发布</button>
<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">已发布</button>
......@@ -37,8 +69,6 @@
<span>参与人员:</span>
<span>最新批次名称</span>
</div>
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length>0 " (click)="goDetail(item);$event.stopPropagation();">查看</button>-->
<!--<button class="sign-up" *ngIf="item.activityState==2 && item.orderList.length==0 " (click)="goApply(item);$event.stopPropagation();">报名</button>-->
</div>
</ion-item>
</ion-list>
......
src/pages/surveyManage/list/list.scss
View file @ 80919d79
......@@ -33,9 +33,31 @@ page-list {
left: 0px;
}
}
.item-list{
margin-top: 10px;
}
.slide-zoom{
height: 100%;
}
.list-ios .item-block .item-inner,
.list-ios > .item-block:first-child,
.list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
border: none;
}
.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;
}
.item-header{
border-bottom: 1px solid #ddd;
}
.item-header,.content-button{
padding: 10px 0;
}
.footter-opr{
display: flex;
flex-direction: row;
......
src/pages/surveyManage/list/list.ts
View file @ 80919d79
......@@ -15,9 +15,9 @@ declare var Swiper;
export class ListPage {
@ViewChild('contentSlides') contentSlides :Slides;
menuList = [
{name:'草稿箱',id:'1',item:''},
{name:'已发布',id:'2',item:''},
{name:'已过期',id:'3',item:''},
{name:'草稿箱',id:'1',itemList:[{one:''},{one:''},{one:''},{one:''},]},
{name:'已发布',id:'2',itemList:[{one:''},{one:''},{one:''},{one:''},]},
{name:'已过期',id:'3',itemList:[{one:''},{one:''},{one:''},{one:''},]},
];
showOp = false;
swiperIndex;
......
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