update

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
     {
       "path": "/wisdomgroup",
-      "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
+      "proxyUrl": "http://47.103.35.216:8080/wisdomgroup"
     }
   ]
 }

platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.smart19.starter";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 40208;
-  public static final String VERSION_NAME = "4.2.8";
+  public static final int VERSION_CODE = 40209;
+  public static final String VERSION_NAME = "4.2.9";
 }

platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties

-#Tue Jun 18 21:14:16 CST 2019
+#Wed Jun 19 14:08:34 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action_tombstone.xml.flat
@@ -35,17 +35,17 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/opener_paths.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/xml_opener_paths.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-ldpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_time.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_time.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxhdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_narrow.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-xhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_template_icon_group.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_custom.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_chronometer.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-v21_notification_action_background.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_custom.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_media.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-v21_notification_action_background.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-hdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-hdpi_icon.png.flat
@@ -53,10 +53,10 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-xxhdpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxxhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_cancel_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_media_cancel_action.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-hdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v16_notification_template_custom_big.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat

platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt

-#Tue Jun 18 21:14:33 CST 2019
+#Wed Jun 19 14:08:47 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex

platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt

 #Internal package file, do not edit.
-#Tue Jun 18 21:14:33 CST 2019
+#Wed Jun 19 14:08:47 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/64.js
@@ -404,7 +404,7 @@
 227.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/search.png
 75.set=ASSET
 326.set=ASSET
-150.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
+150.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
 249.set=ASSET
 321.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-xxhdpi-v4/screen.png
 34.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
@@ -1149,7 +1149,7 @@ count=430
 205.set=ASSET
 85.set=ASSET
 336.set=ASSET
-151.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
+151.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
 259.set=ASSET
 322.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/iconfont/demo_index.html
 35.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release

platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.ionic.smart19.starter"
     android:hardwareAccelerated="true"
-    android:versionCode="40208"
-    android:versionName="4.2.8" >
+    android:versionCode="40209"
+    android:versionName="4.2.9" >
 
     <uses-sdk
         android:minSdkVersion="16"

platforms/android/app/build/intermediates/manifests/full/release/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40209},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/release/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40209},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/release/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40209},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/outputs/apk/release/output.json

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40209},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/reports/lint-results-release-fatal.html

@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
       <span class="mdl-layout-title">Lint Report: 1 error</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Tue Jun 18 21:14:40 CST 2019      </nav>
+Check performed at Wed Jun 19 14:08:54 CST 2019      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

platforms/android/app/src/main/AndroidManifest.xml

 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="40208" android:versionName="4.2.8" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40209" android:versionName="4.2.9" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">

platforms/android/app/src/main/res/xml/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.2.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.2.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Keyboard">
         <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
     </feature>

platforms/browser/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.2.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.2.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>部机关党建云(试运行)</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/pages/home/dutyAll/duty-apply/duty-apply.html

-
 <ion-header>
 
-  <ion-navbar>
-    <ion-title>换班申请</ion-title>
-  </ion-navbar>
+    <ion-navbar>
+        <ion-title>换班申请</ion-title>
+    </ion-navbar>
 
 </ion-header>
 
 
 <ion-content padding>
-  <ion-list>
-    <ion-item>
-      <span>值班日期</span>
-      <span>{{date | date:'yyyy-MM-dd'}}</span>
-    </ion-item>
-    <ion-item class="margin-top-15">
-      <ion-label>换班原因</ion-label>
-      <ion-textarea placeholder="请在此处输入换班原因" class="duty-textarea" [(ngModel)]="reason"></ion-textarea>
-      <ion-label class="textarea-tips">100/200</ion-label>
-    </ion-item>
-  </ion-list>
-  <button class="submit-btn submit" (click)="submit()">申请</button>
+    <ion-list>
+        <ion-item>
+            <ion-label>值班日期</ion-label>
+            <ion-label class="text-right">{{old.date | date:'yyyy-MM-dd'}}</ion-label>
+        </ion-item>
+        <div>
+            <ion-item>
+                <ion-label>换班日期</ion-label>
+                <ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD"
+                              pickerFormat="YYYY MM DD" (ionChange)="getScheduleInfo()"
+                              [(ngModel)]="change.date"></ion-datetime>
+            </ion-item>
+            <ion-item>
+                <ion-label>换班人</ion-label>
+                <ion-label class="text-right">{{change.personName}}</ion-label>
+            </ion-item>
+        </div>
+        <ion-item class="margin-top-15">
+            <ion-label>换班原因</ion-label>
+            <ion-textarea maxlength="200" placeholder="请在此处输入换班原因" class="duty-textarea" [(ngModel)]="reason"></ion-textarea>
+            <ion-label class="textarea-tips">{{reason.length}}/200</ion-label>
+        </ion-item>
+    </ion-list>
+    <button class="submit-btn submit" (click)="submit()">申请</button>
 </ion-content>

src/pages/home/dutyAll/duty-apply/duty-apply.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Component} from '@angular/core';
+import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {AppService} from "../../../../service/http.service";
+import {HomeService} from "../../home.service";
+import {DatePipe} from "@angular/common";
 
 @IonicPage()
 @Component({
-  selector: 'page-duty-apply',
-  templateUrl: 'duty-apply.html',
+    selector: 'page-duty-apply',
+    templateUrl: 'duty-apply.html',
 })
 export class DutyApplyPage {
 
-    id;
-    date;
-    reason = '';
-  constructor(public navCtrl: NavController, public navParams: NavParams,
-              public appService: AppService) {
-  }
-
-  ionViewDidLoad() {
-    this.id = this.navParams.get('id');
-    this.date = this.navParams.get('date');
-  }
-
-  submit(){
-    const data = {
-        scheduleId:this.id,
-        reason:this.reason
+    reason = '';  //申请原因
+
+    old = {
+        date: null,
+        type: null,
+        id: ''
+    };
+
+    change = {
+        date: null,
+        personName: ''
     };
-    this.appService.alert('确定提交该申请?',res=>{
-        this.appService.ObserverHttpPost('/wisdomgroup/changeApply/app/apply',data)
-            .subscribe((res )=>{
-                this.appService.popToastView('提交该申请成功!','middle',1000);
-                this.navCtrl.pop();
-            })
-    });
-  }
+
+    constructor(public navCtrl: NavController, public navParams: NavParams, private datePipe: DatePipe,
+                public appService: AppService, private homeSer: HomeService) {
+    }
+
+    ionViewDidLoad() {
+        this.old.id = this.navParams.get('id');
+        this.old.date = this.navParams.get('date');
+        this.old.type = this.navParams.get('type');
+        this.change.date = this.datePipe.transform(this.old.date, "yyyy-MM-dd");
+        console.log(this.change.date)
+    }
+
+    //查询值班
+    getScheduleInfo() {
+        const data = {
+            date: this.datePipe.transform(this.change.date, "yyyy/MM/dd"),
+            type: this.old.type   //0 白班  1 夜班
+        };
+        this.homeSer.getScheduleInfo(data).subscribe(
+            (res) => {
+                this.change.personName = res.name;
+            }
+        )
+    }
+
+    submit() {
+        const reason = this.reason + "备注：换班人--" + this.change.personName;
+        const data = {
+            scheduleId: this.old.id,
+            reason: reason
+        };
+        this.appService.alert('确定提交该申请?', res => {
+            this.appService.ObserverHttpPost('/wisdomgroup/changeApply/app/apply', data)
+                .subscribe((res) => {
+                    this.appService.popToastView('提交该申请成功!', 'middle', 1000);
+                    this.navCtrl.pop();
+                })
+        });
+    }
 
 }

src/pages/home/dutyAll/duty/duty.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Component} from '@angular/core';
+import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {CalendarComponentOptions} from "ion2-calendar";
 import {DutyApplyPage} from "../duty-apply/duty-apply";
 import {DutyDetailPage} from "../duty-detail/duty-detail";
 import {DutySignUpPage} from "../duty-sign-up/duty-sign-up";
-import { DayConfig } from "ion2-calendar";
+import {DayConfig} from "ion2-calendar";
 import {AppService} from "../../../../service/http.service";
-import {monthCh,weekDay} from "../../../../app/main";
+import {monthCh, weekDay} from "../../../../app/main";
 
 declare var Swiper;
+
 @IonicPage()
 @Component({
-  selector: 'page-duty',
-  templateUrl: 'duty.html',
+    selector: 'page-duty',
+    templateUrl: 'duty.html',
 })
 export class DutyPage {
 
     menuList = [
-        {name:'值班安排'},
-        {name:'我的值班'},
+        {name: '值班安排'},
+        {name: '我的值班'},
     ];
     swiperIndex;
     changeType = 1;
     dayObj = {
-            name:''
-        };
+        name: ''
+    };
     nightObj = {
-        name:''
+        name: ''
     };
     nowDuty = [];
     historyDuty;
@@ -34,23 +35,23 @@ export class DutyPage {
         from: new Date(2000, 0, 1),
         monthFormat: 'YYYY 年 MM 月 ',
         weekdays: weekDay,
-        monthPickerFormat:monthCh,
+        monthPickerFormat: monthCh,
         pickMode: 'single',
-        color:'danger'
+        color: 'danger'
     };
-  constructor(public navCtrl: NavController, public navParams: NavParams,
-              public appService: AppService) {
-  }
 
-  ionViewDidEnter() {
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public appService: AppService) {
+    }
 
-      const date = new Date().toLocaleDateString();
-      this.getDuty(date);
-      this.myDuty();
+    ionViewDidEnter() {
+        const date = new Date().toLocaleDateString();
+        this.getDuty(date);
+        this.myDuty();
 
-    this.selectPageMenu(0);
-    this.getSchedule()
-  }
+        this.selectPageMenu(0);
+        this.getSchedule()
+    }
 
     selectPageMenu(index) {
 
@@ -59,82 +60,83 @@ export class DutyPage {
         // this.contentSlides.slideTo(index);
     }
 
-    getSchedule(){
+    getSchedule() {
 
     }
 
-    change(type){
-      this.changeType = type;
+    change(type) {
+        this.changeType = type;
     }
 
-    onChange(e){
+    onChange(e) {
         const date = new Date(e).toLocaleDateString();
         this.getDuty(date);
     }
 
-    getDuty(date){
+    getDuty(date) {
         //0 白班  1 夜班
         const data = {
-            date:date,
-            type:0
+            date: date,
+            type: 0
         };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/getScheduleInfo',data)
-            .subscribe((res)=>{
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/getScheduleInfo', data)
+            .subscribe((res) => {
                 this.dayObj = res.json();
             });
 
         const data1 = {
-            date:date,
-            type:1
+            date: date,
+            type: 1
         };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/getScheduleInfo',data1)
-            .subscribe((res)=>{
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/getScheduleInfo', data1)
+            .subscribe((res) => {
                 this.nightObj = res.json();
             });
     }
 
 
     //我的值班
-    myDuty(){
+    myDuty() {
         const data = {
-            type:0
+            type: 0
         };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data)
-            .subscribe((res)=>{
-               this.nowDuty = res.json();
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data)
+            .subscribe((res) => {
+                this.nowDuty = res.json();
             });
         const data1 = {
-            type:1
+            type: 1
         };
-        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data1)
-            .subscribe((res)=>{
+        this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data1)
+            .subscribe((res) => {
                 this.historyDuty = res;
             });
     }
 
     //提交申请
-    dutyApply(item){
+    dutyApply(item) {
         let nowTime = new Date().getTime();
-        if(nowTime > item.dutyDate){
-            this.appService.popToastView('该条值班已过期','middle',1500);
+        if (nowTime > item.dutyDate) {
+            this.appService.popToastView('该条值班已过期', 'middle', 1500);
             return false;
         }
-      this.navCtrl.push('DutyApplyPage',{
-          id:item.id,
-          date:item.dutyDate
-      })
+        this.navCtrl.push('DutyApplyPage', {
+            "id": item.id,
+            "date": item.dutyDate,
+            "type":item.type
+        })
     }
 
     //申请详情
-    dutyDetail(item){
-        this.navCtrl.push('DutyDetailPage',{
-            "id":item.applyId,
-            'time':item.dutyDate
+    dutyDetail(item) {
+        this.navCtrl.push('DutyDetailPage', {
+            "id": item.applyId,
+            'time': item.dutyDate,
         })
     }
 
     //值班签到
-    sigUp(){
+    sigUp() {
         this.navCtrl.push('DutySignUpPage');
     }
 

src/pages/home/home.service.ts

@@ -17,4 +17,9 @@ export class HomeService{
     myScheduleOfToday(): Observable<any>{
         return this.http.get(AppGlobal.domain+'/wisdomgroup/schedule/myScheduleOfToday',{responseType: 'text' });
     }
-}
+
\ No newline at end of file
+    //根据时间查询值班信息
+    getScheduleInfo(data): Observable<any>{
+        return this.http.get(AppGlobal.domain+'/wisdomgroup/schedule/getScheduleInfo?'+this.commonSer.toQuery(data) );
+    }
+}

src/service/http.service.ts

@@ -15,9 +15,9 @@ export class AppGlobal {
     //接口基地址
     // static domain = "http://101.89.112.92:80";     //正式环境
     // static domain = "http://192.168.2.235:8080";   //测试环境
-    static domain = "http://47.103.33.196:8080";   //阿里云测试地址
+    // static domain = "http://47.103.33.196:8080";   //阿里云测试地址
     // static domain = "http://47.103.35.216:8080";   //阿里云正式地址
-    // static domain = "";   //本地环境
+    static domain = "";   //本地环境
 
 
     //图片地址