From 3373983d0a82587d4dd2106a7e6b79b7bd566817 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 26 六月 2024 19:51:45 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/artAndDrama/view/components/chapter001.vue | 185 +++++++++++++++++++++++++++++----------------
1 files changed, 118 insertions(+), 67 deletions(-)
diff --git a/src/books/artAndDrama/view/components/chapter001.vue b/src/books/artAndDrama/view/components/chapter001.vue
index b9ce627..deb3197 100644
--- a/src/books/artAndDrama/view/components/chapter001.vue
+++ b/src/books/artAndDrama/view/components/chapter001.vue
@@ -4,7 +4,8 @@
<div v-if="showPageList.indexOf(4) > -1">
<h1 id="a004">
<img class="img-0" alt="" src="../../assets/images/dy1.jpg" />
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio>
</h1>
<div class="bodystyle">
<div class="bk">
@@ -43,10 +44,11 @@
<span class="hs1">鈼�</span>澶у０鏈楄涓嬮潰鐨勫彞瀛愶紝杩炰竴杩炰笉鍚岄�昏緫閲嶉煶寮鸿皟鐨勬剰鎬濄��
</p>
<h1>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <!-- <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio> -->
</h1>
<!-- 杩炵嚎棰� -->
- <matching :rawData="rawData" :question="question" class="macthing" :primaryColor="'transparent'" :bordercolor="'transparent'"></matching>
+ <matching :rawData="rawData" :question="question" class="macthing" :primary-color="color"></matching>
<p class="text">灏忔彁绀猴細鍔犵偣鐨勬枃瀛椾负鏈彞璇濅腑鐨勯�昏緫閲嶉煶锛屽湪鏈楄鍙戦煶鏃惰閲嶈銆�</p>
</div>
<p><br /></p>
@@ -62,12 +64,10 @@
<img src="../../assets/images/page6-header-green.png" alt="" style="height: auto; width: 100%" />
<div class="bodystyle">
<h3 class="lefth3" id="c001"><img class="img-gn1" alt="" src="../../assets/images/czysj.jpg" /></h3>
- <p class="text"><span class="hs1">鈼�</span>璇烽�夊嚭浣犺涓烘纭殑绛旀銆�</p>
+ <choice class="choice" :questions="questions" :primaryColor="accentColor" hoverBackgroundColor="#F58200" hoverColor="white"></choice>
<p class="center openImgBox">
<img class="img-e" alt="" src="../../assets/images/1-2铓傝殎涓惧ぇ鏍�.gif" />
- </p>
- <choice class="text" :questions="questions" :primaryColor="accentColor" hoverBackgroundColor="#F58200" hoverColor="white"></choice>
- <p class="center text">
+ </p><p class="center text">
<video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true"
x5-video-orientation="h5" x5-video-player-fullscreen="true" x5-playsinline="" controls
controlslist="nodownload" class="w100 video " @play="videoPlay"
@@ -103,7 +103,8 @@
<p class="text">
<span class="hs1">鈼�</span>璇峰皢浠ヤ笅璇炬枃閫夋澶у０鏈楄鍑烘潵锛屽姞鐐圭殑瀛楄閲嶈銆�
</p>
- <h1><audio :src="auidoPathThree" controls class="audio" @play="audioPlay"></audio></h1>
+ <h1><audio :src="auidoPathThree" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio></h1>
<div class="bj3">
<p class="center">
<span class="hs">鏄�<a id="w1"><sup>1</sup></a>锛堣妭閫夛級</span>
@@ -152,7 +153,8 @@
<h1 class="lefth3 openImgBox" id="c005">
<img class="img-gn1" alt="" src="../../assets/images/1-3.gif" style="height: auto; width: 50%" />
</h1>
- <h1><audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio></h1>
+ <h1><audio :src="auidoPathFour" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio></h1>
<div class="bj3">
<p class="center">
<span class="hs">鏄�<a id="w1"></a><sup>1</sup>锛堣妭閫夛級</span>
@@ -227,7 +229,8 @@
<span class="hs1">鈼�</span>璇峰皢浠ヤ笅璇炬枃閫夋澶у０鏈楄鍑烘潵锛屽姞鐐圭殑瀛楄閲嶈銆�
</p>
<h1>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathFive" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio>
</h1>
<div class="bj3">
@@ -302,19 +305,38 @@
<h3 class="lefth3" id="c009">
<img class="img-gn1" alt="" src="../../assets/images/xsyty.jpg" />
</h3>
- <p class="text"><span class="hs1">鈼�</span>鏀惧ぇ缂╁皬</p>
+ <p class="text ends">
+ <span><span class="hs1">鈼�</span>鏀惧ぇ缂╁皬</span>
+ <span> <audio :src="auidoPathSex" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio> </span>
+ </p>
<p class="text">
璇蜂綘浜ゆ浛鈥滄斁澶р�濆拰鈥滅缉灏忊�濅簲瀹樸�傚湪鈥滄斁澶р�濇椂锛屾兂璞′簲瀹樿椋炲埌澶栧お绌猴紱鍦ㄢ�滅缉灏忊�濇椂锛屾兂璞′簲瀹樺叏閮ㄧ缉灏忓埌浜嗛蓟灏栦笂銆�
</p>
- <p class="text"><span class="hs1">鈼�</span>鎻愬崌鑻规灉鑲�</p>
+
+ <p class="text ends">
+ <span><span class="hs1">鈼�</span>鎻愬崌鑻规灉鑲�</span>
+ <span><audio :src="auidoPathSeven" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio> </span>
+ </p>
<p class="text">
鎯宠薄浣犲湪涓�涓檶鐢熺殑鍦版柟锛岃皝閮戒笉璁よ瘑锛岀獊鐒堕亣瑙佷簡濂芥湅鍙嬶紝浣犲緢楂樺叴锛屼笂鍓嶅拰浠�/濂规墦鎷涘懠銆傚仛涓�鍋氫綘姝ゆ椂鐨勮〃鎯呭惂銆�
</p>
- <p class="text"><span class="hs1">鈼�</span>寰瑧璇粹�渁ng鈥�</p>
+ <p class="text ends">
+ <span><span class="hs1">鈼�</span>寰瑧璇粹�渁ng鈥�</span>
+ <span><audio :src="auidoPathEight" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio></span>
+ </p>
<p class="text">
璇蜂綘璇曚竴璇曞湪鎻愬崌鑻规灉鑲岀殑鍩虹涓婏紝鍙戝嚭鈥渁ng鈥濈殑闊炽�傚０闊宠灏藉彲鑳芥媺闀裤�佷繚鎸佺ǔ瀹氾紝骞跺悜杩滈�併��
</p>
- <p class="text"><span class="hs1">鈼�</span>鍚戣繙灞卞枈鈥滈樋姣涒��</p>
+
+ <p class="text ends">
+ <span style="text-wrap: nowrap"><span class="hs1">鈼�</span>鍚戣繙灞卞枈鈥滈樋姣涒��</span>
+ <span style="margin-left: -4%;"><audio :src="auidoPathNine" controls controlslist="noplaybackrate nodownload" class="audio"
+ @play="audioPlay"></audio></span>
+
+ </p>
<p class="text">
鎯宠薄鑷繁绔欏湪涓�搴ч珮灞变笂锛屽ソ鏈嬪弸鈥滈樋姣涒�濈珯鍦ㄥ闈㈢殑楂樺北涓婏紝浣犺濡備綍鍠婁粬鍛紵
</p>
@@ -395,12 +417,18 @@
videoPathOne: "",
auidoPathOne: "",
auidoPathTwo: "",
- auidoPathThree: "",
+ auidoPathFour: "",
+ auidoPathFive: "",
+ auidoPathSex: "",
+ auidoPathSeven: "",
+ auidoPathEight: "",
+ auidoPathNine: "",
+ color:"#fff",
chapterData: {
- isCollectImg: false,
- isCollectVideo: false,
- txtOne: "",
- txtTwo: "",
+ isCollectImg: false,
+ isCollectVideo: false,
+ txtOne: "",
+ txtTwo: "",
},
rawData: {
left: [
@@ -519,9 +547,9 @@
questions: [
{
analysisCon: "undefined",
- answer: ['A', 'B'],
+ answer: ['A','B'],
difficulty: 0,
- id: 47772,
+ id: 1,
isCollect: false,
isComplete: false,
isRight: null,
@@ -530,22 +558,22 @@
number: 1,
options: [
{
- "img": "",
- "index": "3CA6",
- "txt": "缇ゅ眳",
- "value": "A"
+ img: "",
+ index: "3CA6",
+ txt: "缇ゅ眳",
+ value: "A"
},
{
- "img": "",
- "index": "73EE",
- "txt": "绀句細鎬�",
- "value": "B"
+ img: "",
+ index: "73EE",
+ txt: "绀句細鎬�",
+ value: "B"
},
{
- "img": "",
- "index": "6AEF",
- "txt": "鐙眳",
- "value": "C"
+ img: "",
+ index: "6AEF",
+ txt: "鐙眳",
+ value: "C"
},
],
optionStyle: "Image",
@@ -563,7 +591,7 @@
analysisCon: "undefined",
answer: ['A', 'C'],
difficulty: 0,
- id: 47773,
+ id: 2,
isCollect: false,
isComplete: false,
isRight: null,
@@ -572,22 +600,22 @@
number: 1,
options: [
{
- "img": "",
- "index": "3CA6",
- "txt": "鏄庣‘鐨�",
- "value": "A"
+ img: "",
+ index: "3CA6",
+ txt: "鏄庣‘鐨�",
+ value: "A"
},
{
- "img": "",
- "index": "73EE",
- "txt": "濂囨�殑",
- "value": "B"
+ img: "",
+ index: "73EE",
+ txt: "濂囨�殑",
+ value: "B"
},
{
- "img": "",
- "index": "6AEF",
- "txt": "鏈夊簭鐨�",
- "value": "C"
+ img: "",
+ index: "6AEF",
+ txt: "鏈夊簭鐨�",
+ value: "C"
},
],
optionStyle: "Image",
@@ -605,7 +633,7 @@
analysisCon: "undefined",
answer: ['A', 'B'],
difficulty: 0,
- id: 47774,
+ id: 3,
isCollect: false,
isComplete: false,
isRight: null,
@@ -614,22 +642,22 @@
number: 1,
options: [
{
- "img": "",
- "index": "3CA6",
- "txt": "鍥㈢粨鐨�",
- "value": "A"
+ img: "",
+ index: "3CA6",
+ txt: "鍥㈢粨鐨�",
+ value: "A"
},
{
- "img": "",
- "index": "73EE",
- "txt": "浼樼鐨�",
- "value": "B"
+ img: "",
+ index: "73EE",
+ txt: "浼樼鐨�",
+ value: "B"
},
{
- "img": "",
- "index": "6AEF",
- "txt": "鏉炬暎鐨�",
- "value": "C"
+ img: "",
+ index: "6AEF",
+ txt: "鏉炬暎鐨�",
+ value: "C"
},
],
optionStyle: "Image",
@@ -679,15 +707,33 @@
this.videoPathOne = await getResourcePath(
"691cbd2c13198d04afc7800d0f2cafb0"
);
- // this.auidoPathOne = await getResourcePath(
- // "2c5f6c69b0f9f7a3c03e473cb8c977f5"
- // );
+ this.auidoPathOne = await getResourcePath(
+ "a8778fb480281170f6c421b57694d4ef"
+ );
// this.auidoPathTwo = await getResourcePath(
- // "e93c0fdde08be5a4386c8c863892a287"
+ // "1089676a40bedbe85a12db86199c3615"
// );
- // this.auidoPathThree = await getResourcePath(
- // "e93c0fdde08be5a4386c8c863892a287"
- // );
+ this.auidoPathThree = await getResourcePath(
+ "1089676a40bedbe85a12db86199c3615"
+ );
+ this.auidoPathFour = await getResourcePath(
+ "abbb24d6a0f1de8c08462c3d4b68f575"
+ );
+ this.auidoPathFive = await getResourcePath(
+ "abce7305a3e3c22b686af3a395575411"
+ );
+ this.auidoPathSex = await getResourcePath(
+ "66b8f2c7f953556400367a89e0af8321"
+ );
+ this.auidoPathSeven = await getResourcePath(
+ "27fcd83f77a10ecbf97970863e2653c3"
+ );
+ this.auidoPathEight = await getResourcePath(
+ "3d7f52cc80f8ed8994a046b418399116"
+ );
+ this.auidoPathNine = await getResourcePath(
+ "3729175530def1b0baca68e0bd344862"
+ );
},
setBookQuestion() {
console.log("淇濆瓨");
@@ -724,7 +770,12 @@
.w70 {
width: 78%;
}
-
+.choice{
+ border: 1px solid green;
+ border-radius: 10px;
+ padding: 0 10px;
+ box-sizing: border-box;
+}
.fw-400 {
font-weight: 400 !important;
}
--
Gitblit v1.9.1