natasha 6 månader sedan
förälder
incheckning
b9835b9d1f
2 ändrade filer med 46 tillägg och 21 borttagningar
  1. 37 15
      src/components/Adult/Preview.vue
  2. 9 6
      src/components/Adult/phonePreview/SelectTone.vue

+ 37 - 15
src/components/Adult/Preview.vue

@@ -437,6 +437,7 @@
                               currentTreeID
                           "
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.data.type == 'image'">
@@ -447,6 +448,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -470,6 +472,7 @@
                               currentTreeID
                           "
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -496,7 +499,7 @@
                               currentTreeID
                           "
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -520,6 +523,7 @@
                               currentTreeID
                           "
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -534,6 +538,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -556,7 +561,7 @@
                           :judge-answer="itemJ"
                           :col-length="items.length"
                           :NpcNewWordMp3="NpcNewWordMp3"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <!-- <template v-if="itemss.type == 'sentence_segword_chs'">
@@ -587,7 +592,7 @@
                           :judge-answer="itemJ"
                           :col-length="items.length"
                           :NpcNewWordMp3="NpcNewWordMp3"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'dialogue_answer_chs'">
@@ -598,7 +603,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'input_record_chs'">
@@ -608,7 +613,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'recordHZ_inputPY_chs'">
@@ -618,7 +623,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -637,6 +642,7 @@
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
                           :type="itemss.type"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'NumberCombination_chs'">
@@ -646,6 +652,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -670,7 +677,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type === 'fill_drag'">
@@ -680,7 +687,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type === 'config_table'">
@@ -690,6 +697,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type === 'header_separate'">
@@ -699,6 +707,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'toneSelect_chs'">
@@ -708,7 +717,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'sudoku_chs'">
@@ -718,6 +727,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'single_chs'">
@@ -727,6 +737,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'text_problem_chs'">
@@ -736,6 +747,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -751,7 +763,7 @@
                           :index-str="index + '_' + indexs + '_' + indexss"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -765,7 +777,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -777,7 +789,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'sort_chs'">
@@ -787,7 +799,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -799,7 +811,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -817,6 +829,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -833,6 +846,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -848,6 +862,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -862,7 +877,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
-                          :isPhone="isPhone"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -887,6 +902,7 @@
                           "
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'table_chs'">
@@ -897,6 +913,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'play_record_chs'">
@@ -907,6 +924,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -922,6 +940,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
 
@@ -933,6 +952,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template
@@ -948,6 +968,7 @@
                           :index-str="index + '_' + indexs + '_' + indexss"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <template v-if="itemss.type == 'sentence_single_chs'">
@@ -958,6 +979,7 @@
                           :theme-color="themeColor"
                           :task-model="TaskModel"
                           :judge-answer="itemJ"
+                          :baseSizePhone="baseSizePhone"
                         />
                       </template>
                       <!-- {{ itemss.type }} -->

+ 9 - 6
src/components/Adult/phonePreview/SelectTone.vue

@@ -1,9 +1,8 @@
 <!--  -->
 <template>
   <div
-    class="Big-Book-prev-Textdes SelectTone"
+    class="Big-Book-prev-Textdes SelectTone SelectTone-phone"
     v-if="isShowTemp"
-    :class="[isPhone ? 'SelectTone-phone' : '']"
   >
     <div
       class="aduioLine-box"
@@ -44,7 +43,11 @@
                 )
               "
             ></a>
-            <div v-html="item.con" class="con"></div>
+            <div
+              v-html="item.con"
+              class="con"
+              :style="{ fontSize: baseSizePhone + 'px !important' }"
+            ></div>
             <a
               v-for="(itmes, indexs) in toneList"
               :key="indexs"
@@ -70,7 +73,7 @@ import AudioLine from "../preview/AudioLine.vue";
 
 export default {
   components: { Audio, AudioLine },
-  props: ["curQue", "themeColor", "TaskModel", "judgeAnswer", "isPhone"],
+  props: ["curQue", "themeColor", "TaskModel", "judgeAnswer", "baseSizePhone"],
   data() {
     return {
       toneList: [
@@ -294,7 +297,7 @@ export default {
       border-radius: 8px;
       display: flex;
       align-items: center;
-      padding: 8px 12px 8px 16px;
+      padding: 10px;
       margin: 8px 0;
       .play-btn {
         width: 16px;
@@ -428,7 +431,7 @@ export default {
         p {
           margin: 0;
           font-family: "Sans-GBNPC" !important;
-          font-size: 16px !important;
+          // font-size: 16px !important;
           background: transparent !important;
           .pinyin {
             font-family: "Sans-GBNPC" !important;