From 3d27635c7ac693c461dd2ca01e8f5bebb1f0c642 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 17:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/lifeCare/css/default.less |  183 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 140 insertions(+), 43 deletions(-)

diff --git a/src/books/lifeCare/css/default.less b/src/books/lifeCare/css/default.less
index d187c53..68f329b 100644
--- a/src/books/lifeCare/css/default.less
+++ b/src/books/lifeCare/css/default.less
@@ -22,10 +22,10 @@
   }
 
   .prefaceImg {
-    width: 90% !important;
+    width: 92% !important;
     position: absolute;
-    left: 35px;
-    top: 50px;
+    left: 4%;
+    top: 4%;
   }
 
   input {
@@ -35,10 +35,11 @@
     outline: none;
     font-size: 16px;
     text-align: center;
+    white-space: pre-line;
   }
 
   .chapter {
-    font-family: "瀹嬩綋", SimSun, sans-serif;
+    font-family: "瀹嬩綋";
 
     .topImg {
       padding-top: 0 !important;
@@ -51,43 +52,36 @@
 
     .header {
       width: 100%;
-      height: 136px;
-      position: absolute;
-      left: 0;
-      top: 0;
-      z-index: 1001;
+      height: 100px;
 
       .pageHeader-first {
         width: 100%;
-        height: 136px;
-        position: relative;
+        height: 100%;
+        padding-top: 6%;
 
         .header-bj {
           width: 78%;
-          height: 115px;
-          border-left: 1px solid #dfb27d;
-          border-bottom: 1px solid #dfb27d;
-          position: absolute;
-          right: 30px;
-          top: 3px;
+          height: 100%;
+          border-left: 2px solid #dfb27d;
+          border-bottom: 2px solid #dfb27d;
+          margin-left: 18%;
         }
 
         .content {
-          background-color: #f49a4c;
-          width: 740px;
-          height: 35px;
-          position: absolute;
-          left: 25px;
-          top: 75px;
+          background-color: #F49A4C;
+          width: 91%;
+          height: 32%;
           display: flex;
           justify-content: flex-start;
           align-items: center;
+          margin-top: -6%;
+          margin-left: 3%;
 
           .pageStr {
-            width: 140px;
             color: #fff;
-            font-size: 28px;
+            font-size: 24px;
             text-align: center;
+            margin: 0 20px;
           }
 
           .title {
@@ -96,14 +90,45 @@
             align-items: center;
             color: #fff;
             font-size: 20px;
+            position: relative;
 
             img {
               height: 30px !important;
               margin-right: 20px;
             }
+
+            .ztImg {
+              height: 40px !important;
+              margin-top: -4px;
+            }
+          }
+        }
+
+        .zt1-content {
+          background-color: #f7b80a;
+        }
+
+        .zt1-header-bj {
+          border-left-color: #a5c24f;
+          border-bottom-color: #a5c24f;
+        }
+
+
+        @media (max-width: 756px) {
+          .content {
+            margin-top: -12%;
+
+            .title {
+              font-size: 18px;
+            }
+
+            .pageStr {
+              font-size: 18px;
+            }
           }
         }
       }
+
 
       .pageHeader-second {
         width: 100%;
@@ -111,6 +136,7 @@
         justify-content: center;
         align-items: center;
         flex-direction: column;
+        padding-top: 3%;
 
         .second-con {
           width: 90%;
@@ -121,7 +147,7 @@
           font-size: 20px;
           position: absolute;
           right: 36px;
-          top: 60px;
+          top: 80px;
 
           .second-left {
             width: 23px;
@@ -155,14 +181,44 @@
               font-size: 28px;
               color: #fff;
             }
+
+            .zt1-pageNum {
+              background-color: #a5c24f;
+            }
+
+            .zt1-pageStr {
+              color: #a5c24f;
+            }
+          }
+        }
+
+        @media (max-width: 756px) {
+          .second-con {
+            font-size: 18px;
+
+            .pageNum {
+              font-size: 18px !important;
+            }
+          }
+        }
+
+        @media (max-width: 1024px) {
+
+          .second-con {
+            right: 20px;
+            top: 75px;
           }
         }
 
         .borderLine {
           width: 93%;
-          height: 1px;
+          height: 2px;
           background-color: #f49a4c;
           margin-top: 105px;
+        }
+
+        .zt1-boderLine {
+          background-color: #a5c24f;
         }
       }
     }
@@ -195,15 +251,16 @@
         text-align: center;
         border: 1px solid #999;
         margin: 0;
-        padding: 2px 9px;
+        padding: 8px 9px;
         font-size: 16px;
       }
 
       tr td {
         border: 1px solid #999;
         text-align: center;
-        padding: 2px 0;
+        padding: 8px;
         overflow: hidden;
+        white-space: pre-line;
       }
     }
 
@@ -269,6 +326,29 @@
       padding: 12px 10px;
       box-sizing: border-box;
       padding-top: 30px;
+      font-family: '浠垮畫';
+      font-weight: 700;
+
+
+      p {
+        margin-top: 0px;
+      }
+
+      .p-text {
+        p {
+
+          line-height: 22px;
+          font-weight: 700;
+          color: #666;
+        }
+
+        div {
+          line-height: 22px;
+          font-size: 20px;
+          text-align: center;
+          padding-top: 10px;
+        }
+      }
     }
 
     .page-box {
@@ -303,7 +383,7 @@
     }
 
     .pdf-content {
-      padding: 0 5%;
+      padding: 5% 5%;
       box-sizing: border-box;
     }
 
@@ -467,12 +547,16 @@
       margin: 15px;
     }
 
+    .img-gn-zt {
+      width: 180px;
+    }
+
     div.bodystyle {
       font-size: 18px;
       text-align: justify;
       padding: 10% 10%;
-      padding-top: 18%;
       box-sizing: border-box;
+      font-family: '瀹嬩綋';
     }
 
     div.bj {
@@ -555,6 +639,15 @@
       text-indent: 0em;
     }
 
+    .h5-zt {
+      font-size: 18px;
+    }
+
+    .tip-specail {
+      border: 1px solid #f49a4c !important;
+      padding: 15px 15px;
+    }
+
     p {
       margin-top: 1em;
       text-indent: 2em;
@@ -620,7 +713,7 @@
     }
 
     h2 {
-      font-family: "瀹嬩綋";
+      font-family: "FZLTZHJW";
       font-weight: bold;
       font-size: 1.2em;
       margin-top: 0.2em;
@@ -633,7 +726,10 @@
     #b003,
     #b004,
     #b005,
-    #b006 {
+    #b006,
+    #b007,
+    #b008,
+    #b009 {
       margin-bottom: 100px;
     }
 
@@ -918,7 +1014,7 @@
     }
 
     .img-gn {
-      height: 3.2em;
+      height: 45px;
       margin-bottom: -0.4em;
     }
 
@@ -1015,14 +1111,6 @@
       margin-right: -1em;
     }
 
-    .block {
-      font-size: 18px;
-      line-height: 25px;
-      font-family: "浠垮畫";
-      font-weight: 600;
-      color: #666;
-    }
-
     .bk-h3 {
       border: 3px solid #f49a4c;
       padding: 0.7em;
@@ -1091,11 +1179,20 @@
     }
 
     div.bk-qjms {
+      font-family: 'FZLTXIHJW';
       border: 3px dotted #f49a4c;
       padding: 15px;
       margin-bottom: 2em;
       margin-top: 0.5em;
       position: relative;
+
+      .block {
+        font-size: 18px;
+        line-height: 25px;
+        font-family: "浠垮畫";
+        font-weight: 600;
+        color: #666;
+      }
     }
 
     p.bj1-qjms {
@@ -1117,4 +1214,4 @@
 
 body {
   background-color: #e6e6e6;
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1