文章高度

src/components/Adult/preview/ArticleViewChs/NormalModelChs.vue

@@ -148,7 +148,9 @@
                                 : ''
                             ]"
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             <template>
@@ -283,7 +285,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 1].config.fontFamily
+                                item.wordsList[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -407,7 +411,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 2].config.fontFamily
+                                item.wordsList[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -523,7 +529,9 @@
                                 )
                               "
                               :style="{
-                                fontFamily: pItem.config.fontFamily
+                                fontFamily: pItem.config.fontFamily,
+                                height: '28px',
+                                display: 'inline-block'
                               }"
                               >{{
                                 NumberList.indexOf(pItem.pinyin) == -1
@@ -697,7 +705,9 @@
                                 )
                               "
                               :style="{
-                                fontFamily: pItem.config.fontFamily
+                                fontFamily: pItem.config.fontFamily,
+                                height: '28px',
+                                display: 'inline-block'
                               }"
                               >{{
                                 NumberList.indexOf(pItem.pinyin) == -1
@@ -789,7 +799,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 1].config.fontFamily
+                                item.sentArr[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -893,7 +905,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 2].config.fontFamily
+                                item.sentArr[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -999,7 +1013,9 @@
                               )
                             "
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1

src/components/Adult/preview/ArticleViewChs/PhraseModelChs.vue

@@ -119,7 +119,9 @@
                               )
                             "
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1
@@ -179,7 +181,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 1].config.fontFamily
+                                item.wordsList[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -263,7 +267,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 2].config.fontFamily
+                                item.wordsList[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -330,7 +336,9 @@
                             )
                           "
                           :style="{
-                            fontFamily: pItem.config.fontFamily
+                            fontFamily: pItem.config.fontFamily,
+                            height: '28px',
+                            display: 'inline-block'
                           }"
                           >{{
                             NumberList.indexOf(pItem.pinyin) == -1
@@ -453,7 +461,9 @@
                                 )
                               "
                               :style="{
-                                fontFamily: pItem.config.fontFamily
+                                fontFamily: pItem.config.fontFamily,
+                                height: '28px',
+                                display: 'inline-block'
                               }"
                               >{{
                                 NumberList.indexOf(pItem.pinyin) == -1
@@ -509,7 +519,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 1].config.fontFamily
+                                item.sentArr[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -579,7 +591,9 @@
                             "
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 2].config.fontFamily
+                                item.sentArr[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -649,7 +663,9 @@
                               )
                             "
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1

src/components/Adult/preview/ArticleViewChs/Practicechs.vue

@@ -136,7 +136,9 @@
                               sentIndex == index ? 'wordBlank' : ''
                             ]"
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1
@@ -187,7 +189,9 @@
                           ]"
                           :style="{
                             fontFamily:
-                              item.sentArr[pIndex + 1].config.fontFamily
+                              item.sentArr[pIndex + 1].config.fontFamily,
+                            height: '28px',
+                            display: 'inline-block'
                           }"
                         >
                           {{
@@ -249,7 +253,9 @@
                           ]"
                           :style="{
                             fontFamily:
-                              item.sentArr[pIndex + 2].config.fontFamily
+                              item.sentArr[pIndex + 2].config.fontFamily,
+                            height: '28px',
+                            display: 'inline-block'
                           }"
                         >
                           {{
@@ -315,7 +321,9 @@
                             sentIndex == index ? 'wordBlank' : ''
                           ]"
                           :style="{
-                            fontFamily: pItem.config.fontFamily
+                            fontFamily: pItem.config.fontFamily,
+                            height: '28px',
+                            display: 'inline-block'
                           }"
                           >{{
                             NumberList.indexOf(pItem.pinyin) == -1

src/components/Adult/preview/ArticleViewChs/WordModelChs.vue

@@ -116,7 +116,9 @@
                                 : ''
                             ]"
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1
@@ -165,7 +167,9 @@
                             ]"
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 1].config.fontFamily
+                                item.wordsList[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -242,7 +246,9 @@
                             ]"
                             :style="{
                               fontFamily:
-                                item.wordsList[pIndex + 2].config.fontFamily
+                                item.wordsList[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(
@@ -300,7 +306,9 @@
                               : ''
                           ]"
                           :style="{
-                            fontFamily: pItem.config.fontFamily
+                            fontFamily: pItem.config.fontFamily,
+                            height: '28px',
+                            display: 'inline-block'
                           }"
                           >{{
                             NumberList.indexOf(pItem.pinyin) == -1
@@ -411,7 +419,9 @@
                               :key="'ci' + wIndex + pIndex + index"
                               :class="[]"
                               :style="{
-                                fontFamily: pItem.config.fontFamily
+                                fontFamily: pItem.config.fontFamily,
+                                height: '28px',
+                                display: 'inline-block'
                               }"
                               >{{
                                 NumberList.indexOf(pItem.pinyin) == -1
@@ -460,7 +470,9 @@
                             :class="[]"
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 1].config.fontFamily
+                                item.sentArr[pIndex + 1].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -519,7 +531,9 @@
                             :class="[]"
                             :style="{
                               fontFamily:
-                                item.sentArr[pIndex + 2].config.fontFamily
+                                item.sentArr[pIndex + 2].config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                           >
                             {{
@@ -577,7 +591,9 @@
                             :key="'ci' + wIndex + pIndex + index"
                             :class="[]"
                             :style="{
-                              fontFamily: pItem.config.fontFamily
+                              fontFamily: pItem.config.fontFamily,
+                              height: '28px',
+                              display: 'inline-block'
                             }"
                             >{{
                               NumberList.indexOf(pItem.pinyin) == -1

src/components/Adult/preview/Picture.vue

@@ -12,7 +12,11 @@
               items.pinyin && (!items.pinyinSite || items.pinyinSite == 'top')
             "
             class="pinyin"
-            :style="{ fontSize: items.fontSize.substring(0, 2) - 6 + 'px' }"
+            :style="{
+              fontSize: items.fontSize
+                ? items.fontSize.substring(0, 2) - 6 + 'px'
+                : ''
+            }"
             >{{ items.pinyin }}</span
           >
           <p v-if="items.hanzi" :style="{ fontSize: items.fontSize }">
@@ -21,7 +25,11 @@
           <span
             v-if="items.pinyin && items.pinyinSite == 'bottom'"
             class="pinyin"
-            :style="{ fontSize: items.fontSize.substring(0, 2) - 6 + 'px' }"
+            :style="{
+              fontSize: items.fontSize
+                ? items.fontSize.substring(0, 2) - 6 + 'px'
+                : ''
+            }"
             >{{ items.pinyin }}</span
           >
         </div>
@@ -50,7 +58,11 @@
               items.pinyin && (!items.pinyinSite || items.pinyinSite == 'top')
             "
             class="pinyin"
-            :style="{ fontSize: items.fontSize.substring(0, 2) - 6 + 'px' }"
+            :style="{
+              fontSize: items.fontSize
+                ? items.fontSize.substring(0, 2) - 6 + 'px'
+                : ''
+            }"
             >{{ items.pinyin }}</span
           >
           <p v-if="items.hanzi" :style="{ fontSize: items.fontSize }">
@@ -58,7 +70,11 @@
           </p>
           <span
             v-if="items.pinyin && items.pinyinSite == 'bottom'"
-            :style="{ fontSize: items.fontSize.substring(0, 2) - 6 + 'px' }"
+            :style="{
+              fontSize: items.fontSize
+                ? items.fontSize.substring(0, 2) - 6 + 'px'
+                : ''
+            }"
             class="pinyin"
             >{{ items.pinyin }}</span
           >
@@ -223,7 +239,9 @@
                       "
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -237,7 +255,9 @@
                       v-if="itemss.pinyin && items.pinyinSite == 'bottom'"
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -262,7 +282,9 @@
                       "
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -276,7 +298,9 @@
                       v-if="itemss.pinyin && items.pinyinSite == 'bottom'"
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -305,7 +329,9 @@
                       "
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -319,7 +345,9 @@
                       v-if="itemss.pinyin && items.pinyinSite == 'bottom'"
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -345,7 +373,9 @@
                       "
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >
@@ -359,7 +389,9 @@
                       v-if="itemss.pinyin && items.pinyinSite == 'bottom'"
                       class="pinyin"
                       :style="{
-                        fontSize: items.fontSize.substring(0, 2) - 6 + 'px'
+                        fontSize: items.fontSize
+                          ? items.fontSize.substring(0, 2) - 6 + 'px'
+                          : ''
                       }"
                       >{{ itemss.pinyin }}</span
                     >

src/components/Adult/preview/Voicefullscreen.vue

@@ -232,7 +232,10 @@
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="'font-size:' + pySize + 'px'"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ pItem.pinyin }}</span
                         >
                       </template>
@@ -270,7 +273,12 @@
                                 : '',
                               pItem.words && !isPlaying ? 'newActive' : ''
                             ]"
-                            :style="'font-size:' + hzSize + 'px'"
+                            :style="{
+                              fontSize: hzSize + 'px',
+                              fontFamily: pItem.config.fontFamily,
+                              height: hzSize * 1.17 + 'px',
+                              display: 'inline-block'
+                            }"
                             >{{ pItem.chs[wIndex] }}</span
                           >
                         </template>
@@ -284,7 +292,10 @@
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="'font-size:' + pySize + 'px'"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ pItem.pinyin }}</span
                         >
                       </template>
@@ -300,7 +311,11 @@
                               : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px', textAlign: left }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            textAlign: left,
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ item[pIndex + 1].pinyin }}</span
                         >
                       </template>
@@ -331,7 +346,12 @@
                               ? 'newActive'
                               : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px' }"
+                          :style="{
+                            fontSize: hzSize + 'px',
+                            fontFamily: item[pIndex + 1].config.fontFamily,
+                            height: hzSize * 1.17 + 'px',
+                            display: 'inline-block'
+                          }"
                           >{{ item[pIndex + 1].chs }}</span
                         >
                       </span>
@@ -346,7 +366,11 @@
                             bgIndex == 1 ? 'font-white' : '',
                             'bottom'
                           ]"
-                          :style="{ fontSize: pySize + 'px', textAlign: left }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            textAlign: left,
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ item[pIndex + 1].pinyin }}</span
                         >
                       </template>
@@ -369,7 +393,11 @@
                               : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px', textAlign: left }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            textAlign: left,
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ item[pIndex + 2].pinyin }}</span
                         >
                       </template>
@@ -400,7 +428,12 @@
                               ? 'newActive'
                               : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px' }"
+                          :style="{
+                            fontSize: hzSize + 'px',
+                            fontFamily: item[pIndex + 2].config.fontFamily,
+                            height: hzSize * 1.17 + 'px',
+                            display: 'inline-block'
+                          }"
                           >{{ item[pIndex + 2].chs }}</span
                         >
                       </span>
@@ -415,7 +448,11 @@
                             bgIndex == 1 ? 'font-white' : '',
                             'bottom'
                           ]"
-                          :style="{ fontSize: pySize + 'px', textAlign: left }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            textAlign: left,
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ item[pIndex + 2].pinyin }}</span
                         >
                       </template>
@@ -433,7 +470,10 @@
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px' }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ pItem.pinyin }}</span
                         >
                       </template>
@@ -475,7 +515,12 @@
                               : '',
                             pItem.words && !isPlaying ? 'newActive' : ''
                           ]"
-                          :style="{ fontSize: hzSize + 'px' }"
+                          :style="{
+                            fontSize: hzSize + 'px',
+                            fontFamily: pItem.config.fontFamily,
+                            height: hzSize * 1.17 + 'px',
+                            display: 'inline-block'
+                          }"
                           >{{ pItem.chs[wIndex] }}</span
                         >
                       </template>
@@ -490,7 +535,10 @@
                             pItem.className ? pItem.className : '',
                             bgIndex == 1 ? 'font-white' : ''
                           ]"
-                          :style="{ fontSize: pySize + 'px' }"
+                          :style="{
+                            fontSize: pySize + 'px',
+                            height: pySize * 1.25 + 'px'
+                          }"
                           >{{ pItem.pinyin }}</span
                         >
                       </template>
@@ -706,7 +754,7 @@ export default {
         "⑲",
         "⑳"
       ],
-      chsFhList: ["，", "。", "”", "：", "》", "？", "！", "；"],
+      chsFhList: ["，", "。", "”", "：", "》", "？", "！", "；", "、"],
       enFhList: [",", ".", ";", "?", "!", ":", ">", "<"],
       curTime: 0,
       wavblob: null,