car update

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.6.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>部机关党建云</name>
     <description>组织部党建云平台App.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

ionic.config.json

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

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

-#Thu Aug 15 00:27:32 CST 2019
+#Thu Aug 15 02:35:17 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.
-#Thu Aug 15 00:27:33 CST 2019
+#Thu Aug 15 02:35:17 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
 439.set=ASSET

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="40600"
-    android:versionName="4.6.0" >
+    android:versionCode="40500"
+    android:versionName="4.5.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40600},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"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":40600},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"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":40600},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"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":40600},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"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 Thu Aug 15 00:27:35 CST 2019      </nav>
+Check performed at Thu Aug 15 02:35:19 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="40600" android:versionName="4.6.0" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40500" android:versionName="4.5.0" 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.6.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.5.0" 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>

src/interceptor/errorhandle.interceptor.ts

+import {HttpInterceptor, HttpRequest, HttpErrorResponse, HttpHandler, HttpEvent} from '@angular/common/http';import {Observable} from 'rxjs/Observable';import 'rxjs/add/operator/do';
export class ErrorHandlerInterceptor implements HttpInterceptor {

    constructor() {
    }

    intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
        return next.handle(request).do((event: HttpEvent<any>) => {
        }, (err: any) => {
            if (err instanceof HttpErrorResponse) {
                console.log(err);
                if (!(err.status === 401 && (err.message === '' || (err.url && err.url.indexOf('/api/account') === 0)))) {
                }
            }
        });
    }}
\ No newline at end of file

src/pages/serve-pages/business-unit/business-unit.scss

@@ -65,60 +65,60 @@ page-business-unit {
           margin-right: 1rem;
         }
       }
+    }
 
-      .news-left {
-        display: flex;
-        flex-flow: row wrap;
-        min-height: 100%;
-        padding: 5px;
-
-        .news-title {
-          align-self: flex-start;
-          font-weight: bold;
-          width: 100%;
-          //margin-bottom: 1rem;
-          color: #333333;
-          font-size: 1.6rem;
-          font-family: SourceHanSans-Bold;
-          position: relative;
+    .search-item + .search-item {
+      border-top: 1px solid #eeeeee;
+    }
+  }
+  .news-left {
+    display: flex;
+    flex-flow: row wrap;
+    min-height: 100%;
+    padding: 5px;
 
-          .icon-fire {
-            position: absolute;
-            top: 3px;
-            left: -14px;
-            font-size: 1.5rem;
-            color: #e42417;
-          }
-        }
+    .news-title {
+      align-self: flex-start;
+      font-weight: bold;
+      width: 100%;
+      //margin-bottom: 1rem;
+      color: #333333;
+      font-size: 1.6rem;
+      font-family: SourceHanSans-Bold;
+      position: relative;
 
-        .news-end {
-          align-self: flex-end;
-          color: #989898;
-          font-size: 1.5rem;
-          margin-top: .5rem;
-          ion-icon{
-            font-size: 1.2rem;
-          }
-          span {
-            margin-right: .8rem;
-            font-size: 1rem;
-          }
-        }
+      .icon-fire {
+        position: absolute;
+        top: 3px;
+        left: -14px;
+        font-size: 1.5rem;
+        color: #e42417;
       }
+    }
 
-      .news-right {
-        padding: 5px;
-        text-align: center;
-        max-height: 60px;
-
-        img {
-          border-radius: .5rem;
-        }
+    .news-end {
+      align-self: flex-end;
+      color: #989898;
+      font-size: 1.5rem;
+      margin-top: .5rem;
+      ion-icon{
+        font-size: 1.2rem;
+      }
+      span {
+        margin-right: .8rem;
+        font-size: 1rem;
       }
     }
+  }
 
-    .search-item + .search-item {
-      border-top: 1px solid #eeeeee;
+  .news-right {
+    padding: 5px;
+    text-align: center;
+
+    img {
+      max-width: 75px;
+      margin: 0 auto;
+      border-radius: .5rem;
     }
   }
 }

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

@@ -108,7 +108,7 @@ export class FoodDealPage {
         this.serveSer.searchMealCheckList(data).subscribe(
             (res) => {
                 this.totalNum = res.data.total;
-                res.list.forEach(e => {
+                res.data.list.forEach(e => {
                     this.apply.list.push(e);
                 });
                 timer(800).subscribe(() => e.complete());

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

@@ -100,7 +100,7 @@ export class FoodPage {
         this.serveSer.myBook(data).subscribe(
             (res) => {
                 this.page.total = res.data.total;
-                res.list.forEach(e => {
+                res.data.list.forEach(e => {
                     this.applyList.push(e);
                 });
                 timer(800).subscribe(() => e.complete());

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

@@ -73,7 +73,7 @@
             <ion-label style="max-width: 100%" *ngIf="check.participantAmount" class="check-tips">参会人数不可大于会议室可容纳数({{roomMax}})</ion-label>
         </ion-item>
         <div class="item-box">
-            <div class="left"><span class="color-red">*</span>参会人员:
+            <div class="left">参会人员:
             </div>
             <div class="right">
                 <button color="danger" ion-button small (click)="choose()">选择</button>

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

@@ -299,14 +299,20 @@ export class RoomApplyPage {
 
         const max = this.roomMax.replace(/[^0-9]/ig, "");
         console.log(max);
-        if (isNaN(this.obj.participantAmount) || this.obj.participantAmount > max) {
+        if (isNaN(this.obj.participantAmount)) {
+            console.log("max is Nan");
+            this.check.participantAmount = true;
+            return false;
+        }
+        if(~~this.obj.participantAmount > ~~max){
+            console.log("人数太多");
             this.check.participantAmount = true;
             return false;
         }
         //校验
         let checkBool = false;
         for (let i in this.check) {
-            if (!this.obj[i] || this.personList.length == 0) {
+            if (!this.obj[i]) {
                 checkBool = true;
                 this.check[i] = true;
             } else {

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

@@ -108,7 +108,7 @@ export class RoomDealPage {
         this.serveSer.searchCheckList(data).subscribe(
             (res) => {
                 this.totalNum = res.data.total;
-                res.list.forEach(e => {
+                res.data.list.forEach(e => {
                     this.apply.list.push(e);
                 });
                 timer(800).subscribe(() => e.complete());

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

@@ -194,7 +194,7 @@ export class CarApplyPage {
         this.personList.forEach(e => {
             carUser.push(e.id);
         });
-        const data = {
+        const data = <any>{
             startTime: new Date(this.obj.startTime).getTime() - 8 * 60 * 60 * 1000,
             endTime: new Date(this.obj.endTime).getTime() - 8 * 60 * 60 * 1000,
             passengerCount: this.obj.passengerCount,
@@ -202,7 +202,7 @@ export class CarApplyPage {
             useReason: this.obj.useReason,
             fromTo: this.obj.fromTo,
         };
-        console.log(data);
+        if (this.applyId) data.id = this.applyId;
         this.commonSer.alert('确认提交？', () => {
             this.serveSer.saveCarApply(data).subscribe(
                 (res) => {

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

@@ -35,17 +35,27 @@
                                 </span>
                                 </p>
                                 <ion-row>
-                                    <ion-col col-9>
+                                    <ion-col  col-9>
                                         <p>
-                                <span class="apply-room">用车时间：
-                                    <span>{{item.startTime | date:'yyyy-MM-dd HH:mm'}}</span>
-                                </span>
+                                            <span class="apply-room">用车时间：
+                                                <span>{{item.startTime | date:'yyyy-MM-dd HH:mm'}}</span>
+                                            </span>
                                         </p>
                                         <p>
                                            <span class="apply-room">还车时间：
                                                 <span>{{item.endTime | date:'yyyy-MM-dd HH:mm'}}</span>
                                             </span>
                                         </p>
+                                    </ion-col>
+                                    <ion-col col-3>
+                                        <button *ngIf="item.applyStatus == 2" small="true" ion-button color="secondary">
+                                            通过
+                                        </button>
+                                        <button *ngIf="item.applyStatus == 3" small="true" ion-button color="danger">
+                                            驳回
+                                        </button>
+                                    </ion-col>
+                                    <ion-row>
                                         <p>
                                             <span class="apply-room">用车事由：
                                                 <span>{{item.useReasonStr}}</span>
@@ -69,15 +79,7 @@
                                                 <span>{{item.phone}}</span>
                                             </span>
                                         </p>
-                                    </ion-col>
-                                    <ion-col col-3>
-                                        <button *ngIf="item.applyStatus == 2" small="true" ion-button color="secondary">
-                                            通过
-                                        </button>
-                                        <button *ngIf="item.applyStatus == 3" small="true" ion-button color="danger">
-                                            驳回
-                                        </button>
-                                    </ion-col>
+                                    </ion-row>
                                 </ion-row>
                             </ion-item>
                         </ion-item-sliding>

src/pages/serve-pages/use-car/car-deal/car-deal.scss

@@ -43,6 +43,10 @@ page-car-deal {
     .apply{
       background-color: #fff;
       p{
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        width: 100%;
         ion-checkbox{
           vertical-align: bottom;
           margin-right: 5px;
@@ -154,4 +158,7 @@ page-car-deal {
     line-height: 4rem;
     padding: 0 20px;
   }
+  ion-row{
+    width: 100%;
+  }
 }

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

@@ -94,6 +94,7 @@ export class CarDealPage {
     doInfinite(e) {
         if (this.totalNum == this.apply.list.length) {
             this.apply.loadMore = false;
+            timer(800).subscribe(() => e.complete());
             e.enable(false);
             return false;
         }
@@ -106,7 +107,7 @@ export class CarDealPage {
         this.serveSer.searchCarCheckList(data).subscribe(
             (res) => {
                 this.totalNum = res.data.total;
-                res.list.forEach(e => {
+                res.data.list.forEach(e => {
                     this.apply.list.push(e);
                 });
                 timer(800).subscribe(() => e.complete());

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

@@ -111,6 +111,7 @@ export class DriverPage {
             applyId: this.applyId,
             driverName: this.opObj.driverName,
             carNumber: this.opObj.carNumber,
+            phone: this.opObj.phone,
             status: status,
             isOwner: Number(this.opObj.isOwner)
         };