Merge branch 'gcj'

src/components/Adult/inputModules/Neword.vue

@@ -13,6 +13,26 @@
           :autosize="{ minRows: 2 }"
         ></el-input>
       </div>
+      <div class="adult-book-input-item">
+        <span class="adult-book-lable">标题颜色：</span>  
+        <div class="adult-book-main">
+          <el-radio-group v-model="curQue.titleBg">
+            <el-radio label="white">白色</el-radio>
+            <el-radio label="themeColor">书的主题色</el-radio> </el-radio-group
+          >  
+        </div>
+      </div>
+      <div class="adult-book-input-item">
+        <span class="adult-book-lable">详细信息：</span>  
+        <div class="adult-book-main">
+          <el-radio-group v-model="curQue.isInfor">
+            <el-radio :label="true">有</el-radio>
+            <el-radio :label="false">没有</el-radio> </el-radio-group
+          >  
+        </div>
+              
+      </div>
+
       <div
         class="Big-Book-main"
         v-for="(item, index) in curQue.option"
@@ -61,6 +81,8 @@ export default {
         type: "NewWord_chs",
         name: "生词",
         title: "",
+        isInfor: true,
+        titleBg: "", //标题背景颜色
         option: [
           [
             {
@@ -119,6 +141,13 @@ export default {
     if (!this.curQue) {
       let res_data = JSON.parse(JSON.stringify(this.data_structure));
       this.changeCurQue(res_data);
+    } else {
+      if (!this.curQue.hasOwnProperty("isInfor")) {
+        this.$set(this.curQue, "isInfor", true);
+      }
+      if (!this.curQue.hasOwnProperty("titleBg")) {
+        this.$set(this.curQue, "titleBg", "themeColor");
+      }
     }
   },
   beforeCreate() {}, //生命周期 - 创建之前

src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -229,8 +229,8 @@
                 <div class="input-record" v-if="item.isRecord">
                   <Soundrecord
                     @handleWav="handleWav"
-                    type="mini"
-                    class="mini-box"
+                    type="normal"
+                    class="normal-box"
                   />
                 </div>
                 <template
@@ -324,8 +324,8 @@
                 <div class="input-record" v-if="item.isRecord">
                   <Soundrecord
                     @handleWav="handleWav"
-                    type="mini"
-                    class="mini-box"
+                    type="normal"
+                    class="normal-box"
                   />
                 </div>
                 <template
@@ -879,6 +879,12 @@ export default {
           border-radius: 8px;
           padding: 0 12px;
         }
+        .normal-box {
+          width: 129px;
+          border: 1px solid rgba(0, 0, 0, 0.1);
+          border-radius: 8px;
+          padding: 0 12px;
+        }
       }
     }
   }

src/components/Adult/preview/WordPhrase.vue

@@ -84,7 +84,7 @@
                 class="NPC-word-tab-common NPC-word-tab-def"
                 v-html="sItem.def_str"
               ></span>
-              <span>
+              <span v-if="curQue.isInfor">
                 <img
                   src="../../../assets/NPC/detail-icon.png"
                   class="detail-icon"
@@ -426,6 +426,7 @@ export default {
         font-family: "robot";
         width: 48px;
         box-sizing: border-box;
+        text-align: right;
       }
       .NPC-word-tab-def {
         flex: 1;
@@ -518,6 +519,9 @@ export default {
     border: 1px solid rgba(0, 0, 0, 0.1);
     overflow: hidden;
     border-radius: 8px 8px 0 0;
+    &.topTitleWhite {
+      background: #fff;
+    }
     .NPC-top-left {
       display: flex;
       justify-content: flex-start;