Merge branch 'NPC-lhd'--打包前

src/components/Adult/preview/NewWordShow.vue

@@ -166,16 +166,16 @@ export default {
             .bwc-line {
                 width: 1px;
                 height: 62px;
-                background: #BF875E;
+                background: #DE4444;
             }
         }
         .con-box{
             display: flex;
-            border: 1px solid #BF875E;
+            border: 1px solid #DE4444;
             border-radius: 8px;
             overflow: hidden;
             .img-box{
-                background: #fff url('../../../assets/NPC/chinaTianYellow.png') center no-repeat;
+                background: #fff url('../../../assets/NPC/chinaTianRed.png') center no-repeat;
                 background-size: cover;
                 .img_url{
                     width: 64px;
@@ -185,7 +185,7 @@ export default {
             .blank-item{
                 width: 64px;
                 height: 64px;
-                background: #fff url('../../../assets/NPC/chinaTianYellow.png') center no-repeat;
+                background: #fff url('../../../assets/NPC/chinaTianRed.png') center no-repeat;
                 background-size: cover;
                 img{
                     width: 100%;
@@ -214,18 +214,78 @@ export default {
         }
     }
 }
+.NNPE-Big-Book-preview-brown{
+    .NewWordShow{
+        .item-box{
+            .item{
+                .bwc-line {
+                    background: #BF875E;
+                }
+            }
+            .con-box{
+                border: 1px solid #BF875E;
+                .img-box{
+                    background: #fff url('../../../assets/NPC/chinaTianYellow.png') center no-repeat;
+                    background-size: cover;
+                }
+                .blank-item{
+                    background: #fff url('../../../assets/NPC/chinaTianYellow.png') center no-repeat;
+                    background-size: cover;
+                }
+            }
+        }
+    }
+}
+.NNPE-Big-Book-preview-green{
+    .NewWordShow{
+        .item-box{
+            .item{
+                .bwc-line {
+                    background: #24B99E;
+                }
+            }
+            .con-box{
+                border: 1px solid #24B99E;
+                .img-box{
+                    background: #fff url('../../../assets/NPC/chinaTianGreen.png') center no-repeat;
+                    background-size: cover;
+                }
+                .blank-item{
+                    background: #fff url('../../../assets/NPC/chinaTianGreen.png') center no-repeat;
+                    background-size: cover;
+                }
+            }
+        }
+    }
+}
 </style>
 <style lang="scss">
-.NewWordShow{
-    .strock-play-box{
-        width: 16px;
-        height: 16px;
-        right: -1px;
-        background: url('../../../assets/NPC/strock-play-yellow-click.png') center no-repeat;
-        background-size: cover;
+.NNPE-Big-Book-preview-green{
+    .NewWordShow{
+        .strock-play-box{
+            width: 16px;
+            height: 16px;
+            right: -1px;
+            background: url('../../../assets/NPC/strock-play-green-click.png') center no-repeat;
+            background-size: cover;
+        }
+        .character-target-div{
+            // background-color: initial;
+        }
     }
-    .character-target-div{
-        // background-color: initial;
+}
+.NNPE-Big-Book-preview-brown{
+    .NewWordShow{
+        .strock-play-box{
+            width: 16px;
+            height: 16px;
+            right: -1px;
+            background: url('../../../assets/NPC/strock-play-yellow-click.png') center no-repeat;
+            background-size: cover;
+        }
+        .character-target-div{
+            // background-color: initial;
+        }
     }
 }
 </style>

src/components/Adult/preview/RecordModule.vue

@@ -67,6 +67,7 @@ export default {
     }
     .record_control_mini{
         width: 64px;
+        padding: initial;
     }
     .record_control_normal{
         width:129px;

src/components/Adult/preview/SelectYinjie.vue

@@ -130,5 +130,36 @@ export default {
     }
 
 }
-
+.NNPE-Big-Book-preview-green{
+    .SelectYinjie{
+        .item-box{
+            b{
+                background: #24B99E;
+            }
+            .zijie-box{
+                p{
+                    &.active{
+                        background: #24B99E; 
+                    }
+                }
+            }
+        }
+    }
+}
+.NNPE-Big-Book-preview-brown{
+    .SelectYinjie{
+        .item-box{
+            b{
+                background: #BD8865;
+            }
+            .zijie-box{
+                p{
+                    &.active{
+                        background: #BD8865; 
+                    }
+                }
+            }
+        }
+    }
+}
 </style>

src/components/Adult/preview/SentenceSort.vue

@@ -101,4 +101,22 @@ export default {
         }
     }
 }
+.NNPE-Big-Book-preview-green{
+    .sentenceSort {
+        .item-box{
+            b{
+                background: #24B99E;
+            }
+        }
+    }
+}
+.NNPE-Big-Book-preview-brown{
+    .sentenceSort {
+        .item-box{
+            b{
+                background: #BD8865;
+            }
+        }
+    }
+}
 </style>

src/components/Adult/preview/SentenceSortQP.vue

@@ -177,7 +177,6 @@ export default {
       border-radius: 50%;
       font-weight: bold;
       font-size: 16px;
-      color: #ffffff;
       font-family: "robot";
       line-height: 32px;
       margin-right: 4px;
@@ -254,4 +253,22 @@ export default {
     }
   }
 }
+.NNPE-Big-Book-preview-green{
+    .sentenceSort {
+        .item-box{
+            b{
+                background: #24B99E;
+            }
+        }
+    }
+}
+.NNPE-Big-Book-preview-brown{
+    .sentenceSort {
+        .item-box{
+            b{
+                background: #BD8865;
+            }
+        }
+    }
+}
 </style>

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

@@ -399,4 +399,14 @@ export default {
     display: flex;
   }
 }
+.NNPE-Big-Book-preview-green{
+    .strockplay {
+        border-color: #24B99E;
+    }
+}
+.NNPE-Big-Book-preview-brown{
+    .strockplay {
+        border-color: #BD8865;
+    }
+}
 </style>

src/styles/index.scss

@@ -249,45 +249,43 @@ input:-ms-input-placeholder {
 }
 
 .adult-book-preview-sty {
-    &.preview-red {
-        .Audio {
-            .audioLine {
-                .playBtn {
-                    background: url("../assets/icon/pause-16-normal-red.png") no-repeat left top;
-                    background-size: 100% 100%;
-                }
-                .pauseBtn {
-                    background: url("../assets/icon/play-16-normal-red.png") no-repeat left top;
-                    background-size: 100% 100%;
-                }
-                .el-slider__bar {
-                    height: 2px;
-                    background: #DE4444;
-                }
-                .el-slider__button {
-                    background: #DE4444;
-                    border: none;
-                }
-                .el-slider__button-wrapper {
-                    width: 25px;
-                }
+    .Audio {
+        .audioLine {
+            .playBtn {
+                background: url("../assets/icon/pause-16-normal-red.png") no-repeat left top;
+                background-size: 100% 100%;
             }
-        }
-        .Repeat-16 {
-            background: url("../assets/icon/Repeat-16-normal-red.png") no-repeat left top;
-            background-size: 100% 100%;
-            &.disabled {
-                background: url("../assets/icon/Repeat-16-disable-Black.png") no-repeat left top;
+            .pauseBtn {
+                background: url("../assets/icon/play-16-normal-red.png") no-repeat left top;
                 background-size: 100% 100%;
             }
+            .el-slider__bar {
+                height: 2px;
+                background: #DE4444;
+            }
+            .el-slider__button {
+                background: #DE4444;
+                border: none;
+            }
+            .el-slider__button-wrapper {
+                width: 25px;
+            }
         }
-        .pinyin-16 {
-            background: url("../assets/icon/pinyin-16-normal-red.png") no-repeat left top;
+    }
+    .Repeat-16 {
+        background: url("../assets/icon/Repeat-16-normal-red.png") no-repeat left top;
+        background-size: 100% 100%;
+        &.disabled {
+            background: url("../assets/icon/Repeat-16-disable-Black.png") no-repeat left top;
+            background-size: 100% 100%;
+        }
+    }
+    .pinyin-16 {
+        background: url("../assets/icon/pinyin-16-normal-red.png") no-repeat left top;
+        background-size: 100% 100%;
+        &.disabled {
+            background: url("../assets/icon/pinyin-16-disable-Black.png") no-repeat left top;
             background-size: 100% 100%;
-            &.disabled {
-                background: url("../assets/icon/pinyin-16-disable-Black.png") no-repeat left top;
-                background-size: 100% 100%;
-            }
         }
     }
     &.NNPE-Big-Book-preview-green {