From 4307ae925b0f91f8153ec228f478048ae8ec4990 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Mon, 29 Apr 2024 14:10:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=88=E5=AE=A1=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/pocitypass.png        | Bin 0 -> 4665 bytes
 src/views/final/content/Content.vue     |  28 +++++++++++++-----------
 src/views/final/content/ListContent.vue |  28 +++++++++++++-----------
 3 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/images/pocitypass.png

diff --git a/src/assets/images/pocitypass.png b/src/assets/images/pocitypass.png
new file mode 100644
index 0000000000000000000000000000000000000000..468d459f63c40346d14274d68072a7e8bc6f58e0
GIT binary patch
literal 4665
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

literal 0
HcmV?d00001

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 3356fa7..2708ced 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -888,8 +888,8 @@ defineExpose({
 
         <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn">
-            <SvgIcon style="margin-right: 6px" size="22" name="batch" />
-            批量审批
+           <!-- <SvgIcon style="margin-right: 6px" size="22" name="batch" />
+            批量审批-->
           </div>
         </div>
         <div v-show="showActions" class="batch">
@@ -908,6 +908,7 @@ defineExpose({
           >
           <SvgIcon size="24" name="vs" />
           <img
+          style="margin-right: 5px;"
             class="btn-approval"
             src="@/assets/images/task/btn-pass.png"
             alt=""
@@ -1074,17 +1075,18 @@ defineExpose({
     }
 
     .btn {
-      width: 118px;
-      height: 36px;
-      background: linear-gradient(135deg, #5b85f8, #3c6cf0);
-      border-radius: 17px;
-      box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      margin-right: 6px;
-      cursor: pointer;
+       width: 160px;
+    height: 27px;
+    background: url(/src/assets/images/pocitypass.png) no-repeat;
+    background-size: 100% 100%;
+    border-radius: 17px;
+    box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+     margin-right: 16px; 
+    cursor: pointer;
     }
 
     .more {
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 26fee97..004d1dc 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -534,8 +534,8 @@ defineExpose({
 
         <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn">
-            <SvgIcon style="margin-right: 6px" size="22" name="batch" />
-            批量审批
+         <!--   <SvgIcon style="margin-right: 6px" size="22" name="batch" />
+            批量审批-->
           </div>
         </div>
         <div v-show="showActions" class="batch">
@@ -554,6 +554,7 @@ defineExpose({
           >
           <SvgIcon size="24" name="vs" />
           <img
+           style="margin-right:16px"
             class="btn-approval"
             src="@/assets/images/task/btn-pass.png"
             alt=""
@@ -820,17 +821,18 @@ defineExpose({
     }
 
     .btn {
-      width: 118px;
-      height: 36px;
-      background: linear-gradient(135deg, #5b85f8, #3c6cf0);
-      border-radius: 17px;
-      box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      margin-right: 6px;
-      cursor: pointer;
+       width: 163px;
+    height: 27px;
+    background: url(/src/assets/images/pocitypass.png) no-repeat;
+    background-size: 100% 100%;
+    border-radius: 17px;
+    box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+     margin-right: 16px; 
+    cursor: pointer;
     }
 
     .more {
-- 
2.39.3