Merge branch 'NPC-lhd'

src/components/Adult/Preview.vue

@@ -684,6 +684,7 @@ export default {
   width: 860px;
   margin: 0 auto;
   position: relative;
+  padding-bottom:120px;
   .NNPE-title {
     background: #e35454;
     border-radius: 0px 0px 16px 16px;

src/components/Adult/preview/NewWordShow.vue

@@ -140,13 +140,13 @@ export default {
 //@import url(); 引入公共css类
 .NewWordShow {
   width: 100%;
+  margin-bottom: 16px;
   h2 {
-    margin: 16px 0 0;
+    margin: 0 0 8px 0;
     font-weight: 500;
     font-size: 16px;
     line-height: 24px;
     color: #000000;
-    margin-bottom: 16px;
   }
   .item-box {
     display: flex;

src/components/Adult/preview/TableView.vue

@@ -8,7 +8,7 @@
             <th
               v-for="(item, headIndex) in curQue.headerList"
               :key="'header' + headIndex"
-              :style="{ width: curQue.colWidthList[headIndex].con + '%' }"
+              :style="{ width: curQue.colWidthList[headIndex].width + '%' }"
             >
               {{ item.con }}
             </th>
@@ -18,13 +18,14 @@
           <td
             v-for="(col, colIndex) in row"
             :key="'col' + colIndex"
-            :style="{ width: curQue.colWidthList[colIndex].con + '%' }"
+            :style="{ width: curQue.colWidthList[colIndex].width + '%' }"
           >
             <template v-if="!col.isNumll">
               {{ col.con }}
             </template>
             <template v-else>
-              <input type="text" v-model="col.con" />
+                <div v-html="col.con" contenteditable="true" placeholder="输入" class="input"></div>
+              <!-- <input type="text" v-model="col.con" /> -->
             </template>
           </td>
         </tr>
@@ -110,6 +111,7 @@ export default {
       font-size: 16px;
       line-height: 150%;
       color: #000000;
+      margin: 16px 0 8px 0;
     }
     > div {
       display: flex;
@@ -161,18 +163,23 @@ export default {
     table {
       width: 100%;
       border-collapse: collapse; //取消单元格之间的间距
+      table-layout: fixed;
       tr {
         width: 100%;
         th {
           background: rgba(236, 157, 99, 0.1);
           border: 1px solid #e2cfc1;
           height: 40px;
+          font-size: 16px;
+          color: #000000;
         }
         td {
           background: #ffffff;
           border: 1px solid #e2cfc1;
           height: 64px;
           text-align: center;
+          color: #000000;
+          font-size: 16px;
           input {
             outline: none;
             border: none;
@@ -180,6 +187,17 @@ export default {
             width: 90%;
             height: 100%;
           }
+          .input{
+            width: 90%;
+            min-height:24px;
+            margin: 0 auto;
+            font-size: 16px;
+            line-height: 1.5;
+          }
+          .input:empty::before {
+            content: attr(placeholder);
+            color: rgba($color: #000000, $alpha: 0.25);
+          }
         }
       }
     }

src/components/Adult/preview/TextInputRecord.vue

@@ -107,14 +107,16 @@ export default {
         margin-right: 8px;
       }
       > b {
-        width: 24px;
-        line-height: 24px;
-        font-size: 16px;
-        text-align: right;
         margin-right: 8px;
-        font-weight: 400;
-        color: #000000;
-        font-family: "FZJCGFKTK";
+        background: #de4444;
+        text-align: center;
+        width: 16px;
+        height: 16px;
+        color: #ffffff;
+        border-radius: 100%;
+        font-size: 12px;
+        font-family: "robot";
+        line-height: 16px;
       }
       .item-con {
         min-width: 80px;
@@ -155,4 +157,22 @@ export default {
     }
   }
 }
+.NPC-Big-Book-preview-green {
+  .Big-Book-prev-Textdes {
+    li {
+      b {
+        background: #24b99e;
+      }
+    }
+  }
+}
+.NPC-Big-Book-preview-brown {
+  .Big-Book-prev-Textdes {
+    li {
+      b {
+        background: #bd8865;
+      }
+    }
+  }
+}
 </style>

src/components/Adult/preview/TinyModule.vue

@@ -46,4 +46,11 @@ export default {
         word-break: break-word;
     }
 }
+</style>
+<style lang="scss">
+.Big-Book-prev-Tiny{
+    p{
+        margin: 0;
+    }
+}
 </style>

src/components/Adult/preview/components/AudioRed.vue

@@ -53,7 +53,6 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
-    console.log(this.themeColor);
     var that = this;
     window.stopAudioVoice = function () {
       if (that.audio) {

src/views/courseView.vue

@@ -21,7 +21,7 @@
             src="../assets/common/icon-treelist.png"
             @click="treeShow"
           />
-          <h2 class="title">{{ chapterName }}</h2>
+          <!-- <h2 class="title">{{ chapterName }}</h2> -->
           <el-switch
             v-if="!treeFlag"
             v-model="switchvalue"