From b27476519bae6380f608793a23e790c86720d401 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 30 十二月 2024 15:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aviationEtiquette/view/components/chapter001.vue | 14 +++---
src/books/aviationEtiquette/view/components/header.vue | 17 ++++++--
src/books/aviationEtiquette/assets/main.less | 50 ++++++++++++++++++++++---
3 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/src/books/aviationEtiquette/assets/main.less b/src/books/aviationEtiquette/assets/main.less
index c8ee4d5..604427f 100644
--- a/src/books/aviationEtiquette/assets/main.less
+++ b/src/books/aviationEtiquette/assets/main.less
@@ -10,6 +10,28 @@
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
}
+ .foreword{
+ font-family: 'FZLTZHJW';
+ font-weight: 300;
+ font-size: 1.5em;
+ color: #6E85AF;
+ margin-top: 0;
+ margin-bottom: 0;
+ text-indent: 0em;
+ }
+ .topBorder{
+ width:120px;
+ border-top: 1px solid #6E85AF;
+ border-bottom: 1px solid #6E85AF;
+ height: 2px;
+ }
+ .bottomBorder{
+ width:180px;
+ border-top: 1px solid #6E85AF;
+ border-bottom: 1px solid #6E85AF;
+ height: 2px;
+ }
+
.wh-no {
white-space: nowrap;
@@ -227,6 +249,16 @@
.mb-20 {
margin-bottom: 20px !important;
}
+ .pNum{
+ font-size:18px !important;
+ font-style: italic;
+ font-family: "kaiti";
+ padding-top:2px !important;
+ padding-bottom:2px !important;
+ }
+ .cloud{
+ padding: 0px 8px 0 0 !important;
+ }
.headerImg {
width: 30px;
@@ -247,14 +279,14 @@
.header-left-Number {
color: #728DC0;
- font-size: 17px;
+ font-size: 14px;
padding-right: 8px;
.span-box-title {
margin: 0 5px;
display: inline-block;
- width: 10px;
- height: 10px;
+ width: 8px;
+ height: 8px;
background-color: #728DC0;
}
}
@@ -267,7 +299,7 @@
.header-right-Box {
color: #728DC0;
- font-size: 17px;
+ font-size: 14px;
padding-right: 8px;
}
@@ -275,11 +307,12 @@
.header-right-Number {
background-color: #92B0D5;
color: #fff;
- // font-size: 17px;
+ font-size: 14px;
+ padding: 3px 0;
padding-right: 8px;
img {
- height: 16.8px;
+ height: 20.8px;
}
}
@@ -290,12 +323,14 @@
.header-right-last {
background-color: #B799B6;
+ padding: 2px 0;
padding-left: 20px;
}
.header-right-end {
background-color: #738DC0;
+ padding: 2px 0;
padding-left: 50px;
}
@@ -1302,6 +1337,9 @@
font-size: 1.2em;
padding: 25px;
border: 4px dotted #197ABF;
+ .block{
+ font-family: "kaiti";
+ }
}
.zt-ls1 {
diff --git a/src/books/aviationEtiquette/view/components/chapter001.vue b/src/books/aviationEtiquette/view/components/chapter001.vue
index 0b641ba..dd2db75 100644
--- a/src/books/aviationEtiquette/view/components/chapter001.vue
+++ b/src/books/aviationEtiquette/view/components/chapter001.vue
@@ -4,7 +4,7 @@
<div class="page-box" page="7">
<div v-if="showPageList.indexOf(7) > -1">
<ul class="fl al-c jc-fe mr-70 pad-t-55 mb-45">
- <li class="headerText">1</li>
+ <li class="headerText pNum">1</li>
<img class="headerImg mr-10" src="../../assets/images/yemei.png" alt="" />
</ul>
<div class="bodystyle p-even">
@@ -58,8 +58,8 @@
<div v-if="showPageList.indexOf(8) > -1">
<ul class="fl al-c jc-sb pad-t-55 pad-l-80 pad-r-80">
<li class="header-left-Number">
- <span class="mr-10">2</span>
- <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
+ <span class="mr-10 pNum">2</span>
+ <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
</li>
<li class="header-left-text">
<img class="w80" src="../../assets/images/yemei01.png" alt="" />
@@ -101,10 +101,10 @@
<ul class="fl al-c pad-t-55 pad-l-80 jc-fe mb-45">
<li class="header-right-Number header-right-title">妯″潡涓�</li>
<li class="header-right-Number">姘戣埅绀间华涓庢湇鍔¤兘鍔涜鐭�</li>
- <li class="header-right-Number">3</li>
- <li class="header-right-Number"><img class="" src="../../assets/images/yemei02.png" alt="" /></li>
- <li class="header-right-last"><br></li>
- <li class="header-right-end"><br></li>
+ <li class="header-right-Number pNum">3</li>
+ <li class="header-right-Number cloud"><img class="" src="../../assets/images/yemei02.png" alt="" /></li>
+ <li class="header-right-last" style=""><br></li>
+ <li class="header-right-end" style=""><br></li>
</ul>
<div class="bodystyle p-even">
<h6 id="f004">4.绀间负浜烘�у拰鐜鐭涚浘鐨勪骇鐗�</h6>
diff --git a/src/books/aviationEtiquette/view/components/header.vue b/src/books/aviationEtiquette/view/components/header.vue
index 4949b05..e112bd4 100644
--- a/src/books/aviationEtiquette/view/components/header.vue
+++ b/src/books/aviationEtiquette/view/components/header.vue
@@ -110,8 +110,10 @@
<div v-if="showPageList.indexOf(5) > -1">
<div style="padding: 136px 95px">
<div class="fl">
- <div class="fl fd-c al-c" style="margin: 100px 0">
- <h1 id="a004">鍓嶈█</h1>
+ <div class="fl fd-c" style="margin: 0 0 100px 0">
+ <div class="topBorder"></div>
+ <h1 id="a004" class="foreword">鍓嶈█</h1>
+ <div class="bottomBorder"></div>
</div>
</div>
<p>
@@ -134,9 +136,14 @@
</div>
<div class="page-box" page="6">
<div v-if="showPageList.indexOf(6) > -1">
- <ul class="fl al-c pad-t-55 pad-l-60 mb-45">
- <li class="header-left-Number">2</li>
- <li class="header-left-text">姘戣埅鏈嶅姟绀间华</li>
+ <ul class="fl al-c jc-sb pad-t-55 pad-l-80 pad-r-80">
+ <li class="header-left-Number">
+ <span class="mr-10 pNum">2</span>
+ <span><span class="span-box-title"></span>姘戣埅鏈嶅姟绀间华<span class="span-box-title"></span></span>
+ </li>
+ <li class="header-left-text">
+ <img class="w80" src="../../assets/images/yemei01.png" alt="" />
+ </li>
</ul>
<div class="bodystyle">
<p>
--
Gitblit v1.9.1