color

src/pages/activity/activityDetail/activityDetail.html

@@ -56,8 +56,7 @@
                                     <span class="activity-btn2" float-right>已满员</span>
                                 </ng-container>
                             </ng-container>
-
-							<ng-container *ngIf="! batch.signUp">
+                            <ng-container *ngIf="!batch.signUp">
                                 <span class="activity-btn2" float-right>已截止</span>
                             </ng-container>
                         </ng-container>
@@ -66,7 +65,8 @@
                     <p>
                         <span class="color-666">截止时间:</span>
                         <span>{{batch.batchEndDate}}</span>
-						<span class="color-24bafc" float-right>{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span>
+                        <span class="color-24bafc"
+                              float-right>{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span>
                     </p>
                 </div>
             </ion-item>

src/pages/home/more-app/more-app.ts

@@ -5,6 +5,7 @@ import {ChangeApplyListPage} from "../../manageDuty/change-apply-list/change-app
 import { MySurveyPage } from "../../mine/mySurvey/my-survey/my-survey";
 import {Response} from "@angular/http";
 import {AppService} from "../../../service/appHttpService";
+import {SurveryPage} from "../../mine/mySurvey/survery/survery";
 
 
 @IonicPage()
@@ -67,7 +68,7 @@ export class MoreAppPage {
     }
 
     goToMySurvey(){
-        this.navCtrl.push('MySurveyPage');
+        this.navCtrl.push('SurveryPage');
     }
 
     goActivityTrack(){

src/pages/mine/mySurvey/my-survey/my-survey.ts

@@ -17,14 +17,19 @@ export class MySurveyPage {
     userId;
     list = [];
     constructor(public navCtrl: NavController, public navParams: NavParams,
-              public appService: AppService,public storage: Storage) {
-  }
+              public appService: AppService,public storage: Storage) {}
 
   ionViewDidEnter() {
     this.storage.get("user").then((res)=>{
         this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/question/findQuesByUserId/',res.id)
             .subscribe((res)=>{
-              this.list = res.json().datalist;
+                this.list = [];
+                const data = res.json().datalist;
+              data.forEach((res)=>{
+                  if(res.isAnsNum != 0){
+                      this.list.push(res);
+                  }
+              })
             })
     });
    // this.getSurveyList()

src/pages/mine/mySurvey/survery/survery.html

@@ -7,6 +7,38 @@
 </ion-header>
 
 
-<ion-content padding>
-
+<ion-content class="bgc-e7e8ed">
+  <ion-list>
+    <ng-container *ngIf="list.length > 0">
+      <ng-container *ngFor="let item of list" >
+          <ion-item class="item-list margin-bottom-10" >
+            <div class="item" >
+              <div class="item-header padding-15-0">
+                <div class="item-header-style">
+                  <span class="item-title">{{item.title}}</span>
+                  <!--<span   float-right  class="done" *ngIf="item.state==1 ">未发布</span>-->
+                  <span  float-right class="done">已完成</span>
+                  <!--<span  float-right class="done" *ngIf="item.state==3 ">已过期</span>-->
+                </div>
+              </div>
+              <div class="content-button padding-15-0">
+                <span>参与人员:</span>
+                <span *ngIf="item.groupName">{{item.groupName}}</span>
+                <span *ngIf="!item.groupName">全体人员</span>
+                <span *ngIf="item?.writeSelf == 0" float-right class="join" (click)="geToWrite(item)">参与</span>
+                <span *ngIf="item?.writeSelf != 0" float-right class="look" (click)="goToResult(item)">查看</span>
+              </div>
+            </div>
+          </ion-item>
+      </ng-container>
+    </ng-container>
+    <ng-container *ngIf="list.length == 0">
+      <div text-center style="margin-top: 10rem" *ngIf="list.length == 0">
+        <img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
+        <p text-center>
+          暂无数据
+        </p>
+      </div>
+    </ng-container>
+  </ion-list>
 </ion-content>

src/pages/mine/mySurvey/survery/survery.scss

 page-survery {
-
+  .list-ios .item-block .item-inner{
+    border: none;
+  }
+  .content-button{
+    border-top: 1px solid #c8c7cc;
+  }
+  .look{
+    background-color: #fcb164;
+    color: #fff;
+    padding: 1px 10px;
+    font-size: 1.5rem;
+    border-radius: 2px;
+  }
+  .join{
+    background-color: #34b4fc;
+    color: #fff;
+    padding: 1px 10px;
+    font-size: 1.5rem;
+    border-radius: 2px;
+  }
+  .going{
+    color: #fcb164;
+    font-size: 1.4rem;
+    border: 1px solid #34b4fc;
+    padding: 1px 8px;
+    border-radius: 2px;
+  }
+  .done{
+    color: #34b4fc;
+    font-size: 1.4rem;
+    border: 1px solid #34b4fc;
+    padding: 1px 8px;
+    border-radius: 2px;
+  }
 }

src/pages/mine/mySurvey/survery/survery.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {AppService} from "../../../../service/appHttpService";
+import {Storage} from "@ionic/storage";
 
 @IonicPage()
 @Component({
@@ -8,11 +10,34 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class SurveryPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    userId;
+    list = [];
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public appService: AppService,public storage: Storage) {}
+
+    ionViewDidEnter() {
+        this.storage.get("user").then((res)=>{
+            this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/question/findQuesByUserId/',res.id)
+                .subscribe((res)=>{
+                    this.list = res.json().datalist;
+                })
+        });
+        // this.getSurveyList()
+    }
+
+    getSurveyList(){
+        const userId = {};
+        console.log( this.userId);
+    }
+
+    //填写问卷
+    geToWrite(item){
+        this.navCtrl.push('SurveyWritePage',{item:item});
     }
 
-  ionViewDidLoad() {
-    console.log('ionViewDidLoad SurveryPage');
+    //查看问卷结果
+    goToResult(item){
+        this.navCtrl.push('SurveyPreviewPage',{item:item});
     }
 
 }

src/pages/tabs/home/home.ts

@@ -124,7 +124,6 @@ export class HomePage {
 
         this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
             this.slidersItems = res.json();
-            console.log(this.slidersItems);
         }, error => {
             this.appService.alert('网络异常！');
         })