style update

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter.test" version="4.5.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter.test" version="4.5.3" 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>
@@ -16,6 +16,7 @@
     <preference name="BackupWebStorage" value="none" />
     <preference name="SplashScreenDelay" value="1000" />
     <preference name="ShowSplashScreenSpinner" value="false" />
+    <preference name="Fullscreen" value="true" />
     <platform name="android">
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />

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

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.smart19.starter.test";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 40502;
-  public static final String VERSION_NAME = "4.5.2";
+  public static final int VERSION_CODE = 40503;
+  public static final String VERSION_NAME = "4.5.3";
 }

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

-#Fri Aug 02 15:33:07 CST 2019
+#Mon Aug 05 16:53:48 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex

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

-#Mon Aug 05 16:09:11 CST 2019
+#Mon Aug 05 17:54:00 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.
-#Mon Aug 05 16:09:11 CST 2019
+#Mon Aug 05 17:54:00 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/transforms/dex/release/0
 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/icon-gh.png

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.test"
     android:hardwareAccelerated="true"
-    android:versionCode="40502"
-    android:versionName="4.5.2" >
+    android:versionCode="40503"
+    android:versionName="4.5.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","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":40502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","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":40502},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/transforms/dex/release/__content__.json

-[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["PROJECT","EXTERNAL_LIBRARIES","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file

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

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","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 Mon Aug 05 16:09:17 CST 2019      </nav>
+Check performed at Mon Aug 05 17:54:03 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="40502" android:versionName="4.5.2" package="io.ionic.smart19.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40503" android:versionName="4.5.3" package="io.ionic.smart19.starter.test" 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.test" version="4.5.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter.test" version="4.5.3" 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/pages/serve-pages/goods-collect/goods-verify/goods-verify.html

@@ -22,7 +22,8 @@
         </div>
     </div>
     <ng-container *ngIf="changeType == 1">
-        <div class="order" *ngFor="let item of noList">
+        <ng-container *ngFor="let item of noList">
+            <div class="order" *ngIf="mineInfo.orgName == item.orgName || role.includes(6)">
                 <p class="orderTips">
                     <ion-checkbox [(ngModel)]="item.checkbox" color="danger"
                                   (ngModelChange)="changeCheck(item)"></ion-checkbox>
@@ -56,8 +57,10 @@
 
             </div>
         </ng-container>
+    </ng-container>
     <ng-container *ngIf="changeType == 2">
-        <div class="order" *ngFor="let item of doneList" (click)="goDetail(item)">
+        <ng-container *ngFor="let item of doneList">
+            <div class="order"  *ngIf="mineInfo.orgName == item.orgName || role.includes(6)" (click)="goDetail(item)">
                 <p class="orderTips">
                     <span *ngIf="item.status == 2">已申请</span>
                     <span *ngIf="item.status == 3">已领取</span>
@@ -90,6 +93,7 @@
                 </div>
             </div>
         </ng-container>
+    </ng-container>
     <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
         <ion-infinite-scroll-content
                 loadingSpinner="bubbles"

src/pages/serve-pages/goods-collect/goods-verify/goods-verify.ts

@@ -27,6 +27,7 @@ export class GoodsVerifyPage {
     type;
 
     picture = AppGlobal.picture;
+    mineInfo;
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private appMainSer: AppMainService,
                 private serveSer: ServeService, private commonSer: CommonService) {
@@ -49,6 +50,11 @@ export class GoodsVerifyPage {
                 this.getUnsubmit();
             }
         );
+
+        //获取个人信息
+        this.appMainSer.mineInfo.subscribe(value => {
+            this.mineInfo = value;
+        })
     }
 
     ionViewWillLeave() {

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

@@ -43,7 +43,9 @@
                         </div>
                         <div class="morning-room">
                             <span (click)="goApplyEdit(item1)" *ngFor="let item1 of room?.morningUse">
-                                {{item1.name}}(已预定)
+                                {{item1.name}}
+                                <ng-container *ngIf="item1.applicantName != mineInfo.orgName">(已预定)</ng-container>
+                                <ng-container *ngIf="item1.applicantName == mineInfo.orgName">(可编辑)</ng-container>
                             </span>
                         </div>
                     </div>
@@ -53,7 +55,9 @@
                         </div>
                         <div class="morning-room">
                             <span (click)="goApplyEdit(item2)" *ngFor="let item2 of room?.afternoonUse">
-                                {{item2.name}}(已预定)
+                                {{item2.name}}
+                                <ng-container *ngIf="item2.applicantName != mineInfo.orgName">(已预定)</ng-container>
+                                <ng-container *ngIf="item2.applicantName == mineInfo.orgName">(可编辑)</ng-container>
                             </span>
                         </div>
                     </div>

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

@@ -138,7 +138,7 @@ export class RoomDealPage {
             ids: this.chooseObj.join(','),
             status: status,
         };
-        let msg = status == 1 ? '确定通过所选申请' : '确定退回所选申请';
+        let msg = status == 2 ? '确定通过所选申请' : '确定退回所选申请';
         this.commonSer.alert(msg, () => {
             this.serveSer.meetOperate(data).subscribe(
                 (res) => {