From efe6c9919921ba56c7b1be1d320e251416290c44 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Wed, 16 Aug 2023 15:21:08 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=95=B4=E4=BD=93=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/apply/addProject.svg            | 22 ++++++++
 public/images/apply/addTask.svg               | 29 ++++++++++
 public/images/apply/allUser.svg               | 27 +++++++++
 public/images/apply/calendar.svg              | 19 +++++++
 public/images/apply/createMeeting.svg         |  1 +
 public/images/apply/file.svg                  | 17 ++++++
 public/images/apply/joinMeeting.svg           | 25 +++------
 public/images/apply/scan.svg                  | 41 ++++++++++++++
 public/images/apply/setting.svg               | 18 ++++++
 .../js/components/DrawerOverlay/index.vue     | 34 ++++++++++--
 resources/assets/js/pages/manage.vue          |  6 +-
 resources/assets/js/pages/manage/apply.vue    | 55 ++++++++++---------
 .../js/pages/manage/approve/details.vue       |  7 +++
 .../assets/js/pages/manage/approve/index.vue  | 31 +++++++++--
 resources/assets/js/pages/manage/calendar.vue |  1 +
 resources/assets/js/pages/manage/file.vue     |  1 +
 .../assets/js/pages/manage/messenger.vue      | 16 ++----
 .../assets/js/pages/manage/setting/index.vue  |  1 +
 .../sass/components/drawer-overlay.scss       |  1 +
 resources/assets/sass/components/report.scss  |  3 +
 resources/assets/sass/pages/common.scss       | 17 ++++++
 resources/assets/sass/pages/page-apply.scss   | 20 ++++++-
 resources/assets/sass/pages/page-approve.scss | 30 +++++++++-
 .../assets/sass/pages/page-calendar.scss      |  1 +
 resources/assets/sass/pages/page-setting.scss |  2 +-
 .../public/images/apply/addProject.svg        | 22 ++++++++
 .../statics/public/images/apply/addTask.svg   | 29 ++++++++++
 .../statics/public/images/apply/allUser.svg   | 27 +++++++++
 .../statics/public/images/apply/calendar.svg  | 19 +++++++
 .../statics/public/images/apply/file.svg      | 17 ++++++
 .../public/images/apply/joinMeeting.svg       | 20 +++++++
 .../statics/public/images/apply/scan.svg      | 41 ++++++++++++++
 .../statics/public/images/apply/setting.svg   | 18 ++++++
 33 files changed, 551 insertions(+), 67 deletions(-)
 create mode 100644 public/images/apply/addProject.svg
 create mode 100644 public/images/apply/addTask.svg
 create mode 100644 public/images/apply/allUser.svg
 create mode 100644 public/images/apply/calendar.svg
 create mode 100644 public/images/apply/createMeeting.svg
 create mode 100644 public/images/apply/file.svg
 create mode 100644 public/images/apply/scan.svg
 create mode 100644 public/images/apply/setting.svg
 create mode 100644 resources/assets/statics/public/images/apply/addProject.svg
 create mode 100644 resources/assets/statics/public/images/apply/addTask.svg
 create mode 100644 resources/assets/statics/public/images/apply/allUser.svg
 create mode 100644 resources/assets/statics/public/images/apply/calendar.svg
 create mode 100644 resources/assets/statics/public/images/apply/file.svg
 create mode 100644 resources/assets/statics/public/images/apply/joinMeeting.svg
 create mode 100644 resources/assets/statics/public/images/apply/scan.svg
 create mode 100644 resources/assets/statics/public/images/apply/setting.svg

diff --git a/public/images/apply/addProject.svg b/public/images/apply/addProject.svg
new file mode 100644
index 000000000..3cf886bcd
--- /dev/null
+++ b/public/images/apply/addProject.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#87D068;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M35.7,20.1c0-0.8-0.4-1.5-1.1-1.9l-8.9-5.1c-1-0.6-2.2-0.6-3.1,0l-9.1,5.2c-0.6,0.4-1,1-1,1.8s0.4,1.4,1,1.8
+			l9.1,5.2c0.5,0.3,1,0.4,1.6,0.4c0.5,0,1.1-0.1,1.6-0.4l8.9-5.1C35.3,21.6,35.7,20.9,35.7,20.1z"/>
+		<path class="st1" d="M24,29.7c-0.4,0-0.8-0.1-1.2-0.3l-9-5.1c-0.4-0.2-0.9-0.1-1.2,0.3c-0.2,0.4-0.1,0.9,0.3,1.2l9,5.1
+			c0.6,0.4,1.3,0.6,2,0.6c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9C24.9,30.1,24.5,29.7,24,29.7z"/>
+		<path class="st1" d="M24,33.5c-0.6,0-1.3-0.2-1.8-0.5l-8.4-4.8c-0.4-0.2-0.9-0.1-1.2,0.3c-0.2,0.4-0.1,0.9,0.3,1.2l8.4,4.8
+			c0.8,0.5,1.7,0.7,2.6,0.7c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9C24.9,33.9,24.5,33.5,24,33.5z"/>
+		<path class="st1" d="M34.8,30h-2.6v-2.6c0-0.5-0.4-0.9-0.9-0.9c-0.5,0-0.9,0.4-0.9,0.9V30h-2.6c-0.5,0-0.9,0.4-0.9,0.9
+			s0.4,0.9,0.9,0.9h2.6v2.6c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9v-2.6h2.6c0.5,0,0.9-0.4,0.9-0.9S35.3,30,34.8,30z"/>
+	</g>
+</g>
+</svg>
diff --git a/public/images/apply/addTask.svg b/public/images/apply/addTask.svg
new file mode 100644
index 000000000..090f1aa72
--- /dev/null
+++ b/public/images/apply/addTask.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#87D068;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<circle class="st1" cx="19.7" cy="26.6" r="0.9"/>
+		<g>
+			<path class="st1" d="M29,26.9c0.5,0,0.9,0.4,0.9,0.9l0,2.6l2.6,0c0.5,0,0.9,0.4,0.9,0.9c0,0.5-0.4,0.9-0.9,0.9l-2.6,0l0,2.6
+				c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.9-0.4-0.9-0.9l0-2.6l-2.6,0c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9l2.6,0l0-2.6
+				C28.1,27.3,28.5,26.9,29,26.9"/>
+		</g>
+		<g>
+			<path class="st1" d="M26.6,34.8l0-1.2l-1.2,0c0,0,0,0,0,0c-0.6,0-1.2-0.2-1.6-0.7c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6
+				c0.4-0.4,1-0.7,1.6-0.7l1.2,0l0-1.2c0-1.3,1-2.3,2.3-2.3c0,0,0,0,0,0c1.3,0,2.3,1,2.3,2.3l0,1.2l1.2,0c0,0,0,0,0,0
+				c0.3,0,0.6,0.1,0.9,0.2V14.7c0-1.3-1.1-2.3-2.3-2.3H17c-1.3,0-2.3,1.1-2.3,2.3v18.7c0,1.3,1,2.3,2.3,2.3h9.8
+				C26.7,35.4,26.6,35.1,26.6,34.8z M19.7,29.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S21.1,29.3,19.7,29.3z
+				 M22.6,17.9l-2.9,2.9c-0.2,0.2-0.4,0.3-0.6,0.3s-0.4-0.1-0.6-0.3l-1.2-1.2c-0.3-0.3-0.3-0.9,0-1.2s0.9-0.3,1.2,0l0.5,0.5l2.3-2.3
+				c0.3-0.3,0.9-0.3,1.2,0S23,17.6,22.6,17.9z M24.9,17.6h4.7c0.5,0,0.9,0.4,0.9,0.9s-0.4,0.9-0.9,0.9h-4.7c-0.5,0-0.9-0.4-0.9-0.9
+				S24.4,17.6,24.9,17.6z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/public/images/apply/allUser.svg b/public/images/apply/allUser.svg
new file mode 100644
index 000000000..3d145a93b
--- /dev/null
+++ b/public/images/apply/allUser.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F57775;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M21.5,24.5c-3.3,0-6-2.7-6-6s2.7-6,6-6s6,2.7,6,6C27.6,21.8,24.9,24.5,21.5,24.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M28.8,35.5H14.3c-1.1,0-2-0.9-2-2v-4.1c0-1.7,1.4-3.1,3.1-3.1h12.2c1.7,0,3.1,1.4,3.1,3.1v4.1
+			C30.7,34.6,29.9,35.5,28.8,35.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M29.6,22.5c-0.3,0-0.5-0.1-0.7-0.3c-0.2-0.3-0.2-0.7,0-1c0.6-0.8,0.9-1.7,0.9-2.7s-0.3-1.9-0.9-2.7
+			c-0.2-0.3-0.2-0.7,0-1s0.6-0.4,0.9-0.3c1.7,0.6,2.9,2.2,2.9,4s-1.2,3.4-2.9,4C29.8,22.5,29.7,22.5,29.6,22.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M34,34.7h-0.7c-0.3,0-0.5-0.1-0.7-0.3s-0.2-0.5-0.1-0.7c0-0.1,0-0.1,0-0.1v-4c0-0.4-0.2-0.7-0.3-0.9
+			c-0.2-0.2-0.2-0.6-0.1-0.9c0.1-0.3,0.4-0.5,0.7-0.5H33c1.4,0,2.6,1.2,2.6,2.6V33C35.7,34,34.9,34.7,34,34.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/public/images/apply/calendar.svg b/public/images/apply/calendar.svg
new file mode 100644
index 000000000..5243eea5d
--- /dev/null
+++ b/public/images/apply/calendar.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFAA64;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<path class="st1" d="M32.5,14.5h-4.3v-1c0-0.4-0.3-0.8-0.8-0.8s-0.8,0.3-0.8,0.8v1h-5.3v-1c0-0.4-0.3-0.8-0.8-0.8s-0.8,0.3-0.8,0.8
+	v1h-4.3c-1.5,0-2.8,1.2-2.8,2.8v15.3c0,1.5,1.2,2.8,2.8,2.8h17c1.5,0,2.8-1.2,2.8-2.8V17.2C35.2,15.7,34,14.5,32.5,14.5z M15.5,16
+	h4.3v1c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8v-1h5.3v1c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8v-1h4.3c0.7,0,1.2,0.6,1.2,1.2v2.9
+	H14.2v-2.9C14.2,16.5,14.8,16,15.5,16z M18.3,28.1L18.3,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1c-0.6,0-1.1-0.5-1.1-1
+	C17.3,28.5,17.8,28.1,18.3,28.1z M17.3,25.1c0-0.6,0.5-1,1-1h0c0.6,0,1,0.5,1,1s-0.5,1-1,1C17.8,26.2,17.3,25.7,17.3,25.1z M24,28.1
+	L24,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1c-0.6,0-1.1-0.5-1.1-1C23,28.5,23.4,28.1,24,28.1z M23,25.1c0-0.6,0.5-1,1-1h0
+	c0.6,0,1,0.5,1,1s-0.5,1-1,1C23.4,26.2,23,25.7,23,25.1z M29.7,28.1L29.7,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1
+	c-0.6,0-1.1-0.5-1.1-1C28.6,28.5,29.1,28.1,29.7,28.1z M28.6,25.1c0-0.6,0.5-1,1-1h0c0.6,0,1,0.5,1,1s-0.5,1-1,1
+	C29.1,26.2,28.6,25.7,28.6,25.1z"/>
+</svg>
diff --git a/public/images/apply/createMeeting.svg b/public/images/apply/createMeeting.svg
new file mode 100644
index 000000000..c1d209e64
--- /dev/null
+++ b/public/images/apply/createMeeting.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="48" height="48" viewBox="0 0 48 48"><defs><clipPath id="master_svg0_3054_25658"><rect x="12" y="12" width="24" height="24" rx="0"/></clipPath></defs><g><rect x="0" y="0" width="48" height="48" rx="12" fill="#72A1F7" fill-opacity="1"/><g clip-path="url(#master_svg0_3054_25658)"><g><path d="M33.1767,19.46395L30.5723,21.34133L30.5723,19.01332C30.5723,17.34516,29.217,15.99442094,27.5489,16L15.01332,16C13.34911,15.999999801611,12,17.34911,12,19.01332L12,29.5822C12,31.2464,13.34911,32.595600000000005,15.01332,32.595600000000005L27.5489,32.595600000000005C29.217,32.6011,30.5723,31.2504,30.5723,29.5822L30.5723,27.2542L33.182500000000005,29.1259C33.7237,29.5146,34.436800000000005,29.5683,35.0302,29.2651C35.623599999999996,28.9619,35.9979,28.3525,36,27.6861L36,20.907980000000002C36.0011,20.23879,35.626599999999996,19.62559,35.0308,19.32086C34.4351,19.01614,33.7187,19.07142,33.1767,19.46395Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/public/images/apply/file.svg b/public/images/apply/file.svg
new file mode 100644
index 000000000..800cfa2f8
--- /dev/null
+++ b/public/images/apply/file.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFAA64;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M28.7,18.4h3.8c0.5,0,0.8-0.6,0.4-1l-4.7-4.7c-0.4-0.4-1-0.1-1,0.4V17C27.3,17.8,27.9,18.4,28.7,18.4z"/>
+		<path class="st1" d="M28.7,20.2c-1.8,0-3.2-1.4-3.2-3.2v-4c0-0.3-0.3-0.6-0.6-0.6H17c-1.3,0-2.3,1.1-2.3,2.3v18.7
+			c0,1.3,1,2.3,2.3,2.3h14c1.3,0,2.3-1,2.3-2.3V20.7c0-0.3-0.3-0.6-0.6-0.6H28.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/public/images/apply/joinMeeting.svg b/public/images/apply/joinMeeting.svg
index 28b8a98ff..9ae39f7ae 100644
--- a/public/images/apply/joinMeeting.svg
+++ b/public/images/apply/joinMeeting.svg
@@ -3,25 +3,18 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#87D068;}
-	.st1{clip-path:url(#SVGID_00000110451965135261372140000002995710644970903720_);fill:#FFFFFF;}
+	.st0{fill:#53CBAE;}
+	.st1{fill:#FFFFFF;}
 </style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
 <g>
-	<path class="st0" d="M12,0h24c6.6,0,12,5.4,12,12v24c0,6.6-5.4,12-12,12H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0z"/>
 	<g>
-		<defs>
-			<rect id="SVGID_1_" x="12" y="12" width="24" height="24"/>
-		</defs>
-		<clipPath id="SVGID_00000062903037985041173510000002112159436546237855_">
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-		</clipPath>
-		<path style="clip-path:url(#SVGID_00000062903037985041173510000002112159436546237855_);fill:#FFFFFF;" d="M24,24.3"/>
-		<path style="clip-path:url(#SVGID_00000062903037985041173510000002112159436546237855_);fill:#FFFFFF;" d="M34.9,19.3L34.9,19.3
-			c-0.7-0.3-1.4-0.2-2,0.3l-2.2,2V19c0-1.6-1.3-2.9-2.9-2.9H14.9C13.3,16,12,17.3,12,19v10.7c0,1.6,1.3,2.9,2.9,2.9h12.8
-			c1.6,0,2.9-1.3,2.9-2.9V27l2.2,2c0.3,0.3,0.8,0.5,1.2,0.5c0.3,0,0.5-0.1,0.8-0.2c0.7-0.3,1.1-1,1.1-1.7V21
-			C36,20.3,35.6,19.7,34.9,19.3z M24.6,25.1h-2.5v2.5c0,0.5-0.4,0.8-0.8,0.8c-0.5,0-0.8-0.4-0.8-0.8v-2.5H18c-0.5,0-0.8-0.4-0.8-0.8
-			c0-0.5,0.4-0.8,0.8-0.8h2.5V21c0-0.5,0.4-0.8,0.8-0.8c0.5,0,0.8,0.4,0.8,0.8v2.5h2.5c0.5,0,0.8,0.4,0.8,0.8
-			C25.4,24.8,25.1,25.1,24.6,25.1z"/>
+		<path class="st1" d="M35.8,18.3l-2.6,2.2c-0.3,0.3-0.5,0.6-0.5,1v4.8c0,0.4,0.2,0.8,0.5,1l2.6,2.2c0.9,0.8,2.2,0.1,2.2-1v-9.3
+			C38,18.2,36.6,17.6,35.8,18.3z"/>
+		<path class="st1" d="M28.8,14.6H12c-1.1,0-2,0.9-2,2v14.8c0,1.1,0.9,2,2,2h16.8c1.1,0,2-0.9,2-2V16.6
+			C30.8,15.5,29.9,14.6,28.8,14.6z M23.4,24.7h-2.2V27c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-2.2h-2.2
+			c-0.4,0-0.7-0.3-0.7-0.7s0.3-0.7,0.7-0.7h2.2V21c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7v2.2h2.2c0.4,0,0.7,0.3,0.7,0.7
+			S23.8,24.7,23.4,24.7z"/>
 	</g>
 </g>
 </svg>
diff --git a/public/images/apply/scan.svg b/public/images/apply/scan.svg
new file mode 100644
index 000000000..f0ecc2c8c
--- /dev/null
+++ b/public/images/apply/scan.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#72A1F7;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st1" d="M20.3,35.8h-4.7c-1.9,0-3.4-1.5-3.4-3.4v-4.7c0-0.4,0.3-0.8,0.8-0.8s0.8,0.3,0.8,0.8v4.7
+						c0,1.1,0.9,1.9,1.9,1.9h4.7c0.4,0,0.8,0.3,0.8,0.8S20.7,35.8,20.3,35.8z"/>
+				</g>
+				<g>
+					<path class="st1" d="M13,21.1c-0.4,0-0.8-0.3-0.8-0.8v-4.7c0-1.9,1.5-3.4,3.4-3.4h4.7c0.4,0,0.8,0.3,0.8,0.8s-0.3,0.8-0.8,0.8
+						h-4.7c-1.1,0-1.9,0.9-1.9,1.9v4.7C13.8,20.7,13.4,21.1,13,21.1z"/>
+				</g>
+			</g>
+			<g>
+				<g>
+					<path class="st1" d="M35,21.1c-0.4,0-0.8-0.3-0.8-0.8v-4.7c0-1.1-0.9-1.9-1.9-1.9h-4.7c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8
+						h4.7c1.9,0,3.4,1.5,3.4,3.4v4.7C35.8,20.7,35.4,21.1,35,21.1z"/>
+				</g>
+				<g>
+					<path class="st1" d="M32.3,35.8h-4.7c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8h4.7c1.1,0,1.9-0.9,1.9-1.9v-4.7
+						c0-0.4,0.3-0.8,0.8-0.8s0.8,0.3,0.8,0.8v4.7C35.8,34.2,34.2,35.8,32.3,35.8z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<path class="st1" d="M29.5,16.5H18.5c-1.1,0-1.9,0.9-1.9,1.9v11.1c0,1.1,0.9,1.9,1.9,1.9h11.1c1.1,0,1.9-0.9,1.9-1.9V18.5
+				C31.5,17.4,30.6,16.5,29.5,16.5z M27.7,24.8h-7.3c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8h7.3c0.4,0,0.8,0.3,0.8,0.8
+				S28.1,24.8,27.7,24.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/public/images/apply/setting.svg b/public/images/apply/setting.svg
new file mode 100644
index 000000000..99a6c4942
--- /dev/null
+++ b/public/images/apply/setting.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#72A1F7;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<path class="st1" d="M34.6,26.5c-1.9-1.1-1.9-3.8,0-4.9c0.6-0.3,0.8-1.1,0.5-1.7l-1.9-3.3c-0.3-0.6-1.1-0.8-1.7-0.5
+		c-1.9,1.1-4.3-0.3-4.3-2.5c0-0.7-0.6-1.3-1.3-1.3h-3.8c-0.7,0-1.3,0.6-1.3,1.3c0,2.2-2.4,3.6-4.3,2.5l0,0c-0.6-0.3-1.4-0.1-1.7,0.5
+		L13,19.8c-0.3,0.6-0.1,1.4,0.5,1.7l0,0c1.9,1.1,1.9,3.8,0,4.9c-0.6,0.3-0.8,1.1-0.5,1.7l1.9,3.3c0.3,0.6,1.1,0.8,1.7,0.5
+		c1.9-1.1,4.3,0.3,4.3,2.5v0c0,0.7,0.6,1.3,1.3,1.3h3.8c0.7,0,1.3-0.6,1.3-1.3v0c0-2.2,2.4-3.6,4.3-2.5h0c0.6,0.3,1.4,0.1,1.7-0.5
+		l1.9-3.3C35.4,27.6,35.2,26.8,34.6,26.5z M24,26.6c-1.4,0-2.6-1.2-2.6-2.6c0-1.4,1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6
+		C26.6,25.4,25.4,26.6,24,26.6z"/>
+</g>
+</svg>
diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue
index 1307dd7a5..bd0a651e3 100644
--- a/resources/assets/js/components/DrawerOverlay/index.vue
+++ b/resources/assets/js/components/DrawerOverlay/index.vue
@@ -5,12 +5,13 @@
         :closable="escClosable"
         :mask-closable="maskClosable"
         :footer-hide="true"
-        :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${placement}`, '']"
+        :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']"
         :beforeClose="beforeClose"
         fullscreen
         :class-name="modalClass">
-        <DrawerOverlayView
-            :placement="placement"
+        <slot v-if="isFullscreen" />
+        <DrawerOverlayView v-else
+            :placement="transitionName"
             :size="size"
             :minSize="minSize"
             :resize="resize"
@@ -26,11 +27,20 @@ body {
         &.common-drawer-overlay {
             overflow: hidden;
         }
+        &.common-drawer-modal{
+            .ivu-modal-body{
+                padding: 0;
+            }
+            .ivu-modal-close{
+                z-index: 3;
+            }
+        }
     }
 }
 </style>
 <script>
 import DrawerOverlayView from "./view";
+import {mapState} from 'vuex'
 
 export default {
     name: 'DrawerOverlay',
@@ -74,6 +84,7 @@ export default {
     data() {
         return {
             show: this.value,
+            isFullscreen: false
         }
     },
     watch: {
@@ -82,17 +93,30 @@ export default {
         },
         show(v) {
             this.value !== v && this.$emit("input", v)
+        },
+        windowWidth(val){
+            this.isFullscreen = val < 500
         }
     },
     computed: {
+        ...mapState([ 'windowWidth' ]),
+        transitionName(){
+            return this.isFullscreen ? 'bottom' : this.placement
+        },
         modalClass() {
+            if(this.isFullscreen){
+                return "common-drawer-modal"
+            }
             if (this.className) {
-                return `common-drawer-overlay ${this.className} ${this.placement}`
+                return `common-drawer-overlay ${this.className} ${this.transitionName}`
             } else {
-                return `common-drawer-overlay ${this.placement}`
+                return `common-drawer-overlay ${this.transitionName}`
             }
         }
     },
+    mounted() {
+        this.isFullscreen = this.windowWidth < 515
+    },
     methods: {
         onClose() {
             this.$refs.modal.close();
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index f8c5749a7..90b3d899f 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -813,8 +813,12 @@ export default {
         },
 
         classNameRoute(path) {
+            let routeName = this.routeName
+            if(routeName == 'manage-approve'){
+                routeName = `manage-apply`
+            }
             return {
-                "active": this.routeName === `manage-${path}`,
+                "active": routeName === `manage-${path}`,
             };
         },
 
diff --git a/resources/assets/js/pages/manage/apply.vue b/resources/assets/js/pages/manage/apply.vue
index 5f928c69f..ee017ed75 100644
--- a/resources/assets/js/pages/manage/apply.vue
+++ b/resources/assets/js/pages/manage/apply.vue
@@ -11,20 +11,25 @@
             </div>
             <div class="apply-row">
                 <Row :gutter="16">
-                    <Col v-if="!item.isAdmin || userIsAdmin" v-for="(item, key) in applyList" :xs="{ span: 8 }"
-                        :sm="{ span: 8 }" :lg="{ span: 6 }" :xl="{ span: 4 }" :xxl="{ span: 3 }" :key="key">
-                    <div class="apply-col">
-                        <div @click="applyClick(item)">
-                            <img :src="item.src">
-                            <p>{{ item.label }}</p>
-                            <!-- 审批中心 -->
-                            <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" class="manage-box-top-report"
-                                :overflow-count="999" :count="approveUnreadNumber" />
-                            <!-- 工作报告 -->
-                            <Badge v-if="item.value == 'report' && reportUnreadNumber > 0" class="manage-box-top-report"
-                                :overflow-count="999" :count="reportUnreadNumber" />
+                    <Col v-if="item.show==undefined || item.show" v-for="(item, key) in applyList"  :key="key"
+                        :xs="{ span: 8 }" 
+                        :sm="{ span: 8 }" 
+                        :lg="{ span: 6 }" 
+                        :xl="{ span: 4 }" 
+                        :xxl="{ span: 3 }"
+                    >
+                        <div class="apply-col">
+                            <div @click="applyClick(item)">
+                                <img :src="item.src">
+                                <p>{{ item.label }}</p>
+                                <!-- 审批中心 -->
+                                <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" class="manage-box-top-report"
+                                    :overflow-count="999" :count="approveUnreadNumber" />
+                                <!-- 工作报告 -->
+                                <Badge v-if="item.value == 'report' && reportUnreadNumber > 0" class="manage-box-top-report"
+                                    :overflow-count="999" :count="reportUnreadNumber" />
+                            </div>
                         </div>
-                    </div>
                     </Col>
                 </Row>
             </div>
@@ -261,23 +266,21 @@ export default {
             { value: "report", label: "工作报告", src: $A.apiUrl('../images/apply/report.svg') },
             { value: "ai", label: "AI机器人", src: $A.apiUrl('../images/apply/robot.svg') },
             { value: "signIn", label: "签到", src: $A.apiUrl('../images/apply/signin.svg') },
-            { value: "meeting", label: "会议", src: $A.apiUrl('../images/apply/meeting.svg') },
-            { value: "ldap", label: "LDAP", src: $A.apiUrl('../images/apply/ldap.svg'), isAdmin: true },
-            { value: "mail", label: "邮件", src: $A.apiUrl('../images/apply/mail.svg'), isAdmin: true },
-            { value: "appPush", label: "APP推送", src: $A.apiUrl('../images/apply/apppush.svg'), isAdmin: true }
+            { value: "meeting", label: "会议", src: $A.apiUrl('../images/apply/meeting.svg'), show: this.userIsAdmin },
+            { value: "ldap", label: "LDAP", src: $A.apiUrl('../images/apply/ldap.svg'), show: this.userIsAdmin },
+            { value: "mail", label: "邮件", src: $A.apiUrl('../images/apply/mail.svg'), show: this.userIsAdmin },
+            { value: "appPush", label: "APP推送", src: $A.apiUrl('../images/apply/apppush.svg'), show: this.userIsAdmin },
+            { value: "allUser", label: "团队管理", src: $A.apiUrl('../images/apply/allUser.svg'), show: this.userIsAdmin },
         ];
         if (this.windowOrientation == 'portrait') {
-            this.applyList.push({ value: "calendar", label: "日历", src: $A.apiUrl('../images/apply/apppush.svg') })
-            this.applyList.push({ value: "file", label: "文件", src: $A.apiUrl('../images/apply/apppush.svg') })
-            this.applyList.push({ value: "addProject", label: "创建项目", src: $A.apiUrl('../images/apply/apppush.svg') })
-            this.applyList.push({ value: "addTask", label: "添加任务", src: $A.apiUrl('../images/apply/apppush.svg') })
+            this.applyList.push({ value: "calendar", label: "日历", src: $A.apiUrl('../images/apply/calendar.svg') })
+            this.applyList.push({ value: "file", label: "文件", src: $A.apiUrl('../images/apply/file.svg') })
+            this.applyList.push({ value: "addProject", label: "创建项目", src: $A.apiUrl('../images/apply/addProject.svg') })
+            this.applyList.push({ value: "addTask", label: "添加任务", src: $A.apiUrl('../images/apply/addTask.svg') })
             if ($A.isEEUiApp) {
-                this.applyList.push({ value: "scan", label: "扫一扫", src: $A.apiUrl('../images/apply/apppush.svg') })
+                this.applyList.push({ value: "scan", label: "扫一扫", src: $A.apiUrl('../images/apply/scan.svg') })
             }
-            if (this.userIsAdmin) {
-                this.applyList.push({ value: "allUser", label: "团队管理", src: $A.apiUrl('../images/apply/apppush.svg') })
-            }
-            this.applyList.push({ value: "setting", label: "设置", src: $A.apiUrl('../images/apply/apppush.svg') })
+            this.applyList.push({ value: "setting", label: "设置", src: $A.apiUrl('../images/apply/setting.svg') })
         }
     },
 
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index f7521fef4..a8ab3edd3 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -1,5 +1,12 @@
 <template>
     <div class="approve-details" :style="{'z-index':modalTransferIndex}">
+        <!-- 导航 -->
+        <div class="approve-details-nav">
+            <div class="common-nav-back" @click="goBack()">
+                <i class="taskfont">&#xe676;</i>
+            </div>
+            <h2>{{$L('审批详情')}}</h2>
+        </div>
         <!-- 审批详情 -->
         <div class="approve-details-box" ref="approveDetailsBox">
             <h2 class="approve-details-title">
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index c21d40b8b..930b81bae 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -5,11 +5,23 @@
 
             <div class="approve-head">
                 <div class="approve-nav">
+                    <div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{$L('审批中心')}}</h1>
                 </div>
-                <Button v-if="showType == 1" :loading="addLoadIng" type="primary" @click="addApply">{{$L("添加申请")}}</Button>
+                <Button v-if="showType == 1" :loading="addLoadIng" type="primary" @click="addApply"> 
+                    <span v-if="!isShowIcon"> {{$L("添加申请")}} </span> 
+                    <i v-else class="taskfont">&#xe6f2;</i>
+                </Button>
+                <Button v-if="showType == 1 && userIsAdmin" @click="exportApproveShow = true">
+                    <span v-if="!isShowIcon"> {{$L("导出审批数据")}} </span> 
+                    <i v-else class="taskfont">&#xe7a8;</i>
+                </Button>
                 <Button v-if="userIsAdmin" @click="showType = showType == 1 ? 2 : 1">
-                    {{ showType == 1 ? $L("流程设置") : $L("返回") }}
+                    <span v-if="!isShowIcon"> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span> 
+                    <template v-else>
+                        <i v-if="showType == 1" class="taskfont">&#xe67b;</i>
+                        <i v-else class="taskfont">&#xe637;</i>
+                    </template>
                 </Button>
             </div>
             
@@ -211,6 +223,9 @@
             </div>
         </Modal>
 
+        <!--导出审批数据-->
+        <ApproveExport v-model="exportApproveShow"/>
+
     </div>
 </template>
 
@@ -220,15 +235,17 @@ import listDetails from "./details.vue";
 import DrawerOverlay from "../../../components/DrawerOverlay";
 import ImgUpload from "../../../components/ImgUpload";
 import ApproveSetting from "./setting";
-
+import ApproveExport from "../components/ApproveExport";
 import {mapState} from 'vuex'
 
 export default {
-    components:{list,listDetails,DrawerOverlay,ImgUpload,ApproveSetting},
+    components:{list,listDetails,DrawerOverlay,ImgUpload,ApproveSetting,ApproveExport},
     name: "approve",
     data() {
         return {
             showType: 1,
+            exportApproveShow: false,
+            isShowIcon: false, 
             modalTransferIndex: window.modalTransferIndex,
 
             minDate: new Date(2020, 0, 1),
@@ -314,7 +331,7 @@ export default {
         }
     },
     computed: {
-        ...mapState([ 'wsMsg','userInfo','userIsAdmin' ]),
+        ...mapState([ 'wsMsg','userInfo','userIsAdmin','windowWidth' ]),
         departmentList(){
             let departmentNames = (this.userInfo.department_name || '').split(',');
             return (this.userInfo.department || []).map((h,index)=>{
@@ -353,6 +370,9 @@ export default {
             if(val == 1){
                 this.tabsClick()
             }
+        },
+        windowWidth(val){
+            this.isShowIcon = val < 515
         }
     },
     mounted() {
@@ -361,6 +381,7 @@ export default {
         this.getUnreadList()
         this.addData.department_id = this.userInfo.department[0] || 0;
         this.addData.startTime = this.addData.endTime = this.getCurrentDate();
+        this.isShowIcon = this.windowWidth < 515
     },
     methods:{
         // 获取当前时间
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 3cdd24fec..5cb6533e4 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -4,6 +4,7 @@
         <div class="calendar-head">
             <div class="calendar-titbox">
                 <div class="calendar-title">
+                    <div class="common-nav-back portrait" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{rangeText}}</h1>
                 </div>
                 <ButtonGroup class="calendar-arrow" size="small">
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 189142445..6436f8a46 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -6,6 +6,7 @@
 
             <div class="file-head">
                 <div class="file-nav">
+                    <div class="common-nav-back portrait" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{$L('文件')}}</h1>
                     <div v-if="loadIng == 0" class="file-refresh" @click="getFileList"><i class="taskfont">&#xe6ae;</i></div>
                 </div>
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 331db6493..b707862f8 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -453,17 +453,13 @@ export default {
                 if (['dialog', 'contacts'].includes(params.dialogAction)) {
                     this.tabActive = params.dialogAction
                 }
-                if(this.tabActive=='dialog'){
-                    if(params.dialog_id){
-                        const id = $A.runNum(params.dialog_id);
-                        if (id > 0) {
-                            this.openDialog(id)
-                        }
-                        this.clickAgainSubscribe = Store.subscribe('clickAgainDialog', this.shakeUnread);
-                    }
-                    if(params.search){
-                        this.dialogSearchKey = params.search
+                if (params.dialog_id) {
+                    this.tabActive = 'dialog'
+                    const id = $A.runNum(params.dialog_id);
+                    if (id > 0) {
+                        this.openDialog(id)
                     }
+                    this.clickAgainSubscribe = Store.subscribe('clickAgainDialog', this.shakeUnread);
                 }
             },
             immediate: true
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index ce7020bd3..8b975da52 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -4,6 +4,7 @@
         <div class="setting-head">
             <div class="setting-titbox">
                 <div class="setting-title">
+                    <div class="common-nav-back portrait" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{settingTitleName}}</h1>
                     <div v-if="!showMobileBox" class="setting-more" @click="toggleRoute('index')">
                         <Icon type="md-close" />
diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss
index 42248b6a0..9ae83be2f 100644
--- a/resources/assets/sass/components/drawer-overlay.scss
+++ b/resources/assets/sass/components/drawer-overlay.scss
@@ -28,6 +28,7 @@
         max-width: 100%;
         max-height: 100%;
         z-index: 2;
+        position: relative;
 
         .overlay-close {
             flex-shrink: 0;
diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss
index 445402140..e934c9329 100644
--- a/resources/assets/sass/components/report.scss
+++ b/resources/assets/sass/components/report.scss
@@ -69,6 +69,9 @@
         margin-bottom: 12px;
         padding: 20px 24px;
         border-bottom: 1px solid #eeeeee;
+        @media (max-width: 500px) {
+            padding-right: 50px;
+        }
     }
 
     .report-detail-context {
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 4b529bd48..7f701d7fe 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -776,3 +776,20 @@ body {
     transform: translate(100%, 0);
     opacity: 0;
 }
+
+// 全局返回按钮 
+.common-nav-back{
+    cursor: pointer;
+    padding-right: 5px;
+    &.portrait{
+        display: none;
+    }
+    .taskfont{
+        font-size: 26px;
+    }
+}
+body.window-portrait {
+    .common-nav-back{
+        display: block;
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index a7130d647..860f271d8 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -84,7 +84,8 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    max-width: calc(100vw - 40px);
+    // max-width: calc(100vw - 40px);
+    max-width: 100vw;
     overflow: auto;
 
     .ivu-modal-wrap-apply-title {
@@ -99,6 +100,11 @@
             color: #2b85e4;
             font-size: 14px;
         }
+
+        @media (max-width: 500px) {
+            margin-right: 28px;
+        }
+       
     }
 
     .ivu-modal-wrap-apply-body {
@@ -307,4 +313,16 @@
         }
 
     }
+}
+
+
+body.window-portrait {
+    .page-apply {
+        .apply-head{
+            margin: 24px 24px 0 24px;
+        }
+        .apply-row{
+            padding: 16px 24px;
+        }
+    }
 }
\ No newline at end of file
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 0500b3a5c..28b60527c 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -178,6 +178,25 @@
     border: 1px solid #eeeeee;
     background: #fff;
 
+    .approve-details-nav{
+        height: 52px;
+        padding:0 8px;
+        text-align: center;
+        line-height: 52px;
+        background-color: #f8f8f8;
+        display: none;
+        @media (max-width: 425px) {
+           display: block;
+        }
+        .common-nav-back{
+            float: left;
+        }
+        h2{
+            font-size: 17px;
+            font-weight: 600;
+        }
+    }
+
     .approve-details-box {
         flex: 1 1 auto;
         padding: 24px;
@@ -455,6 +474,13 @@
 }
 
 // 
-.window-portrait .page-approve  .approve-mains {
-    height: calc(100vh - 250px);
+body.window-portrait {
+    .page-approve{
+        .approve-head {
+            margin: 20px 14px 16px;
+        }
+        .approve-mains {
+            height: calc(100vh - 250px);
+        }
+    }
 }
\ No newline at end of file
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index e405c8699..35de4a084 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -194,6 +194,7 @@
 body.window-portrait {
     .page-calendar {
         .calendar-head {
+            margin: 24px 24px 16px;
             .calendar-titbox {
                 .calendar-title {
                     flex: 1;
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 9ee0b6c7f..a4c2de9d7 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -375,7 +375,7 @@
 body.window-portrait {
     .page-setting {
         .setting-head {
-            margin: 32px 32px 0;
+            margin: 24px 24px 16px;
             .setting-titbox {
                 .setting-title {
                     .setting-more {
diff --git a/resources/assets/statics/public/images/apply/addProject.svg b/resources/assets/statics/public/images/apply/addProject.svg
new file mode 100644
index 000000000..3cf886bcd
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/addProject.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#87D068;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M35.7,20.1c0-0.8-0.4-1.5-1.1-1.9l-8.9-5.1c-1-0.6-2.2-0.6-3.1,0l-9.1,5.2c-0.6,0.4-1,1-1,1.8s0.4,1.4,1,1.8
+			l9.1,5.2c0.5,0.3,1,0.4,1.6,0.4c0.5,0,1.1-0.1,1.6-0.4l8.9-5.1C35.3,21.6,35.7,20.9,35.7,20.1z"/>
+		<path class="st1" d="M24,29.7c-0.4,0-0.8-0.1-1.2-0.3l-9-5.1c-0.4-0.2-0.9-0.1-1.2,0.3c-0.2,0.4-0.1,0.9,0.3,1.2l9,5.1
+			c0.6,0.4,1.3,0.6,2,0.6c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9C24.9,30.1,24.5,29.7,24,29.7z"/>
+		<path class="st1" d="M24,33.5c-0.6,0-1.3-0.2-1.8-0.5l-8.4-4.8c-0.4-0.2-0.9-0.1-1.2,0.3c-0.2,0.4-0.1,0.9,0.3,1.2l8.4,4.8
+			c0.8,0.5,1.7,0.7,2.6,0.7c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9C24.9,33.9,24.5,33.5,24,33.5z"/>
+		<path class="st1" d="M34.8,30h-2.6v-2.6c0-0.5-0.4-0.9-0.9-0.9c-0.5,0-0.9,0.4-0.9,0.9V30h-2.6c-0.5,0-0.9,0.4-0.9,0.9
+			s0.4,0.9,0.9,0.9h2.6v2.6c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9v-2.6h2.6c0.5,0,0.9-0.4,0.9-0.9S35.3,30,34.8,30z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/addTask.svg b/resources/assets/statics/public/images/apply/addTask.svg
new file mode 100644
index 000000000..090f1aa72
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/addTask.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#87D068;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<circle class="st1" cx="19.7" cy="26.6" r="0.9"/>
+		<g>
+			<path class="st1" d="M29,26.9c0.5,0,0.9,0.4,0.9,0.9l0,2.6l2.6,0c0.5,0,0.9,0.4,0.9,0.9c0,0.5-0.4,0.9-0.9,0.9l-2.6,0l0,2.6
+				c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.9-0.4-0.9-0.9l0-2.6l-2.6,0c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9l2.6,0l0-2.6
+				C28.1,27.3,28.5,26.9,29,26.9"/>
+		</g>
+		<g>
+			<path class="st1" d="M26.6,34.8l0-1.2l-1.2,0c0,0,0,0,0,0c-0.6,0-1.2-0.2-1.6-0.7c-0.4-0.4-0.7-1-0.7-1.6c0-0.6,0.2-1.2,0.7-1.6
+				c0.4-0.4,1-0.7,1.6-0.7l1.2,0l0-1.2c0-1.3,1-2.3,2.3-2.3c0,0,0,0,0,0c1.3,0,2.3,1,2.3,2.3l0,1.2l1.2,0c0,0,0,0,0,0
+				c0.3,0,0.6,0.1,0.9,0.2V14.7c0-1.3-1.1-2.3-2.3-2.3H17c-1.3,0-2.3,1.1-2.3,2.3v18.7c0,1.3,1,2.3,2.3,2.3h9.8
+				C26.7,35.4,26.6,35.1,26.6,34.8z M19.7,29.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S21.1,29.3,19.7,29.3z
+				 M22.6,17.9l-2.9,2.9c-0.2,0.2-0.4,0.3-0.6,0.3s-0.4-0.1-0.6-0.3l-1.2-1.2c-0.3-0.3-0.3-0.9,0-1.2s0.9-0.3,1.2,0l0.5,0.5l2.3-2.3
+				c0.3-0.3,0.9-0.3,1.2,0S23,17.6,22.6,17.9z M24.9,17.6h4.7c0.5,0,0.9,0.4,0.9,0.9s-0.4,0.9-0.9,0.9h-4.7c-0.5,0-0.9-0.4-0.9-0.9
+				S24.4,17.6,24.9,17.6z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/allUser.svg b/resources/assets/statics/public/images/apply/allUser.svg
new file mode 100644
index 000000000..3d145a93b
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/allUser.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F57775;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M21.5,24.5c-3.3,0-6-2.7-6-6s2.7-6,6-6s6,2.7,6,6C27.6,21.8,24.9,24.5,21.5,24.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M28.8,35.5H14.3c-1.1,0-2-0.9-2-2v-4.1c0-1.7,1.4-3.1,3.1-3.1h12.2c1.7,0,3.1,1.4,3.1,3.1v4.1
+			C30.7,34.6,29.9,35.5,28.8,35.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M29.6,22.5c-0.3,0-0.5-0.1-0.7-0.3c-0.2-0.3-0.2-0.7,0-1c0.6-0.8,0.9-1.7,0.9-2.7s-0.3-1.9-0.9-2.7
+			c-0.2-0.3-0.2-0.7,0-1s0.6-0.4,0.9-0.3c1.7,0.6,2.9,2.2,2.9,4s-1.2,3.4-2.9,4C29.8,22.5,29.7,22.5,29.6,22.5z"/>
+	</g>
+	<g>
+		<path class="st1" d="M34,34.7h-0.7c-0.3,0-0.5-0.1-0.7-0.3s-0.2-0.5-0.1-0.7c0-0.1,0-0.1,0-0.1v-4c0-0.4-0.2-0.7-0.3-0.9
+			c-0.2-0.2-0.2-0.6-0.1-0.9c0.1-0.3,0.4-0.5,0.7-0.5H33c1.4,0,2.6,1.2,2.6,2.6V33C35.7,34,34.9,34.7,34,34.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/calendar.svg b/resources/assets/statics/public/images/apply/calendar.svg
new file mode 100644
index 000000000..5243eea5d
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/calendar.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFAA64;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<path class="st1" d="M32.5,14.5h-4.3v-1c0-0.4-0.3-0.8-0.8-0.8s-0.8,0.3-0.8,0.8v1h-5.3v-1c0-0.4-0.3-0.8-0.8-0.8s-0.8,0.3-0.8,0.8
+	v1h-4.3c-1.5,0-2.8,1.2-2.8,2.8v15.3c0,1.5,1.2,2.8,2.8,2.8h17c1.5,0,2.8-1.2,2.8-2.8V17.2C35.2,15.7,34,14.5,32.5,14.5z M15.5,16
+	h4.3v1c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8v-1h5.3v1c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8v-1h4.3c0.7,0,1.2,0.6,1.2,1.2v2.9
+	H14.2v-2.9C14.2,16.5,14.8,16,15.5,16z M18.3,28.1L18.3,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1c-0.6,0-1.1-0.5-1.1-1
+	C17.3,28.5,17.8,28.1,18.3,28.1z M17.3,25.1c0-0.6,0.5-1,1-1h0c0.6,0,1,0.5,1,1s-0.5,1-1,1C17.8,26.2,17.3,25.7,17.3,25.1z M24,28.1
+	L24,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1c-0.6,0-1.1-0.5-1.1-1C23,28.5,23.4,28.1,24,28.1z M23,25.1c0-0.6,0.5-1,1-1h0
+	c0.6,0,1,0.5,1,1s-0.5,1-1,1C23.4,26.2,23,25.7,23,25.1z M29.7,28.1L29.7,28.1c0.6,0,1.1,0.5,1.1,1.1c0,0.6-0.5,1-1,1
+	c-0.6,0-1.1-0.5-1.1-1C28.6,28.5,29.1,28.1,29.7,28.1z M28.6,25.1c0-0.6,0.5-1,1-1h0c0.6,0,1,0.5,1,1s-0.5,1-1,1
+	C29.1,26.2,28.6,25.7,28.6,25.1z"/>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/file.svg b/resources/assets/statics/public/images/apply/file.svg
new file mode 100644
index 000000000..800cfa2f8
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/file.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFAA64;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M28.7,18.4h3.8c0.5,0,0.8-0.6,0.4-1l-4.7-4.7c-0.4-0.4-1-0.1-1,0.4V17C27.3,17.8,27.9,18.4,28.7,18.4z"/>
+		<path class="st1" d="M28.7,20.2c-1.8,0-3.2-1.4-3.2-3.2v-4c0-0.3-0.3-0.6-0.6-0.6H17c-1.3,0-2.3,1.1-2.3,2.3v18.7
+			c0,1.3,1,2.3,2.3,2.3h14c1.3,0,2.3-1,2.3-2.3V20.7c0-0.3-0.3-0.6-0.6-0.6H28.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/joinMeeting.svg b/resources/assets/statics/public/images/apply/joinMeeting.svg
new file mode 100644
index 000000000..9ae39f7ae
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/joinMeeting.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#53CBAE;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<path class="st1" d="M35.8,18.3l-2.6,2.2c-0.3,0.3-0.5,0.6-0.5,1v4.8c0,0.4,0.2,0.8,0.5,1l2.6,2.2c0.9,0.8,2.2,0.1,2.2-1v-9.3
+			C38,18.2,36.6,17.6,35.8,18.3z"/>
+		<path class="st1" d="M28.8,14.6H12c-1.1,0-2,0.9-2,2v14.8c0,1.1,0.9,2,2,2h16.8c1.1,0,2-0.9,2-2V16.6
+			C30.8,15.5,29.9,14.6,28.8,14.6z M23.4,24.7h-2.2V27c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-2.2h-2.2
+			c-0.4,0-0.7-0.3-0.7-0.7s0.3-0.7,0.7-0.7h2.2V21c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7v2.2h2.2c0.4,0,0.7,0.3,0.7,0.7
+			S23.8,24.7,23.4,24.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/scan.svg b/resources/assets/statics/public/images/apply/scan.svg
new file mode 100644
index 000000000..f0ecc2c8c
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/scan.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#72A1F7;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st1" d="M20.3,35.8h-4.7c-1.9,0-3.4-1.5-3.4-3.4v-4.7c0-0.4,0.3-0.8,0.8-0.8s0.8,0.3,0.8,0.8v4.7
+						c0,1.1,0.9,1.9,1.9,1.9h4.7c0.4,0,0.8,0.3,0.8,0.8S20.7,35.8,20.3,35.8z"/>
+				</g>
+				<g>
+					<path class="st1" d="M13,21.1c-0.4,0-0.8-0.3-0.8-0.8v-4.7c0-1.9,1.5-3.4,3.4-3.4h4.7c0.4,0,0.8,0.3,0.8,0.8s-0.3,0.8-0.8,0.8
+						h-4.7c-1.1,0-1.9,0.9-1.9,1.9v4.7C13.8,20.7,13.4,21.1,13,21.1z"/>
+				</g>
+			</g>
+			<g>
+				<g>
+					<path class="st1" d="M35,21.1c-0.4,0-0.8-0.3-0.8-0.8v-4.7c0-1.1-0.9-1.9-1.9-1.9h-4.7c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8
+						h4.7c1.9,0,3.4,1.5,3.4,3.4v4.7C35.8,20.7,35.4,21.1,35,21.1z"/>
+				</g>
+				<g>
+					<path class="st1" d="M32.3,35.8h-4.7c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8h4.7c1.1,0,1.9-0.9,1.9-1.9v-4.7
+						c0-0.4,0.3-0.8,0.8-0.8s0.8,0.3,0.8,0.8v4.7C35.8,34.2,34.2,35.8,32.3,35.8z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<path class="st1" d="M29.5,16.5H18.5c-1.1,0-1.9,0.9-1.9,1.9v11.1c0,1.1,0.9,1.9,1.9,1.9h11.1c1.1,0,1.9-0.9,1.9-1.9V18.5
+				C31.5,17.4,30.6,16.5,29.5,16.5z M27.7,24.8h-7.3c-0.4,0-0.8-0.3-0.8-0.8s0.3-0.8,0.8-0.8h7.3c0.4,0,0.8,0.3,0.8,0.8
+				S28.1,24.8,27.7,24.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/assets/statics/public/images/apply/setting.svg b/resources/assets/statics/public/images/apply/setting.svg
new file mode 100644
index 000000000..99a6c4942
--- /dev/null
+++ b/resources/assets/statics/public/images/apply/setting.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#72A1F7;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,48H12C5.4,48,0,42.6,0,36V12C0,5.4,5.4,0,12,0h24c6.6,0,12,5.4,12,12v24C48,42.6,42.6,48,36,48z"/>
+<g>
+	<path class="st1" d="M34.6,26.5c-1.9-1.1-1.9-3.8,0-4.9c0.6-0.3,0.8-1.1,0.5-1.7l-1.9-3.3c-0.3-0.6-1.1-0.8-1.7-0.5
+		c-1.9,1.1-4.3-0.3-4.3-2.5c0-0.7-0.6-1.3-1.3-1.3h-3.8c-0.7,0-1.3,0.6-1.3,1.3c0,2.2-2.4,3.6-4.3,2.5l0,0c-0.6-0.3-1.4-0.1-1.7,0.5
+		L13,19.8c-0.3,0.6-0.1,1.4,0.5,1.7l0,0c1.9,1.1,1.9,3.8,0,4.9c-0.6,0.3-0.8,1.1-0.5,1.7l1.9,3.3c0.3,0.6,1.1,0.8,1.7,0.5
+		c1.9-1.1,4.3,0.3,4.3,2.5v0c0,0.7,0.6,1.3,1.3,1.3h3.8c0.7,0,1.3-0.6,1.3-1.3v0c0-2.2,2.4-3.6,4.3-2.5h0c0.6,0.3,1.4,0.1,1.7-0.5
+		l1.9-3.3C35.4,27.6,35.2,26.8,34.6,26.5z M24,26.6c-1.4,0-2.6-1.2-2.6-2.6c0-1.4,1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6
+		C26.6,25.4,25.4,26.6,24,26.6z"/>
+</g>
+</svg>