Bläddra i källkod

新增主题色橙色

natasha 3 veckor sedan
förälder
incheckning
f88f366347

+ 54 - 0
src/components/Adult/Preview.vue

@@ -2813,6 +2813,8 @@ export default {
                     ? "#24b99e"
                     : this.themeColor === "brown"
                     ? "#bd8865"
+                    : this.themeColor === "orange"
+                    ? "#F7931D"
                     : "#e35454";
                 sItem.fontSize = "16px";
                 sItem.fontWeight = "bold";
@@ -2824,6 +2826,8 @@ export default {
                   ? "#24b99e"
                   : this.themeColor === "brown"
                   ? "#bd8865"
+                  : this.themeColor === "orange"
+                  ? "#F7931D"
                   : "#e35454",
               fontFamily:
                 "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
@@ -3869,6 +3873,56 @@ export default {
     }
   }
 }
+.NPC-Big-Book-preview-orange {
+  .submitLookAnswer {
+    background: #f7931d;
+  }
+  .NNPE-title {
+    background: #f7931d;
+  }
+  .NNPE-operate {
+    a {
+      background: #f7931d url("../../assets/newImage/common/btn-pre.png") center
+        no-repeat;
+      background-size: 24px;
+      &.btn-next {
+        background: #f7931d url("../../assets/newImage/common/btn-next.png")
+          center no-repeat;
+        background-size: 24px;
+      }
+      &:hover {
+        background-color: #ffa31d;
+      }
+      &:active {
+        background-color: #f1911d;
+      }
+    }
+  }
+  .submitAnswer {
+    background: #f7931d;
+    &:hover {
+      background-color: #ffa31d;
+    }
+    &:active {
+      background-color: #f1911d;
+    }
+  }
+  .classTopic-box {
+    background: #f7931d;
+  }
+  .NNPE-Book-content-inner {
+    > div.title-box-preview {
+      .title-big {
+        b {
+          background: #f7931d;
+        }
+        h2 {
+          color: #f7931d;
+        }
+      }
+    }
+  }
+}
 .go-back-person {
   position: fixed;
   top: 18px;

+ 4 - 4
src/components/Adult/phonePreview/ConfigurableTable.vue

@@ -100,6 +100,10 @@
                   </span>
                   <template v-else>
                     <el-input
+                      v-if="
+                        judgeAnswer !== 'standardAnswer' ||
+                          (judgeAnswer === 'standardAnswer' && col.answer)
+                      "
                       v-model="
                         judgeAnswer === 'standardAnswer'
                           ? col.answer
@@ -120,10 +124,6 @@
                             ].answer.trim())
                       "
                       @input="enterAnswer(i, j, 'input')"
-                      v-if="
-                        judgeAnswer !== 'standardAnswer' ||
-                          (judgeAnswer === 'standardAnswer' && col.answer)
-                      "
                       :style="{ fontSize: baseSizePhone + 2 + 'px' }"
                     />
                   </template>

+ 1 - 1
src/components/Adult/phonePreview/SelectDrag.vue

@@ -43,7 +43,7 @@
           </template>
           <div v-else>
             <span
-              :key="`${isPyTop ? 'chs' : 'pinyin'}-${j}`"
+              :key="`${isPyTop ? 'chs' : 'pinyin'}-${i}`"
               :class="['chs']"
               v-text="`${item.sentence}`"
             />

+ 10 - 0
src/components/Adult/phonePreview/WordPhrase.vue

@@ -1263,4 +1263,14 @@ export default {
     }
   }
 }
+.NPC-Big-Book-preview-orange {
+  .NPC-zhedie-phone {
+    .topTitle {
+      background: #f7931d !important;
+    }
+    .tabNum {
+      background: #f7931d !important;
+    }
+  }
+}
 </style>

+ 1 - 5
src/components/Adult/preview/FillDrag.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fill-drag" :class="[isPhone ? 'fill-drag-phone' : '']">
+  <div class="fill-drag">
     <!-- 选项 -->
     <div class="fill-drag-options">
       <draggable
@@ -109,10 +109,6 @@ export default {
     themeColor: {
       type: String,
       required: true
-    },
-    isPhone: {
-      type: Boolean,
-      required: true
     }
   },
   data() {

+ 1 - 6
src/components/Adult/preview/SelectDrag.vue

@@ -2,7 +2,6 @@
 <template>
   <div
     class="select-drag"
-    :class="[isPhone ? 'select-drag-phone' : '']"
     v-if="curQue && judgeAnswer == 'standardAnswer' ? IsError : true"
   >
     <!-- 选项 -->
@@ -44,7 +43,7 @@
           </template>
           <div v-else>
             <span
-              :key="`${isPyTop ? 'chs' : 'pinyin'}-${j}`"
+              :key="`${isPyTop ? 'chs' : 'pinyin'}-${i}`"
               :class="['chs']"
               v-text="`${item.sentence}`"
             />
@@ -171,10 +170,6 @@ export default {
     judgeAnswer: {
       type: String,
       required: true
-    },
-    isPhone: {
-      type: Boolean,
-      required: true
     }
   },
   data() {

+ 10 - 0
src/components/Adult/preview/WordPhrase.vue

@@ -1177,4 +1177,14 @@ export default {
     }
   }
 }
+.NPC-Big-Book-preview-orange {
+  .NPC-zhedie {
+    .topTitle {
+      background: #f7931d !important;
+    }
+    .tabNum {
+      background: #f7931d !important;
+    }
+  }
+}
 </style>

+ 3 - 0
src/views/courseList.vue

@@ -397,6 +397,9 @@
               <el-radio v-model="formDialog.theme_color" label="brown"
                 >棕色</el-radio
               >
+              <el-radio v-model="formDialog.theme_color" label="orange"
+                >橙色</el-radio
+              >
             </el-form-item>
             <el-form-item label="教材图片" label-width="90px" prop="fileList">
               <el-upload