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/chapter001.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index ed722b4..766a485 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -329,6 +329,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
</span>
@@ -421,6 +422,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-box video-border"
></video>
<p class="img">瑙嗛锛氶楠�</p>
@@ -530,7 +532,7 @@
<div class="fl">
<div
- class="left fl fl-di fl-evenly openImgBox"
+ class="left fl fl-di ju-cn openImgBox"
style="width: 30%; margin-top: 5px"
>
<img
@@ -553,8 +555,8 @@
</div>
</div>
<div class="fl">
- <div class="left" style="width: 30%">
- <div class="banshi openImgBox">
+ <div class="left fl fl-di ju-cn" style="width: 30%">
+ <div class="banshi openImgBox" style="height:86px">
<div class="swiper-container swiper-img">
<div class="swiper-wrapper">
<div class="swiper-slide">
@@ -606,11 +608,11 @@
<h3 id="c002">浜屻�佸鍓嶅効绔ヨ繍鍔ㄧ郴缁熺殑淇濆仴</h3>
<h4 id="d004">锛堜竴锛夋寚瀵煎鍓嶅効绔ヤ繚鎸佹纭Э鍔匡紝闃叉鑴婃煴鍜岃兏寤撶暩褰�</h4>
<p class="lh2">
- 淇濇寔姝ｇ‘濮垮娍锛屽舰鎴愯壇濂戒綋鎬侊紝鍗斥�滃潗鏈夊潗鐩搞�佺珯鏈夌珯鐩糕�濓紝涓嶄粎鏄负浜嗙編瑙傦紝鏇存槸
+ 淇濇寔姝ｇ‘濮垮娍锛屽舰鎴愯壇濂戒綋鎬侊紝鍗斥�滃潗鏈夊潗鐩搞�佺珯鏈夌珯鐩糕�濓紝涓嶄粎鏄负浜嗙編瑙傦紝鏇存槸涓轰簡淇濊瘉瀛﹀墠鍎跨韬績鍋ュ悍鍙戣偛銆備笉鑹綋鎬侊紝濡傞┘鑳屻�佷弗閲嶈剨鏌变晶寮瓑锛屽鑷磋兏寤撶暩褰紝鍙弗閲嶅奖鍝嶅鍓嶅効绔ョ殑蹇冭偤鍙戣偛锛屽鏄撴偅鍛煎惛绯荤粺鐤剧梾銆備綋鎬佷笉鑹殑鍎跨涔熷鏄撹嚜鍗戯紝褰卞搷鍋ュ叏浜烘牸鐨勫舰鎴愩��
</p>
<div class="fl">
- <p class="left m0-t0 lh2" style="width: 45%">
- 涓轰簡淇濊瘉瀛﹀墠鍎跨韬績鍋ュ悍鍙戣偛銆備笉鑹綋鎬侊紝濡傞┘鑳屻�佷弗閲嶈剨鏌变晶寮瓑锛屽鑷磋兏寤撶暩褰紝鍙弗閲嶅奖鍝嶅鍓嶅効绔ョ殑蹇冭偤鍙戣偛锛屽鏄撴偅鍛煎惛绯荤粺鐤剧梾銆備綋鎬佷笉鑹殑鍎跨涔熷鏄撹嚜鍗戯紝褰卞搷鍋ュ叏浜烘牸鐨勫舰鎴愩�備负闃叉鑴婃煴銆佽兏寤撶瓑楠ㄩ鍙樺舰锛屽舰鎴愯壇濂戒綋鎬侊紝椤绘敞鎰忎互涓嬪嚑鐐癸細濠村効涓嶅疁杩囨棭鍧愩�佺珯锛屼笉瀹滅潯杞簥鍜屼箙鍧愭矙
+ <p class="lh2" style="width: 45%">
+ 涓洪槻姝㈣剨鏌便�佽兏寤撶瓑楠ㄩ鍙樺舰锛屽舰鎴愯壇濂戒綋鎬侊紝椤绘敞鎰忎互涓嬪嚑鐐癸細濠村効涓嶅疁杩囨棭鍧愩�佺珯锛屼笉瀹滅潯杞簥鍜屼箙鍧愭矙鍙戙�傝礋閲嶄笉瑕佽秴杩囪嚜韬綋閲嶇殑1/8锛屾洿涓嶈兘闀挎椂闂村崟渚ц礋閲嶃�傛墭骞兼満鏋勫簲閰嶅涓庡鍓嶅効绔ヨ韩鏉愮浉閫傚簲鐨勬妞呫�傚鏋滃鍓嶅効绔ユ墍鐢ㄧ殑妗屽瓙浣庛�佹瀛愰珮锛屾槗褰㈡垚椹艰儗锛涘鏋滄瀛愰珮銆佹瀛愪綆锛屽鏄撳舰鎴愯剨渚у集锛堣鍥�1-5锛夈�� 鏁欏笀瑕侀殢鏃剁籂姝�
</p>
<div class="right fl fl-cn fl-di" style="width: 55%">
<div class="banshi openImgBox">
@@ -646,7 +648,7 @@
</div>
</div>
<p class="lh2 t0">
- 鍙戙�傝礋閲嶄笉瑕佽秴杩囪嚜韬綋閲嶇殑1/8锛屾洿涓嶈兘闀挎椂闂村崟渚ц礋閲嶃�傛墭骞兼満鏋勫簲閰嶅涓庡鍓嶅効绔ヨ韩鏉愮浉閫傚簲鐨勬妞呫�傚鏋滃鍓嶅効绔ユ墍鐢ㄧ殑妗屽瓙浣庛�佹瀛愰珮锛屾槗褰㈡垚椹艰儗锛涘鏋滄瀛愰珮銆佹瀛愪綆锛屽鏄撳舰鎴愯剨渚у集锛堣鍥�1-5锛夈�傛暀甯堣闅忔椂绾犳瀛﹀墠鍎跨鍧愩�佺珛銆佽涓殑涓嶆纭Э鍔匡紝骞朵负浠栦滑鍋氬嚭姒滄牱銆�
+ 瀛﹀墠鍎跨鍧愩�佺珛銆佽涓殑涓嶆纭Э鍔匡紝骞朵负浠栦滑鍋氬嚭姒滄牱銆�
</p>
<h4 id="d005">锛堜簩锛夌瀛︾粍缁囦綋鑲查敾鐐煎拰鎴峰娲诲姩</h4>
<p class="lh2">
@@ -688,7 +690,11 @@
<p class="lh2">
楠ㄧ殑鐢熼暱闇�瑕佸ぇ閲忚泲鐧借川銆侀挋鍜岀７绛夛紝杩橀渶瑕佺淮鐢熺礌D淇冭繘閽欍�佺７鐨勫惛鏀讹紱鑲岃倝鐨勭敓闀垮強鑳介噺鐨勫偍瀛橈紝闇�瑕佸ぇ閲忚泲鐧借川鍜岃憽钀勭硸銆傚悎鐞嗚喅椋熸槸淇濊瘉楠ㄥ拰鑲岃倝鍙戣偛鐨勯噸瑕佹潯浠躲�傚効绔ュ簲澶氭憚鍙栧惈閽欍�佺７銆佺淮鐢熺礌D銆佽泲鐧借川绛変赴瀵岀殑椋熷搧锛屽灏忚櫨鐨�佽泲榛勩�佺墰濂躲�佸姩鐗╄倽鑴忋�佽眴鍒跺搧绛夛紝浠ヤ績杩涢鐨勯挋鍖栧拰鑲岃倝鐨勫彂鑲层��
</p>
- <h6 class="Conclusion-title2">
+ <h4 id="d008">锛堜簲锛夋敞鎰忎繚鎶ゅソ鍏宠妭鍜岄煣甯�</h4>
+ <p class="lh2">
+ 鎴愪汉涓嶈鐚涘姏鐗垫媺鍎跨鐨勬墜鑷傦紝浠ラ槻浼ょ潃鑲樺叧鑺傘�佽偐鍏宠妭锛涙暀鑲插効绔ヤ笉瑕佷粠楂樺寰�纭湴涓婅烦锛岄伩鍏嶄激鐫�楠ㄧ泦銆傚彟澶栵紝鏁欏笀鍦ㄧ粍缁囧効绔ヨ繘琛屼綋鑲查敾鐐煎拰鎴峰娲诲姩鏃讹紝灏介噺閬垮厤鍦ㄧ‖鍦伴潰涓婂仛璺宠穬杩愬姩銆�
+ </p>
+ <h6 class="Conclusion-title2">
<img
class="img-gn"
alt=""
@@ -704,10 +710,6 @@
:chapter="1"
:page="6"
/>
- </p>
- <h4 id="d008">锛堜簲锛夋敞鎰忎繚鎶ゅソ鍏宠妭鍜岄煣甯�</h4>
- <p class="lh2">
- 鎴愪汉涓嶈鐚涘姏鐗垫媺鍎跨鐨勬墜鑷傦紝浠ラ槻浼ょ潃鑲樺叧鑺傘�佽偐鍏宠妭锛涙暀鑲插効绔ヤ笉瑕佷粠楂樺寰�纭湴涓婅烦锛岄伩鍏嶄激鐫�楠ㄧ泦銆傚彟澶栵紝鏁欏笀鍦ㄧ粍缁囧効绔ヨ繘琛屼綋鑲查敾鐐煎拰鎴峰娲诲姩鏃讹紝灏介噺閬垮厤鍦ㄧ‖鍦伴潰涓婂仛璺宠穬杩愬姩銆�
</p>
<p class="custom_tag" style="margin-top: 30px"><b>鈥㈣祫鏂欓摼鎺モ��</b></p>
<div class="fieldset">
@@ -1015,7 +1017,7 @@
绐︽墠閫愭笎鍙戣偛瀹屽杽銆傚洜姝わ紝瀛﹀墠鍎跨铏界劧瀹规槗鍙戠敓涓婂懠鍚搁亾鎰熸煋锛屼絾鏋佸皯鍑虹幇榧荤鐐庛�傞蓟涓殧鍓嶄笅鏂硅绠′赴瀵岋紝瀹规槗鍥犲共鐕ャ�佸浼ょ瓑鍑鸿锛岀О涓衡�滄槗鍑鸿鍖衡�濄��
</p>
<p class="lh2">
- 瀛﹀墠鍎跨榧绘唱绠¤緝鐭紝寮�鍙ｄ簬鐪煎唴鐪︼紝鐡ｈ啘鍙戣偛涓嶅叏銆傚洜姝わ紝濡傛灉涓婂懠鍚搁亾鎰熸煋锛岀梾鑿屽彲浠ラ�氳繃榧�
+ 瀛﹀墠鍎跨榧绘唱绠¤緝鐭紝寮�鍙ｄ簬鐪煎唴鐪︼紝鐡ｈ啘鍙戣偛涓嶅叏銆傚洜姝わ紝濡傛灉涓婂懠鍚搁亾鎰熸煋锛岀梾鑿屽彲
</p>
</div>
<div class="right" style="width: 60%">
@@ -1029,19 +1031,20 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
style="margin-top: 20px"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ懠鍚搁亾鐨勯槻寰＄壒鐐逛笌淇濆仴</p>
</div>
</div>
- <p class="t0">娉渚靛強鐪肩粨鑶滐紝寮曞彂娉泭鐐庛�佺粨鑶滅値绛夈��</p>
+ <p class="t0">浠ラ�氳繃榧绘唱绠′镜鍙婄溂缁撹啘锛屽紩鍙戞唱鍥婄値銆佺粨鑶滅値绛夈��</p>
<h5 id="e013">2.鍜�</h5>
<p class="lh2">
鍜藉垎鍒互杞叚娓哥缂樺拰浼氬帉涓婄紭涓虹晫锛屽垎涓洪蓟鍜姐�佸彛鍜藉拰鍠夊捊锛屽湪濠村効鏈熺浉瀵圭嫮灏忥紝鏂瑰悜鍨傜洿銆傚鍓嶅効绔ュ捊榧撶杈冨銆佺煭锛岃�屼笖骞崇洿锛屾晠涓婂懠鍚搁亾鎰熸煋鏃讹紝鐥呭師浣撳鏄撲镜鍏ヤ腑鑰筹紝寮曞彂涓�崇値锛屾崯浼ゅ惉鍔涖��
</p>
- <div class="fl">
- <div class="left" style="width: 80%">
+ <div class="fl fl-between">
+ <div class="left" style="width: 78%">
<h5 id="e014">3.鍠�</h5>
<p class="lh2">
瀛﹀墠鍎跨鍠夎厰鐙獎锛岄粡鑶滄煍瀚╋紝鏈変赴瀵岀殑琛�绠″拰娣嬪反缁勭粐銆傚鏋滄劅鏌擄紝鍙洜榛忚啘鍏呰銆佽偪鑳�锛屼娇鍠夎厰鏇寸嫮绐勶紝瀵艰嚧鍛煎惛鍥伴毦銆�
@@ -1050,8 +1053,9 @@
瀛﹀墠鍎跨鍠夐儴鐨勪繚鎶ゆ�у弽灏勬満鑳藉皻涓嶅畬鍠勶紝杩涢鏃惰绗戝鏄撳皢鏈毤纰庣殑椋熺墿鍛涘叆鍛煎惛閬撱��
</p>
<p class="lh2">
- 瀛﹀墠鍎跨澹板甫瀹规槗鐤插姵锛岃嫢鍙戠敓鑲胯儉銆佸厖琛�锛屽彲鑳藉嚭鐜板０闊冲樁鍝戙�傚枆鑵旀ā寮忚鍥�1-7銆�
+ 瀛﹀墠鍎跨澹板甫瀹规槗鐤插姵锛岃嫢鍙戠敓鑲胯儉銆佸厖琛�锛屽彲鑳藉嚭鐜板０闊冲樁鍝戙��
</p>
+ <p class="lh2">鍠夎厰妯″紡瑙佸浘1-7銆�</P>
</div>
<div class="right" style="width: 20%">
<p class="center openImgBox">
@@ -1471,6 +1475,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ績銆佽绠＄殑鐗圭偣鍙婁繚鍋�</p>
@@ -1950,6 +1955,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ墮榻跨殑鐢熺悊鐗圭偣鍙婁繚鍋�</p>
@@ -3024,6 +3030,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ唴鍒嗘硨绯荤粺鐨勭敓鐞嗙壒鐐逛笌淇濆仴</p>
@@ -3421,6 +3428,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
</p>
@@ -3946,6 +3954,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ溂鐨勭敓鐞嗙壒鐐逛笌淇濆仴</p>
@@ -4049,6 +4058,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヨ�崇殑鐗圭偣鍙婁繚鍋�</p>
@@ -4254,6 +4264,7 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
+ controlslist="nodownload"
class="video-border w100"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ毊鑲ょ殑鐗圭偣涓庝繚鍋�</p>
--
Gitblit v1.9.1