color

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.2.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
     {
       "path": "/wisdomgroup",
-      "proxyUrl": "http://10.10.200.38:8080/wisdomgroup"
+      "proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
     }
   ]
 }
\ No newline at end of file

src/app/app.scss

@@ -3,6 +3,9 @@
 p{
   margin: 0;
 }
+.back-button.show-back-button{
+  margin-left: 5px;
+}
 //列表
 .item-ios{
   padding-left: 0;

src/pages/activity/activityApply/activityApply.ts

@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage';
 import { AppService, AppGlobal } from '../../../service/appHttpService';
 import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
 import {MinePage} from "../../tabs/mine/mine";
+import {ActivityDetailPage} from "../activityDetail/activityDetail";
 
 @IonicPage()
 @Component({
@@ -205,11 +206,7 @@ export class ActivityApplyPage {
                     if (true) {
                         this.isSuccess = true;
                             //清空 插入
-                            const index = this.navCtrl.getActive().index;
-                            this.navCtrl.remove(0, index);
-                            this.navCtrl.setRoot(MinePage);
-                            this.navCtrl.parent.select(3);
-                            this.navCtrl.push("MyActivityListPage");
+                            this.navCtrl.push("ActivityDetailPage",{id:this.item.activityId});
                     } else {
 
                     }

src/pages/activity/activityDetail/activityDetail.html

@@ -7,14 +7,11 @@
 
     <div class="item1">
         <div class="img-box">
-            <img class="item1-image" src="./assets/imgs/logo.png">
+            <img class="item1-image" src="{{picture + activity?.activityIMG}}">
         </div>
         <div class="item1-content">
             <div class="margin-5-0">
                 <label class="item1-title">{{activity?.activityName}}</label>
-                <div class="item1-content-box">
-                    <span *ngIf="activity?.activityNo == '0'" (click)="sayNo()" class="item-type">不想参加</span>
-                </div>
             </div>
             <div class="item1-introduction">
                 {{activity.activityIntro}}
@@ -30,14 +27,17 @@
 					<span class="item-title">
 						批次信息
 						 <ng-container *ngIf="batchList.length > 0">
-							 (最多可报名
+							 (最多可报
 								<span *ngIf="activity.applyCount == 0 || !activity.applyCount">{{ batchList.length}}</span>
 								<span *ngIf="activity.applyCount != 0">{{activity.applyCount}}</span>
-							个批次信息)
+							个批次)
+                                             <span *ngIf="activity?.activityNo == '0'" (click)="sayNo()" class="item-type">不想参加</span>
+
 						 </ng-container>
 					</span>
                 </label>
             </ion-item>
+            <ng-container *ngIf="activity?.activityNo == '0'">
                 <ion-item class="item2-content" *ngIf="batchList.length > 0">
                     <div *ngFor="let batch of batchList" class="item2-box" (click)="goBatchDetail(batch)">
                         <p>
@@ -45,7 +45,9 @@
                             <span>{{batch.batchName}}</span>
                             <!--是否报名 > 是否截止 > 是否满员 -->
                             <ng-container *ngIf="batch.order">
-                            <span class="activity-btn2" *ngIf="batch.order.orderstate == 1 || batch.order.orderstate == 2" float-right>已报名</span>
+                            <span class="activity-btn2"
+                                  *ngIf="batch.order.orderstate == 1 || batch.order.orderstate == 2"
+                                  float-right>已报名</span>
                                 <span class="activity-btn2" *ngIf="batch.order.orderstate == 4" float-right>已评价</span>
                                 <span class="activity-btn2" *ngIf="batch.order.orderstate == 3" float-right>未出行</span>
                             </ng-container>
@@ -72,6 +74,12 @@
                         </p>
                     </div>
                 </ion-item>
+            </ng-container>
+            <ng-container *ngIf="activity?.activityNo != '0'">
+                <p class="no-info">
+                    已选择不想参加
+                </p>
+            </ng-container>
             <p class="no-info" *ngIf="batchList.length == 0">
                 暂无批次
             </p>

src/pages/activity/activityDetail/activityDetail.scss

@@ -234,5 +234,12 @@ page-activityDetail {
     font-size: 1rem;
     border-radius: 3px;
     color: #999;
+    display: inline-block;
+    float: right;
+    margin-right: 8px;
+  }
+  .list-ios .item-block .item-inner{
+    padding-right: 0px;
+    margin-right: 0px;
   }
 }
\ No newline at end of file

src/pages/activity/activityDetail/activityDetail.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams, AlertController, ToastController } from 'ionic-angular';
+import {Component} from '@angular/core';
+import {IonicPage, NavController, NavParams, AlertController, ToastController} from 'ionic-angular';
 
 import {Http, Response} from '@angular/http';
 
-import { AppService } from '../../../service/appHttpService';
-import { JoinDetailPage } from '../../activity-track/joinDetail/joinDetail';
+import {AppGlobal, AppService} from '../../../service/appHttpService';
+import {JoinDetailPage} from '../../activity-track/joinDetail/joinDetail';
 import {BatchDetailPage} from "../batch-detail/batch-detail";
 
 @IonicPage()
@@ -17,8 +17,9 @@ export class ActivityDetailPage {
     activityId;  //活动ID
     batches: object[];
     activity = {
-      batchList:[]
+        batchList: []
     };
+    picture: string = AppGlobal.picture;
     batchList = [];
     //页面报名保存展示
     isCover: boolean = false;
@@ -26,7 +27,6 @@ export class ActivityDetailPage {
     introduce: string;
 
 
-
     constructor(public navCtrl: NavController,
                 public navParams: NavParams,
                 public alertCtrl: AlertController,
@@ -35,24 +35,28 @@ export class ActivityDetailPage {
 
     }
 
-  ionViewDidEnter(){
+    ionViewDidEnter() {
+        const index = this.navCtrl.length() -3;
+       if(index > 1){
+           this.navCtrl.remove(3, index);
+       }
         this.activityId = this.navParams.get('id');
         this.findMyOrderByOrderId();
     }
 
-    findMyOrderByOrderId(){
+    findMyOrderByOrderId() {
 
         let now = new Date().getTime();
-        this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id":this.activityId})
-            .subscribe((res :Response) => {
+        this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id": this.activityId})
+            .subscribe((res: Response) => {
                     this.activity = res.json();
                     this.batchList = this.activity.batchList;
-                    for( let i = 0;i<this.batchList.length;i++ ){
+                    for (let i = 0; i < this.batchList.length; i++) {
                         let endDate = this.batchList[i].batchEndDate + " 24:00:00";
-                        endDate = new Date(endDate).getTime() +'';     //判断是否过截止日期
-                        if( now > Number(endDate) ){      //已截止
+                        endDate = new Date(endDate).getTime() + '';     //判断是否过截止日期
+                        if (now > Number(endDate)) {      //已截止
                             this.batchList[i].signUp = false;
-                        }else{    //
+                        } else {    //
                             this.batchList[i].signUp = true;
                         }
                         console.log(this.batchList);
@@ -64,14 +68,14 @@ export class ActivityDetailPage {
     }
 
 
-    goJoinDetail(){
+    goJoinDetail() {
         this.navCtrl.push("JoinDetailPage");
     }
 
     //批次详情
-    goBatchDetail(item){
+    goBatchDetail(item) {
         console.log(this.activity);
-      this.navCtrl.push('BatchDetailPage',{batch:item,activity:this.activity});
+        this.navCtrl.push('BatchDetailPage', {batch: item, activity: this.activity});
     }
 
     //活动介绍限定65个字符串，多余以省略号代替
@@ -85,12 +89,13 @@ export class ActivityDetailPage {
     hidden() {
         this.isCover = false;
     }
+
     show() {
         this.isCover = true;
     }
 
     //不参加
-    sayNo(){
+    sayNo() {
         this.appService.ObserverHttpPostAdd("/wisdomgroup/modules/activityNon/admin/", this.activityId)
             .subscribe((res: Response) => {
                     this.navCtrl.pop();

src/pages/activity/activityList/activityList.html

@@ -24,9 +24,14 @@
 						<span class="item-title">{{item.activityName}}</span>
 					</div>
 
-					<button ion-button round class="btn btn1" *ngIf="item.activityState==2 ">可报名</button>
-					<button ion-button round class="btn btn2" *ngIf="item.activityState==1 ">已报名</button>
-					<button ion-button round class="btn btn3" *ngIf="item.activityState==3 ">不可报名</button>
+					<ng-container *ngIf="item.activityNo == 1">
+						<button ion-button round class="btn btn2">不参加</button>
+
+					</ng-container>
+					<ng-container *ngIf="item.activityNo == 0">
+						<button ion-button round class="btn btn1" *ngIf="item.activityState==2 && item.orderList.length == 0 ">可报名</button>
+						<button ion-button round class="btn btn2" *ngIf="item.activityState==2 && item.orderList.length > 0 ">已报名</button>
+					</ng-container>
 				</div>
 				<div class="content-box" (click)="goDetail(item)">
 					<div class="content-item-box">

src/pages/activity/activityList/activityList.ts

@@ -26,40 +26,6 @@ export class ActivityListPage {
       
   } 
 
-  //报名按钮
-  goApply(item) {   //活动状态：1：待发布（不可报名），2：发布中（可报名）3:已完成（报名截止）
-    console.log("报名按钮："+item.activityState);
-    if(item.activityState == 2){
-      let flag  = false;
-      this.isExitOrderWithActivity(item,result=>{ 
-          flag = result;
-          if(flag){
-            this.appService.toast("您已经报名该活动，请在我的活动中查看！");
-          }else{
-            this.navCtrl.push("ActivityApplyPage", {item:item});
-          }
-          //this.navCtrl.push("ActivityApplyPage", {item:item});
-      });
-      
-    }else{
-      if(item.activityState == 1){
-        this.appService.toast("报名暂未开通！");
-      }else{
-        this.appService.toast("活动已完成！");
-      }
-    }
-  }
-
-  isExitOrderWithActivity(activity,callback?): any {
-    this.appService.ObserverHttpPost("/wisdomgroup/modules/order/isExitOrderWithActivity",activity)
-    .toPromise() 
-    .then(res => { 
-      var data = res.json();     
-      callback(data == null ? "[]" : data); 
-    }) 
-    .catch(error => {    
-    });
-  }
 
   //初始化显示活动列表
   ionViewDidEnter(): void {

src/pages/activity/batch-detail/batch-detail.html

@@ -27,7 +27,9 @@
               <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 [innerHtml]='batch.batchNotice' ></span> </p>
+              <p> <span>活动须知：</span> <br>
+                <span [innerHtml]='batch.batchNotice' ></span>
+              </p>
             </div>
           </div>
           <div class="content-button">

src/pages/contact/add-block/add-block.scss

@@ -34,7 +34,7 @@ page-add-block {
   }
   .icon-span{
     text-align: center;
-    background-color: #eeeeee;
+    background-color: #d5e6f3;
     display: inline-block;
     width: 35px;
     height: 35px;

src/pages/contact/block-list/block-list.html

@@ -13,6 +13,7 @@
       </span>
     <span class="contact-title color-999">添加联系人</span>
   </div>
+  <p class="padding-10 color-666">(左滑删除该组联系人)</p>
   <ion-list>
     <ion-item-sliding *ngFor="let contactPerson of contactPersons">
         <ion-item>

src/pages/contact/block-list/block-list.scss

@@ -17,7 +17,7 @@ page-block-list {
   }
   .icon-span{
     text-align: center;
-    background-color: #eeeeee;
+    background-color: #d5e6f3;
     display: inline-block;
     width: 35px;
     height: 35px;

src/pages/contact/contact-modal/contact-modal.scss

@@ -35,7 +35,7 @@ page-contact-modal {
   }
   .icon-span{
     text-align: center;
-    background-color: #eeeeee;
+    background-color: #d5e6f3;
     display: inline-block;
     width: 35px;
     height: 35px;

src/pages/contact/contract-personinfo/contract-personinfo.html

@@ -67,27 +67,27 @@
         <span class="info-span">房间号</span>
         <div class="info-item-content">
 
-          <ng-container *ngIf="role == 1 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="abbreviation">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 2 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="abbreviation">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 3">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="abbreviation">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 0 || role == 4">
+          <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="abbreviation">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="abbreviation">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 3">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="abbreviation">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 0 || role == 4">-->
             {{abbreviation}}
-          </ng-container>
+          <!--</ng-container>-->
         </div>
       </div>
     </ion-item>
@@ -95,27 +95,27 @@
       <div class="info-item">
         <span class="info-span">座机</span>
         <div  class="info-item-content" >
-          <ng-container *ngIf="role == 1 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="telephone">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 2 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="telephone">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 3">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="telephone">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 0 || role == 4">
+          <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="telephone">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="telephone">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 3">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="telephone">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 0 || role == 4">-->
             {{telephone}}
-          </ng-container>
+          <!--</ng-container>-->
         </div>
       </div>
     </ion-item>
@@ -125,28 +125,28 @@
       <div class="info-item">
         <span class="info-span">邮箱</span>
         <div  class="info-item-content">
-          <ng-container *ngIf="role == 1 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="email">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 2 && orgName == nowOrgName">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="email">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-
-          <ng-container *ngIf="role == 3">
-            <label  (click)="editFun()">
-              <input type="text" [(ngModel)]="email">
-              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
-            </label>
-          </ng-container>
-          <ng-container *ngIf="role == 0 || role == 4">
+          <!--<ng-container *ngIf="role == 1 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="email">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 2 && orgName == nowOrgName">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="email">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+
+          <!--<ng-container *ngIf="role == 3">-->
+            <!--<label  (click)="editFun()">-->
+              <!--<input type="text" [(ngModel)]="email">-->
+              <!--<ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>-->
+            <!--</label>-->
+          <!--</ng-container>-->
+          <!--<ng-container *ngIf="role == 0 || role == 4">-->
             {{email}}
-          </ng-container>
+          <!--</ng-container>-->
         </div>
       </div>
     </ion-item>

src/pages/contact/contract-personinfo/contract-personinfo.scss

@@ -28,6 +28,14 @@ page-contract-personinfo {
         border: none;
         height: 3rem;
         padding: 2px;
+        text-align: right;
+        font-size: 18px;
+        color: #272727;
+    }
+    .info-item-content{
+        text-align: right;
+        font-size: 18px;
+        color: #272727;
     }
 
     .info{

src/pages/contact/my-block/my-block.scss

@@ -33,7 +33,7 @@ page-my-block {
   }
   .icon-span{
     text-align: center;
-    background-color: #eeeeee;
+    background-color: #d5e6f3;
     display: inline-block;
     width: 35px;
     height: 35px;

src/pages/contact/select-block/select-block.scss

@@ -33,7 +33,7 @@ page-select-block {
   }
   .icon-span{
     text-align: center;
-    background-color: #eeeeee;
+    background-color: #d5e6f3;
     display: inline-block;
     width: 35px;
     height: 35px;

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

@@ -22,7 +22,7 @@ page-survery {
   .going{
     color: #fcb164;
     font-size: 1.4rem;
-    border: 1px solid #34b4fc;
+    border: 1px solid #fcb164;
     padding: 1px 8px;
     border-radius: 2px;
   }

src/pages/mine/mySurvey/survey-result/survey-result.html

@@ -35,8 +35,8 @@
             </ng-container>
           </ng-container>
           <ng-container *ngIf="item.quesType == 3">
-            <ng-container *ngFor=" let option2 of item.quesDesc;let i2 = index;">
-              <p> {{i2 +1}}、 {{option2.option_title}} <span class="margin-left-15" *ngIf="item.option[0].index == 0">{{item.option[0].number}}</span></p>
+            <ng-container *ngFor=" let option2 of item.option;let i2 = index;">
+              <p> {{i2 +1}}、 {{option2.title}} <span class="margin-left-15">{{option2.number}}</span></p>
             </ng-container>
           </ng-container>
           <ng-container *ngIf="item.quesType == 4">

src/pages/mine/mySurvey/survey-write/survey-write.html

@@ -73,13 +73,13 @@
             </ion-item>
         </div>
     </ion-list>
-    <p class="text-center">
-        <label>
-            <input type="checkbox" [(ngModel)]="isans">
-            <span class="input-check"></span>
-            <span>匿名回答</span>
-        </label>
-    </p>
+    <!--<p class="text-center">-->
+        <!--<label>-->
+            <!--<input type="checkbox" [(ngModel)]="isans">-->
+            <!--<span class="input-check"></span>-->
+            <!--<span>匿名回答</span>-->
+        <!--</label>-->
+    <!--</p>-->
 
     <button class="submit-btn submit" (click)="confirm()">提交</button>
 </ion-content>

src/pages/person/editPersonInfo/editPersonInfo.html

 <ion-header>
-  <ion-toolbar>
-    <div class="searchToolBar">
-      <button ion-button clear small navPop style="padding: 0;">
-        <img class="back-btn" src="./assets/imgs/back.png" />
-      </button>
-      <ion-title text-center>
-        信息编辑
-      </ion-title>
-    </div>
-  </ion-toolbar>
+  <ion-navbar>
+    <ion-title text-center>信息编辑</ion-title>
+  </ion-navbar>
 </ion-header>
 <ion-content class="content">
 

src/pages/person/personInfo/personInfo.html

@@ -81,5 +81,6 @@
   </ion-list>
 
   <!-- <button ion-button block class="save">保存信息</button> -->
-  <button ion-button block class="save" (click)="modifyPwd()">修改密码</button>
+  <!--<button ion-button block class="save" (click)="modifyPwd()">修改密码</button>-->
+  <button class="submit-btn submit" (click)="modifyPwd()">修改密码</button>
 </ion-content>
\ No newline at end of file

src/pages/person/personInfo/personInfo.scss

@@ -105,4 +105,9 @@ page-personInfo {
         width: 30px;
         height: 30px;
     }
+  .submit{
+    margin-top: 20px;
+    border: 1px solid #34b4fc;
+    background-color: #34b4fc;
+  }
 }

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -80,7 +80,7 @@ export class OutGoingReportEditPage {
                     //编辑初始化：查询
                     this.appService.ObserverHttpPost("/wisdomgroup/modules/userpre/getUserpre", {premanagerId: value.id})
                         .subscribe((res: Response) => {
-                            if(res){
+                            if(res.json()){
                                 let result = res.json();
                                 this.userpre.id = result["id"];  //保存-id
                                 //离沪勾选

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

@@ -37,6 +37,7 @@ export class CreatePage {
 
     ionViewDidLoad() {
         this.temp = this.navParams.get('temp');    //问卷信息
+        console.log(this.temp);
         if (this.navParams.get('edit')) {      //编辑
             this.editTemp = this.navParams.get('edit');
             this.editIndex = this.navParams.get('index');
@@ -44,7 +45,6 @@ export class CreatePage {
             this.title = this.editTemp[this.editIndex].title;
             this.isAns = this.editTemp[this.editIndex].isAns;
             this.quesDescList = this.editTemp[this.editIndex].quesDesc;
-            console.log(this.editTemp[this.editIndex]);
         } else {     //新增
             this.qType = this.navParams.get('type');   //题目类型
         }
@@ -155,7 +155,7 @@ export class CreatePage {
                 quesDesc: this.quesDescList,
                 minOps: 0,
                 maxOps: 0,
-                index: 0  //序号
+                index: this.temp.quesNum  //序号
             }
         ];
         const data = {

src/pages/surveyManage/item/set/set.html

@@ -16,10 +16,10 @@
       <ion-toggle [(ngModel)]="isopen"></ion-toggle>
     </ion-item>
 
-    <ion-item>
-      <ion-label>匿名回答</ion-label>
-      <ion-toggle [(ngModel)]="isans"></ion-toggle>
-    </ion-item>
+    <!--<ion-item>-->
+      <!--<ion-label>匿名回答</ion-label>-->
+      <!--<ion-toggle [(ngModel)]="isans"></ion-toggle>-->
+    <!--</ion-item>-->
 
   </ion-list>
   <button class="submit-btn submit" (click)="save()">确认</button>

src/pages/surveyManage/item/set/set.ts

@@ -12,7 +12,7 @@ export class SetPage {
 
     id;    // 问卷ID；
 
-    isans; //匿名
+    isans = null; //匿名
     isopen; //公开
     temp = {
         id: '',

src/pages/surveyManage/list/list.html

@@ -54,7 +54,7 @@
     <p class="survey-title">{{temp?.title}}</p>
     <div class="footter-opr">
       <div *ngIf="swiperIndex == 0" (click)="edit()"><span>编辑</span></div>
-      <div *ngIf="swiperIndex == 1" (click)="edit()"><span>查看</span></div>
+      <div *ngIf="swiperIndex == 1" (click)="look()"><span>查看</span></div>
       <div *ngIf="swiperIndex == 1" (click)="cancel()"><span>取消发布</span></div>
       <div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div>
       <div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div>

src/pages/surveyManage/list/list.ts

@@ -5,6 +5,7 @@ import {DesicrPage} from "../item/desicr/desicr";
 import {AppService} from "../../../service/appHttpService";
 import {EditPage} from "../item/edit/edit";
 import {DetailPage} from "../item/detail/detail";
+import {SurveyResultPage} from "../../mine/mySurvey/survey-result/survey-result";
 
 
 declare var Swiper;
@@ -86,13 +87,6 @@ export class ListPage {
         // this.contentSlides.slideTo(index);
     }
 
-    slideChanged() {
-        //getActiveIndex()获得当前页面的index
-        let index = this.contentSlides.getActiveIndex();
-        //s切换菜单
-        // this.swiper.slideTo(index, 300);
-    }
-
 
     //显示问卷操作
     showOpra(item) {
@@ -161,7 +155,10 @@ export class ListPage {
     //结果
     result() {
         this.showOp = false;
-        this.navCtrl.push('ResultPage');
+        const data = {
+            id:this.temp.id
+        }
+        this.navCtrl.push('SurveyResultPage',{item:data});
     }
 
     //复制

src/pages/tabs/contact/contact.html

@@ -20,7 +20,7 @@
       <span class="contact-title">常用联系人</span>
     </div>
     <div class="common">
-        我的分组
+        我的分组(左滑删除分组)
     </div>
     <div class="item new-add" (click)="usualContactAdd()">
         <span class="icon-span">

src/pages/tabs/contact/contact.scss

@@ -58,7 +58,7 @@ page-contact {
     }
     .icon-span{
         text-align: center;
-        background-color: #eeeeee;
+        background-color: #d5e6f3;
         display: inline-block;
         width: 35px;
         height: 35px;

src/pages/tabs/mine/mine.ts

@@ -34,7 +34,7 @@ export class MinePage {
                 private alertCtrl: AlertController,
                 public navParams: NavParams,
                 public appService: AppService,
-                public storage: Storage,
+                public storage: Storage,public app:App,
                 private appUpdateService: AppUpdateService,
                 private appVersion: AppVersion) {
         this.orgNameInfo();
@@ -158,7 +158,8 @@ export class MinePage {
     }
 
     goSet() {
-        this.navCtrl.push('VersionPage');
+        // this.navCtrl.push('VersionPage');
+        this.app.getRootNav().push('VersionPage');
     }
 
     goDuty() {

src/pages/version/version.ts

-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
 import {AlertController, IonicPage, NavController, NavParams} from 'ionic-angular';
-import { AppService } from '../../service/appHttpService';
-import { AppVersion } from '@ionic-native/app-version';
-import { AppUpdateService } from '../../service/appUpdateService';
-import { Storage } from "@ionic/storage";
+import {AppService} from '../../service/appHttpService';
+import {AppVersion} from '@ionic-native/app-version';
+import {AppUpdateService} from '../../service/appUpdateService';
+import {Storage} from "@ionic/storage";
 import {LoginPage} from "../login/login";
 import {HomePage} from "../tabs/home/home";
 
@@ -16,17 +16,16 @@ import {HomePage} from "../tabs/home/home";
 export class VersionPage {
     version: string = '';
     latestVersion: string = '';
-  isLatest:boolean = true;
-  pusNumber:boolean;
-  constructor(
-    public navCtrl: NavController, 
+    isLatest: boolean = true;
+    pusNumber: boolean;
+
+    constructor(public navCtrl: NavController,
                 public navParams: NavParams,
-    public appService:AppService,
+                public appService: AppService,
                 private appUpdateService: AppUpdateService,
                 private appVersion: AppVersion,
-    private storage:Storage,
-    private alertCtrl: AlertController
-  ) {
+                private storage: Storage,
+                private alertCtrl: AlertController) {
 
     }
 
@@ -43,20 +42,21 @@ export class VersionPage {
     }
 
     //获取推送开关
-  getAppPush(){
-        this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush',null)
+    getAppPush() {
+        this.appService.ObserverHttpGet('/wisdomgroup/modules/common/file/getAppPush', null)
             .subscribe(
-                (res)=>{
+                (res) => {
                     this.pusNumber = res.json();
                 }
             )
     }
 
     //保存推送开关
-    savePush(){
-        this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/common/file/addAppPush/',this.pusNumber)
+    savePush() {
+        this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/common/file/addAppPush/', this.pusNumber)
             .subscribe(
-                (res)=>{}
+                (res) => {
+                }
             )
     }
 
@@ -80,14 +80,14 @@ export class VersionPage {
     }
 
     //更新
-  update(){
-      if(this.isLatest){
+    update() {
+        if (this.isLatest) {
             const alert = this.alertCtrl.create({
                 subTitle: '已是最新版本',
                 buttons: ['确定']
             });
             alert.present();
-      }else{
+        } else {
             const confirm = this.alertCtrl.create({
                 message: '有最新版本，是否更新?',
                 buttons: [
@@ -118,7 +118,6 @@ export class VersionPage {
         this.appService.ObserverHttpGet("/wisdomgroup/app/logout", null)
             .subscribe((res: Response) => {
                     let data = res.json();
-                   this.navCtrl.setRoot(HomePage);
                     this.navCtrl.push('LoginPage');
                 }, error => {
                     this.appService.alert('网络异常！');

src/service/appHttpService.ts

@@ -294,7 +294,7 @@ export class AppService {
 }
 
 
-// //app请求方式
+//app请求方式
 //
 // import {LoadingController, AlertController, ToastController} from 'ionic-angular';
 // import {Injectable} from '@angular/core';
@@ -561,8 +561,3 @@ export class AppService {
 //     }
 //
 // }
-//
-//
-//
-//
-//