color

src/app/app.module.ts

@@ -24,7 +24,7 @@ import {ContactModalPage} from "../pages/contact/contact-modal/contact-modal";
 import {PersonPage} from "../pages/surveyManage/modal/person/person";
 import {PersonListPage} from "../pages/contact/person-list/person-list";
 import {BlockModalPage} from "../pages/activity-track/block-modal/block-modal";
-import {QuestionDetailPage} from "../pages/mySurvey/question-detail/question-detail";
+import { QuestionDetailPage } from "../pages/mine/mySurvey/question-detail/question-detail";
 
 @NgModule({
     declarations: [

src/pages/dutyALl/duty/duty.html

@@ -2,7 +2,7 @@
 
     <ion-navbar>
         <ion-title>值班情况</ion-title>
-        <span (click)="sigUp()" float-right class="margin-right-10 color-999">值班签到</span>
+        <span (click)="sigUp()" float-right class="margin-right-10 color-fff">值班签到</span>
 
     </ion-navbar>
     <div class="duty">

src/pages/dutyALl/duty/duty.scss

@@ -7,7 +7,7 @@ page-duty {
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: 3rem;
+    height: 36px;
     background-color: #fff;
   }
   .duty-state{

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

@@ -2,8 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {ListPage} from "../../surveyManage/list/list";
 import {ChangeApplyListPage} from "../../manageDuty/change-apply-list/change-apply-list";
-import {MySurveyPage} from "../../mySurvey/my-survey/my-survey";
-
+import { MySurveyPage } from "../../mine/mySurvey/my-survey/my-survey";
 
 
 @IonicPage()

src/pages/mine/my-duty/my-duty.html

+<!--
+  Generated template for the MyDutyPage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>myDuty</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/mine/my-duty/my-duty.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { MyDutyPage } from './my-duty';
+
+@NgModule({
+  declarations: [
+    MyDutyPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(MyDutyPage),
+  ],
+})
+export class MyDutyPageModule {}

src/pages/mine/my-duty/my-duty.scss

+page-my-duty {
+
+}

src/pages/mine/my-duty/my-duty.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the MyDutyPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-my-duty',
+  templateUrl: 'my-duty.html',
+})
+export class MyDutyPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad MyDutyPage');
+  }
+
+}

src/pages/myReport/myReport.ts → src/pages/mine/myReport/myReport.ts

@@ -3,15 +3,15 @@ import { IonicPage, NavController, NavParams, Slides } from 'ionic-angular';
 
 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 {MinePage} from "../tabs/mine/mine";
+import {MinePage} from "../../tabs/mine/mine";
 
 declare var Swiper;
 @IonicPage()

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

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import { AppService } from "../../../../service/appHttpService";
 import { Storage } from "@ionic/storage";
 import {SurveyWritePage} from "../survey-write/survey-write";
 import {SurveyResultPage} from "../survey-result/survey-result";

src/pages/mySurvey/question-detail/question-detail.ts → src/pages/mine/mySurvey/question-detail/question-detail.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import { AppService } from "../../../../service/appHttpService";
 
 @Component({
     selector: 'page-question-detail',

src/pages/mySurvey/survey-preview/survey-preview.ts → src/pages/mine/mySurvey/survey-preview/survey-preview.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import { AppService } from "../../../../service/appHttpService";
 import {Storage} from "@ionic/storage";
 import {SurveyResultPage} from "../survey-result/survey-result";
 

src/pages/mySurvey/survey-result/survey-result.ts → src/pages/mine/mySurvey/survey-result/survey-result.ts

 import { Component } from '@angular/core';
 import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
-import {message} from "../../../app/main";
-import {PersonListPage} from "../../contact/person-list/person-list";
+import { AppService } from "../../../../service/appHttpService";
+import { message } from "../../../../app/main";
+import { PersonListPage } from "../../../contact/person-list/person-list";
 import {QuestionDetailPage} from "../question-detail/question-detail";
 
 @IonicPage()

src/pages/mySurvey/survey-write/survey-write.ts → src/pages/mine/mySurvey/survey-write/survey-write.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import { AppService } from "../../../../service/appHttpService";
 
 
 @IonicPage()

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -4,7 +4,7 @@ import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 import {AppService, AppGlobal} from "../../../service/appHttpService";
 import {OutGoingReportDetailPage} from '../outGoingReportDetail/outGoingReportDetail';
-import {MyReportPage} from "../../myReport/myReport";
+import {MyReportPage} from "../../mine/myReport/myReport";
 import {MinePage} from "../../tabs/mine/mine";
 
 @IonicPage()

src/pages/tabs/mine/mine.ts

@@ -4,7 +4,7 @@ import { LoginPage } from '../../login/login';
 import { AppService } from '../../../service/appHttpService';
 import { PersonInfoPage } from '../../person/personInfo/personInfo';
 import { MyActivityListPage } from '../../myActivityList/myActivityList';
-import { MyReportPage } from '../../myReport/myReport';
+import { MyReportPage } from '../../mine/myReport/myReport';
 import { OperationListPage } from '../../operation-list/operation-list';
 import { VersionPage } from '../../version/version';
 import { Response } from '@angular/http';
@@ -12,7 +12,8 @@ import { Storage } from '@ionic/storage';
 
 import { AppVersion } from '@ionic-native/app-version';
 import { AppUpdateService } from '../../../service/appUpdateService';
-import {MySurveyPage} from "../../mySurvey/my-survey/my-survey";
+import { MySurveyPage } from "../../mine/mySurvey/my-survey/my-survey";
+import {MyDutyPage} from "../../mine/my-duty/my-duty";
 
 
 @Component({
@@ -157,6 +158,6 @@ export class MinePage {
     }
 
     goDuty(){
-        this.navCtrl.push("DutyPage");
+        this.navCtrl.push("MyDutyPage");
     }
 }