key update

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
   {
     "path": "/wisdomgroup",
-    "proxyUrl": "http://218.78.19.169:8081/wisdomgroup"
+    "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
   },
   {
     "path": "/logistics",

src/app/app.component.ts

@@ -20,11 +20,12 @@ import {TabsService} from "../pages/tabs/tabs.service";
 import {version} from "moment";
 
 
-declare var Wechat:any;
-declare var window:any;
+declare var Wechat: any;
+declare var window: any;
 declare var cordova: any;
 declare var device: any;
-declare var appAvailability:any;
+declare var appAvailability: any;
+
 @Component({
     templateUrl: 'app.html'
 })
@@ -32,7 +33,8 @@ export class MyApp {
 
     @ViewChild(Content) content: Content;
     rootPage;
-    showSplash = true;
+    showSplash = false;
+    nowVersion = "4.6.0";
 
     user;
 
@@ -50,6 +52,8 @@ export class MyApp {
                 private appMainSer: AppMainService,
                 public appService: AppService) {
         this.platform.ready().then(() => {
+            this.showSplash = true;
+
             this.splashScreen.hide();
             this.statusBar.show();
             this.statusBar.overlaysWebView(false);
@@ -60,7 +64,6 @@ export class MyApp {
             timer(4500).subscribe((res) => {
                 this.showSplash = false;
                 this.device();
-                this.loadLogin();
             });
 
             //app字体不跟随手机字体大小变化
@@ -72,18 +75,21 @@ export class MyApp {
 
     //用户设备
     device() {
+        console.log('device');
         if (this.platform.is('android')) {
             this.screenOrientation.lock('portrait-primary');  //锁定竖屏
             this.checkVersion();
+        } else {
+            this.loadLogin();
         }
     }
 
     //检测是否需要更新
     async checkVersion() {
-        let appVersion;
 
         await this.appVersion.getVersionNumber().then((ver: string) => {
-            appVersion = ver.trim();
+            this.nowVersion = ver.trim();
+            this.loadLogin();
         });
         await this.appUpdateService.compariVersion().subscribe(res => {
             const data = res.json();
@@ -91,8 +97,8 @@ export class MyApp {
             console.log(data);
             data.latestVersion = data.latestVersion.trim();
             if (data.code == 200) {
-                if (data.latestVersion != null && data.latestVersion != appVersion) {
-                    this.appUpdateService.detectionUpgrade(data.androidDownload, true,data.latestVersion); //提示升级
+                if (data.latestVersion != null && data.latestVersion != this.nowVersion) {
+                    this.appUpdateService.detectionUpgrade(data.androidDownload, true, data.latestVersion); //提示升级
                 }
             }
         });
@@ -110,7 +116,8 @@ export class MyApp {
         await this.getNoRead();
     }
 
-    async takeLogin(){
+    async takeLogin() {
+        this.user.newestVersion = this.nowVersion;
         await this.tabSer.loginpost(this.user).subscribe((res) => {
             if (res.code == '200') {
                 this.storage.set('user', res.data);
@@ -118,7 +125,7 @@ export class MyApp {
                 this.storage.set('userLoginInfo', this.user);
                 this.rootPage = TabsPage;
             } else {
-                this.appService.alert('手机号或密码错误！');
+                this.appService.alert(res.message);
                 this.rootPage = LoginPage;
             }
         });

src/app/app.module.ts

@@ -59,6 +59,7 @@ import {ContactService} from "../pages/contact/contact.service";
 import {UntilService} from "../provide/until.service";
 import {PaymentPageModule} from "../pages/discover-pages/payment/payment.module";
 import {RepairPageModule} from "../pages/serve-pages/repair/repair.module";
+import {TimeFormatService} from "../provide/timeFormat.service";
 
 
 @NgModule({
@@ -145,6 +146,7 @@ import {RepairPageModule} from "../pages/serve-pages/repair/repair.module";
         AppMainService,
         DiscoverService,
         UntilService,
+        TimeFormatService,
         {provide: ErrorHandler, useClass: IonicErrorHandler}
     ]
 })

src/app/app.scss

@@ -559,3 +559,15 @@ ion-buttons button span.top-right-icon{
 .action-sheet-wrapper{
   top: 25%;
 }
+
+.cancelBtn{
+  padding: .8rem !important;
+  border: 1px solid #419bf6;
+  text-align: center;
+  border-radius: 10px;
+  width: 70%;
+  margin: 0 auto !important;
+  span{
+    color: #419bf6 !important;
+  }
+}

src/index.html

@@ -47,7 +47,37 @@
 
 <!-- The main bundle js is generated during the build process -->
 <script src="build/main.js"></script>
+<script>
+    //Cache Buster
+    (function () {
+        let rep = /.*\?.*/,
+            links = document.getElementsByTagName('link'),
+            scripts = document.getElementsByTagName('script'),
+            process_scripts = true;
+        for (let i = 0; i < links.length; i++) {
+            let link = links[i],
+                href = link.href;
+            if (rep.test(href)) {
+                link.href = href + '&' + Date.now();
+            } else {
+                link.href = href + '?' + Date.now();
+            }
+
+        }
+        if (process_scripts) {
+            for (let i = 0; i < scripts.length; i++) {
+                let script = scripts[i],
+                    src = script.src;
+                if (rep.test(src)) {
+                    script.src = src + '&' + Date.now();
+                } else {
+                    script.src = src + '?' + Date.now();
+                }
 
+            }
+        }
+    })();
+</script>
 </body>
 
 <script src="assets/swiper/swiper-4.1.6.min.js"></script>

src/pages/login/login.ts

@@ -8,6 +8,7 @@ import {Storage} from '@ionic/storage';
 import {AppService} from '../../service/http.service';
 import {LoginService} from "./login.service";
 import {TabsService} from "../tabs/tabs.service";
+import {AppVersion} from "@ionic-native/app-version";
 
 
 @IonicPage()
@@ -24,19 +25,23 @@ export class LoginPage {
         userid: '',							//登录数据
         mobile: '',
         password: '',
-        rememberMe: true
+        rememberMe: true,
+        newestVersion: '4.6.0'
     };
     tabflag: any;
 
     constructor(public navCtrl: NavController,
                 public navParams: NavParams,
                 public storage: Storage,
-                public alertCtrl: AlertController,
+                public alertCtrl: AlertController, private appVersion: AppVersion,
                 private loadingCtrl: LoadingController,
                 public http: Http, private loginSer: LoginService,
                 public appService: AppService,
                 public tabSer: TabsService,
                 public elementRef: ElementRef) {
+        this.appVersion.getVersionNumber().then((ver: string) => {
+            this.user.newestVersion = ver.trim();
+        });
 
     }
 
@@ -93,7 +98,7 @@ export class LoginPage {
                     this.storage.set('userLoginInfo', this.user);
                     return this.navCtrl.setRoot(TabsPage, {"user": this.user});
                 } else {
-                    this.appService.alert('手机号或密码错误！');
+                    this.appService.alert(res.message);
                 }
             },
             (err) => {

src/pages/mine/person/personInfo/personInfo.ts

@@ -127,6 +127,7 @@ export class PersonInfoPage {
         const fileTransfer: FileTransferObject = this.transfer.create();
         fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/icon/upload', options).then(
             (res) => {
+                console.log(res);
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传成功');
                 this.getUserInfo();

src/pages/serve-pages/food/food.html

@@ -103,6 +103,7 @@
                                     <span *ngIf="item.typeList && item.typeList.includes(2)">晚餐</span>
                                 </span>
                             </p>
+                            <p (click)="removeItem(item)" class="cancelBtn"> <span>取消</span> </p>
                         </ion-item>
                         <ion-item *ngIf="item.diffFlag == 2">
                             <p>
@@ -124,10 +125,9 @@
                                     <span>{{item.orderDate | date:'yyyy-MM-dd'}}</span>
                                 </span>
                             </p>
+                            <p (click)="removeItem(item)" class="cancelBtn"> <span>取消</span> </p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
+
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"

src/pages/serve-pages/food/food.ts

@@ -141,11 +141,11 @@ export class FoodPage {
 
     //取消预定
     removeItem(item) {
-        debugger
         if (item.orderDate < new Date().getTime()) {
             this.commonSer.toast("已过期不可取消");
             return;
         }
+        this.commonSer.alert('确定取消?',()=>{
             this.serveSer.cancelMeals(item.id).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
@@ -156,6 +156,7 @@ export class FoodPage {
                     }
                 }
             )
+        });
     }
 
     //审核

src/pages/serve-pages/hair-cut/hair-cut.html

@@ -47,7 +47,7 @@
                                         <span *ngIf="item1.startEnd == 1">9:00-09:45</span>
                                         <span *ngIf="item1.startEnd == 2">09:45-10:30</span>
                                         <span *ngIf="item1.startEnd == 3">10:30-11:15</span>
-                                        <span *ngIf="item1.userName == mineInfo?.username"> {{item1.userName}}</span>
+                                        <span> {{item1.userName}}</span>
                                          (已预定)
                                 </span>
                             </ng-container>
@@ -59,14 +59,15 @@
                         </div>
                         <div class="morning-room">
                             <ng-container *ngFor="let item2 of room?.afternoonUse">
-                                <span [ngClass]="item2.isImportant == 1?'import':''"
-                                      *ngIf="role.includes(9) ||  item2.userName == mineInfo?.username"
+                                <span [ngClass]="item2.isImportant == 1?'import':''" *ngIf="role.includes(9) ||  item2.userName == mineInfo?.username"
                                       (click)="goApplyEdit(item2)">
                                         <span *ngIf="item2.startEnd == 4">13:00-14:00</span>
                                         <span *ngIf="item2.startEnd == 5">14:00-15:00</span>
                                         <span *ngIf="item2.startEnd == 6">15:00-16:00</span>
                                         <span *ngIf="item2.startEnd == 7">16:00-17:00</span>
+                                    <span>
                                         {{item2.userName}}
+                                    </span>
                                     (已预定)
                                 </span>
                             </ng-container>
@@ -133,10 +134,8 @@
                                     <span *ngIf="item.startEnd == 7">16:00-17:00</span>
                                 </span>
                             </p>
+                            <p (click)="removeItem(item)" class="cancelBtn"> <span>取消</span> </p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"

src/pages/serve-pages/hair-cut/hair-cut.ts

@@ -137,6 +137,7 @@ export class HairCutPage {
             this.commonSer.toast("已过期不可取消");
             return;
         }
+        this.commonSer.alert('确定取消?',()=>{
             this.serveSer.cancelHair(item.id).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
@@ -147,6 +148,7 @@ export class HairCutPage {
                     }
                 }
             )
+        });
     }
 
     //改变

src/pages/serve-pages/meet-room/meet-room.html

@@ -37,19 +37,22 @@
             <div class="room">
                 <div class="notYet">
                     <p>会议室预定信息</p>
-                    <p class="meet-tips"><span>提示:点击会议室名称进行预定</span></p>
                     <div class="room-apply">
                         <div class="room-flex" *ngFor="let room of room">
                             <div class="room-name" (click)="chooseType(room,{},'8:00:00')">
                                 {{room.roomName}}
                             </div>
                             <div class="room-apply">
-                                <p *ngFor="let apply of room?.applies" (click)="chooseType(room,apply,'8:00:00')">
+                                <p *ngFor="let apply of room?.applies" (click)="chooseType(room,apply,'8:00:00')"
+                                   [ngClass]="apply.startTime.split(':').join('') > clock12 ? 'afternoonBg':''">
                                     <span>{{apply.timeQuantum}}</span>
                                     <span>{{apply.applicantName}}</span>
                                     <span>{{apply.orgName}}</span>
-                                    <span>{{apply.meetingTypeStr}}</span>
+<!--                                    <span>{{apply.meetingTypeStr}}</span>-->
                                 </p>
+                                <p *ngIf="this.role.includes(1) || this.role.includes(2) || this.role.includes(3)
+                                    || this.role.includes(7)" class="list-btn" (click)="goApply(room,'8:00:00')">
+                                    会议室预定</p>
                             </div>
                         </div>
                     </div>
@@ -92,10 +95,9 @@
                                     <span>{{item.startTime | date:'yyyy年MM月dd日 HH:mm'}}</span>-<span>{{item.endTime | date:'HH:mm'}}</span>
                                 </span>
                             </p>
+                            <p *ngIf="nowDate < item.startTime" (click)="removeItem(item)" class="cancelBtn">
+                                <span>取消</span></p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"
@@ -112,6 +114,16 @@
                     loadingSpinner="bubbles"
                     loadingText="加载中"></ion-infinite-scroll-content>
         </ion-infinite-scroll>
+
+<!--        <ion-fab right bottom *ngIf="this.role.includes(1) || this.role.includes(2) || this.role.includes(3)-->
+<!--            || this.role.includes(7)">-->
+<!--            <button ion-fab color="light" (click)="goApply(room[0],'8:00')">-->
+<!--                <div class="fab-call">-->
+<!--                    <ion-icon style="font-size: 2rem" class="top-right-icon icon-fabu iconfont"></ion-icon>-->
+<!--                    <p>会议室预定</p>-->
+<!--                </div>-->
+<!--            </button>-->
+<!--        </ion-fab>-->
     </ion-content>
 </ion-content>
 

src/pages/serve-pages/meet-room/meet-room.scss

@@ -274,12 +274,42 @@ page-meet-room {
   }
   .room-apply{
     p{
+      border: 1px solid #fff1f0;
       padding: 1.5rem 5px;
+      border-radius: 5px;
     }
-    p:nth-of-type(2n){
+    p.afternoonBg{
       background-color: #fff1f0;
-      border-radius: 5px;
+      border: 1px solid #fff1f0;
       color: #000000;
     }
   }
+
+  .fab ion-icon {
+    color: #e42417;
+    font-size: 4rem;
+  }
+
+  .fab-ios-light {
+    border: 1px solid #333333;
+    width: 7rem;
+    height: 7rem;
+  }
+
+  .fab-call {
+    line-height: normal;
+
+    p {
+      color: #333333;
+      font-size: 1rem;
+    }
+  }
+  .list-btn{
+    text-align: center;
+    color: #4d8bfc;
+    border:1px solid #4d8bfc !important;
+    font-weight: bold;
+    font-size: 2rem;
+    border-radius: 5px;
+  }
 }

src/pages/serve-pages/meet-room/meet-room.ts

@@ -10,6 +10,7 @@ import {CommonService} from "../../../provide/common.service";
 import {AppMainService} from "../../../app/app.service";
 import {RoomDealPage} from "./room-deal/room-deal";
 import {timer} from "rxjs/observable/timer";
+import {TimeFormatService} from "../../../provide/timeFormat.service";
 
 @IonicPage()
 @Component({
@@ -41,15 +42,17 @@ export class MeetRoomPage {
         isLoad: true,
     };
 
+    clock12 = "1200";
+    nowDate;
+
     constructor(public navCtrl: NavController, public navParams: NavParams,
-                private serveSer: ServeService, public datePipe: DatePipe,
+                private serveSer: ServeService, public datePipe: DatePipe,private timeFormat:TimeFormatService,
                 private commonSer: CommonService, private appMainSer: AppMainService) {
     }
 
     ionViewDidEnter() {
         this.myApply();
         this.getApply();
-
     }
 
     ionViewDidLoad() {
@@ -90,6 +93,7 @@ export class MeetRoomPage {
     }
 
     doInfinite(e) {
+        this.nowDate = new Date().getTime();
         if (this.page.total == this.applyList.length) {
             console.log("没有更多了");
             e.enable(false);
@@ -113,6 +117,7 @@ export class MeetRoomPage {
 
     //我的预定
     myApply() {
+        this.nowDate = new Date().getTime();
         const data = {
             P_pageNumber: this.page.P_pageNumber,
             P_pageSize: this.page.P_pageSize,
@@ -128,10 +133,7 @@ export class MeetRoomPage {
 
     //取消预定
     removeItem(item) {
-        if (item.startTime < new Date().getTime()) {
-            this.commonSer.toast("已过期不可取消");
-            return;
-        }
+        this.commonSer.alert('确定取消申请?', () => {
             this.serveSer.cancelApply(item.id).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
@@ -142,6 +144,7 @@ export class MeetRoomPage {
                     }
                 }
             )
+        });
     }
 
     //审核
@@ -167,15 +170,14 @@ export class MeetRoomPage {
         } else {
             this.navCtrl.push(RoomApplyPage, {
                 id: apply.applyId,
-                type:'look'
+                type: 'look'
             });
         }
     }
 
     //新增申请
-    goApply(room, apply, time) {
+    goApply(room, time) {
         let data;
-        if (apply) {
         data = {
             roomId: room.roomId,
             roomName: room.roomName,
@@ -183,7 +185,6 @@ export class MeetRoomPage {
             startTime: this.date + ' ' + time,
             accommodation: room.accommodation
         };
-        }
         this.navCtrl.push(RoomApplyPage, {data: data});
     }
 
@@ -199,7 +200,7 @@ export class MeetRoomPage {
             if (apply.applyId) {
                 this.goApplyEdit(room, apply);
             } else {
-                this.goApply(room, apply, time);
+                this.goApply(room, time);
             }
         }
     }

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -6,6 +6,7 @@ import {CommonService} from "../../../../provide/common.service";
 import {DatePipe} from "@angular/common";
 import {AppMainService} from "../../../../app/app.service";
 import {UntilService} from "../../../../provide/until.service";
+import {TimeFormatService} from "../../../../provide/timeFormat.service";
 
 @Component({
     selector: 'page-room-apply',
@@ -81,6 +82,7 @@ export class RoomApplyPage {
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private actionSheetCtrl: ActionSheetController,
                 private serveSer: ServeService, public _modalCtrl: ModalController, private appMainSer: AppMainService,
+                public timeFormat: TimeFormatService,
                 private commonSer: CommonService, private datePipe: DatePipe, private until: UntilService) {
         this.appMainSer.mineInfo.subscribe(value => {
             this.mineInfo = value;
@@ -121,15 +123,11 @@ export class RoomApplyPage {
     }
 
     changeStartTime(e) {
-        const minute = e.minute > 9 ? e.minute : '0' + e.minute;
-        const hour = e.hour > 9 ? e.hour : '0' + e.hour;
-        this.obj.startTime = e.year + '-' + e.month + '-' + e.day + " " + hour + ":" + minute + ":00";
+        this.obj.startTime = this.timeFormat.ionTimeFormat(e);
     }
 
     changeEndTime(e) {
-        const minute = e.minute > 9 ? e.minute : '0' + e.minute;
-        const hour = e.hour > 9 ? e.hour : '0' + e.hour;
-        this.obj.endTime = e.year + '-' + e.month + '-' + e.day + " " + hour + ":" + minute + ":00";
+        this.obj.endTime = this.timeFormat.ionTimeFormat(e);
     }
 
     //会议详情

src/pages/serve-pages/repair/repair-apply/repair-apply.html

@@ -10,6 +10,9 @@
     <ion-input [(ngModel)]="obj.equipmentName" placeholder="设备名称"></ion-input>
   </ion-item>
   <ion-item>
+    <ion-input [(ngModel)]="obj.roomName" placeholder="房间号"></ion-input>
+  </ion-item>
+  <ion-item>
     <textarea [(ngModel)]="obj.remark" class="content-textarea" placeholder="备注"></textarea>
   </ion-item>
   <ion-item>
@@ -17,7 +20,7 @@
       <ion-col class="imgList" col-4 *ngFor="let img of obj.urlList;let i  = index;">
         <span class="imgTips" *ngIf="i == 0">设备图片</span>
         <ion-icon (click)="deleteFile(i)" class="main-color" name="close-circle"></ion-icon>
-        <img [src]="pictrue + img" alt="标题图片">
+        <img [src]="picUrl + img" alt="标题图片">
       </ion-col>
       <ion-col col-4 *ngIf="obj.urlList.length < 9">
         <div class="selectDiv" (click)="tackePic()">

src/pages/serve-pages/repair/repair-apply/repair-apply.ts

@@ -13,11 +13,12 @@ import {ServeService} from "../../serve.service";
 export class RepairApplyPage {
 
     rId;
-    pictrue = AppGlobal.domain + '/wisdomgroup';
+    picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
     obj = <any>{
         equipmentName: '',
         remark: '',
-        urlList: []
+        urlList: [],
+        roomName:''
     };
     status;
     actionSheet_image;
@@ -116,13 +117,13 @@ export class RepairApplyPage {
         });
         uploadLoading.present();
         const fileTransfer: FileTransferObject = this.transfer.create();
-        fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/upload1', options).then(
+        fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/icon/upload', options).then(
             (res) => {
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传成功');
                 const data = JSON.parse(res.response);
-                this.commonSer.log(data.data[0].filePath);
-                this.obj.urlList.push(data.data[0].filePath);
+                this.commonSer.log(data.data.id);
+                this.obj.urlList.push(data.data.id);
             }, err => {
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传错误');
@@ -141,6 +142,10 @@ export class RepairApplyPage {
 
     //提交
     submit() {
+        if(!this.obj.equipmentName){
+            this.commonSer.toast('请输入设备名称');
+            return
+        }
         this.commonSer.alert('确定提交申请?', () => {
             if (this.rId) this.obj.id = this.rId;
             this.serveSer.saveRepair(this.obj).subscribe(

src/pages/serve-pages/repair/repair.html

@@ -88,9 +88,9 @@
                                 </span>
                             </p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
+<!--                        <ion-item-options>-->
+<!--                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>-->
+<!--                        </ion-item-options>-->
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"

src/pages/serve-pages/repair/repair.scss

@@ -230,19 +230,24 @@ page-repair {
     font-size: 1rem;
     border-radius: 4px;
   }
-  .fab ion-icon{
+
+  .fab ion-icon {
     color: #e42417;
-    font-size: 3.5rem;
+    font-size: 4rem;
   }
-  .fab-ios-light{
+
+  .fab-ios-light {
     border: 1px solid #333333;
-    width: 7rem;
-    height: 7rem;
+    width: 9rem;
+    height: 9rem;
   }
-  .fab-call{
+
+  .fab-call {
     line-height: normal;
-    p{
+
+    p {
       color: #333333;
+      font-size: 1rem;
     }
   }
 }

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

@@ -4,6 +4,7 @@ import {ServeService} from "../../serve.service";
 import {CommonService} from "../../../../provide/common.service";
 import {DatePipe} from "@angular/common";
 import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
+import {TimeFormatService} from "../../../../provide/timeFormat.service";
 
 
 @Component({
@@ -40,7 +41,7 @@ export class CarApplyPage {
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, public modalCtrl: ModalController,
-                private commonSer: CommonService, private datePipe: DatePipe,
+                private commonSer: CommonService, private datePipe: DatePipe,private timeFormat:TimeFormatService,
                 private actionSheetCtrl: ActionSheetController) {
     }
 
@@ -93,15 +94,11 @@ export class CarApplyPage {
     }
 
     changeStartTime(e) {
-        const minute = e.minute > 9 ? e.minute : '0' + e.minute;
-        const hour = e.hour > 9 ? e.hour : '0' + e.hour;
-        this.obj.startTime = e.year + '-' + e.month + '-' + e.day + " " + hour + ":" + minute + ":00";
+        this.obj.startTime = this.timeFormat.ionTimeFormat(e);
     }
 
     changeEndTime(e) {
-        const minute = e.minute > 9 ? e.minute : '0' + e.minute;
-        const hour = e.hour > 9 ? e.hour : '0' + e.hour;
-        this.obj.endTime = e.year + '-' + e.month + '-' + e.day + " " + hour + ":" + minute + ":00";
+        this.obj.endTime = this.timeFormat.ionTimeFormat(e);
     }
 
     //选择事由

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

@@ -119,14 +119,13 @@
                                                 <span>{{item.phone}}</span>
                                             </span>
                             </p>
+                            <p *ngIf="nowDate < item.startTime" (click)="removeItem(item)" class="cancelBtn">
+                                <span>取消</span></p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"
-                          *ngIf="!isLoad  && applyList.length == 0">
+                          *ngIf="page.isLoad  && applyList.length == 0">
                     <img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
                     <p text-center>
                         暂无申请

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

@@ -35,22 +35,26 @@ export class UseCarPage {
     role = [];
     mineInfo;
 
-    pageNumber = 1;
-    pageSize = AppGlobal.pageCount;
-    total;
-    isLoad = true;
+    page = {
+        P_pageNumber: 1,
+        P_pageSize: AppGlobal.pageCount,
+        total: 0,
+        isLoad: false,
+    };
 
     checkObj = {
         checkedApplyList: [],   //已审核
         uncheckApplyist: []   //未审核
     };
 
+    nowDate;
+
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, public datePipe: DatePipe,
                 private commonSer: CommonService, private appMainSer: AppMainService) {
     }
 
-    ionViewDidEnter(){
+    ionViewDidEnter() {
         this.myApply();
         this.getApply();
     }
@@ -80,52 +84,72 @@ export class UseCarPage {
         )
     }
 
+    //我的预定
+    myApply() {
+        this.nowDate = new Date().getTime();
+        const data = {
+            P_pageNumber: 1,
+            P_pageSize: this.page.P_pageSize,
+        };
+        this.serveSer.myCarApply(data).subscribe(
+            (res) => {
+                this.page.isLoad = false;
+                this.applyList = res.data.list;
+                this.page.total = res.data.total;
+            }
+        )
+    }
+
     getDate(e) {
         this.date = e;
         this.getApply();
     }
 
-    doRefresh(e){
+    doRefresh(e) {
         this.getApply();
         const data = {
             P_pageNumber: 1,
-            P_pageSize: this.pageSize,
+            P_pageSize: this.page.P_pageSize,
         };
         this.serveSer.myCarApply(data).subscribe(
             (res) => {
-                this.isLoad = false;
+                this.page.isLoad = true;
                 this.applyList = res.data.list;
-                this.total = res.data.total;
+                this.page.total = res.data.total;
                 timer(800).subscribe(() => e.complete());
             }
         )
     }
 
-    doInfinite(e){
-        timer(800).subscribe(() => e.complete());
+    doInfinite(e) {
+        this.nowDate = new Date().getTime();
+        if (this.page.total == this.applyList.length) {
+            console.log("没有更多了");
+            e.enable(false);
+            return false;
         }
-
-    //我的预定
-    myApply() {
+        this.page.P_pageNumber++;
         const data = {
-            P_pageNumber: this.pageNumber,
-            P_pageSize: this.pageSize,
+            P_pageNumber: this.page.P_pageNumber,
+            P_pageSize: this.page.P_pageSize,
         };
         this.serveSer.myCarApply(data).subscribe(
             (res) => {
-                this.isLoad = false;
-                this.applyList = res.data.list;
-                this.total = res.data.total;
+                this.page.total = res.total;
+                this.applyList = this.applyList.concat(res.list);
+                timer(800).subscribe(() => e.complete());
             }
         )
+        timer(800).subscribe(() => e.complete());
     }
 
     //取消预定
     removeItem(item) {
-        if(item.startTime < new Date().getTime()){
+        if (item.startTime < new Date().getTime()) {
             this.commonSer.toast("已过期不可取消");
             return;
         }
+        this.commonSer.alert('确定取消?', () => {
             this.serveSer.cancelCarApply(item.id).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
@@ -136,6 +160,7 @@ export class UseCarPage {
                     }
                 }
             )
+        });
     }
 
     //新增预定

src/pages/serve-pages/vistor-register/vistor-register.html

@@ -47,7 +47,7 @@
                                 来访时间：<span>{{done.visitTime | date:"yyyy-MM-dd HH:mm"}}</span>
                             </div>
                             <div>
-                                访客公司：<span>{{done.visitorOrg}}</span>
+                                访客单位：<span>{{done.visitorOrg}}</span>
                                 访客车辆：<span>{{done.carNumber}}</span>
                             </div>
                         </div>
@@ -66,7 +66,7 @@
                                 来访时间：<span>{{no.visitTime | date:"yyyy-MM-dd HH:mm"}}</span>
                             </div>
                             <div>
-                                访客公司：<span>{{no.visitorOrg}}</span>
+                                访客单位：<span>{{no.visitorOrg}}</span>
                                 访客车辆：<span>{{no.carNumber}}</span>
                             </div>
                         </div>
@@ -110,10 +110,8 @@
                                     </button>
                                 </ion-col>
                             </ion-row>
+                            <p *ngIf="nowDate < item.startTime" (click)="removeItem(item,$event)" class="cancelBtn"> <span>取消</span> </p>
                         </ion-item>
-                        <ion-item-options>
-                            <button ion-button color="danger" (click)="removeItem(item)">取消</button>
-                        </ion-item-options>
                     </ion-item-sliding>
                 </ion-list>
                 <ion-list text-center style="margin-top: 10rem;color: #666666"

src/pages/serve-pages/vistor-register/vistor-register.ts

@@ -37,9 +37,10 @@ export class VistorRegisterPage {
     myList;
 
     pageNumber = 1;
-    pageSize = 100;
+    pageSize = 1000;
     total;
     isLoad = true;
+    nowDate;
 
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 private serveSer: ServeService, public datePipe: DatePipe,
@@ -89,6 +90,7 @@ export class VistorRegisterPage {
 
     //我的预定
     myApply() {
+        this.nowDate = new Date().getTime();
         const data = {
             P_pageNumber: this.pageNumber,
             P_pageSize: this.pageSize,
@@ -103,11 +105,13 @@ export class VistorRegisterPage {
     }
 
     //取消预定
-    removeItem(item) {
-        if(item.submitTime < new Date().getTime() || item.status == 2 ){
+    removeItem(item, ev) {
+        ev.stopPropagation();
+        if (item.submitTime < new Date().getTime() || item.status == 2) {
             this.commonSer.toast("已过期不可取消");
             return;
         }
+        this.commonSer.alert('确定取消?', () => {
             this.serveSer.cancelVisitor(item.id).subscribe(
                 (res) => {
                     if (res.errcode == 1000) {
@@ -118,6 +122,7 @@ export class VistorRegisterPage {
                     }
                 }
             )
+        });
     }
 
     //审核
@@ -134,7 +139,7 @@ export class VistorRegisterPage {
 
     //编辑申请
     goApplyEdit(item) {
-        if(item.status == 2) return;
+        if (item.status == 2) return;
         this.navCtrl.push(VistorApplyPage, {id: item.id});
     }
 
@@ -144,7 +149,7 @@ export class VistorRegisterPage {
     }
 
     //确认到访
-    confirmVist(item,e) {
+    confirmVist(item, e) {
         e.stopPropagation();
         this.commonSer.alert("确认访客已到访?", () => {
             this.serveSer.confirmVisit(item.id).subscribe(

src/pages/tabs/discover/discover.ts

@@ -75,11 +75,6 @@ export class DiscoverPage {
                     "indexChildren": '12'
                 },
                 {
-                    "name": "身边典型",
-                    "type": 6,
-                    "indexChildren": '16'
-                },
-                {
                     "name": "机关动态",
                     "type": 3,
                     "indexChildren": '13'
@@ -150,58 +145,67 @@ export class DiscoverPage {
             ]
         },
         {
-            "name": "党风廉政", "type": 9, "indexParent": 4, "children": [
+            "name": "先进风采", "type": 25, "indexParent": 4, "children": [
+                {
+                    "name": "先进风采",
+                    "type": 25,
+                    "indexChildren": '41'
+                },
+            ]
+        },
+        {
+            "name": "党风廉政", "type": 9, "indexParent": 5, "children": [
                 {
                     "name": "廉政格言",
                     "type": 9,
-                    "indexChildren": '41'
+                    "indexChildren": '51'
                 },
                 {
                     "name": "纪检提示",
                     "type": 10,
-                    "indexChildren": '42'
+                    "indexChildren": '52'
                 },
                 {
                     "name": "警示教育",
                     "type": 12,
-                    "indexChildren": '43'
+                    "indexChildren": '53'
                 }
             ]
         },
         {
-            "name": "互动交流", "type": 21, "indexParent": 5, "children": [
+            "name": "互动交流", "type": 21, "indexParent": 6, "children": [
                 {
                     "name": "学思践悟",
                     "type": 21,
-                    "indexChildren": '51'
+                    "indexChildren": '61'
                 },
                 {
                     "name": "话题讨论",
                     "type": 22,
-                    "indexChildren": '52'
+                    "indexChildren": '62'
                 },
                 {
                     "name": "你问我答",
                     "type": 24,
-                    "indexChildren": '55'
+                    "indexChildren": '63'
                 }]
         },
         {
-            "name": "知识拓展", "type": 16, "indexParent": 6, "children": [
+            "name": "知识拓展", "type": 16, "indexParent": 7, "children": [
                 {
                     "name": "视频资料",
                     "type": 16,
-                    "indexChildren": '61'
+                    "indexChildren": '71'
                 },
                 {
                     "name": "他山之石",
                     "type": 18,
-                    "indexChildren": '63'
+                    "indexChildren": '73'
                 },
                 {
                     "name": "综合知识",
                     "type": 19,
-                    "indexChildren": '64'
+                    "indexChildren": '74'
                 },
             ]
         }

src/pages/test/test.html

-
-<ion-header>
-
-  <ion-navbar>
-    <ion-title>test</ion-title>
-  </ion-navbar>
-
-</ion-header>
-
-
-<ion-content>
-
-</ion-content>

src/pages/test/test.module.ts

-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { TestPage } from './test';
-
-@NgModule({
-  declarations: [
-    TestPage,
-  ],
-  imports: [
-    IonicPageModule.forChild(TestPage),
-  ],
-})
-export class TestPageModule {}

src/pages/test/test.scss

-page-test {
-
-}

src/pages/test/test.ts

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

src/pages/version/version.html

@@ -21,7 +21,11 @@
             <span>系统建议</span>
             <ion-icon float-right name="ios-arrow-forward" ></ion-icon>
         </ion-item>
-        <ion-item class="margin-top-20">
+        <ion-item class="margin-top-20" (click)="clearSotrage()">
+            <span>清除缓存</span>
+            <span float-right name="ios-arrow-forward" ></span>
+        </ion-item>
+        <ion-item>
             <span>当前版本</span>
             <span float-right (click)="update()"><span *ngIf="!isLatest" class="red-span"></span>{{version}}</span>
         </ion-item>

src/pages/version/version.ts

@@ -8,6 +8,7 @@ import {LoginPage} from "../login/login";
 import {App} from "ionic-angular";
 import {ProposalPage} from "../mine-pages/proposal/proposal";
 import {TabsService} from "../tabs/tabs.service";
+import {CommonService} from "../../provide/common.service";
 
 @IonicPage()
 @Component({
@@ -27,6 +28,7 @@ export class VersionPage {
                 private appUpdateService: AppUpdateService,
                 private appVersion: AppVersion,
                 private storage: Storage,
+                private commonSer: CommonService,
                 private app: App, private tabSer: TabsService,
                 private alertCtrl: AlertController) {
 
@@ -120,6 +122,11 @@ export class VersionPage {
         }
     }
 
+    //清除缓存
+    clearSotrage() {
+        window.location.reload(true);
+        this.commonSer.toast('缓存清除成功');
+    }
 
     //后台退出
     logoutApp() {

src/provide/backButton.service.ts

@@ -52,8 +52,8 @@ export class BackButtonService {
     private showExit(): void {
         //如果为true，退出
         if (this.backButtonPressed) {
-            this.platform.exitApp();
             this.tabSer.logout();
+            this.platform.exitApp();
         } else {
             //第一次按，弹出Toast
             this.toastCtrl.create({

src/provide/timeFormat.service.ts

+export class TimeFormatService {
    constructor() {
    }

    ionTimeFormat(e) {
        const month = e.month > 9 ? e.month : '0' + e.month;
        const day = e.day > 9 ? e.day : '0' + e.day;
        const minute = e.minute > 9 ? e.minute : '0' + e.minute;
        const hour = e.hour > 9 ? e.hour : '0' + e.hour;
        const time = e.year + '-' + e.month + '-' + e.day + " " + hour + ":" + minute + ":00";
        return time;
    }}
\ No newline at end of file