Merge branch 'NPC-lhd'

src/components/Adult/preview/InputHasRecord.vue

@@ -48,7 +48,7 @@
                                                             <span class="hanzi content-con">{{itemCon.chs}}</span>
                                                         </div>
                                                         <div style="text-align: left">
-                                                            <span class="pinyin">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                                            <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
                                                             <span class="hanzi content-con">{{items.detail.wordsList[indexCon + 1].chs}}</span>
                                                         </div>
                                                     </div>
@@ -91,7 +91,7 @@
                                                 <span class="hanzi content-con">{{itemCon.chs}}</span>
                                             </div>
                                             <div style="text-align: left">
-                                                <span class="pinyin">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                                <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
                                                 <span class="hanzi content-con">{{items.detail.wordsList[indexCon + 1].chs}}</span>
                                             </div>
                                         </div>
@@ -127,6 +127,7 @@ export default {
         wordShow: ["1"],
         textareaCon: '', // 输入框
         chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+        noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
     };
   },
   computed: {},
@@ -268,6 +269,9 @@ export default {
                 line-height: 16px;
                 color: #000000;
                 height: 16px;
+                &.noFont{
+                    font-family: initial;
+                }
             }
             .synthesis-box{
                 display: flex;

src/components/Adult/preview/components/FreePaint.vue

@@ -198,14 +198,16 @@ export default {
         font-weight: bold;
         font-size: 14px;
         line-height: 34px;
-        color: #ff5757;
+        color: #fff;
         cursor: pointer;
-        background: #ffe6e6;
+        background: #DE4444;
         border-radius: 8px;
-        // &:hover {
-          background: #ff5757;
-          color: #ffffff;
-        // }
+        &:hover {
+          background: #F76565;
+        }
+        &:active{
+            background: #C43C3C;
+        }
       }
     }
     .right-strockred {
@@ -361,6 +363,40 @@ export default {
 .el-tabs {
   width: 100%;
 }
+.NNPE-Big-Book-preview-green{
+    .practice {
+        .right-content {
+            .nav-list {
+                > li {
+                    background: #24B99E;
+                    &:hover {
+                        background: #3DD4B8;
+                    }
+                    &:active{
+                        background: #1FA189;
+                    }
+                }
+            }
+        }
+    }
+}
+.NNPE-Big-Book-preview-brown{
+    .practice {
+        .right-content {
+            .nav-list {
+                > li {
+                    background: #BD8865;
+                    &:hover {
+                        background: #D6A687;
+                    }
+                    &:active{
+                        background: #A37557;
+                    }
+                }
+            }
+        }
+    }
+}
 </style>
 <style lang="scss">
 .practiceSingle {