Browse Source

Merge branch 'NPC-lhd'

natasha 3 years ago
parent
commit
285e24f83c

+ 2 - 1
src/components/Adult/inputModules/DialogueAnswerChs/index.vue

@@ -256,7 +256,8 @@ export default {
   > .inner {
     background: #fff;
     width: 1000px;
-    height: 860px;
+    height: 100vh;
+    max-height: 860px;
     overflow-y: auto;
     margin: 0 auto;
     box-sizing: border-box;

+ 3 - 3
src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -109,7 +109,7 @@
                             >{{ pItem.pinyin }}</span
                           >
                         </span>
-                        <span class="NNPE-words-box">
+                        <span class="NNPE-words-box" v-if="item.wordsList[pIndex + 1]">
                           <span
                             v-if="pyPosition == 'top'"
                             class="NNPE-pinyin"
@@ -159,7 +159,7 @@
                       <!--下一个元素不是标点-->
                       <template v-else>
                         <span
-                          v-if="pyPosition == 'top'"
+                          v-if="pyPosition == 'top'&&item.wordsList[pIndex + 1]"
                           class="NNPE-pinyin"
                           :class="[
                             pItem.padding ? 'padding' : '',
@@ -196,7 +196,7 @@
                           </div>
                         </template>
                         <span
-                          v-if="pyPosition == 'bottom'"
+                          v-if="pyPosition == 'bottom'&&item.wordsList[pIndex + 1]"
                           class="NNPE-pinyin"
                           :class="[
                             pItem.padding ? 'padding' : '',