update

app/build/104.js

-webpackJsonp([104],{969:function(e,o,a){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),a.d(o,"PaymentPageModuleNgFactory",function(){return R});var d=a(1),m=a(304),r=a(611),t=a(612),n=a(613),p=a(614),u=a(615),l=a(616),c=a(617),i=a(618),s=a(619),F=a(628),b=a(6),v=a(18),M=a(288),f=a(111),y=a(219),R=d["ɵcmf"](m.a,[],function(e){return d["ɵmod"]([d["ɵmpd"](512,d.ComponentFactoryResolver,d["ɵCodegenComponentFactoryResolver"],[[8,[r.a,t.a,n.a,p.a,u.a,l.a,c.a,i.a,s.a,F.a]],[3,d.ComponentFactoryResolver],d.NgModuleRef]),d["ɵmpd"](4608,b.l,b.k,[d.LOCALE_ID,[2,b.t]]),d["ɵmpd"](4608,v["ɵi"],v["ɵi"],[]),d["ɵmpd"](4608,v.FormBuilder,v.FormBuilder,[]),d["ɵmpd"](512,b.b,b.b,[]),d["ɵmpd"](512,v["ɵba"],v["ɵba"],[]),d["ɵmpd"](512,v.FormsModule,v.FormsModule,[]),d["ɵmpd"](512,v.ReactiveFormsModule,v.ReactiveFormsModule,[]),d["ɵmpd"](512,M.a,M.a,[]),d["ɵmpd"](512,M.b,M.b,[]),d["ɵmpd"](512,m.a,m.a,[]),d["ɵmpd"](256,f.a,y.a,[])])})}});
\ No newline at end of file
+webpackJsonp([104],{968:function(e,o,a){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),a.d(o,"PaymentPageModuleNgFactory",function(){return R});var d=a(1),m=a(304),r=a(611),t=a(612),n=a(613),p=a(614),u=a(615),l=a(616),c=a(617),i=a(618),s=a(619),F=a(628),b=a(6),v=a(18),M=a(288),f=a(111),y=a(219),R=d["ɵcmf"](m.a,[],function(e){return d["ɵmod"]([d["ɵmpd"](512,d.ComponentFactoryResolver,d["ɵCodegenComponentFactoryResolver"],[[8,[r.a,t.a,n.a,p.a,u.a,l.a,c.a,i.a,s.a,F.a]],[3,d.ComponentFactoryResolver],d.NgModuleRef]),d["ɵmpd"](4608,b.l,b.k,[d.LOCALE_ID,[2,b.t]]),d["ɵmpd"](4608,v["ɵi"],v["ɵi"],[]),d["ɵmpd"](4608,v.FormBuilder,v.FormBuilder,[]),d["ɵmpd"](512,b.b,b.b,[]),d["ɵmpd"](512,v["ɵba"],v["ɵba"],[]),d["ɵmpd"](512,v.FormsModule,v.FormsModule,[]),d["ɵmpd"](512,v.ReactiveFormsModule,v.ReactiveFormsModule,[]),d["ɵmpd"](512,M.a,M.a,[]),d["ɵmpd"](512,M.b,M.b,[]),d["ɵmpd"](512,m.a,m.a,[]),d["ɵmpd"](256,f.a,y.a,[])])})}});
\ No newline at end of file

app/index.html

@@ -17,7 +17,7 @@
     <meta name="format-detection" content="telephone=no">
     <meta name="msapplication-tap-highlight" content="no">
     <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
-    <link rel="stylesheet" href="assets/swiper/swiper-4.1.6.min.css?v=3.26">
+    <link rel="stylesheet" href="assets/swiper/swiper-4.1.6.min.css?v=2.25">
     <link rel="manifest" href="manifest.json">
     <meta name="theme-color" content="#4e8ef7">
 
@@ -26,7 +26,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
     <!-- cordova.js required for cordova apps (remove if not needed) -->
-    <script src="assets/cordova/cordova.js?v=3.26"></script>
+    <script src="assets/cordova/cordova.js?v=2.25"></script>
 
     <!-- un-comment this code to enable service worker
     <script>
@@ -37,7 +37,7 @@
       }
     </script>-->
 
-    <link href="build/main.css?v=3.26" rel="stylesheet">
+    <link href="build/main.css?v=2.25" rel="stylesheet">
 
 </head>
 
@@ -47,18 +47,16 @@
 <ion-app></ion-app>
 
 <!-- The polyfills js is generated during the build process -->
-<script src="build/polyfills.js?v=3.26"></script>
+<script src="build/polyfills.js?v=2.25"></script>
 
 <!-- The vendor js is generated during the build process
      It contains all of the dependencies in node_modules -->
-<script src="build/vendor.js?v=3.26"></script>
+<script src="build/vendor.js?v=2.25"></script>
 
 <!-- The main bundle js is generated during the build process -->
-<script src="build/main.js?v=3.26"></script>
-<script>
-</script>
+<script src="build/main.js?v=2.25"></script>
 </body>
 
-<script src="assets/swiper/swiper-4.1.6.min.js?v=3.26"></script>
+<script src="assets/swiper/swiper-4.1.6.min.js?v=2.25"></script>
 
 </html>

src/pages/home/activity-track/activity-search/activity-search.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Component} from '@angular/core';
+import {IonicPage, LoadingController, NavController, NavParams} from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService,AppGlobal} from "../../../../service/http.service";
+import {AppService, AppGlobal} from "../../../../service/http.service";
 import {message} from "../../../../app/main";
 
 
 @IonicPage()
 @Component({
-  selector: 'page-activity-search',
-  templateUrl: 'activity-search.html',
+    selector: 'page-activity-search',
+    templateUrl: 'activity-search.html',
 })
 export class ActivitySearchPage {
 
@@ -16,14 +16,16 @@ export class ActivitySearchPage {
     items;
     id;
     picture: string = AppGlobal.picture;
-  constructor(public navCtrl: NavController, public navParams: NavParams,
-              public appService: AppService) {
-  }
 
-  ionViewDidLoad() {
-    this.id = this.navParams.get('id');
-    this.searchUser();
-  }
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                private loadCtrl: LoadingController,
+                public appService: AppService) {
+    }
+
+    ionViewDidLoad() {
+        this.id = this.navParams.get('id');
+        this.searchUser();
+    }
 
     clearValue() {
         this.searchValue = "";
@@ -34,8 +36,8 @@ export class ActivitySearchPage {
         this.navCtrl.push('ReplaceApplyPage', {id: this.id, personInfo: item})
     }
 
-    confirmSayNo(item){
-        this.appService.alert('确定设置该用户不参加？',(res)=>{
+    confirmSayNo(item) {
+        this.appService.alert('确定设置该用户不参加？', (res) => {
             this.sayNo(item);
         })
     }
@@ -48,8 +50,8 @@ export class ActivitySearchPage {
         };
         this.appService.ObserverHttpForm("/wisdomgroup/modules/activityNon/", this.id, data)
             .subscribe((res: Response) => {
-                   this.appService.popToastView('已保存该用户不参加','middle',1500);
-                   this.searchUser();
+                    this.appService.popToastView('已保存该用户不参加', 'middle', 1500);
+                    this.searchUser();
                 }, error => {
                 }
             );
@@ -65,15 +67,17 @@ export class ActivitySearchPage {
     }
 
     //取消报名
-    cancelSignUp(item){
-        this.appService.alert('确定取消该活动报名',(res)=>{
+    cancelSignUp(item) {
+        this.appService.alert('确定取消该活动报名', (res) => {
             const data = {
-                'userid':item.id,
-                'id':item.orderId
+                'userid': item.id,
+                'id': item.orderId
             }
-            this.appService.ObserverHttpGetOption("/wisdomgroup/modules/order/deleteOrder", data).
-            subscribe((res)=>{
-                this.appService.popToastView('取消报名成功!','middle',1500);
+            let load = this.loadCtrl.create()
+            load.present();
+            this.appService.ObserverHttpGetOption("/wisdomgroup/modules/order/deleteOrder", data).subscribe((res) => {
+                load.dismiss()
+                this.appService.popToastView('取消报名成功!', 'middle', 1500);
                 this.searchUser();
             })
         })

src/pages/home/activity-track/replace-apply/replace-apply.ts

 import {Component} from '@angular/core';
-import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
+import {IonicPage, LoadingController, ModalController, NavController, NavParams} from 'ionic-angular';
 import {Response} from "@angular/http";
 import {PersonPage} from "../../surveyManage/modal/person/person";
 import {BlockModalPage} from "../block-modal/block-modal";
 import {MinePage} from "../../../tabs/mine/mine";
 import {AppService} from "../../../../service/http.service";
+import {CommonService} from "../../../../provide/common.service";
 
 
 @IonicPage()
@@ -34,6 +35,8 @@ export class ReplaceApplyPage {
     };
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
+                private loadCtrl: LoadingController,
+                private commonSer: CommonService,
                 public appService: AppService, public modalCtrl: ModalController) {
     }
 
@@ -79,13 +82,16 @@ export class ReplaceApplyPage {
 
     //选择批次
     selectblock() {
-        let modal = this.modalCtrl.create(BlockModalPage, {blockList: this.batchList,applyCount:this.activity.applyCount});
+        let modal = this.modalCtrl.create(BlockModalPage, {
+            blockList: this.batchList,
+            applyCount: this.activity.applyCount
+        });
         modal.onDidDismiss(res => {
             let minPerNumber = 5;
             if (res) {
                 this.selectBatchList = res;
-                this.selectBatchList.forEach((data)=>{
-                    if(minPerNumber > data.batchPerNumber){
+                this.selectBatchList.forEach((data) => {
+                    if (minPerNumber > data.batchPerNumber) {
                         minPerNumber = data.batchPerNumber;
                         this.item = data;
                     }
@@ -97,7 +103,7 @@ export class ReplaceApplyPage {
     }
 
     //报名
-    confirmOrder(orderId) {
+    confirmOrder() {
         //验证信息：
         /**0.对于暂未有批次的。
          1.判断携带人数是否超过限额人数。
@@ -116,12 +122,12 @@ export class ReplaceApplyPage {
         let leaveNum = this.item.batchLimitNumber - this.item.hasSignUpCount;
 
         //报名次数 applyCount 1,2,3,4,5,0-> 不限
-          if (Number(this.order.Personnumber + 1) > Number(leaveNum)) {
-                this.appService.popToastView("报名人数超过了该批次的剩余人数", 'middle', 1000);
-                return false;
-            } else {
-                this.submitOrder();
-            }
+        if (Number(this.order.Personnumber + 1) > Number(leaveNum)) {
+            this.appService.popToastView("报名人数超过了该批次的剩余人数", 'middle', 1000);
+            return false;
+        } else {
+            this.submitOrder();
+        }
     }
 
     // 提交订单
@@ -134,14 +140,18 @@ export class ReplaceApplyPage {
             UserID: this.personInfo.id,
             Username: this.personInfo.name,
             Usertel: this.personInfo.mobile,
-            batchlist:''
+            batchlist: ''
         };
 
-        this.selectBatchList.forEach(res=>{
+        this.selectBatchList.forEach(res => {
             order.batchlist += res.id + ',';
         });
+        let load = this.loadCtrl.create()
+        load.present();
         this.appService.ObserverHttpPost("/wisdomgroup/modules/order/create", order)
             .subscribe((res: Response) => {
+                    this.commonSer.toast('提交成功');
+                    load.dismiss()
                     this.navCtrl.pop();
                 }, error => {
                 }

src/pages/serve-pages/use-car/car-apply/car-apply.html

@@ -12,7 +12,7 @@
         <ion-item>
             <ion-label class="item-left"><span class="color-red">*</span>用车时间:</ion-label>
             <ion-datetime (ionChange)="changeStartTime($event)" [disabled]="type == 'deal' " cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
-                          pickerFormat="YYYY MM DD HH mm" placeholder="请选择" [max]="obj.endTimeChange" [min]="nowDate"
+                          pickerFormat="YYYY MM DD HH mm" placeholder="请选择" [max]="maxTime" [min]="nowDate"
                           [(ngModel)]="obj.startTimeChange"></ion-datetime>
             <ion-label class="right-arrow">
                 <ion-icon name="arrow-forward"></ion-icon>
@@ -23,7 +23,7 @@
             <ion-label class="item-left"><span class="color-red">*</span>还车时间:</ion-label>
             <ion-datetime (ionChange)="changeEndTime($event)" [disabled]="type == 'deal' " cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD HH:mm"
                           pickerFormat="YYYY MM DD HH mm" placeholder="请选择" [min]="obj.startTimeChange"
-                          [(ngModel)]="obj.endTimeChange"></ion-datetime>
+                          [(ngModel)]="obj.endTimeChange" [max]="maxTime"></ion-datetime>
             <ion-label class="right-arrow">
                 <ion-icon name="arrow-forward"></ion-icon>
             </ion-label>

src/pages/serve-pages/use-car/car-apply/car-apply.ts

@@ -45,11 +45,12 @@ export class CarApplyPage {
     applyId; //是否编辑
     type;
     nowDate;
+    maxTime;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, public modalCtrl: ModalController,
-                private loading:LoadingController,
-                private commonSer: CommonService, private datePipe: DatePipe,private timeFormat:TimeFormatService,
+                private loading: LoadingController,
+                private commonSer: CommonService, private datePipe: DatePipe, private timeFormat: TimeFormatService,
                 private actionSheetCtrl: ActionSheetController) {
     }
 
@@ -71,6 +72,7 @@ export class CarApplyPage {
 
         } else {
             this.obj.startTimeChange = this.datePipe.transform(new Date(), 'yyyy-MM-ddTHH:mm');
+            this.maxTime = this.datePipe.transform(Date.now() + 60 * 24 * 60 * 60 * 1000, 'yyyy-MM-ddTHH:mm');
             this.nowDate = this.datePipe.transform(new Date(), 'yyyy-MM-ddTHH:mm');
         }
     }
@@ -229,7 +231,7 @@ export class CarApplyPage {
         console.log(data);
         this.commonSer.alert('确认提交？', () => {
             let loading = this.loading.create({
-                content:'提交中...'
+                content: '提交中...'
             });
             loading.present();
             this.serveSer.saveCarApply(data).subscribe(

src/pages/tabs/key/key.html

@@ -50,12 +50,12 @@
                     <label class="label2-2 more2-2">一键报修</label>
                 </div>
             </div>
-            <div tappable (click)="goTo('RequirementPage')">
-                <div class="card">
-                    <img src="./assets/imgs/home/icon-wxdc.png">
-                    <label class="label2-2 more2-2">问需调查</label>
-                </div>
-            </div>
+<!--            <div tappable (click)="goTo('RequirementPage')">-->
+<!--                <div class="card">-->
+<!--                    <img src="./assets/imgs/home/icon-wxdc.png">-->
+<!--                    <label class="label2-2 more2-2">问需调查</label>-->
+<!--                </div>-->
+<!--            </div>-->
             <div tappable (click)="goTo('BusinessUnitPage')">
                 <div class="card">
                     <img src="./assets/imgs/home/icon-ywzd.png">

src/service/http.service.ts

@@ -14,12 +14,12 @@ export class AppGlobal {
 
     //接口基地址
     // static domain = "http://192.168.2.106:8080";     //正式环境
-    // static domain = "https://bjgdjy.shjcdj.cn";   //政务云
+    static domain = "https://bjgdjy.shjcdj.cn";   //政务云
     // static domain = "http://47.103.33.196:8080";   //阿里云正式地址
     // static domain = "http://47.103.35.216:8080";   //阿里云测试地址
     // static domain = "http://218.78.19.169:8081";   //天翼云地址
     // static domain = "http://218.78.19.169:8082/";   //天翼测试云地址
-    static domain = "";   //本地环境
+    // static domain = "";   //本地环境
 
     //图片地址
     static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";