diff --git a/pc4mobx/hrmSalary/common/titleLogo.png b/pc4mobx/hrmSalary/common/titleLogo.png new file mode 100644 index 00000000..d02c2227 Binary files /dev/null and b/pc4mobx/hrmSalary/common/titleLogo.png differ 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 (
-
+
{theme || ""}
@@ -34,7 +34,10 @@ class Content extends Component { return (
{ - groupName ?
{groupName}
: null + groupName ?
+ + {groupName} +
: null }
{ @@ -71,9 +74,9 @@ class Content extends Component { !onlyOneGrup && tipPosi.toString() === "2" && tip &&
} + {this.props.children}
- {this.props.children}
); 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 {