From b6714063e5c7b3d140d4b8de19549ef93c35766b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 11 六月 2024 10:43:50 +0800
Subject: [PATCH] 合并代码
---
src/books/childHealth/view/content/components/chapter006.vue | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter006.vue b/src/books/childHealth/view/content/components/chapter006.vue
index 9eee52c..8281281 100644
--- a/src/books/childHealth/view/content/components/chapter006.vue
+++ b/src/books/childHealth/view/content/components/chapter006.vue
@@ -517,10 +517,8 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻鍏� 瀛︿範涓婚涓�</span>
<examinations
- v-if="questionData && questionData[150]"
+ v-if="questionData"
:cardList="questionData[150]"
- :chapter="6"
- :page="142"
/>
</p>
<p class="custom_tag"><b>鈥㈡墿灞曞欢浼糕��</b></p>
@@ -840,6 +838,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="w100 video-border"
></video>
<p class="img">瑙嗛锛氭柊鐢熷効鐗圭偣涓庝繚鍋�</p>
@@ -1145,6 +1144,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="w100 video-border"
></video>
<p class="img">瑙嗛锛氶噸瑙嗘柊鐢熷効鐤剧梾绛涙煡</p>
@@ -1225,6 +1225,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="w100 video-border"
></video>
<p class="img">瑙嗛锛氭棭浜у効鐨勭壒鐐逛笌淇濆仴</p>
@@ -1292,10 +1293,8 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻鍏� 瀛︿範涓婚浜�</span>
<examinations
- v-if="questionData && questionData[160]"
+ v-if="questionData"
:cardList="questionData[160]"
- :chapter="6"
- :page="152"
/>
</p>
<h2 class="module_block" id="b024">
@@ -1646,10 +1645,8 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻鍏� 瀛︿範涓婚涓�</span>
<examinations
- v-if="questionData && questionData[164]"
+ v-if="questionData"
:cardList="questionData[164]"
- :chapter="6"
- :page="156"
/>
</p>
<p class="custom_tag"><b>鈥㈡墿灞曞欢浼糕��</b></p>
@@ -2018,10 +2015,8 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻鍏� 瀛︿範涓婚鍥�</span>
<examinations
- v-if="questionData && questionData[167]"
+ v-if="questionData"
:cardList="questionData[167]"
- :chapter="6"
- :page="159"
/>
</p>
<div class="annotation-border"></div>
@@ -2313,6 +2308,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="w100 video-border"
></video>
<p class="img">瑙嗛锛氬辜鍎挎湡鐨勭壒鐐逛笌淇濆仴</p>
@@ -2501,10 +2497,8 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻鍏� 瀛︿範涓婚浜�</span>
<examinations
- v-if="questionData && questionData[172]"
+ v-if="questionData"
:cardList="questionData[172]"
- :chapter="6"
- :page="164"
/>
</p>
<h6 class="Conclusion-title4">涓撻灏忕粨</h6>
@@ -2763,18 +2757,14 @@
瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵鎵爜娴嬩竴娴嬪惂锛�<br />
<span class="img">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級1</span><br />
<examinations
- v-if="questionData && questionData[174][1]"
- :cardList="questionData[174][1]"
- :chapter="6"
- :page="1661"
+ v-if="questionData"
+ :cardList="questionData[174] ? questionData[174][1] : []"
/>
<span class="span-border"></span>
<span class="img mt-20 dl-bl">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級2</span>
<examinations
- v-if="questionData && questionData[174][2]"
- :cardList="questionData[174][2]"
- :chapter="6"
- :page="1662"
+ v-if="questionData"
+ :cardList="questionData[174] ? questionData[174][2] : []"
/>
</p>
<h6 class="Conclusion-title4">鈥㈠涔犲弽鎬濃��</h6>
--
Gitblit v1.9.1