From f4bfea700a57d71a9c30315387a77650af13858c Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期五, 14 六月 2024 18:10:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/components/chapter001.vue | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 16ced22..0545773 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -287,12 +287,6 @@
<span class="learn-title-text">瑙嗛锛�</span>
<span class="t0">浜轰綋姒傝堪</span>
<span class="svg-btn t0" @click="changeResources('videoOne')">
- <!-- <img
- src="../../../assets/images/icon/video.png"
- alt=""
- style="margin-left: 10px"
- class="btn"
- /> -->
<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -314,12 +308,10 @@
</g>
</svg>
</span>
-
<!-- <svg @click="changeResources('videoOne')" 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-video"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 10l4.553 -2.276a1 1 0 0 1 1.447 .894v6.764a1 1 0 0 1 -1.447 .894l-4.553 -2.276v-4z" /><path d="M3 6m0 2a2 2 0 0 1 2 -2h8a2 2 0 0 1 2 2v8a2 2 0 0 1 -2 2h-8a2 2 0 0 1 -2 -2z" /></svg> -->
</span>
<span v-if="videoOne">
<video
- v-if="videoOne"
poster="../../../assets/images/chapterOne/people-video-img.jpg"
:src="pathOne"
webkit-playsinline="true"
@@ -555,7 +547,7 @@
</div>
</div>
<div class="fl">
- <div class="left fl fl-di ju-cn" style="width: 30%">
+ <div class="left fl fl-di ju-cn" style="width: 42%">
<div class="banshi openImgBox" style="height:86px">
<div class="swiper-container swiper-img">
<div class="swiper-wrapper">
@@ -582,7 +574,7 @@
</div>
<p class="img">鍥�1-4 姝ｅ父瓒冲拰鎵佸钩瓒�</p>
</div>
- <div class="right" style="width: 70%; padding-left: 20px">
+ <div class="right" style="width: 58%; padding-left: 20px">
<h5 id="e009" class="tl">2.瓒抽儴鑲岃倝銆侀煣甯﹁繕涓嶇粨瀹�</h5>
<p class="tl lh2">
瓒抽鍊熷姪鍧氬己鐨勯煣甯﹁繛鎺ヨ捣鏉ワ紝褰㈡垚绐侀潰鍚戜笂鐨勮冻寮擄紙瑙佸浘1-4鐨勬甯歌冻锛夈��
@@ -1144,7 +1136,7 @@
<p class="lh2">
鏁欒偛瀛﹀墠鍎跨鐜╃幓鐠冪悆銆佺‖甯併�佺航鎵ｃ�佽眴绫荤瓑灏忎笢瑗挎椂瑕佺壒鍒敞鎰忥紝鏇翠笉鑳藉皢瀹冧滑鏀惧叆榧昏厰锛屼弗闃插懠鍚搁亾寮傜墿鐨勫彂鐢熴��
</p>
- <h6 class="Conclusion-title2">
+ <!-- <h6 class="Conclusion-title2">
<img
class="img-gn"
alt=""
@@ -1160,7 +1152,7 @@
:chapter="1"
:page="9"
/>
- </p>
+ </p> -->
<h4 id="d015">锛堜簲锛変繚鎶ゅ０甯�</h4>
<p class="lh2">
閫夋嫨閫傚悎瀛﹀墠鍎跨闊冲煙鐗圭偣鐨勬瓕鏇叉垨鏈楄鏉愭枡锛屾瘡娆″敱姝屾垨鏈楄鐨勬椂闂翠笉瀹滆繃闀匡紙鏈�澶�5鍒嗛挓锛夛紝鏇翠笉鑳介珮澹板枈鍙紝浠ラ槻澹板甫鍏呰銆佽偪鑳�銆佸彉鍘氾紝閫犳垚澹伴煶鍢跺搼銆傜粌涔犲彂澹扮殑
@@ -1181,6 +1173,23 @@
<div class="padding-96">
<p class="lh2">
鍦烘墍搴斾繚鎸佺┖姘旀祦閫氾紝娓╁害銆佹箍搴﹂�傚疁銆傚啲瀛ｄ笉瑕佸湪瀹ゅ缁冨０锛岃閬垮厤瀛﹀墠鍎跨鍦ㄦ俯搴﹂鍙樼殑鎯呭喌涓嬬粌涔犲彂澹般�傚綋鍜介儴鏈夌値鐥囨椂锛屽簲鍑忓皯鍙戦煶锛岀洿鍒板畬鍏ㄥ悍澶嶃��
+ </p>
+ <h6 class="Conclusion-title2">
+ <img
+ class="img-gn"
+ alt=""
+ src="../../../assets/images/icon/ycs.png"
+ />
+ 浜戞祴璇�
+ </h6>
+ <p class="blockh6-c">
+ <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚浜�</span>
+ <examinations
+ :cardList="questionData[18]"
+ v-if="questionData"
+ :chapter="1"
+ :page="9"
+ />
</p>
<p class="custom_tag"><b>鈥㈣祫鏂欓摼鎺モ��</b></p>
<div class="fieldset">
@@ -3627,6 +3636,10 @@
<p>
鎵樺辜鏈烘瀯淇濇暀浜哄憳瑕佺儹鐖便�佸叧蹇冨鍓嶅効绔ワ紝涓哄鍓嶅効绔ュ垱璁捐壇濂界殑鐢熸椿鐜涓庣ぞ浼氱幆澧冿紱涓庡鍓嶅効绔ュ缓绔嬭壇濂界殑甯堢敓鍏崇郴锛屽府鍔╁拰寮曞瀛﹀墠鍎跨涓庡悓浼村弸濂界浉澶勶紱鍧氭寔姝ｉ潰鏁欒偛锛屼笉浼ゅ瀛﹀墠鍎跨鐨勮嚜灏婂績锛涗笉姝ц鏈夌己闄风殑鍎跨锛涙洿涓嶈兘浣撶綒鍙婂彉鐩镐綋缃氬効绔ワ紝浠ヤ繚璇佸効绔ュ湪鎵樺辜鏈烘瀯涓敓娲绘剦蹇��
</p>
+ <h4 id="d065">锛堝叚锛夊畨鎺掍赴瀵岀殑娲诲姩鍙婇�傚綋鐨勪綋鑲查敾鐐�</h4>
+ <p>
+ 涓板瘜鐨勬椿鍔紝鐗瑰埆鏄�傚悎瀛﹀墠鍎跨骞撮緞鐗圭偣鐨勪綋鑲查敾鐐硷紝鑳戒績杩涜剳鐨勫彂鑲诧紝鎻愰珮绁炵粡绯荤粺鍙嶅簲鐨勭伒鏁忔�у拰鍑嗙‘鎬с�備负浣垮ぇ鑴戜袱鍗婄悆鍧囪 鍙戝睍锛屽簲浣垮鍓嶅効绔ョ殑鍔ㄤ綔澶氭牱鍖栵紝濡備袱鎵嬪悓鏃跺仛鎵嬫寚鎿嶃�佹攢鐖強鍚勭鍩烘湰浣撴搷绛夈�傛棩甯告椿鍔ㄤ腑锛岃浠栦滑澶氬姩鎵嬶紝灏芥棭鐢ㄧ瀛愯繘椁愶紝瀛︿細浣跨敤鍓垁锛岀帺绌跨彔瀛愭父鎴忕瓑銆傝瀛﹀墠鍎跨鍦ㄦ椿鍔ㄤ腑鈥滃乏鍙冲紑寮撯�濓紝鑳芥洿濂藉湴淇冭繘澶ц剳涓ゅ崐鐞冪殑鍙戣偛銆�
+ </p>
<h6 class="Conclusion-title2">
<img
class="img-gn"
@@ -3643,10 +3656,6 @@
:chapter="1"
:page="31"
/>
- </p>
- <h4 id="d065">锛堝叚锛夊畨鎺掍赴瀵岀殑娲诲姩鍙婇�傚綋鐨勪綋鑲查敾鐐�</h4>
- <p>
- 涓板瘜鐨勬椿鍔紝鐗瑰埆鏄�傚悎瀛﹀墠鍎跨骞撮緞鐗圭偣鐨勪綋鑲查敾鐐硷紝鑳戒績杩涜剳鐨勫彂鑲诧紝鎻愰珮绁炵粡绯荤粺鍙嶅簲鐨勭伒鏁忔�у拰鍑嗙‘鎬с�備负浣垮ぇ鑴戜袱鍗婄悆鍧囪 鍙戝睍锛屽簲浣垮鍓嶅効绔ョ殑鍔ㄤ綔澶氭牱鍖栵紝濡備袱鎵嬪悓鏃跺仛鎵嬫寚鎿嶃�佹攢鐖強鍚勭鍩烘湰浣撴搷绛夈�傛棩甯告椿鍔ㄤ腑锛岃浠栦滑澶氬姩鎵嬶紝灏芥棭鐢ㄧ瀛愯繘椁愶紝瀛︿細浣跨敤鍓垁锛岀帺绌跨彔瀛愭父鎴忕瓑銆傝瀛﹀墠鍎跨鍦ㄦ椿鍔ㄤ腑鈥滃乏鍙冲紑寮撯�濓紝鑳芥洿濂藉湴淇冭繘澶ц剳涓ゅ崐鐞冪殑鍙戣偛銆�
</p>
<p class="custom_tag"><b>鈥㈣祫鏂欓摼鎺モ��</b></p>
<div class="fieldset">
@@ -4933,7 +4942,7 @@
this.$data.pathTwo = await getResourcePath(
"e5993b62684fe55d13190cfe52bf00ed"
);
- this.$data.pathThree = getResourcePath(
+ this.$data.pathThree = await getResourcePath(
"6b6d42213aa85aa5ff7724aaf96ffee6"
);
this.$data.pathFour = await getResourcePath(
--
Gitblit v1.9.1