color

ionic.config.json

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

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

@@ -26,6 +26,7 @@
               <div class="contact-organization">{{contactPerson.orgName}}</div>
               <div>
                 <span class="contact-handphone">手机：{{contactPerson.mobile}}</span>
+                <span class="contact-telphone">座机：{{contactPerson.telephone}}</span>
               </div>
             </div>
           </div>

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

@@ -121,6 +121,7 @@ page-block-list {
   .contact-handphone{
     color: #808080;
     font-size: 12px;
+    margin-right: 10px;
   }
 
   .back-btn{

src/pages/contact/contactList/contactList.html

@@ -25,6 +25,7 @@
 
           <div>
             <span class="contact-handphone">手机：{{contactPerson.mobile}}</span>
+            <span class="contact-telphone">座机：{{contactPerson.telephone}}</span>
           </div>
         </div>
       </div>

src/pages/contact/contactList/contactList.scss

@@ -65,6 +65,7 @@ page-contactList {
     .contact-handphone{
         color: #808080;
         font-size: 12px;
+        margin-right: 10px;
     }
 
     .back-btn{

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

@@ -65,6 +65,7 @@ page-person-list {
   .contact-handphone{
     color: #808080;
     font-size: 12px;
+    margin-right: 10px;
   }
 
   .back-btn{

src/pages/contact/search/search.html

@@ -30,6 +30,7 @@
           <div class="contact-organization">{{contactPerson.orgName}}</div>
           <div>
             <span class="contact-handphone">手机：{{contactPerson.mobile}}</span>
+            <span class="contact-telphone">座机：{{contactPerson.telephone}}</span>
           </div>
         </div>
       </div>

src/pages/contact/search/search.scss

@@ -112,7 +112,7 @@ page-search {
 
     .contact-handphone{
         color: #808080;
-        font-size: 12px;
+        font-size: 12px;margin-right: 10px;
     }
 
     .back-btn{

src/pages/contact/search/search.ts

@@ -11,7 +11,7 @@ import {AppGlobal, AppService} from '../../../service/appHttpService';
 
 export class SearchPage {
 
-    searchValue: string;
+    searchValue = '';
     picture: string = AppGlobal.picture;
     contactPersons: Array<string>[];
 
@@ -32,6 +32,10 @@ export class SearchPage {
 
     }
 
+    ionViewDidLoad(){
+        this.searchUser();
+    }
+
     clearValue() {
         this.searchValue = "";
     }

src/pages/manageDuty/select-relay-person/select-relay-person.scss

@@ -65,7 +65,7 @@ page-select-relay-person {
   .contact-handphone{
     color: #666666;
     font-size: 1.5rem;
-    margin-left: 7px;
+    margin-left: 10px;
   }
 
   .back-btn{

src/pages/mine/myReport/myReport.ts

-import { Component, ViewChild } from '@angular/core';
-import { IonicPage, NavController, NavParams, Slides } from 'ionic-angular';
+import {Component, ViewChild} from '@angular/core';
+import {IonicPage, NavController, NavParams, Slides} from 'ionic-angular';
 
-import {  Response } from '@angular/http';
+import {Response} from '@angular/http';
 
-import { AppService } from '../../../service/appHttpService';
-import { OutGoingReportEditPage } from '../../report/outGoingReportEdit/outGoingReportEdit';
+import {AppService} from '../../../service/appHttpService';
+import {OutGoingReportEditPage} from '../../report/outGoingReportEdit/outGoingReportEdit';
 
-import { ActivityStatisticService } from '../../../service/activityStatisticService';
+import {ActivityStatisticService} from '../../../service/activityStatisticService';
 
-import { OutGoingReportViewPage } from '../../report/outGoingReportView/outGoingReportView';
+import {OutGoingReportViewPage} from '../../report/outGoingReportView/outGoingReportView';
 
-import { Storage } from '@ionic/storage';
+import {Storage} from '@ionic/storage';
 import {MinePage} from "../../tabs/mine/mine";
 
 declare var Swiper;
+
 @IonicPage()
 @Component({
-  selector: 'page-myReport',
-  templateUrl: 'myReport.html',
+    selector: 'page-myReport',
+    templateUrl: 'myReport.html',
 })
 
 
 export class MyReportPage {
 
     swiperIndex = 0;
-  swiper: any;
-  allReport = [];
-  processingReport: Array<any> = [];
-  endReport: Array<any> = [];
-
-  //ViewChild传入一个字符串contentSlides，变量contentSlides接收。其它不变  
-  @ViewChild('contentSlides') contentSlides: Slides;
-  menus: Array<string> = ['全部报备', '报备中', '已结束'];
-
-  constructor(
-    public navCtrl: NavController,
-    public appService: AppService,
-    public activityStatisticService: ActivityStatisticService,
-    public storage:Storage
-  ) {
-
-     console.log(this.navCtrl);
-  }
-
-  //初始化加载我的报备
-  ngOnInit(): void {
-    this.getAllMyReport();
-  }
-
-  //当页面加载的时候触发，只触发一次，当有缓存的的时候，打开页面时不在加载  
-  ionViewDidLoad() {
-
-  }
-  //选择菜单  
-  selectPageMenu(index) {
-      this.swiperIndex = index;
-    //切换页面  
-    // this.contentSlides.slideTo(index);
-  }
-  //选择菜单之后设置菜单样式  
-  setStyle(index) {
-    //得到菜单的个数  
-    var slides = document.getElementsByClassName('pageMenuSlides')[0].getElementsByClassName('swiper-slide');
-    //给所有的菜单都设置上swiper-slide样式  
-    if (index < slides.length) {
-      for (var i = 0; i < slides.length; i++) {
-        var s = slides[i];
-        s.className = "swiper-slide";
-      }
-      //给当前菜单设置成这个样式  
-      slides[index].className = "swiper-slide bottomLine";
+    swiper: any;
+    allReport = [];
+    processingReport: Array<any> = [];
+    endReport: Array<any> = [];
+
+    //ViewChild传入一个字符串contentSlides，变量contentSlides接收。其它不变
+    @ViewChild('contentSlides') contentSlides: Slides;
+    menus: Array<string> = ['全部报备', '报备中', '已结束'];
+
+    constructor(public navCtrl: NavController,
+                public appService: AppService,
+                public activityStatisticService: ActivityStatisticService,
+                public storage: Storage) {
+
+        console.log(this.navCtrl);
+    }
+
+    //初始化加载我的报备
+    ngOnInit(): void {
+        this.getAllMyReport();
+    }
+
+    //当页面加载的时候触发，只触发一次，当有缓存的的时候，打开页面时不在加载
+    ionViewDidLoad() {
+
     }
-  }
-
-  slideChanged() {
-    //getActiveIndex()获得当前页面的index  
-    let index = this.contentSlides.getActiveIndex();
-    this.setStyle(index);
-    //s切换菜单  
-    this.swiper.slideTo(index, 300);
-
-  }
-
-  //获取所有我的报备
-  getAllMyReport() {
-    this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getPremanagerByUser", null)
-      .subscribe((res: Response) => {
-        let data = res.json();
-        this.allReport = data;
-
-        this.allReport.forEach(element => {       
-            if (!element["isOverTimeFlag"]) { //报备中
-                this.processingReport.push(element);
-            }else{
-                this.endReport.push(element);  //已结束
-            }
-        });
-        }, error => {
-            this.appService.alert('网络异常！');
+
+    //选择菜单
+    selectPageMenu(index) {
+        this.swiperIndex = index;
+        //切换页面
+        // this.contentSlides.slideTo(index);
+    }
+
+    //获取所有我的报备
+    getAllMyReport() {
+        this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getPremanagerByUser", null)
+            .subscribe((res: Response) => {
+                    let data = res.json();
+                    this.allReport = data;
+
+                    this.allReport.forEach(element => {
+                        if (!element["isOverTimeFlag"]) { //报备中
+                            this.processingReport.push(element);
+                        } else {
+                            this.endReport.push(element);  //已结束
+                        }
+                    });
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
+    }
+
+    //跳转到报备页面
+    goReport(report) {
+        if (report.isOverTimeFlag) {
+            return false;
         }
-    );
-  }
+        this.storage.set("premanager", report);
+        this.navCtrl.push("OutGoingReportEditPage");
+    }
+
+    //跳转到报备查看详情页面
+    goDetail(report) {
+        this.navCtrl.push("OutGoingReportViewPage", {premanager: report});
+    }
 
-  //跳转到报备页面
-  goReport(report){
-    if( report.isOverTimeFlag ){
-      return false;
+    goBack() {
+        this.navCtrl.popToRoot();
     }
-    this.storage.set("premanager",report);
-    this.navCtrl.push("OutGoingReportEditPage");
-  }
-
-  //跳转到报备查看详情页面
-  goDetail(report){      
-    this.navCtrl.push("OutGoingReportViewPage",{premanager:report});
-  }
-
-  goBack(){
-    this.navCtrl.popToRoot();
-  }
 
 }

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

@@ -22,7 +22,7 @@ page-my-survey {
   .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/survery/survery.html

@@ -35,7 +35,7 @@
               <div class="item-header padding-15-0">
                 <div class="item-header-style">
                   <span class="item-title">{{item.title}}</span>
-                  <span float-right class="done">未完成</span>
+                  <span float-right class="going">未作答</span>
                 </div>
               </div>
               <div class="content-button padding-15-0">

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

@@ -31,8 +31,11 @@ export class EditPage {
                 public toastCtrl: ToastController, public alertCtrl: AlertController) {
     }
 
-    ionViewDidEnter() {
+    ionViewDidLoad(){
         this.tempId = this.navParams.get('temp').id;
+    }
+
+    ionViewDidEnter() {
         this.getDetail();
         const length = this.navCtrl.length();
         if (length > 5) {

src/pages/surveyManage/list/list.html

@@ -55,6 +55,7 @@
     <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)="cancel()"><span>取消发布</span></div>
       <div *ngIf="swiperIndex == 1" (click)="overDue()"><span>设为过期</span></div>
       <div *ngIf="swiperIndex == 0" (click)="release()"><span>发布</span></div>
       <div *ngIf="swiperIndex == 1 || swiperIndex == 2" (click)="result()"><span>结果</span></div>

src/pages/surveyManage/list/list.ts

@@ -145,11 +145,11 @@ export class ListPage {
     cancel(){
         // 0  清除  1  不清除
         const data = {
-            'isdelete':'0'
-        }
+            'isdelete':'1'
+        };
         this.appService.alert('确定取消发布该问卷吗',
             (res) => {
-                this.appService.ObserverHttpGetAdd('/wisdomgroup/modules/question/cancel/', this.temp.id)
+                this.appService.ObserverHttpForm('/wisdomgroup/modules/question/cancel/', this.temp.id,data)
                     .subscribe((res) => {
                         this.appService.popToastView('取消发布成功','middle',1000);
                         this.selectPageMenu(this.swiperIndex);

src/pages/version/version.ts

@@ -5,6 +5,7 @@ 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";
 
 @IonicPage()
 @Component({
@@ -117,6 +118,7 @@ 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('网络异常！');