|
@@ -24,8 +24,9 @@
|
|
|
:mp3="curQue.mp3_list[0].id"
|
|
|
:getCurTime="getCurTime"
|
|
|
:mp3Source="curQue.mp3_list[0].source"
|
|
|
- :width="colLength == 2 ? 200 : isPhone ? 200 : 590"
|
|
|
+ :width="160"
|
|
|
ref="audioLine"
|
|
|
+ :baseSizePhone="baseSizePhone"
|
|
|
/>
|
|
|
</template>
|
|
|
</div>
|
|
@@ -51,6 +52,7 @@
|
|
|
<p
|
|
|
:class="['notice', isHasRemark ? 'hasRemark' : '']"
|
|
|
v-if="curQue.notice"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
|
{{ curQue.notice }}
|
|
|
</p>
|
|
@@ -60,7 +62,11 @@
|
|
|
:key="'detail' + index"
|
|
|
>
|
|
|
<div :class="['article-content', isHasRemark ? 'hasRemark' : '']">
|
|
|
- <RoleChs :curRole="item.roleDetail" :type="1" />
|
|
|
+ <RoleChs
|
|
|
+ :curRole="item.roleDetail"
|
|
|
+ :type="1"
|
|
|
+ :baseSizePhone="baseSizePhone"
|
|
|
+ />
|
|
|
<div class="wordsList-box">
|
|
|
<img
|
|
|
:src="articleImg[index]"
|
|
@@ -70,12 +76,16 @@
|
|
|
class="roleDetail"
|
|
|
v-if="item.roleDetail.detail.wordsList.length > 0"
|
|
|
>
|
|
|
- <span class="pinyin">{{
|
|
|
- item.roleDetail.detail.wordsList | handlePinyin
|
|
|
- }}</span>
|
|
|
- <span class="chs">{{
|
|
|
- item.roleDetail.detail.wordsList | handleChs
|
|
|
- }}</span>
|
|
|
+ <span
|
|
|
+ class="pinyin"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handlePinyin }}</span
|
|
|
+ >
|
|
|
+ <span
|
|
|
+ class="chs"
|
|
|
+ :style="{ fontSize: baseSizePhone + 2 + 'px' }"
|
|
|
+ >{{ item.roleDetail.detail.wordsList | handleChs }}</span
|
|
|
+ >
|
|
|
</div>
|
|
|
<div
|
|
|
class="para-con"
|
|
@@ -89,6 +99,7 @@
|
|
|
curQue.enPosition == 'top'
|
|
|
"
|
|
|
class="enwords"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
|
{{ item.enwords }}
|
|
|
</div>
|
|
@@ -131,6 +142,7 @@
|
|
|
noFont.indexOf(item.pinyin) > -1 ? 'noFont' : ''
|
|
|
]"
|
|
|
@click.stop="viewNotes($event, pItem.pinyin)"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
<span
|
|
@@ -150,7 +162,8 @@
|
|
|
:style="{
|
|
|
fontFamily: pItem.config.fontFamily,
|
|
|
height: '28px',
|
|
|
- display: 'inline-block'
|
|
|
+ display: 'inline-block',
|
|
|
+ fontSize: baseSizePhone + 6 + 'px'
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(pItem.pinyin) == -1
|
|
@@ -170,6 +183,7 @@
|
|
|
noFont.indexOf(item.pinyin) > -1 ? 'noFont' : ''
|
|
|
]"
|
|
|
@click.stop="viewNotes($event, pItem.pinyin)"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
@@ -195,6 +209,7 @@
|
|
|
item.wordsList[pIndex + 1].pinyin
|
|
|
)
|
|
|
"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 1].pinyin }}</span
|
|
|
>
|
|
|
<span
|
|
@@ -212,7 +227,8 @@
|
|
|
fontFamily:
|
|
|
item.wordsList[pIndex + 1].config.fontFamily,
|
|
|
height: '28px',
|
|
|
- display: 'inline-block'
|
|
|
+ display: 'inline-block',
|
|
|
+ fontSize: baseSizePhone + 6 + 'px'
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(
|
|
@@ -243,6 +259,7 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 1].pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
@@ -280,6 +297,7 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
|
<span
|
|
@@ -307,7 +325,8 @@
|
|
|
fontFamily:
|
|
|
item.wordsList[pIndex + 2].config.fontFamily,
|
|
|
height: '28px',
|
|
|
- display: 'inline-block'
|
|
|
+ display: 'inline-block',
|
|
|
+ fontSize: baseSizePhone + 6 + 'px'
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(
|
|
@@ -338,6 +357,7 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
@@ -355,6 +375,7 @@
|
|
|
pItem.className ? pItem.className : '',
|
|
|
noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : ''
|
|
|
]"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
@click.stop="viewNotes($event, pItem.pinyin)"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
@@ -379,7 +400,8 @@
|
|
|
:style="{
|
|
|
fontFamily: pItem.config.fontFamily,
|
|
|
height: '28px',
|
|
|
- display: 'inline-block'
|
|
|
+ display: 'inline-block',
|
|
|
+ fontSize: baseSizePhone + 6 + 'px'
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(pItem.pinyin) == -1
|
|
@@ -399,6 +421,7 @@
|
|
|
pItem.className ? pItem.className : '',
|
|
|
noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : ''
|
|
|
]"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
@click.stop="viewNotes($event, pItem.pinyin)"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
@@ -423,6 +446,7 @@
|
|
|
(curQue.enPosition && curQue.enPosition == 'bottom'))
|
|
|
"
|
|
|
class="enwords"
|
|
|
+ :style="{ fontSize: baseSizePhone + 'px' }"
|
|
|
>
|
|
|
{{ item.enwords }}
|
|
|
</div>
|
|
@@ -434,6 +458,7 @@
|
|
|
<RemarkChs
|
|
|
:remarkDetail="item.remarkDetail"
|
|
|
:marginTop="item.roleDetail.detail.wordsList.length > 0 ? 44 : 8"
|
|
|
+ :baseSizePhone="baseSizePhone"
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -472,6 +497,8 @@
|
|
|
:mp3Url="wordPlayMp3"
|
|
|
:bg="wordbgs"
|
|
|
:ed="wordeds"
|
|
|
+ :baseSizePhone="baseSizePhone"
|
|
|
+ :themeColorPhone="themeColorPhone"
|
|
|
/>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -484,7 +511,12 @@
|
|
|
left: windowWidth > 642 ? '' : '0px'
|
|
|
}"
|
|
|
>
|
|
|
- <Notecard :item="curNoteCon" :changeCard="changeCard" />
|
|
|
+ <Notecard
|
|
|
+ :item="curNoteCon"
|
|
|
+ :changeCard="changeCard"
|
|
|
+ :baseSizePhone="baseSizePhone"
|
|
|
+ :themeColorPhone="themeColorPhone"
|
|
|
+ />
|
|
|
</div>
|
|
|
</template>
|
|
|
</div>
|
|
@@ -513,7 +545,8 @@ export default {
|
|
|
"TaskModel",
|
|
|
"colLength",
|
|
|
"NpcNewWordMp3",
|
|
|
- "isPhone"
|
|
|
+ "baseSizePhone",
|
|
|
+ "themeColorPhone"
|
|
|
],
|
|
|
components: {
|
|
|
AudioLine,
|
|
@@ -1117,7 +1150,7 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
|
|
|
&.hasRemark {
|
|
|
- width: 553px;
|
|
|
+ width: calc(100% - 120px);
|
|
|
box-sizing: border-box;
|
|
|
border-right: 1px rgba(0, 0, 0, 0.1) solid;
|
|
|
}
|
|
@@ -1161,7 +1194,7 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
align-items: flex-start;
|
|
|
&.hasRemark {
|
|
|
- width: 553px;
|
|
|
+ width: calc(100% - 120px);
|
|
|
border-right: 1px rgba(0, 0, 0, 0.1) solid;
|
|
|
padding: 8px 0px 8px 23px;
|
|
|
}
|
|
@@ -1291,7 +1324,7 @@ export default {
|
|
|
clear: both;
|
|
|
overflow: hidden;
|
|
|
.roleDetail {
|
|
|
- height: 36px;
|
|
|
+ min-height: 36px;
|
|
|
display: flex;
|
|
|
justify-content: flex-start;
|
|
|
align-items: center;
|