From 4eb70150b8d468275ed0c342234bc94d85faed20 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 22 五月 2024 17:00:08 +0800
Subject: [PATCH] 合并
---
src/books/embedded/view/components/chapter001.vue | 4 +---
src/books/childHealth/assets/main.less | 36 +++++++++++++++++-------------------
src/books/childHealth/view/content/components/chapter001.vue | 2 +-
src/books/childHealth/view/content/index.vue | 6 +++---
src/books/embedded/view/components/header.vue | 2 +-
5 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/books/childHealth/assets/main.less b/src/books/childHealth/assets/main.less
index 0fa669a..8f3aa7b 100644
--- a/src/books/childHealth/assets/main.less
+++ b/src/books/childHealth/assets/main.less
@@ -352,7 +352,7 @@
background: transparent;
}
.textarea-border {
- border-color:#15c0f2;
+ border-color: #15c0f2;
}
.completion-input {
width: 64px !important;
@@ -566,9 +566,8 @@
.btn {
cursor: pointer;
width: 23px;
- color: #15c0f2;
border-radius: 5px;
- border:1px solid #666;
+ border: 1px solid;
margin-left: 5px;
}
.table-br-color {
@@ -604,11 +603,11 @@
margin-top: 40px;
}
.ta-br {
- border-color: #C0C4CC;
+ border-color: #c0c4cc;
}
textarea:focus {
- border-color:#15c0f2;
- outline: none;
+ border-color: #15c0f2;
+ outline: none;
}
.cl-66 {
color: #666;
@@ -649,25 +648,24 @@
}
}
-
::-webkit-scrollbar {
width: 8px;
height: 10px;
}
-
- ::-webkit-scrollbar-track-piece {
+
+::-webkit-scrollbar-track-piece {
background-color: rgba(0, 0, 0, 0.1);
-webkit-border-radius: 6px;
}
-
- ::-webkit-scrollbar-thumb:vertical {
+
+::-webkit-scrollbar-thumb:vertical {
height: 5px;
- background-color:rgba(125, 125, 125, 0.3);
- -webkit-border-radius:6px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
}
-
- ::-webkit-scrollbar-thumb:horizontal {
- width: 5px;
- background-color: rgba(125, 125, 125, 0.3);
- -webkit-border-radius: 6px;
-}
\ No newline at end of file
+
+::-webkit-scrollbar-thumb:horizontal {
+ width: 5px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
+}
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 5f6d939..535115e 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -62,7 +62,7 @@
<span class="fl fl-cn mb-20">
<span class="learn-title-text">鑷富瀛︿範浠诲姟鍗曪細</span>
<span class="t0" >涓撻涓�瀛︿範涓婚涓� 杩愬姩绯荤粺鑷富瀛︿範浠诲姟鍗�</span>
- <svg @click="changeResources('learnTbaleOne')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="btn icon icon-tabler icons-tabler-outline icon-tabler-list-details"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M13 5h8" /><path d="M13 9h5" /><path d="M13 15h8" /><path d="M13 19h5" /><path d="M3 4m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" /><path d="M3 14m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" /></svg>
+ <svg @click="changeResources('learnTbaleOne')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="btn theme-color theme-border icon icon-tabler icons-tabler-outline icon-tabler-list-details"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M13 5h8" /><path d="M13 9h5" /><path d="M13 15h8" /><path d="M13 19h5" /><path d="M3 4m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" /><path d="M3 14m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" /></svg>
<!-- <img
src="../../../assets/images/icon/list-details.svg"
alt=""
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 702c809..3164729 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -312,7 +312,7 @@
let pageDom = this.getParentWithClass(domItem, "page-box");
let chapterDom = this.getParentWithClass(domItem, "chapter");
let page, chapterNum;
- if (pageDom) page = pageHtml.getAttribute("page");
+ if (pageDom) page = pageDom.getAttribute("page");
if (chapterDom) chapterNum = chapterDom.getAttribute("num");
// 鍚戜笂鍖归厤涓婚鑹�
const themeColor =
@@ -330,7 +330,7 @@
let pageDom = this.getParentWithClass(domItem, "page-box");
let chapterDom = this.getParentWithClass(domItem, "chapter");
let page, chapterNum;
- if (pageDom) page = pageHtml.getAttribute("page");
+ if (pageDom) page = pageDom.getAttribute("page");
if (chapterDom) chapterNum = chapterDom.getAttribute("num");
// 鍚戜笂鍖归厤涓婚鑹�
const themeColor =
@@ -348,7 +348,7 @@
let pageDom = this.getParentWithClass(domItem, "page-box");
let chapterDom = this.getParentWithClass(domItem, "chapter");
let page, chapterNum;
- if (pageDom) page = pageHtml.getAttribute("page");
+ if (pageDom) page = pageDom.getAttribute("page");
if (chapterDom) chapterNum = chapterDom.getAttribute("num");
// 鍚戜笂鍖归厤涓婚鑹�
const themeColor =
diff --git a/src/books/embedded/view/components/chapter001.vue b/src/books/embedded/view/components/chapter001.vue
index ec02cff..e62435f 100644
--- a/src/books/embedded/view/components/chapter001.vue
+++ b/src/books/embedded/view/components/chapter001.vue
@@ -50,9 +50,7 @@
宓屽叆寮忕粍鎬佽蒋浠舵槸涓�绉嶇敤浜庡祵鍏ュ紡绯荤粺骞跺甫鏈夌綉缁滃姛鑳界殑搴旂敤杞欢锛屽祵鍏ュ紡绯荤粺鏄寚鍙祵鍏ヨ嚦鏌愪竴璁惧銆佷骇鍝佸苟鍙繛鎺ヨ嚦缃戠粶鐨勫甫鏈夋櫤鑳斤紙鍗冲井澶勭悊鍣級鐨勮澶囥�備緥濡傦紝鍦ㄨ嚜鍔ㄥ彇娆炬満锛圓TM锛夈�佸姙鍏澶囥�佽嚜鍔ㄥ寲浜у搧銆佸鐢ㄧ數鍣ㄣ�佸钩鏉跨數鑴戙�佷釜浜烘暟鐮佸姪鐞嗕箖鑷宠埅绌虹數瀛愰鍩熼兘鏈夊箍娉涘簲鐢ㄣ�傚祵鍏ュ紡缁勬�佽蒋浠跺垎寮�鍙戠郴缁熷拰杩愯绯荤粺銆傚祵鍏ュ紡缁勬�佽蒋浠剁殑寮�鍙戠郴缁熶竴鑸繍琛屼簬鍏锋湁鑹ソ浜烘満鐣岄潰鐨刉indows鎿嶄綔绯荤粺涓婏紝鑰岃繍琛岀郴缁熷彲鍩轰簬澶氱宓屽叆寮忔搷浣滅郴缁熷Windows
CE锛孡inux鍜孌OS涔嬩笂锛岀敋鑷崇洿鎺ユ敮鎸佺壒瀹氱殑CPU銆傚祵鍏ュ紡绯荤粺鍏锋湁涓嶱C鍑犱箮涓�鏍风殑鍔熻兘锛屼笌PC鐨勫尯鍒粎浠呮槸灏嗗井鍨嬫搷浣滅郴缁熶笌搴旂敤杞欢宓屽叆鍦≧OM銆丷AM涓嶧lash瀛樺偍鍣ㄤ腑锛岃�屼笉鏄瓨鍌ㄤ簬纾佺洏绛夎浇浣撲腑銆�
</p>
- <p class="content">
- 闅忕潃鍚嶱C鏃朵唬鐨勫埌鏉ワ紝鍦ㄥ埗閫犱笟棰嗗煙鏇存敞閲嶄娇鐢ㄧ鍚堝叾鐗瑰畾闇�姹傚苟甯︽湁鏅鸿兘鐨勫祵鍏ュ紡宸ヤ笟鎺у埗缁勬�佽蒋浠讹紝鑰屽祵鍏ュ紡缁勬�佽蒋浠剁壒鍏风殑鎸夊姛鑳藉壀瑁佺殑鐗规�э紝浠ュ強鍏跺唴宓岀殑瀹炴椂澶氫换鍔℃搷浣滅郴缁燂紝鍙繚璇佹暣涓祵鍏ョ郴缁熶綋绉皬銆佹垚鏈綆銆佸疄鏃舵�ч珮銆佸彲闈犳�ч珮鐨勫悓鏃讹紝杩樻柟渚夸笉鍏峰宓屽叆寮忚蒋浠跺紑鍙戠粡楠岀殑鐢ㄦ埛鍦ㄦ瀬鐭殑鏃堕棿鍐咃紝浣跨敤宓屽叆寮忕粍鎬佽蒋浠跺揩閫熷紑鍙戝畬鎴愪竴涓祵鍏ュ紡绯荤粺锛屽苟鏋佸ぇ鍦板姞蹇簡宓屽叆寮忎骇鍝佽繘鍏ュ競鍦虹殑閫熷害锛岃�屼笖浣夸骇鍝佸叿鏈変赴瀵岀殑浜烘満鐣岄潰銆傚寳浜槅浠戦�氭�佸叕鍙窶CGS缁勬�佽蒋浠讹紝閫氳繃澶у姏鍔犲己瀵瑰伐鎺х‖浠朵骇鍝佺殑椹卞姩鏀寔鍜屾彁鍗囪蒋浠跺唴閮ㄥ姛
- </p>
+ <p class="content">闅忕潃鍚嶱C鏃朵唬鐨勫埌鏉ワ紝鍦ㄥ埗閫犱笟棰嗗煙鏇存敞閲嶄娇鐢ㄧ鍚堝叾鐗瑰畾闇�姹傚苟甯︽湁鏅鸿兘鐨勫祵鍏ュ紡宸ヤ笟鎺у埗缁勬�佽蒋浠讹紝鑰屽祵鍏ュ紡缁勬�佽蒋浠剁壒鍏风殑鎸夊姛鑳藉壀瑁佺殑鐗规�э紝浠ュ強鍏跺唴宓岀殑瀹炴椂澶氫换鍔℃搷浣滅郴缁燂紝鍙繚璇佹暣涓祵鍏ョ郴缁熶綋绉皬銆佹垚鏈綆銆佸疄鏃舵�ч珮銆佸彲闈犳�ч珮鐨勫悓鏃讹紝杩樻柟渚夸笉鍏峰宓屽叆寮忚蒋浠跺紑鍙戠粡楠岀殑鐢ㄦ埛鍦ㄦ瀬鐭殑鏃堕棿鍐咃紝浣跨敤宓屽叆寮忕粍鎬佽蒋浠跺揩閫熷紑鍙戝畬鎴愪竴涓祵鍏ュ紡绯荤粺锛屽苟鏋佸ぇ鍦板姞蹇簡宓屽叆寮忎骇鍝佽繘鍏ュ競鍦虹殑閫熷害锛岃�屼笖浣夸骇鍝佸叿鏈変赴瀵岀殑浜烘満鐣岄潰銆傚寳浜槅浠戦�氭�佸叕鍙窶CGS缁勬�佽蒋浠讹紝閫氳繃澶у姏鍔犲己瀵瑰伐鎺х‖浠朵骇鍝佺殑椹卞姩鏀寔鍜屾彁鍗囪蒋浠跺唴閮ㄥ姛</p>
</div>
<ul class="page-footer fl fl-cl al-cn w-mi p0 mb-40">
<li class="footer-num">1</li>
diff --git a/src/books/embedded/view/components/header.vue b/src/books/embedded/view/components/header.vue
index 97dc46b..3cb07cd 100644
--- a/src/books/embedded/view/components/header.vue
+++ b/src/books/embedded/view/components/header.vue
@@ -195,7 +195,7 @@
<div class="page-heder-img">
<img src="../../assets/images/qianyan.png" class="mt-100" alt="" />
</div>
- <div class="padding-96">
+ <div style="padding: 0 103px 0 103px;">
<document>
<p class="quotation cl-66">
鏈功鏄珮鑱岄櫌鏍′笌鍖椾含鏄嗕粦閫氭�佽嚜鍔ㄥ寲杞欢绉戞妧鏈夐檺鍏徃锛堜互涓嬬畝绉扳�滄槅浠戦�氭�佸叕鍙糕�濓級鍚堜綔缂栧啓鐨勫熀浜庡伐浣滆繃绋嬪鍚戙�侀潰鍚戞暀甯堝拰宸ユ帶琛屼笟鎶�鏈汉鍛樸�佹湇鍔′簬鏈虹數鍜岃嚜鍔ㄥ寲绫讳笓涓氳亴涓氳兘鍔涘煿鍏荤殑鈥滃崄浜屼簲鈥濊亴涓氭暀鑲插浗瀹惰鍒掓暀鏉愩��
--
Gitblit v1.9.1