|
@@ -2,7 +2,11 @@
|
|
|
<template>
|
|
|
<div class="NNPE-ArticleView" v-if="curQue">
|
|
|
<a class="ArticleView-full" @click="fullScreen">全屏模式</a>
|
|
|
- <div class="aduioLine-box aduioLine-practice">
|
|
|
+ <div class="aduioLine-box aduioLine-practice" v-if="
|
|
|
+ curQue.mp3_list &&
|
|
|
+ curQue.mp3_list.length > 0 &&
|
|
|
+ curQue.mp3_list[0].id
|
|
|
+ ">
|
|
|
<div
|
|
|
class="aduioLine-content"
|
|
|
v-if="
|
|
@@ -83,7 +87,7 @@
|
|
|
<span class="NNPE-words-box">
|
|
|
<template v-if="curQue.pyPosition == 'top'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
class="NNPE-pinyin"
|
|
|
:class="[
|
|
|
pItem.className ? pItem.className : '',
|
|
@@ -96,7 +100,7 @@
|
|
|
<span
|
|
|
class="NNPE-chs"
|
|
|
:class="[
|
|
|
- pItem.padding && config.isShowPY ? 'padding' : '',
|
|
|
+ pItem.padding && config.isShowPY && resObj.dhaspinyinArr[index] ? 'padding' : '',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
|
]"
|
|
|
>
|
|
@@ -118,7 +122,7 @@
|
|
|
</span>
|
|
|
<template v-if="curQue.pyPosition == 'bottom'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
class="NNPE-pinyin"
|
|
|
:class="[
|
|
|
pItem.className ? pItem.className : '',
|
|
@@ -132,7 +136,7 @@
|
|
|
<span class="NNPE-words-box">
|
|
|
<template v-if="curQue.pyPosition == 'top'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
:class="[
|
|
|
'NNPE-pinyin',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
@@ -161,7 +165,7 @@
|
|
|
</span>
|
|
|
<template v-if="curQue.pyPosition == 'bottom'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
:class="[
|
|
|
'NNPE-pinyin',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
@@ -184,7 +188,7 @@
|
|
|
>
|
|
|
<template v-if="curQue.pyPosition == 'top'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
:class="[
|
|
|
'NNPE-pinyin',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
@@ -213,7 +217,7 @@
|
|
|
</span>
|
|
|
<template v-if="curQue.pyPosition == 'bottom'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
:class="[
|
|
|
'NNPE-pinyin',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
@@ -230,7 +234,7 @@
|
|
|
<template v-else>
|
|
|
<template v-if="curQue.pyPosition == 'top'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
class="NNPE-pinyin"
|
|
|
:class="[
|
|
|
pItem.chs != '“' && pItem.padding ? 'padding' : '',
|
|
@@ -244,7 +248,7 @@
|
|
|
<span
|
|
|
class="NNPE-chs"
|
|
|
:class="[
|
|
|
- pItem.chs != '“' && pItem.padding && config.isShowPY
|
|
|
+ pItem.chs != '“' && pItem.padding && config.isShowPY && resObj.dhaspinyinArr[index]
|
|
|
? 'padding'
|
|
|
: '',
|
|
|
sentIndex == index ? 'wordBlank' : '',
|
|
@@ -270,7 +274,7 @@
|
|
|
</span>
|
|
|
<template v-if="curQue.pyPosition == 'bottom'">
|
|
|
<span
|
|
|
- v-if="config.isShowPY"
|
|
|
+ v-if="config.isShowPY && resObj.dhaspinyinArr[index]"
|
|
|
class="NNPE-pinyin"
|
|
|
:class="[
|
|
|
pItem.chs != '“' && pItem.padding ? 'padding' : '',
|
|
@@ -555,7 +559,10 @@ export default {
|
|
|
timeArr = [];
|
|
|
let curQue = JSON.parse(JSON.stringify(this.curQue));
|
|
|
let wordTimeList = curQue.wordTime;
|
|
|
+ let dhaspinyin = false; // 每段是否有拼音
|
|
|
+ let dhaspinyinArr = []
|
|
|
curQue.detail.forEach((dItem, dIndex) => {
|
|
|
+ dhaspinyin = false;
|
|
|
dItem.wordsList.forEach((sItem, sIndex) => {
|
|
|
let sentArr = [];
|
|
|
|
|
@@ -586,11 +593,13 @@ export default {
|
|
|
timeList: [],
|
|
|
};
|
|
|
sentArr.push(obj);
|
|
|
+ if(wItem.pinyin) dhaspinyin=true
|
|
|
});
|
|
|
resArr.push(sentArr);
|
|
|
});
|
|
|
|
|
|
timeArr.push(dItem.timeList);
|
|
|
+ dhaspinyinArr.push(dhaspinyin)
|
|
|
});
|
|
|
if (wordTimeList && wordTimeList.length > 0) {
|
|
|
this.mergeWordTime(resArr, wordTimeList);
|
|
@@ -603,8 +612,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- this.resObj = { sentList: resArr, timeList: timeList };
|
|
|
- console.log(this.resObj);
|
|
|
+ this.resObj = { sentList: resArr, timeList: timeList,dhaspinyinArr:dhaspinyinArr };
|
|
|
},
|
|
|
mergeWordTime(resArr, wordTimeList) {
|
|
|
resArr.forEach((item, index) => {
|