活动

src/app/app.module.ts

@@ -20,14 +20,12 @@ import { File } from '@ionic-native/file';
 import { Keyboard } from '@ionic-native/keyboard';
 import { Badge } from "@ionic-native/badge";
 import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
-import {SelectTypePage} from "../pages/surveyManage/modal/select-type/select-type";
 import { PersonPage } from "../pages/surveyManage/modal/person/person";
 
 @NgModule({
   declarations: [
     MyApp,
       ContactModalPage,
-      SelectTypePage,
       PersonPage
   ],
   imports: [
@@ -51,7 +49,6 @@ import { PersonPage } from "../pages/surveyManage/modal/person/person";
   entryComponents: [
     MyApp,
       ContactModalPage,
-      SelectTypePage,
       PersonPage
   ],
   providers: [

src/pages/activity/activityDetail/activityDetail.html

@@ -46,8 +46,11 @@
 					<p>
 						<span class="color-666">批次名称:</span>
 						<span>{{batch.batchName}}</span>
-						<span class="activity-btn2" float-right>已报名</span>
-						<span *ngIf="" class="activity-btn2" float-right>已满员</span>
+						<span *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber">
+							<span class="activity-btn2" *ngIf="batch.order" float-right>已报名</span>
+							<span class="activity-btn2" *ngIf="!batch.order" float-right>未报名</span>
+						</span>
+						<span *ngIf="batch.hasSignUpCount == batch.batchLimitNumber" class="activity-btn2" float-right>已满员</span>
 					</p>
 					<p>
 						<span class="color-666">截止时间:</span>

src/pages/surveyManage/item/create/create.html

@@ -7,7 +7,7 @@
 <ion-header>
 
   <ion-navbar>
-    <ion-title>单选题</ion-title>
+    <ion-title>{{qType}}</ion-title>
   </ion-navbar>
 
 </ion-header>

src/pages/surveyManage/item/create/create.ts

@@ -15,11 +15,13 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class CreatePage {
 
+  qType
   constructor(public navCtrl: NavController, public navParams: NavParams) {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad CreatePage');
+    this.qType = this.navParams.get('type');
+    console.log(this.qType);
   }
 
 }

src/pages/surveyManage/item/desicr/desicr.html

-<!--
-  Generated template for the DesicrPage page.
-
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <ion-header>
 
   <ion-navbar>
@@ -20,6 +14,10 @@
       <ion-input type="password" placeholder="请输入标题"></ion-input>
     </ion-item>
     <ion-item>
+      <ion-label color="primary" stacked><span class="color-red">*</span>参与用户组</ion-label>
+     <span>选择用户组  </span>
+    </ion-item>
+    <ion-item>
       <ion-label color="primary" stacked><span class="color-red">*</span>问卷说明</ion-label>
      <ion-textarea></ion-textarea>
     </ion-item>

src/pages/surveyManage/item/edit/edit.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams,ModalController } from 'ionic-angular';
-import {SelectTypePage} from "../../modal/select-type/select-type";
+import {SelectTypePage} from "../select-type/select-type";
 
 @IonicPage()
 @Component({
@@ -19,8 +19,7 @@ export class EditPage {
 
   //添加题目
     add(){
-      let typeModal = this.modalCtrl.create(SelectTypePage);
-      typeModal.present();
+     this.navCtrl.push('SelectTypePage')
     }
 
 }

src/pages/surveyManage/item/select-type/select-type.html

+
+<ion-header>
+  <ion-navbar>
+    <ion-title>选择题型</ion-title>
+  </ion-navbar>
+</ion-header>
+
+
+<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>
+  </div>
+</ion-content>

src/pages/surveyManage/item/select-type/select-type.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { SelectTypePage } from './select-type';
+
+@NgModule({
+  declarations: [
+    SelectTypePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SelectTypePage),
+  ],
+})
+export class SelectTypePageModule {}

src/pages/surveyManage/modal/select-type/select-type.ts → src/pages/surveyManage/item/select-type/select-type.ts

 import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams, ViewController } from 'ionic-angular';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {CreatePage} from "../create/create";
 
+/**
+ * Generated class for the SelectTypePage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
 
+@IonicPage()
 @Component({
   selector: 'page-select-type',
   templateUrl: 'select-type.html',
 })
 export class SelectTypePage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams,
-              public viewCtrl: ViewController) {
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
   }
 
   ionViewDidLoad() {
     console.log('ionViewDidLoad SelectTypePage');
   }
 
-    dismiss() {
-        let data = { 'foo': 'bar' };
-        this.viewCtrl.dismiss(data);
+    select(type){
+      this.navCtrl.push('CreatePage',{'type':type});
     }
 
 }

src/pages/surveyManage/modal/select-type/select-type.html

-
-<ion-header>
-  <ion-navbar>
-    <ion-title>选择题型</ion-title>
-    <ion-buttons start>
-      <button ion-button (click)="dismiss()">
-        <span ion-text color="primary" showWhen="ios">取消</span>
-        <ion-icon name="md-close" showWhen="android,windows"></ion-icon>
-      </button>
-    </ion-buttons>
-  </ion-navbar>
-</ion-header>
-
-
-<ion-content padding>
-
-</ion-content>