api update

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

-#Mon Aug 12 11:33:40 CST 2019
+#Mon Aug 12 15:22:05 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/packageDebug/debug/file-input-save-data.txt

 #Internal package file, do not edit.
-#Mon Aug 12 11:33:41 CST 2019
+#Mon Aug 12 15:22:06 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 493.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -8,7 +8,7 @@
 511.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/notice/notice-srzf.png
 53.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 66.set=ANDROID_RESOURCE
-317.set=ANDROID_RESOURCE
+317.set=ASSET
 356.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 373.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/verify-edit.jpg
 203.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/60.js.map
@@ -24,13 +24,13 @@
 270.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 100.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 416.set=ASSET
-43.set=ASSET
+43.set=ANDROID_RESOURCE
 133.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 483.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 304.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 330.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/22.js
 501.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova.plugins.diagnostic/www/android/diagnostic.notifications.js
-43.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+43.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 166.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 60.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png
 217.set=ASSET
@@ -66,17 +66,17 @@
 421.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 126.set=ASSET
 501.set=ASSET
-283.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+283.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 454.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 130.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notification_bg_normal.9.png
-480.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_custom_big.xml
+480.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/25.js.map
 301.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/bb.png
 14.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 424.set=ASSET
 163.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/cordova-js-src/android/promptbasednativeapi.js
 40.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/7.js
 379.set=ASSET
-317.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+317.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 51.set=ANDROID_RESOURCE
 302.set=ANDROID_RESOURCE
 179.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
@@ -90,9 +90,9 @@
 290.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/xml/provider_paths.xml
 444.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 356.set=ASSET
-120.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/wdsc.png
+120.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/50.js.map
 477.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-153.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/12.js.map
+153.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/58.js
 279.set=ASSET
 324.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/party.png
 202.set=ASSET
@@ -110,7 +110,7 @@
 256.set=ANDROID_RESOURCE
 134.set=ASSET
 117.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-11.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/five.png
+11.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/main.js.map
 467.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 314.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/icon-password-confirm.png
 179.set=JAVA_RESOURCE
@@ -141,7 +141,7 @@
 201.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 234.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 463.set=JAVA_RESOURCE
-405.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+405.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 90.set=ASSET
 341.set=ANDROID_RESOURCE
 267.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -174,7 +174,7 @@
 295.set=ASSET
 384.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 3.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-231.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/71.js
+231.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/82.js.map
 402.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/roboto-bold.woff
 264.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/roboto-regular.ttf
 418.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -234,10 +234,10 @@
 91.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js
 368.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 215.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/84.js
-405.set=ANDROID_RESOURCE
+405.set=ASSET
 32.set=ANDROID_RESOURCE
 248.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/14.js
-206.set=ANDROID_RESOURCE
+206.set=ASSET
 112.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 462.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 145.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
@@ -250,15 +250,15 @@
 86.set=ASSET
 337.set=ASSET
 358.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-375.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/sw-toolbox.js
-205.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/23.js.map
+375.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/24.js.map
+205.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/one.png
 88.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 238.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/83.js.map
 409.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/53.js
 138.set=ASSET
 272.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 102.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-436.set=ASSET
+436.set=ANDROID_RESOURCE
 63.set=ASSET
 314.set=ASSET
 135.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -302,7 +302,7 @@
 252.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 423.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 146.set=ASSET
-285.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+285.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 456.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 132.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/5.js
 482.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/wdsh.png
@@ -311,7 +311,7 @@
 444.set=ASSET
 165.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/ionicons.ttf
 148.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-42.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_action_tombstone.xml
+42.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-port-mdpi-v4/screen.png
 399.set=ASSET
 319.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 71.set=ASSET
@@ -345,14 +345,14 @@
 420.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/75.js
 282.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/wdfb.png
 453.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/FileUploadOptions.js
-436.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+436.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 276.set=ASSET
 154.set=ANDROID_RESOURCE
 119.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 13.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/44.js.map
 469.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 8.set=ASSET
-316.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-ycsq.png
+316.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/52.js.map
 199.set=ASSET
 29.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
 178.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/survey/set.png
@@ -411,7 +411,7 @@
 489.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/65.js
 140.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
 490.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
+49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
 409.set=ASSET
 392.set=ANDROID_RESOURCE
 36.set=ASSET
@@ -421,7 +421,7 @@
 83.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 386.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 5.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-233.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/82.js.map
+233.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/36.js
 404.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/64.js
 266.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/login_bg.png
 491.set=ASSET
@@ -429,18 +429,18 @@
 129.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-ionic-keyboard/www/android/keyboard.js
 13.set=ASSET
 130.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-480.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+480.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 301.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 292.set=ANDROID_RESOURCE
 40.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 163.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 360.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/com.moust.cordova.videoplayer/www/videoplayer.js
 73.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-393.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/right-grey.png
+393.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/3.js.map
 256.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v16/notification_template_custom_big.xml
 427.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/wdxx.png
 67.set=ASSET
-318.set=ASSET
+318.set=ANDROID_RESOURCE
 289.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/iconfont/demo.css
 290.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 120.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -506,7 +506,7 @@
 57.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 357.set=ASSET
 377.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/35.js.map
-207.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/34.js.map
+207.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png
 203.set=ASSET
 158.set=ASSET
 241.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -595,13 +595,13 @@
 251.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/47.js.map
 422.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/78.js.map
 17.set=ASSET
-284.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
+284.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
 455.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/noto-sans.scss
 438.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 296.set=ASSET
 15.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/back.png
 147.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/iconfont/iconfont.ttf
-318.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/52.js.map
+318.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_part_chronometer.xml
 472.set=ASSET
 181.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 352.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -609,15 +609,15 @@
 91.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 215.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 273.set=JAVA_RESOURCE
-412.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/10.js.map
+412.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/no-info.png
 151.set=ASSET
 248.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 274.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/cordova-js-src/android/nativeapiprovider.js
 5.set=ASSET
 445.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/mail.png
 196.set=ANDROID_RESOURCE
-478.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/verify-back.jpg
-38.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/6.js.map
+478.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-wply.png
+38.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/tabs/icon-key.png
 48.set=ANDROID_RESOURCE
 171.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 342.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -628,7 +628,7 @@
 173.set=ANDROID_RESOURCE
 238.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 409.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-435.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_media_action.xml
+435.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/63.js.map
 381.set=ANDROID_RESOURCE
 25.set=ANDROID_RESOURCE
 118.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-land-hdpi-v4/screen.png
@@ -638,12 +638,12 @@
 503.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 194.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 365.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-480.set=ANDROID_RESOURCE
-212.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/37.js
+480.set=ASSET
+212.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/71.js.map
 79.set=ASSET
 398.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 228.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-245.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable/notification_tile_bg.xml
+245.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png
 281.set=ASSET
 108.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/17.js
 506.set=JAVA_RESOURCE
@@ -662,11 +662,11 @@
 388.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 235.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/79.js.map
 7.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-406.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/51.js.map
+406.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_lines_media.xml
 108.set=ASSET
 181.set=ASSET
 268.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/33.js
-406.set=ASSET
+406.set=ANDROID_RESOURCE
 33.set=ASSET
 132.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 482.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -674,7 +674,7 @@
 500.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/tabs/icon-mine-on.png
 42.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 165.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-207.set=ASSET
+207.set=ANDROID_RESOURCE
 362.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/iconfont/iconfont.js
 75.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 395.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/0.js.map
@@ -710,9 +710,9 @@
 162.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-land-mdpi-v4/screen.png
 369.set=ANDROID_RESOURCE
 316.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-41.set=ANDROID_RESOURCE
+41.set=ASSET
 178.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-72.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/67.js.map
+72.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/xtsz.png
 349.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 215.set=ASSET
 410.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -721,7 +721,7 @@
 443.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 346.set=JAVA_RESOURCE
 476.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-152.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/58.js
+152.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/70.js
 269.set=ANDROID_RESOURCE
 323.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/34.js
 36.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -730,7 +730,7 @@
 185.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/right-white.png
 339.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 95.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/head.png
-219.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/57.js.map
+219.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/confirm.png
 445.set=ASSET
 72.set=ASSET
 220.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -815,7 +815,7 @@
 362.set=ASSET
 79.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/63.js
 80.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-285.set=ASSET
+285.set=ANDROID_RESOURCE
 383.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 163.set=ASSET
 230.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/75.js.map
@@ -865,7 +865,7 @@
 344.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 270.set=ASSET
 377.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-207.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+207.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 224.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-network-information/www/Connection.js
 2.set=ASSET
 193.set=ASSET
@@ -883,7 +883,7 @@
 196.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 90.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/81.js
 367.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-214.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/71.js.map
+214.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-lhbb.png
 99.set=DEX
 22.set=ASSET
 247.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-statusbar/www/statusbar.js
@@ -901,7 +901,7 @@
 327.set=ASSET
 357.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 374.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/resources.arsc
-204.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/one.png
+204.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/23.js.map
 87.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 237.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-port-ldpi-v4/screen.png
 9.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -957,15 +957,15 @@
 284.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 455.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 131.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/dqrhd.png
-481.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/25.js.map
+481.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_custom_big.xml
 302.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/xml/camera_provider_paths.xml
 15.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 434.set=ASSET
 164.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/survey/add.png
 147.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-41.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-port-mdpi-v4/screen.png
+41.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/55.js.map
 389.set=ASSET
-318.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+318.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 61.set=ASSET
 312.set=ASSET
 74.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-ywzd.png
@@ -978,7 +978,7 @@
 291.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-mdpi-v4/icon.png
 445.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 366.set=ASSET
-121.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/50.js.map
+121.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/wdsc.png
 478.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 154.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v21/notification_template_icon_group.xml
 289.set=ASSET
@@ -995,11 +995,11 @@
 343.set=ASSET
 281.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-hysyd.png
 452.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-tts/www/tts.js
-435.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+435.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 266.set=ASSET
 144.set=ANDROID_RESOURCE
 118.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-12.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/main.js.map
+12.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/five.png
 468.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 315.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/66.js
 189.set=ASSET
@@ -1030,7 +1030,7 @@
 202.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 235.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 473.set=ASSET
-406.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+406.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 351.set=ASSET
 268.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 115.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-yjbx.png
@@ -1055,17 +1055,17 @@
 174.set=ASSET
 138.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/2.js.map
 488.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/20.js
-48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
+48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
 382.set=ASSET
 26.set=ASSET
 82.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 385.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
 4.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-232.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/36.js
+232.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/71.js
 403.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/noto-sans-regular.woff
 265.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js
 419.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-481.set=ASSET
+481.set=ANDROID_RESOURCE
 298.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/vendor.js.map
 128.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/39.js
 300.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -1146,8 +1146,8 @@
 96.set=ASSET
 347.set=ASSET
 359.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
-376.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/24.js.map
-206.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png
+376.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/sw-toolbox.js
+206.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/34.js.map
 89.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 239.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/noto-sans-bold.ttf
 148.set=ASSET
@@ -1216,7 +1216,7 @@
 454.set=ASSET
 166.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/13.js
 149.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-43.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/55.js.map
+43.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_action_tombstone.xml
 81.set=ASSET
 332.set=ASSET
 76.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/FileReader.js
@@ -1246,13 +1246,13 @@
 363.set=ASSET
 250.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/browser/isChrome.js
 421.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/52.js
-283.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
+283.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/14.js.map
 454.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/bir-bg.png
 437.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 286.set=ASSET
 164.set=ASSET
 14.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/73.js
-317.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_part_chronometer.xml
+317.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-ycsq.png
 179.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar/META-INF/com.android.support_support-v4.version
 462.set=ASSET
 180.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
@@ -1261,15 +1261,15 @@
 90.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 214.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 263.set=ASSET
-411.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/no-info.png
+411.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/10.js.map
 141.set=ASSET
 247.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 273.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar/META-INF/android.arch.lifecycle_livedata-core.version
 444.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-appavailability/www/AppAvailability.js
 186.set=ASSET
-477.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-wply.png
+477.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/21.js.map
 394.set=ASSET
-37.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/tabs/icon-key.png
+37.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/6.js.map
 38.set=ASSET
 170.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 341.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
@@ -1314,18 +1314,18 @@
 387.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 234.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova.plugins.diagnostic/www/android/diagnostic.js
 6.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-405.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_lines_media.xml
+405.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/51.js.map
 171.set=ASSET
 267.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-more.png
 23.set=ASSET
 131.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-481.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
+481.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 302.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
-41.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+41.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 164.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 361.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/dspsx.png
 74.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-394.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/3.js.map
+394.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/right-grey.png
 count=513
 257.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/44.js
 428.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/81.js.map
@@ -1358,7 +1358,7 @@ count=513
 315.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 31.set=ANDROID_RESOURCE
 177.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-71.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/xtsz.png
+71.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/67.js.map
 348.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 205.set=ASSET
 458.set=ASSET
@@ -1366,7 +1366,7 @@ count=513
 442.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 336.set=ANDROID_RESOURCE
 475.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-151.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/70.js
+151.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/12.js.map
 259.set=ASSET
 322.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/green_right.png
 35.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
@@ -1376,8 +1376,8 @@ count=513
 509.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 512.set=ASSET
 94.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/search.png
-218.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/confirm.png
-435.set=ANDROID_RESOURCE
+218.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/57.js.map
+435.set=ASSET
 62.set=ASSET
 313.set=ASSET
 236.set=ASSET
@@ -1479,7 +1479,7 @@ count=513
 252.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_media.xml
 423.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/icon-px.png
 27.set=ANDROID_RESOURCE
-285.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/14.js.map
+285.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
 456.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/main.js
 439.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 16.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/FileSystem.js
@@ -1492,14 +1492,14 @@ count=513
 360.set=ASSET
 92.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 216.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-283.set=ANDROID_RESOURCE
+283.set=ASSET
 413.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/80.js
 161.set=ASSET
 249.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
 275.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/wdwj.png
 446.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/roboto-bold.woff2
 508.set=ASSET
-479.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/21.js.map
+479.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/mine/verify-back.jpg
 309.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/10.js
 39.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova-plugin-file/www/android/FileSystem.js
 58.set=ANDROID_RESOURCE
@@ -1509,11 +1509,11 @@ count=513
 343.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 260.set=ASSET
 376.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-206.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
+206.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 223.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/iconfont/iconfont.css
 183.set=ANDROID_RESOURCE
 239.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-436.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/63.js.map
+436.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_media_action.xml
 408.set=ASSET
 391.set=ASSET
 35.set=ASSET
@@ -1529,12 +1529,12 @@ count=513
 195.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 366.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 490.set=ASSET
-213.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/icon-lhbb.png
+213.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/37.js
 89.set=ASSET
 399.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 12.set=ASSET
 229.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
-246.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png
+246.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable/notification_tile_bg.xml
 291.set=ANDROID_RESOURCE
 109.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/polyfills.js
 110.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug

src/components/party-person/party-person.html

 <ng-container *ngIf="list.length > 0">
-    <div style="margin-bottom: 10px" *ngFor="let contactPerson of list">
-        <div class="contact-box">
-            <ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''">
-                <img src="{{picture+contactPerson.picUrl}}" class="contact-img">
-            </ng-container>
-            <ng-container *ngIf="!contactPerson?.picUrl || contactPerson?.picUrl == ''">
-                <img src="./assets/imgs/man.png" class="contact-img"
-                     *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
-                <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
-            </ng-container>
-            <div class="contact-box-right">
-                <div>
-                    <span class="contact-name">{{contactPerson.username}}</span>
-                </div>
+    <div class="padding-10">
+        <div style="margin-bottom: 10px" *ngFor="let contactPerson of list">
+            <div class="contact-box">
+                <ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''">
+                    <img src="{{picture+contactPerson.picUrl}}" class="contact-img">
+                </ng-container>
+                <ng-container *ngIf="!contactPerson?.picUrl || contactPerson?.picUrl == ''">
+                    <img src="./assets/imgs/man.png" class="contact-img"
+                         *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
+                    <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
+                </ng-container>
+                <div class="contact-box-right">
+                    <div>
+                        <span class="contact-name">{{contactPerson.username}}</span>
+                    </div>
 
-                <div>
-                    <span class="contact-handphone">党内职务：{{contactPerson.job}}</span>
-                    <span class="contact-telphone">入党时间：{{contactPerson.partytime | date:'yyyy-MM-dd'}}</span>
+                    <div>
+                        <span class="contact-handphone">党内职务：{{contactPerson.job}}</span>
+                        <span class="contact-telphone">入党时间：{{contactPerson.partytime | date:'yyyy-MM-dd'}}</span>
+                    </div>
                 </div>
             </div>
         </div>

src/pages/serve-pages/goods-collect/evaluation/evaluation.html

-<ion-header>

    <ion-navbar>
        <ion-title>申领评价</ion-title>
    </ion-navbar>
</ion-header>
<ion-content>

    <div class="order"><!--        <div class="orderTips">--><!--            <p>--><!--                <span *ngIf="item.status == 2">已申请</span>--><!--                <span *ngIf="item.status == 3">已领取</span>--><!--                <span *ngIf="item.status == 4">已驳回</span>--><!--                <span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>--><!--            </p>--><!--            <p>--><!--                <span>申请人：{{item.applicantName}}</span>--><!--                <span float-right>申请部门：{{item.orgName}}</span>--><!--            </p>--><!--        </div>-->
        <div class="goodsList">
            <ng-container *ngFor="let goods of goodsList;let gi = index;">
                <div class="goodsItem">
                    <div class="goods-img">
                        <img [src]="picture + goods.url">
                    </div>
                    <div class="goods-info">
                        <p class="model">
                            {{goods.brand}}&nbsp;&nbsp;&nbsp;
                            <span>{{goods.model}}</span>
                        </p>
                        <p class="img-star">
                            <ng-container *ngFor="let star of goods.starList;let i = index;">
                                <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span>
                            </ng-container>
                            <span class="score">{{goods.score}}分</span>
                        </p>
                    </div>
                </div>
            </ng-container>
        </div>
    </div>
    <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content>
+<ion-header>

    <ion-navbar>
        <ion-title>申领评价</ion-title>
    </ion-navbar>
</ion-header>
<ion-content>

    <div class="order"><!--        <div class="orderTips">--><!--            <p>--><!--                <span *ngIf="item.status == 2">已申请</span>--><!--                <span *ngIf="item.status == 3">已领取</span>--><!--                <span *ngIf="item.status == 4">已驳回</span>--><!--                <span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>--><!--            </p>--><!--            <p>--><!--                <span>申请人：{{item.applicantName}}</span>--><!--                <span float-right>申请部门：{{item.orgName}}</span>--><!--            </p>--><!--        </div>-->
        <div class="goodsList">
            <ng-container *ngFor="let goods of goodsList;let gi = index;">
                <div class="goodsItem">
                    <div class="goods-img">
                        <img [src]="picture + goods.url">
                    </div>
                    <div class="goods-info">
                        <p class="model">
                            {{goods.brand}}&nbsp;&nbsp;&nbsp;
                            <span>{{goods.model}}</span>
                        </p>
                        <p class="img-star">
                            <ng-container *ngFor="let star of goods.starList;let i = index;">
                                <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span>
                            </ng-container><!--                            <span class="score">{{goods.score}}分</span>-->
                        </p>
                    </div>
                </div>
            </ng-container>
        </div>
    </div>
    <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content>
\ No newline at end of file

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

@@ -66,17 +66,18 @@ export class EvaluationPage {
             const arr = this.goodsList.map(e => {
                 const a = {
                     id: e.id,
-                    score: e.score
+                    score: e.score.toFixed(1)
                 };
                 return a
             });
-            console.log(arr);
-            // this.serveSer.orderScore(arr).subscribe(
-            //     (res) => {
-            //         this.navCtrl.pop();
-            //         this.commonSer.toast('已评价成功');
-            //     }
-            // )
+            this.serveSer.orderScore(arr).subscribe(
+                (res) => {
+                    if(res){
+                        this.navCtrl.pop();
+                        this.commonSer.toast('已评价成功');
+                    }
+                }
+            )
         })
     }
 

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

@@ -131,16 +131,18 @@ export class MeetRoomPage {
 
     //新增申请
     goApply(item) {
-        if (this.role.includes(0)) return false;
-        let data;
-        if (item) {
-            data = {
-                roomId: item.id,
-                roomName: item.name,
-                startTime: this.selectDate + ' 9:00:00',
-            };
-        }
-        this.navCtrl.push(RoomApplyPage, {data: data});
+        if (this.role.includes(1) || this.role.includes(7)){
+            let data;
+            if (item) {
+                data = {
+                    roomId: item.id,
+                    roomName: item.name,
+                    equipmervice:item.equipmervice,
+                    startTime: this.selectDate + ' 9:00:00',
+                };
+            }
+            this.navCtrl.push(RoomApplyPage, {data: data});
+        };
     }
 
 }

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

@@ -73,10 +73,10 @@ export class RoomApplyPage {
         this.appMainSer.mineInfo.subscribe(value => {
             this.mineInfo = value;
         })
+        this.getList();
     }
 
     ionViewDidLoad() {
-        this.getList();
         this.initParams();
         this.applyId = this.navParams.get('id');
         if (this.applyId) {
@@ -91,6 +91,8 @@ export class RoomApplyPage {
             this.obj.startTime = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm');
             this.obj.roomId = data.roomId;
             this.obj.roomText = data.roomName;
+            this.obj.equipmervice = data.equipmervice.split(',');
+
         } else {
             const now = this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ' 9:00';
             this.obj.startTime = this.datePipe.transform(now, 'yyyy-MM-ddTHH:mm');
@@ -185,6 +187,7 @@ export class RoomApplyPage {
                 handler: () => {
                     this.obj.roomId = e.id;
                     this.obj.roomText = e.name;
+                    this.obj.equipmervice = e.equipmervice.split(',');
                     this.roomMax = `该会议室可容纳${e.accommodation}人`;
                 }
             };

src/pages/serve-pages/serve.service.ts

-import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class ServeService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    getAllOrganization(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data));
    }

    /**   物品领用   **/
    //办公用品列表
    searchSupplies(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data));
    }

    //物品详情
    supplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params);
    }

    //保存订单
    saveOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data);
    }

    //查询订单
    myOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data));
    }

    //类型列表
    getTypeList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null);
    }

    //购物车
    shoppingCar(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data));
    }

    //更新购物车
    saveOrderSuppy(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data);
    }

    //删除购物车物品
    deleteOrderSuppy(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params);
    }

    //申请审核
    dealOrder(data, params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data));
    }

    //查询未提交的
    searchUnsubmit(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data));
    }

    //物品评价
    orderScore(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', this.commonSer.toFormData(data));
    }

    //查询已提交的
    searchSubmited(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data));
    }

    /**   会议室预定   **/
    queryMeetingRoomByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data));
    }

    //预定详情
    meetDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params);
    }

    //会议室列表
    getRoomList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null);
    }

    //部领导列表
    getLeaders(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null);
    }

    //保存会议申请
    saveApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data);
    }

    //我的预定列表
    queryMyApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data));
    }

    //取消预定
    cancelApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params);
    }

    //查询已审核/未审核的申请
    searchCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    meetOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data));
    }

    /** 用车申请  **/
    //保存申请
    saveCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data);
    }

    //获取司机
    getCarList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList');
    }

    //获取车辆
    getDriverList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList');
    }

    //根据日期查询用车信息
    queryCarApplyByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data));
    }

    //查询用车申请详情
    carDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,);
    }

    //我的申请
    myCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data));
    }

    //取消申请
    cancelCarApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,);
    }

    //查询已审核/未审核的申请
    searchCarCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    carOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data);
    }

    /*****理发********/
    //保存理发预约
    saveHairApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data);
    }

    //取消预约
    cancelHair(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,);
    }

    //预约详情
    hairApplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,);
    }

    //根据日期查询预约信息
    queryAppointmentByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data));
    }

    //我的预约
    myAppointment(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data));
    }

    /**访客登记**/
    //查询访客
    searchVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data));
    }

    //保存访客
    saveVisitorApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data);
    }

    //访客登记详情
    editVisitorApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', data);
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data));
    }

    //取消预约
    cancelVisitor(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params);
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data));
    }


}
+import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class ServeService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    getAllOrganization(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data));
    }

    /**   物品领用   **/
    //办公用品列表
    searchSupplies(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data));
    }

    //物品详情
    supplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params);
    }

    //保存订单
    saveOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data);
    }

    //查询订单
    myOrder(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data));
    }

    //类型列表
    getTypeList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null);
    }

    //购物车
    shoppingCar(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data));
    }

    //更新购物车
    saveOrderSuppy(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data);
    }

    //删除购物车物品
    deleteOrderSuppy(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params);
    }

    //申请审核
    dealOrder(data, params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/dealOrder/' + params, this.commonSer.toFormData(data));
    }

    //查询未提交的
    searchUnsubmit(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchUnsubmit', this.commonSer.toFormData(data));
    }

    //物品评价
    orderScore(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordersuppy/score', data);
    }

    //查询已提交的
    searchSubmited(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchSubmited', this.commonSer.toFormData(data));
    }

    /**   会议室预定   **/
    queryMeetingRoomByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data));
    }

    //预定详情
    meetDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params);
    }

    //会议室列表
    getRoomList(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null);
    }

    //部领导列表
    getLeaders(): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null);
    }

    //保存会议申请
    saveApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data);
    }

    //我的预定列表
    queryMyApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMyApply', this.commonSer.toFormData(data));
    }

    //取消预定
    cancelApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/cancel/' + params);
    }

    //查询已审核/未审核的申请
    searchCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/meetingapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    meetOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/operate', this.commonSer.toFormData(data));
    }

    /** 用车申请  **/
    //保存申请
    saveCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/saveApply', data);
    }

    //获取司机
    getCarList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getCarList');
    }

    //获取车辆
    getDriverList(): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/getDriverList');
    }

    //根据日期查询用车信息
    queryCarApplyByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/queryCarApplyByDate', this.commonSer.toFormData(data));
    }

    //查询用车申请详情
    carDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/detail/' + params,);
    }

    //我的申请
    myCarApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/myApply', this.commonSer.toFormData(data));
    }

    //取消申请
    cancelCarApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/carapply/cancel/' + params,);
    }

    //查询已审核/未审核的申请
    searchCarCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup//modules/carapply/searchCheckList', this.commonSer.toFormData(data));
    }

    //审核通过/驳回
    carOperate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/carapply/operate', data);
    }

    /*****理发********/
    //保存理发预约
    saveHairApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/saveApply', data);
    }

    //取消预约
    cancelHair(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/cancel/' + params,);
    }

    //预约详情
    hairApplyDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/haircut/detail/' + params,);
    }

    //根据日期查询预约信息
    queryAppointmentByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/queryAppointmentByDate', this.commonSer.toFormData(data));
    }

    //我的预约
    myAppointment(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/haircut/myAppointment', this.commonSer.toFormData(data));
    }

    /**访客登记**/
    //查询访客
    searchVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/searchVisitor', this.commonSer.toFormData(data));
    }

    //保存访客
    saveVisitorApply(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/save', data);
    }

    //访客登记详情
    editVisitorApply(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/editVisitor/' + params);
    }

    //我的访客
    myVisitor(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/myVisitor', data);
    }

    //根据日期查询访客登记
    findVisitorByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/visitor/findVisitorByDate', this.commonSer.toFormData(data));
    }

    //取消预约
    cancelVisitor(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/cancel/' + params);
    }

    /** 业务制度 **/
    //业务制度详情
    businessDetail(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/detail/' + params, null);
    }

    //查询业务制度列表
    searchBusinessSystem(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/businessystem/searchBusinessSystem', this.commonSer.toFormData(data));
    }


}
\ No newline at end of file

src/pages/tabs/discover/discover.html

@@ -182,9 +182,9 @@
                                 </div>
                             </div>
                         </ng-container>
-<!--                        <ng-container *ngIf="showBranch">-->
+                        <ng-container *ngIf="showBranch">
                             <party-person #partyPerson [list]="branchPersonList"></party-person>
-<!--                        </ng-container>-->
+                        </ng-container>
                     </div>
                     <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
                         <ion-infinite-scroll-content

src/pages/tabs/discover/discover.ts

@@ -408,11 +408,19 @@ export class DiscoverPage {
 
     //父级选择
     changeParent(item) {
+        this.obj.parentName = item.name;
+        this.obj.childrenName = item.children[0].name;
+
+        if (this.obj.childrenName != "组织结构") {
+            this.branchPersonList = [];
+            this.showBranch = false;
+            this.obj.branchId = null;
+        }
+
+
         this.newsContent.nativeElement.scrollLeft = 0;   //二级菜单滑动重置
 
         this.indexParent = item.indexParent;
-        this.obj.parentName = item.name;
-        this.obj.childrenName = item.children[0].name;
 
         this.toIndex = item.indexParent;
         this.childrenList = item.children;
@@ -466,6 +474,7 @@ export class DiscoverPage {
     //子级选择
     changeChildren(item) {
         this.indexChildren = item.indexChildren;
+        this.obj.childrenName = item.name;
         if (!this.obj.branchId) this.obj.branchId = "fe1af3207840431dbed4b500122d83ea";
         if (item.name == "组织结构") {
             this.getMemberList(this.obj.branchId);
@@ -478,9 +487,9 @@ export class DiscoverPage {
             this.obj.branchId = null;
         }
 
+
         this.resourceType = item.name == "视频资料" ? 3 : 1;
         this.isRecent = this.obj.parentName == "最新发布" ? 1 : 0;
-        this.obj.childrenName = item.name;
 
         if (this.obj.parentName == "主题教育") {
             this.obj.plateType = null;
@@ -537,6 +546,17 @@ export class DiscoverPage {
 
     //下拉刷新
     doRefresh(e) {
+        if (this.obj.childrenName == "组织结构") {
+            this.getMemberList(this.obj.branchId);
+            this.showBranch = true;
+            this.slideList[this.indexParent] = [];
+            e.complete();
+            return false;
+        } else {
+            this.branchPersonList = [];
+            this.showBranch = false;
+            this.obj.branchId = null;
+        }
         this.getBanner();
         const data = {
             pageNum: 1,