联系人列表更新

platforms/android/.idea/workspace.xml

@@ -55,7 +55,7 @@
       <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CordovaLib/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
+            <state relative-caret-position="-782">
               <caret line="12" column="57" lean-forward="false" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
               <folding />
             </state>
@@ -3088,7 +3088,6 @@
     </navigator>
     <panes>
       <pane id="ProjectPane" />
-      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="AndroidView">
         <subPane>
@@ -3101,6 +3100,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -3287,7 +3287,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="812" extended-state="6" />
+    <frame x="0" y="23" width="1440" height="812" extended-state="0" />
     <layout>
       <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32914925" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -3298,14 +3298,14 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.54253834" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41841003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Flutter Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25679544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Build" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41980475" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.67921895" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22818312" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -3465,6 +3465,50 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="38" column="16" lean-forward="false" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#799#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#858#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/settings.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wrapper.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CordovaLib/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="57" lean-forward="false" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
           <caret line="38" column="16" lean-forward="false" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
           <folding>
@@ -3625,7 +3669,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/CordovaLib/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
+        <state relative-caret-position="-782">
           <caret line="12" column="57" lean-forward="false" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
           <folding />
         </state>

platforms/android/app/build/intermediates/blame/res/debug/multi-v2/debug.json

 {
     "logs": [
         {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
             "map": [
                 {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
                     "from": {
                         "startLines": "2",
                         "startColumns": "4",
                         "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
+                        "endColumns": "102",
+                        "endOffsets": "153"
                     }
                 }
             ]
         },
         {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
             "map": [
                 {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
                     "from": {
                         "startLines": "2",
                         "startColumns": "4",
                         "startOffsets": "55",
-                        "endColumns": "102",
-                        "endOffsets": "153"
+                        "endColumns": "100",
+                        "endOffsets": "151"
                     }
                 }
             ]
@@ -46,31 +46,31 @@
             ]
         },
         {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
             "map": [
                 {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
                     "from": {
                         "startLines": "2",
                         "startColumns": "4",
                         "startOffsets": "55",
-                        "endColumns": "65",
-                        "endOffsets": "116"
+                        "endColumns": "100",
+                        "endOffsets": "151"
                     }
                 }
             ]
         },
         {
-            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
+            "outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
             "map": [
                 {
-                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
+                    "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
                     "from": {
                         "startLines": "2",
                         "startColumns": "4",
                         "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
+                        "endColumns": "65",
+                        "endOffsets": "116"
                     }
                 }
             ]

platforms/android/app/build/intermediates/blame/res/debug/single/debug.json

@@ -40,16 +40,16 @@
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml"
     },
     {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
-        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
+        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
     },
     {
         "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_action.xml"
     },
     {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
-        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
+        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
     },
     {
         "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat",

platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

-#Thu Aug 15 00:55:57 CST 2019
+#Fri Aug 16 15:28:21 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action_tombstone.xml.flat
@@ -35,17 +35,17 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/opener_paths.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/xml_opener_paths.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-ldpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_time.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_part_time.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xxhdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action_tombstone.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_narrow.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_template_icon_group.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_custom.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_part_chronometer.xml.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-v21_notification_action_background.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media_custom.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_media.xml.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-v21_notification_action_background.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-hdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-hdpi_icon.png.flat
@@ -53,10 +53,10 @@
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-xxhdpi_icon.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action.xml.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat
-/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-xxxhdpi_screen.png.flat
+/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_cancel_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_cancel_action.xml.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-hdpi_screen.png.flat
-/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v16_notification_template_custom_big.xml.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-land-hdpi_screen.png.flat
+/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-hdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat

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

-#Thu Aug 15 00:56:04 CST 2019
+#Fri Aug 16 15:32:01 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/manifests/full/debug/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.ionic.smart19.starter"
     android:hardwareAccelerated="true"
-    android:versionCode="40600"
-    android:versionName="4.6.0" >
+    android:versionCode="40500"
+    android:versionName="4.5.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40600},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40600},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/debug/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40600},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json

-[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"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/debug/output.json

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40600},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

src/app/app.service.ts

-import {Injectable} from '@angular/core';import {BehaviorSubject, Subscription} from 'rxjs';
@Injectable()export class AppMainService {

    private roleSource:BehaviorSubject<any> = new BehaviorSubject([]);
    public role = this.roleSource.asObservable();

    private mineSource:BehaviorSubject<any> = new BehaviorSubject({});
    public mineInfo = this.mineSource.asObservable();

    private readSource:BehaviorSubject<any> = new BehaviorSubject(0);
    public readInfo = this.readSource.asObservable();

    //权限赋值
    public setRole(value: string){
        this.roleSource.next(value);
    }

    //个人信息
    public setInfo(value: any){
        this.mineSource.next(value);
    }

    //未读消息
    public setRead(value: any){
        console.log(value)
        this.readSource.next(value);
    }
}
+import {Injectable} from '@angular/core';import {BehaviorSubject, Subscription} from 'rxjs';
@Injectable()export class AppMainService {

    private roleSource:BehaviorSubject<any> = new BehaviorSubject([]);
    public role = this.roleSource.asObservable();

    private mineSource:BehaviorSubject<any> = new BehaviorSubject({});
    public mineInfo = this.mineSource.asObservable();

    private readSource:BehaviorSubject<any> = new BehaviorSubject(0);
    public readInfo = this.readSource.asObservable();

    //权限赋值
    public setRole(value: string){
        this.roleSource.next(value);
    }

    //个人信息
    public setInfo(value: any){
        this.mineSource.next(value);
    }

    //未读消息
    public setRead(value: any){
        this.readSource.next(value);
    }
}
\ No newline at end of file

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

-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { FoodPage } from './food';
+import {NgModule} from '@angular/core';
+import {IonicPageModule} from 'ionic-angular';
+import {FoodPage} from './food';
 import {FoodApplyPage} from "./food-apply/food-apply";
 import {FoodDealPage} from "./food-deal/food-deal";
 import {CalendarModule} from "ion2-calendar";
+import {RushBuyPage} from "./rush-buy/rush-buy";
 
 @NgModule({
     declarations: [
         FoodPage,
         FoodApplyPage,
-    FoodDealPage
+        FoodDealPage,
+        RushBuyPage,
     ],
     imports: [
         CalendarModule,
         IonicPageModule.forChild(FoodPage),
     ],
-  entryComponents:[
+    entryComponents: [
         FoodApplyPage,
-    FoodDealPage
+        FoodDealPage,
+        RushBuyPage,
     ]
 })
-export class FoodPageModule {}
+export class FoodPageModule {
+}

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

@@ -10,6 +10,7 @@ import {AppMainService} from "../../../app/app.service";
 import {FoodApplyPage} from "./food-apply/food-apply";
 import {FoodDealPage} from "./food-deal/food-deal";
 import {timer} from "rxjs/observable/timer";
+import {RushBuyPage} from "./rush-buy/rush-buy";
 
 
 @IonicPage()
@@ -160,7 +161,6 @@ export class FoodPage {
     //改变
     change(type) {
         this.changeType = type;
-
         if (this.changeType == 1) this.getApply();
         if (this.changeType == 2) this.myApply();
     }
@@ -179,8 +179,16 @@ export class FoodPage {
         }
     }
 
-    //抢购
-    buy(){
-
+    //抢购 每天的14:00-17:00
+    buy() {
+        const nowDate = new Date().getTime();
+        const startTime = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ' 13:00:00').getTime();
+        const endTime = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ' 17:00:00').getTime();
+        if(startTime < nowDate && nowDate < endTime){
+            this.commonSer.toast('开始抢购');
+            this.navCtrl.push(RushBuyPage);
+        }else{
+            this.commonSer.toast("抢购时间为每天的14:00~17:00");
+        }
     }
 }

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

@@ -42,7 +42,7 @@
                         </div>
                         <div class="morning-room">
                             <ng-container *ngFor="let item1 of room?.morningUse">
-                                 <span  (click)="goApplyEdit(item1)">
+                                 <span *ngIf="role.includes(9) ||  item1.userName == mineInfo?.username" (click)="goApplyEdit(item1)" [ngClass]="item1.isImportant == 1?'import':''">
                                         <span *ngIf="item1.startEnd == 1">9:00-10:00</span>
                                         <span *ngIf="item1.startEnd == 2">10:00-11:00</span>
                                         <span *ngIf="item1.startEnd == 3">11:00-12:00</span>
@@ -58,7 +58,7 @@
                         </div>
                         <div class="morning-room">
                             <ng-container *ngFor="let item2 of room?.afternoonUse">
-                                <span *ngIf="role.includes(9) ||  item2.userName == mineInfo?.username" (click)="goApplyEdit(item2)" >
+                                <span [ngClass]="item2.isImportant == 1?'import':''" *ngIf="role.includes(9) ||  item2.userName == mineInfo?.username" (click)="goApplyEdit(item2)" >
                                      <span *ngIf="item2.startEnd == 4">14:00-15:00</span>
                                      <span *ngIf="item2.startEnd == 5">15:00-16:00</span>
                                      <span *ngIf="item2.startEnd == 6">16:00-17:00</span>

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

@@ -3,7 +3,7 @@ page-hair-cut {
     border: none;
   }
 
-  .bar-buttons-ios[end]{
+  .bar-buttons-ios[end] {
     width: 35px;
     height: 35px;
     text-align: center;
@@ -111,20 +111,26 @@ page-hair-cut {
       padding: 10px 5px;
       min-height: 53px;
 
-      span {
+      > span {
         display: inline-block;
         font-size: 1.5rem;
-        background-color: #e42417;
-        border: 1px solid #e42417;
+        background-color: #ffa698;
+        border: 1px solid #ffa698;
         border-radius: 4px;
-        color: #ffffff;
+        color: #333333;
         padding: 8px 12px;
         margin-bottom: 8px;
         margin-right: 5px;
-        span{
+
+        span {
           margin: 0;
         }
       }
+      > span.import {
+        background-color: #e42417;
+        border: 1px solid #e42417;
+        color: #ffffff;
+      }
     }
   }
 
@@ -172,19 +178,23 @@ page-hair-cut {
 
   .duty-content {
     padding: 15px;
-    ion-item{
-      p{
+
+    ion-item {
+      p {
         padding: 0 10px 10px 10px;
-        span{
+
+        span {
           color: #333333;
           font-weight: 500;
-          span{
+
+          span {
             color: #666666;
             font-weight: 400;
           }
         }
       }
-      p:first-child{
+
+      p:first-child {
         border-bottom: 1px solid #cccccc;
         margin-bottom: 10px;
       }
@@ -194,9 +204,11 @@ page-hair-cut {
   .apply {
     font-size: 1.4rem;
     border-radius: 5px;
+
     .apply-room {
       font-size: 1.4rem;
-      span{
+
+      span {
         margin-right: 5px;
       }
     }
@@ -214,11 +226,11 @@ page-hair-cut {
     }
   }
 
-  .apply + .apply{
+  .apply + .apply {
     margin-top: 8px;
   }
 
-  .list-ios .item-block .item-inner{
+  .list-ios .item-block .item-inner {
     padding: 0;
   }
 }

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

 import {Component} from '@angular/core';
 import {ActionSheetController, IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
 import {ServeService} from "../../serve.service";
-import {FilterComponent} from "../../../../components/filter/filter";
 import {PersonMulComponent} from "../../../../components/person-mul/person-mul";
 import {CommonService} from "../../../../provide/common.service";
 import {DatePipe} from "@angular/common";

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));
    }

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

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

    //已完成
    searchDelivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data));
    }

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

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


    orderDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + params);
    }


    /**   会议室预定   **/
    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', this.commonSer.toFormData(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));
    }


    /**预约订餐**/
    //保存订餐信息
    saveMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data);
    }

    //取消订单
    cancelMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null);
    }

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

    //我的订餐
    myBook(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data) );
    }

    //日历查询订餐信息
    mealsQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data));
    }

    //查询已处理/未处理订餐
    searchMealCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data));
    }

    //订餐详情
    detailMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null);
    }
}
+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));
    }

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

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

    //已完成
    searchDelivery(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/searchDelivery', this.commonSer.toFormData(data));
    }

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

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


    orderDetail(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/personDetail/' + params);
    }


    /**   会议室预定   **/
    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', this.commonSer.toFormData(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);
    }

    //确认到访
    confirmVisit(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/visitor/confirmVisit/' + 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));
    }


    /**预约订餐**/
    //保存订餐信息
    saveMeals(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/save', data);
    }

    //取消订单
    cancelMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/cancel/' + params, null);
    }

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

    //我的订餐
    myBook(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/myBook', this.commonSer.toFormData(data) );
    }

    //日历查询订餐信息
    mealsQueryByDate(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/queryByDate', this.commonSer.toFormData(data));
    }

    //查询已处理/未处理订餐
    searchMealCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/searchCheckList', this.commonSer.toFormData(data));
    }

    //订餐详情
    detailMeals(params): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/bookmeals/detail/' + params, null);
    }
}
\ No newline at end of file

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

@@ -90,16 +90,26 @@
                                      <span>{{item.visitTime | date:'yyyy-MM-dd HH:mm'}}</span>
                                 </span>
                             </p>
+                            <ion-row>
+                                <ion-col col-8>
                                     <p>
                                     <span class="apply-room">访客单位：
                                         <span>{{item.visitorOrg}}</span>
                                     </span>
                                     </p>
                                     <p>
-                                <span class="order-time">车牌号：
-                                    <span>{{item.carNumber}}</span>
+                                    <span class="order-time">
+                                        车牌号：<span>{{item.carNumber}}</span>
                                     </span>
                                     </p>
+                                </ion-col>
+                                <ion-col col-4>
+                                    <span *ngIf="item.status == 2" class="confirm-tag" >已到访</span>
+                                    <button *ngIf="item.status == 1" (click)="confirmVist(item,$event)" small="true" ion-button
+                                            color="secondary">确认到访
+                                    </button>
+                                </ion-col>
+                            </ion-row>
                         </ion-item>
                         <ion-item-options>
                             <button ion-button color="danger" (click)="removeItem(item)">取消</button>

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

@@ -200,12 +200,20 @@ page-vistor-register {
         }
       }
 
-      p:first-child {
+      > p:first-child {
         border-bottom: 1px solid #cccccc;
         margin-bottom: 10px;
       }
     }
   }
+  .confirm-tag{
+    font-size: 1.4rem;
+    color: #999;
+    border: 1px solid #eee;
+    padding: 4px 10px;
+    border-radius: 4px;
+    background-color: #eee;
+  }
 
   .apply {
     font-size: 1.4rem;

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

@@ -130,6 +130,7 @@ export class VistorRegisterPage {
 
     //编辑申请
     goApplyEdit(item) {
+        if(item.status == 2) return;
         this.navCtrl.push(VistorApplyPage, {id: item.id});
     }
 
@@ -138,4 +139,18 @@ export class VistorRegisterPage {
         this.navCtrl.push(VistorApplyPage);
     }
 
+    //确认到访
+    confirmVist(item,e) {
+        e.stopPropagation();
+        this.commonSer.alert("确认访客已到访?", () => {
+            this.serveSer.confirmVisit(item.id).subscribe(
+                (res) => {
+                    this.pageNumber = 1;
+                    this.commonSer.toast('确认到访成功');
+                    this.myApply();
+                }
+            )
+        });
+    }
+
 }