gcj 3 年之前
父节点
当前提交
272e3bf8ca

+ 1 - 1
src/components/Adult/common/DuoSentenceSegwordChs/components/DuoSegbywordChs.vue

@@ -249,7 +249,7 @@ export default {
         let obj = {
           chs: item,
           pinyin: "",
-          fontSize: "16px",
+          fontSize: "20px",
           fontColor: "#000",
           fontFamily: "FZJCGFKTK",
           wordPadding: [],

+ 1 - 1
src/components/Adult/common/DuoSentenceSegwordChs/index.vue

@@ -106,7 +106,7 @@ export default {
           let obj = {
             chs: item,
             pinyin: "",
-            fontSize: "16px",
+            fontSize: "20px",
             fontColor: "#000",
             fontFamily: "FZJCGFKTK",
             wordPadding: [],

+ 37 - 14
src/components/Adult/common/SentenceSegTemp.vue

@@ -78,6 +78,21 @@
       </template>
       <template>
         <div class="adult-book-input-item adult-book-input-item-center">
+          <span class="adult-book-lable">字体:</span>
+          <el-radio-group
+            v-model="dItem.config.fontFamily"
+            @change="(value) => changefontFamily(value, dItem)"
+          >
+            <el-radio
+              v-for="(item, index) in fontFamilyList"
+              :key="'fontFamilyList' + index"
+              :label="item.value"
+            >
+              <span>{{ item.name }}</span>
+            </el-radio>
+          </el-radio-group>
+        </div>
+        <div class="adult-book-input-item adult-book-input-item-center">
           <span class="adult-book-lable">字的大小:</span>
           <el-radio-group v-model="dItem.config.fontSize">
             <el-radio label="12px">12px</el-radio>
@@ -105,18 +120,7 @@
             </el-radio>
           </el-radio-group>
         </div>
-        <div class="adult-book-input-item adult-book-input-item-center">
-          <span class="adult-book-lable">字体:</span>
-          <el-radio-group v-model="dItem.config.fontFamily">
-            <el-radio
-              v-for="(item, index) in fontFamilyList"
-              :key="'fontFamilyList' + index"
-              :label="item.value"
-            >
-              <span>{{ item.name }}</span>
-            </el-radio>
-          </el-radio-group>
-        </div>
+
         <div class="adult-book-input-item adult-book-input-item-center">
           <span class="adult-book-lable">设置间距:</span>
           <el-checkbox-group v-model="dItem.config.wordPadding">
@@ -131,7 +135,17 @@
         </div>
       </template>
     </div>
-    <el-button @click="addElement()">添加元素</el-button>
+    <el-button @click="addElement()" style="margin-bottom: 10px"
+      >添加元素</el-button
+    >
+    <!-- <div class="adult-book-input-item">
+      <span class="adult-book-lable">英文:</span>
+      <el-input
+        v-model="detail.en"
+        type="textarea"
+        placeholder="请输入英文翻译"
+      />
+    </div> -->
     <el-dialog
       title="功能设置"
       :close-on-click-modal="false"
@@ -268,6 +282,15 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    changefontFamily(value, dItem) {
+      if (value == "FZJCGFKTK") {
+        dItem.config.fontSize = "20px";
+      } else if (value == "Sans-GB") {
+        dItem.config.fontSize = "16px";
+      } else if (value == "robot") {
+        dItem.config.fontSize = "16px";
+      }
+    },
     addElement() {
       let obj = {
         pyPosition: "top", //top 拼音在上面;bottom 拼音在下面
@@ -277,7 +300,7 @@ export default {
         wordsList: [],
         hengList: [],
         config: {
-          fontSize: "16px",
+          fontSize: "20px",
           fontColor: "#000",
           fontFamily: "FZJCGFKTK",
           wordPadding: [],

+ 1 - 1
src/components/Adult/common/SentenceSegwordChs/components/SegbywordChs.vue

@@ -222,7 +222,7 @@ export default {
       createPinyin(data).then((res) => {
         let wordsList = res.data.result[0];
         wordsList = wordsList.map((item, index) => {
-          item.fontSize = "16px";
+          item.fontSize = "20px";
           item.fontColor = "#000";
           item.fontFamily = "FZJCGFKTK";
           item.wordPadding = [];

+ 1 - 1
src/components/Adult/common/SentenceSegwordChs/index.vue

@@ -107,7 +107,7 @@ export default {
         let obj = {
           chs: item,
           pinyin: "",
-          fontSize: "16px",
+          fontSize: "20px",
           fontColor: "#000",
           fontFamily: "FZJCGFKTK",
           wordPadding: [],

+ 1 - 1
src/components/Adult/inputModules/DialogueTem/index.vue

@@ -507,7 +507,7 @@ export default {
           let obj = {
             chs: sItem,
             pinyin: "",
-            fontSize: "16px",
+            fontSize: "20px",
             fontColor: "#000",
             fontFamily: "FZJCGFKTK",
             wordPadding: [],

+ 8 - 1
src/components/Adult/inputModules/SentenceModule.vue

@@ -10,6 +10,12 @@
       </el-radio-group>
     </div>
     <div class="adult-book-input-item">
+      <span class="adult-book-lable">序号背景:</span>
+      <el-checkbox v-model="curQue.numberBg" style="margin-top: 6px"
+        >要背景色</el-checkbox
+      >
+    </div>
+    <div class="adult-book-input-item">
       <span class="adult-book-lable">拼音位置:</span>
       <el-radio-group v-model="curQue.pyPosition">
         <el-radio :label="'top'">字的上面</el-radio>
@@ -699,6 +705,7 @@ export default {
         detail: [],
         sentenceType: "chinese",
         numberStyle: "number",
+        numberBg: false, //是否跟书籍主题色一致
         pyPosition: "top", //top 拼音在上面;bottom 拼音在下面
         pyColor: "black",
         segModel: "words", //word 按字分割;words 按词分割
@@ -1068,7 +1075,7 @@ export default {
               wordsList: [],
               hengList: [],
               config: {
-                fontSize: "16px",
+                fontSize: "20px",
                 fontColor: "#000",
                 fontFamily: "FZJCGFKTK",
                 wordPadding: [],

+ 61 - 52
src/components/Adult/preview/SentenceModule.vue

@@ -100,13 +100,17 @@
               <div
                 :class="[
                   'number-box number-box-hasmp3',
-                  items.pyNumber && items.pyNumber[0] > 0
+                  items.pyNumber &&
+                  items.pyNumber[0] > 0 &&
+                  curQue.pyPosition == 'top'
                     ? 'number-box-hasPY'
                     : '',
+                  curQue.numberBg ? '' : 'number-box-nobg',
                 ]"
               >
                 <NumberStyle
-                  className="number01"
+                  :className="curQue.numberBg ? 'number01' : 'number-nobg'"
+                  :numberBg="curQue.numberBg"
                   :numberStyle="curQue.numberStyle"
                   :numberIndex="items.index"
                 />
@@ -174,6 +178,7 @@
                         :record_check="sdItem.fn_check_list.record_check"
                         :hengLeg="sdItem.hengLeg"
                       />
+                      <!-- <div class="en" v-if="sdItem.en">{{ sdItem.en }}</div> -->
                       <div
                         class="promax-box-div"
                         v-if="
@@ -219,39 +224,38 @@
                         : '',
                     ]"
                   >
-                    <!-- 判断 -->
+                    <!-- 短输入 -->
                     <div
                       :class="[
-                        'judge-part',
-                        items.fn_check_list.judge_check.indexOf('row') > -1
-                          ? 'answer-part-padding-5'
+                        'short-part',
+                        items.pyNumber && items.pyNumber[0] > 0
+                          ? 'short-part-hasPY'
                           : '',
                       ]"
-                      v-if="sdIndex == 0 && items.fn_check_list.judge_check"
+                      v-if="sdIndex == 0 && items.fn_check_list.short_check"
                     >
-                      <JudgeTemp
-                        :isRecord="items.fn_check_list.record_check"
+                      <ShortInputTemp
+                        :doubleInput="items.correct.doubleInput"
                         :Bookanswer="curQue.Bookanswer[index][indexs]"
-                        :judge_isNo="items.judge_isNo"
                         :TaskModel="TaskModel"
-                        :Isexample="items.Isexample"
                       />
                     </div>
-
-                    <!-- 短输入 -->
+                    <!-- 判断 -->
                     <div
                       :class="[
-                        'short-part',
-                        items.pyNumber && items.pyNumber[0] > 0
-                          ? 'short-part-hasPY'
+                        'judge-part',
+                        items.fn_check_list.judge_check.indexOf('row') > -1
+                          ? 'answer-part-padding-5'
                           : '',
                       ]"
-                      v-if="sdIndex == 0 && items.fn_check_list.short_check"
+                      v-if="sdIndex == 0 && items.fn_check_list.judge_check"
                     >
-                      <ShortInputTemp
-                        :doubleInput="items.correct.doubleInput"
+                      <JudgeTemp
+                        :isRecord="items.fn_check_list.record_check"
                         :Bookanswer="curQue.Bookanswer[index][indexs]"
+                        :judge_isNo="items.judge_isNo"
                         :TaskModel="TaskModel"
+                        :Isexample="items.Isexample"
                       />
                     </div>
                     <!-- 多选题 -->
@@ -307,7 +311,11 @@
                     <!-- 录音 -->
                     <div
                       class="judge-part record-part"
-                      v-if="sdItem.fn_check_list.record_check"
+                      v-if="
+                        sdItem.fn_check_list.record_check &&
+                        items.fn_check_list.sent_check !=
+                          'sentence_long_input_chs'
+                      "
                     >
                       <Soundrecord
                         :type="
@@ -315,10 +323,11 @@
                             ? typeList[sdItem.fn_check_list.record_check]
                             : 'normal'
                         "
-                        :class="
+                        :class="[
                           'record_' +
-                          typeList[sdItem.fn_check_list.record_check]
-                        "
+                            typeList[sdItem.fn_check_list.record_check],
+                          'record-common',
+                        ]"
                         :TaskModel="TaskModel"
                         :tmIndex="sdIndex"
                         :answerRecordList="
@@ -691,10 +700,10 @@ export default {
       border: 1px solid rgba(0, 0, 0, 0.1);
       border-radius: 8px;
       margin: 8px 0;
-      padding: 8px 12px;
+      padding: 9px 12px;
       .number-box {
-        width: 24px;
-        height: 32px;
+        width: 16px;
+        height: 30px;
         border-radius: 100%;
         display: flex;
         justify-content: center;
@@ -704,9 +713,13 @@ export default {
         // &-hasmp3 {
         //   margin-top: 8px;
         // }
-        // &-hasPY {
-        //   margin-top: 27px;
-        // }
+        &-hasPY {
+          margin-top: 17px;
+        }
+        &-nobg {
+          width: 24px;
+          justify-content: flex-end;
+        }
       }
       > .number-box {
         margin-right: 16px;
@@ -725,10 +738,7 @@ export default {
     .sent-stem {
       flex: 1;
       display: flex;
-      //   padding: 9px 16px 9px 16px;
-      //   border-radius: 8px;
       background: #fff;
-      align-items: center;
       .stem-content {
         flex: 1;
       }
@@ -742,7 +752,7 @@ export default {
         width: 100%;
         display: flex;
         flex-wrap: wrap;
-        padding: 7px 0;
+        // padding: 7px 0;
         box-sizing: border-box;
         &-138 {
           padding-right: 138px;
@@ -777,7 +787,7 @@ export default {
         &.answer-part-138 {
           position: absolute;
           right: 0px;
-          top: 2px;
+          top: 0px;
         }
         > div {
           margin-left: 16px;
@@ -801,32 +811,31 @@ export default {
       }
     }
   }
-  .record_mini {
-    width: 68px;
-    background: #FFFFFF;
-border: 1px solid rgba(0, 0, 0, 0.1);
-box-sizing: border-box;
-border-radius: 8px;
-    padding: 0 8px;
-    margin: 0 auto;
-  }
-  .record_normal {
-    width: 138px;
-    border-radius: 20px;
-    padding: 0 16px;
+  .record-common {
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    box-sizing: border-box;
+    border-radius: 8px;
+    padding: 0 12px;
     margin: 0 auto;
   }
+  // .record_mini {
+  //   width: 68px;
+  // }
+  // .record_normal {
+  //   width: 126px;
+  // }
   .promax-box-div {
-    height: 16px;
     width: 100%;
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    box-sizing: border-box;
+    border-radius: 0px 0px 8px 8px;
     .promax-box {
-      position: absolute;
-      bottom: 4px;
-      left: 24px;
       width: 320px;
+      height: 40px;
       border-radius: 20px;
       padding: 0 16px;
-      margin: 0 auto;
     }
   }
   &.hasmp3 {

+ 9 - 2
src/components/Adult/preview/Soundrecord.vue

@@ -176,8 +176,15 @@ export default {
       deep: true,
     },
     answerRecordList(newVal) {
-      this.recordList = newVal;
-      this.selectIndex = this.recordList.length - 1;
+      let _this = this;
+      _this.recordList = newVal;
+      _this.selectIndex = _this.recordList.length - 1;
+      _this.$emit(
+        "getSelectData",
+        _this.recordList[_this.selectIndex].selectData
+      );
+      _this.recordFile = _this.recordList.length + 1;
+      _this.handleChangeRecord(this.selectIndex);
     },
   },
   // 生命周期 - 创建完成(可以访问当前this实例)

+ 28 - 17
src/components/Adult/preview/Soundrecorddiff.vue

@@ -16,12 +16,12 @@
     <div
       v-if="
         (TaskModel != 'ANSWER' && !microphoneStatus && recordList.length > 0) ||
-          TaskModel == 'ANSWER'
+        TaskModel == 'ANSWER'
       "
       :class="[
         'hasRecord',
         bgIndex == 1 ? 'hasRecord-white' : '',
-        TaskModel == 'ANSWER' ? 'hasRecord-answer' : ''
+        TaskModel == 'ANSWER' ? 'hasRecord-answer' : '',
       ]"
     >
       <div
@@ -37,7 +37,8 @@
       <span
         class="record-time"
         :class="[TaskModel == 'ANSWER' ? 'disabled' : '']"
-      >{{ isPlaying ? "-" : "" }}{{ handleDateTime(recordtime) }}</span>
+        >{{ isPlaying ? "-" : "" }}{{ handleDateTime(recordtime) }}</span
+      >
       <el-select
         v-model="selectIndex"
         placeholder="无录音"
@@ -79,7 +80,7 @@ export default {
       recorder: new Recorder({
         sampleBits: 16, // 采样位数,支持 8 或 16,默认是16
         sampleRate: 16000, // 采样率,支持 11025、16000、22050、24000、44100、48000,根据浏览器默认值,我的chrome是48000
-        numChannels: 1 // 声道,支持 1 或 2, 默认是1
+        numChannels: 1, // 声道,支持 1 或 2, 默认是1
       }),
       microphoneStatus: false,
       hasMicro: "", // 录音后的样式class
@@ -92,15 +93,27 @@ export default {
       selectIndex: null, // 选中的录音索引
       oldIndex: null, // 存储播放录音索引
       playtime: 0, // 播放时间
-      isPlaying: false
+      isPlaying: false,
     };
   },
-  watch: {},
+  watch: {
+    answerRecordList(newVal) {
+      let _this = this;
+      _this.recordList = newVal;
+      _this.selectIndex = _this.recordList.length - 1;
+      _this.$emit(
+        "getSelectData",
+        _this.recordList[_this.selectIndex].selectData
+      );
+      _this.recordFile = _this.recordList.length + 1;
+      _this.handleChangeRecord(this.selectIndex);
+    },
+  },
   // 生命周期 - 创建完成(可以访问当前this实例)
   created() {
     this.handleActive();
     let that = this;
-    window.stopAudioSound = function() {
+    window.stopAudioSound = function () {
       if (that.audio) {
         that.audio.pause();
       }
@@ -114,10 +127,7 @@ export default {
       : [];
     if (_this.recordList.length > 0) {
       _this.selectIndex = 0;
-      this.$emit(
-        "getSelectData",
-        this.recordList[0].selectData
-      );
+      this.$emit("getSelectData", this.recordList[0].selectData);
       _this.recordFile = _this.recordList.length + 1;
       _this.handleChangeRecord(0);
       if (_this.TaskModel != "ANSWER") {
@@ -130,16 +140,16 @@ export default {
     } else if (_this.TaskModel == "ANSWER") {
       _this.hasMicro = "disabled";
     }
-    _this.audio.addEventListener("play", function() {
+    _this.audio.addEventListener("play", function () {
       _this.changeStatus("active");
       _this.isPlaying = true;
       _this.$emit("getPlayStatus", true);
     });
-    _this.audio.addEventListener("pause", function() {
+    _this.audio.addEventListener("pause", function () {
       _this.changeStatus("normal");
       _this.$emit("getPlayStatus", false);
     });
-    _this.audio.addEventListener("ended", function() {
+    _this.audio.addEventListener("ended", function () {
       _this.changeStatus("normal");
       _this.isPlaying = false;
       _this.$emit("getPlayStatus", false);
@@ -175,8 +185,9 @@ export default {
           name: _this.fileName
             ? _this.fileName + _this.recordFile
             : "新录音" + _this.recordFile,
-          id: _this.recordFile + Math.round(Math.random() * 10)
+          id: _this.recordFile + Math.round(Math.random() * 10),
         };
+        console.log(this.selectData);
         if (this.selectData) obj.selectData = this.selectData;
         _this.recordList.push(obj);
         _this.recordFile++;
@@ -333,8 +344,8 @@ export default {
         }
         this.$emit("getRerordStatus", this.recordList.length > 0);
       }
-    }
-  } // 如果页面有keep-alive缓存功能,这个函数会触发
+    },
+  }, // 如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="scss" scoped>

+ 29 - 81
src/components/Adult/preview/components/JudgeTemp.vue

@@ -9,25 +9,18 @@
     v-if="Bookanswer"
     :style="{ width: judgeWidth + 'px' }"
   >
-    <div
-      :class="['judge-option', Bookanswer.judge == 'true' ? 'rActive' : '']"
+    <a
+      :class="['right-btn', Bookanswer.judge == 'true' ? 'active' : '']"
       @click="changeOption('true')"
     >
-      <svg-icon icon-class="right-icon" className="judge-icon-right"></svg-icon>
-    </div>
-    <div
-      :class="['judge-option', Bookanswer.judge == 'false' ? 'fActive' : '']"
+      <img src="../../../../assets/newImage/common/right-btn.png" />
+    </a>
+    <a
+      :class="['error-btn', Bookanswer.judge == 'false' ? 'active' : '']"
       @click="changeOption('false')"
     >
-      <svg-icon icon-class="false-icon" className="judge-icon-false"></svg-icon>
-    </div>
-    <div
-      :class="['judge-option', Bookanswer.judge == 'unso' ? 'unActive' : '']"
-      @click="changeOption('unso')"
-      v-if="judge_isNo"
-    >
-      <svg-icon icon-class="unso-icon" className="judge-icon-unso"></svg-icon>
-    </div>
+      <img src="../../../../assets/newImage/common/error-btn.png" />
+    </a>
   </div>
 </template>
 
@@ -41,7 +34,7 @@ export default {
   computed: {
     judgeWidth() {
       let _this = this;
-      let value = 138;
+      let value = 80;
       if (_this.isRecord) {
         value = 138;
       } else {
@@ -86,76 +79,31 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 40px;
-  width: 138px;
-
-  overflow: hidden;
-  background: #ffffff;
-  &-138 {
-    border-radius: 32px;
-    .judge-option {
-      border-radius: 20px;
-    }
-  }
-  &-80 {
-    border-radius: 40px;
-    .judge-option {
-      border-radius: 40px;
-    }
-  }
-  &.judge-temp-example {
-    background: rgba(0, 0, 0, 0.04);
-    .judge-option {
-      cursor: not-allowed;
-      .svg-icon.judge-icon-right {
-        stroke: rgba(0, 0, 0, 0.25);
-      }
-      .svg-icon.judge-icon-false {
-        color: rgba(0, 0, 0, 0.25);
-      }
-    }
-  }
-  .judge-option {
-    flex: 1;
+  height: 32px;
+  a {
+    width: 32px;
+    height: 32px;
+    border-radius: 8px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
     display: flex;
     justify-content: center;
     align-items: center;
-
-    height: 40px;
-    cursor: pointer;
-    .judge-icon {
-      width: 16px;
-      height: 16px;
-    }
-    .judge-icon-right {
-      @extend .judge-icon;
-      stroke: #13d578;
-    }
-    .judge-icon-false {
-      @extend .judge-icon;
-      color: #ff5555;
+    > img {
+      width: 24px;
+      height: 24px;
     }
-    .judge-icon-unso {
-      @extend .judge-icon;
-      color: rgba(51, 51, 51, 0.45);
-    }
-    &.rActive {
-      background: #13d578;
-      .judge-icon-right {
-        stroke: #fff !important;
-      }
+    &:hover,
+    &.active {
+      background-color: #e5fff0;
+      border-color: #00c850;
     }
-    &.fActive {
-      background: #ff5555;
-      .judge-icon-false {
-        color: #fff !important;
-      }
-    }
-    &.unActive {
-      background: #f1f1f1;
-      .judge-icon-unso {
-        color: #333 !important;
-      }
+  }
+  a.error-btn {
+    margin-left: 4px;
+    &:hover,
+    &.active {
+      background-color: #ffe5e5;
+      border-color: #de4444;
     }
   }
 }

+ 11 - 7
src/components/Adult/preview/components/NumberStyle.vue

@@ -1,14 +1,12 @@
 <!--  -->
 <template>
-  <div :class="className">
-    {{ numberValue }}
-  </div>
+  <div :class="className">{{ numberValue }}{{ !numberBg ? "." : "" }}</div>
 </template>
 
 <script>
 export default {
   components: {},
-  props: ["numberStyle", "numberIndex", "className"],
+  props: ["numberStyle", "numberIndex", "className", "numberBg"],
   data() {
     return {
       enList: [
@@ -114,6 +112,12 @@ export default {
 <style lang='scss' scoped>
 //@import url(); 引入公共css类
 // //@import "../common.scss";
+.number-nobg {
+  font-size: 16px;
+  line-height: 150%;
+  color: #000;
+  font-family: "robot";
+}
 .number01 {
   width: 16px;
   height: 16px;
@@ -127,12 +131,12 @@ export default {
   background: #de4444;
 }
 .NPC-Big-Book-preview-green {
-  .number01{
-      background: #24b99e;
+  .number01 {
+    background: #24b99e;
   }
 }
 .NPC-Big-Book-preview-brown {
-  .number01{
+  .number01 {
     background: #bd8865;
   }
 }

+ 19 - 46
src/components/Adult/preview/components/OneSentenceTemp.vue

@@ -94,9 +94,6 @@
                 v-if="pyNumber > 0 && pyPosition == 'top'"
                 class="RLC-pinyin"
                 :class="[
-                  pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                  pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                  pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                   noFont.indexOf(detail.wordsList[pIndex + 1].pinyin) > -1
                     ? 'noFont'
                     : '',
@@ -126,9 +123,6 @@
                 v-if="pyNumber > 0 && pyPosition == 'bottom'"
                 class="RLC-pinyin"
                 :class="[
-                  pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                  pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                  pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                   noFont.indexOf(detail.wordsList[pIndex + 1].pinyin) > -1
                     ? 'noFont'
                     : '',
@@ -149,9 +143,6 @@
                 v-if="pyNumber > 0 && curQue.pyPosition == 'top'"
                 :class="[
                   'RLC-pinyin',
-                  pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                  pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                  pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                   noFont.indexOf(detail.wordsList[pIndex + 2].pinyin) > -1
                     ? 'noFont'
                     : '',
@@ -175,9 +166,6 @@
                 v-if="pyNumber > 0 && curQue.pyPosition == 'bottom'"
                 :class="[
                   'RLC-pinyin',
-                  pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                  pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                  pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                   noFont.indexOf(detail.wordsList[pIndex + 2].pinyin) > -1
                     ? 'noFont'
                     : '',
@@ -195,9 +183,6 @@
               class="RLC-pinyin"
               :class="[
                 pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                 noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
               ]"
               >{{ pItem.pinyin | handlePY }}</span
@@ -258,9 +243,6 @@
               class="RLC-pinyin"
               :class="[
                 pItem.chs != '“' && pItem.padding ? 'padding' : '',
-                pyColor == 'black' ? 'RLC-pinyin-black' : '',
-                pyColor == 'grey' ? 'RLC-pinyin-grey' : '',
-                pyColor == 'sub' ? 'RLC-pinyin-sub' : '',
                 noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
               ]"
               >{{ pItem.pinyin | handlePY }}</span
@@ -352,15 +334,7 @@ export default {
         _this.fn_check_list.sent_check == "sentence_long_input_chs" &&
         _this.fn_check_list.style_check == "sentence_textarea_chs"
       ) {
-        if (!_this.bgColor || _this.bgColor == "grey") {
-          classname = "answer-input-textarea-white";
-        }
-        if (_this.bgColor == "white") {
-          classname = "answer-input-textarea-grey";
-        }
-        if (_this.bgColor == "theme") {
-          classname = "answer-input-textarea-theme";
-        }
+        classname = "answer-input-textarea";
       }
       return classname;
     },
@@ -446,12 +420,12 @@ export default {
     }
   }
   .answer-input {
-    min-height: 25px;
+    min-height: 24px;
     box-sizing: border-box;
     border: 0;
     border-bottom: 1px rgba(0, 0, 0, 0.45) solid;
     background: 0 0;
-    min-width: 120px;
+    min-width: 100px;
     outline: 0;
     text-align: left;
     font-family: "FZJCGFKTK";
@@ -459,10 +433,20 @@ export default {
     color: rgba(0, 0, 0, 0.45);
     box-sizing: border-box;
     color: #000000;
-    line-height: 150%;
+    line-height: 145%;
     &-input {
       min-width: 432px;
     }
+    &-textarea {
+      min-width: 432px;
+      min-height: 64px;
+      box-sizing: border-box;
+      padding: 8px 16px;
+      border-radius: 8px 8px 0 0;
+      background: #ffffff;
+      border: 1px solid rgba(0, 0, 0, 0.1);
+      border-bottom: 0;
+    }
     &.answer-textarea {
       min-width: 432px;
       border: 0;
@@ -471,18 +455,7 @@ export default {
       padding: 16px 24px 20px;
       border-radius: 8px;
     }
-    &-textarea-grey {
-      @extend .answer-textarea;
-      background: #f5f5f5;
-    }
-    &-textarea-white {
-      @extend .answer-textarea;
-      background: #fff;
-    }
-    &-textarea-theme {
-      @extend .answer-textarea;
-      //@include background_color("theme_color_015");
-    }
+
     &-auto {
       min-width: 518px !important;
     }
@@ -494,10 +467,10 @@ export default {
 .RLC-pinyin {
   font-family: "Sans-GB";
   font-weight: normal;
-  font-size: 12px;
-  line-height: 12px;
-  color: #000000;
-  height: 12px;
+  font-size: 14px;
+  line-height: 130%;
+  color: rgba(0, 0, 0, 0.6);
+  height: 18px;
   text-align: center;
   &-black {
     color: #000;

+ 2 - 2
vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: `https://gcls.utschool.cn/`,
-        target: `https://gcls.helxsoft.cn/`,
+        target: `https://gcls.utschool.cn/`,
+        //target: `https://gcls.helxsoft.cn/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''