From 98f35401e6c152c88cf5d646e540ad44e5a80af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 18 Jan 2024 14:44:24 +0800
Subject: [PATCH] =?UTF-8?q?release/2.9.10.2312.02=20=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/common/titleLogo.png        | Bin 0 -> 554 bytes
 .../components/pcTemplate/content.js          |   9 ++--
 .../components/pcTemplate/index.less          |  44 ++++++++++++------
 pc4mobx/hrmSalary/pages/mySalary/index.less   |   4 +-
 4 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/common/titleLogo.png

diff --git a/pc4mobx/hrmSalary/common/titleLogo.png b/pc4mobx/hrmSalary/common/titleLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d02c222716a88c72dfe0793a775044559bcdd966
GIT binary patch
literal 554
zcmeAS@N?(olHy`uVBq!ia0vp^;y^6J!N$PA`1h5_S0IP6ILO_JVcj{Imq3n7YJ_K+
zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DYo4FvHn0AcYsrAM5}so8sx>
z7~;YEHf*EcVF#YA>v?*3wRLjqmoe*zzH&Osz{I)ngCU2Zf`BvovaZhcnN3&Dc}i-k
z95>FLboynG&@P3G9@po*eV%^3@X_N3zU7l=#BqrCJFiVuo*s2)+WuurWx_rL9{F<d
zW};YEQ~$}Bf<h^W2}?|thOBbDYnn8pG4+3O*d#$C?P=P+o8NA1GSu_E-j{xA=|<lP
zJO4NHMW@vTafU2e@L5@Q@%2qt#LxG=-23?BwwF2Yk58Ppc(K$YgT})1Y!**EGt(^&
zRQl;HUVHjqLvF#z{~~8hR)z3}m9!nd&-~+3*#>X(4D+9U4i!)HJ}k5}l`Yz^$eE#S
znV{f1Mfp^#pIZ{&rgI&CW_ro?pr^8L;{DQuYoWf`rI~j#Dt%v7g&oL0G1v9hl&9ZQ
zC*E8o5_`fU)F<3et-a`}H_IiK!;hCd{kZt8^qDV~YL|4ceeXQFt^18y`Y)HZ=CH~0
zWBiu!CBK*W)NJ`HsCwd@%)W0gl`lUR3HbW%e2F|`o5h?b#^S}rEiV?%`MyeM?V+Cw
e?HJ-4O8>HMQk)_4u$jdP6i=S6elF{r5}E*G>EjCk

literal 0
HcmV?d00001

diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js
index b8c7360b..310999d6 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/content.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js
@@ -10,7 +10,7 @@ class Content extends Component {
     const { onlyOneGrup, showData } = dealTemplate(itemTypeList, "pc");
     return (
       <div className="salary-preview-container">
-        <div style={{ border: "10px solid #F6F6F6" }}>
+        <div style={{ border: "10px solid #F3F9FF" }}>
           <div className="edition-center">
             <div className="header">
               <div className="header-title">{theme || ""}</div>
@@ -34,7 +34,10 @@ class Content extends Component {
                     return (
                       <div className="salary-group" key={groupId || index}>
                         {
-                          groupName ? <div className="group-title">{groupName}</div> : null
+                          groupName ? <div className="group-title">
+                            <img src={require("../../common/titleLogo.png")} alt=""/>
+                            <span>{groupName}</span>
+                          </div> : null
                         }
                         <div className="group-list">
                           {
@@ -71,9 +74,9 @@ class Content extends Component {
                 !onlyOneGrup && tipPosi.toString() === "2" && tip &&
                 <div className="corporate-culture-text" title={tip} dangerouslySetInnerHTML={{ __html: tip }}/>
               }
+              {this.props.children}
             </div>
           </div>
-          {this.props.children}
         </div>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less
index 856a3d78..e57fe5e5 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/index.less
+++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less
@@ -4,7 +4,7 @@
   overflow-y: auto;
 
   .weapp-salary-sp {
-    background: #f6f6f6;
+    background: #F3F9FF;
   }
 
   .weapp-salary-payroll-pc-preview {
@@ -58,6 +58,7 @@
 
     .body {
       width: 100%;
+      background: #FFF;
       //margin-top: 32px;
 
       .comp-img {
@@ -69,34 +70,43 @@
       }
 
       .corporate-culture-text {
-        width: 100%;
         text-align: left;
         color: #111;
-        padding: 8px 16px;
+        margin: 16px 30px 20px 30px;
         white-space: pre-wrap;
         word-break: break-all;
-        margin-top: 16px;
+        padding: 10px 14px;
+        background: #FAFAFA;
+        border: 1px solid rgba(238, 238, 238, 1);
+        border-radius: 4px;
       }
 
       .data-detail {
-        margin-top: 16px;
-
         .salary-group {
-          margin-bottom: 16px;
-          padding-bottom: 16px;
           background: #FFF;
 
           .group-title {
             font-size: 14px;
-            padding: 16px 0 0 8px;
+            padding: 16px 0 0 30px;
             font-weight: bolder;
+            color: #333333;
+
+            img {
+              width: 16px;
+              height: 20px;
+            }
+
+            span {
+              vertical-align: middle;
+              margin-left: 10px;
+            }
           }
 
           .group-list {
             margin-top: 16px;
             display: flex;
             flex-wrap: wrap;
-            padding: 0 8px;
+            padding: 0 30px;
 
             .even {
               border-left: 1px solid #e5e5e5;
@@ -125,9 +135,9 @@
                 background: #fbfbfb;
                 border-right: 1px solid #e5e5e5;
                 font-size: 12px;
-                color: #666;
+                color: #5F5F5F;
                 display: flex;
-                justify-content: center;
+                justify-content: flex-start;
                 align-items: center;
                 flex-shrink: 0;
 
@@ -148,7 +158,7 @@
                 line-height: 40px;
                 background: #fff;
                 font-size: 12px;
-                color: #111;
+                color: #5F5F5F;
                 word-break: break-all;
               }
             }
@@ -157,4 +167,12 @@
       }
     }
   }
+
+  .space {
+    margin: 20px 0 40px 0 !important;
+
+    button:last-child {
+      margin-right: 30px;
+    }
+  }
 }
diff --git a/pc4mobx/hrmSalary/pages/mySalary/index.less b/pc4mobx/hrmSalary/pages/mySalary/index.less
index d4fd9324..0451e3c2 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/index.less
+++ b/pc4mobx/hrmSalary/pages/mySalary/index.less
@@ -30,8 +30,10 @@
   .salary-preview-container {
     max-width: 1000px;
     margin: 0 auto;
-    border: 2px solid #FFF;
+    border: 1px solid rgba(229,229,229,1);
     padding-top: 32px;
+    background: #F3F9FF;
+    border-radius: 4px;
   }
 
   .space {