Browse Source

背景设置优化

dsy 3 days ago
parent
commit
d948bc571e

+ 2 - 8
src/courseware_preview/index.vue

@@ -34,12 +34,8 @@
     </div>
 
     <div class="audit-content">
-      <div
-        ref="previewMain"
-        class="main-container"
-        :style="{ paddingRight: sidebarShow ? '15px' : '315px', ...computedCommonPreviewStyle() }"
-      >
-        <main :class="['preview-main']">
+      <div ref="previewMain" class="main-container" :style="{ paddingRight: sidebarShow ? '15px' : '315px' }">
+        <main :class="['preview-main']" :style="computedCommonPreviewStyle()">
           <div class="preview-left" :style="{ backgroundColor: background.background?.is_global ? '' : '#fff' }"></div>
           <CoursewarePreview
             v-if="courseware_info.book_name"
@@ -1255,14 +1251,12 @@ $total-width: $courseware-width + $courseware-left-margin + $courseware-right-ma
       width: $courseware-left-margin;
       min-width: $courseware-left-margin;
       max-width: $courseware-left-margin;
-      background-color: $courseware-bgColor;
     }
 
     .preview-right {
       width: $courseware-right-margin;
       min-width: $courseware-right-margin;
       max-width: $courseware-right-margin;
-      background-color: $courseware-bgColor;
     }
 
     &.no-audit {

+ 2 - 2
src/views/book/courseware/preview/CoursewarePreview.vue

@@ -424,7 +424,6 @@ export default {
         backgroundSize: bcImgUrl ? `${pos.width}% ${pos.height}%` : '',
         backgroundPosition: bcImgUrl ? `${pos.left}% ${pos.top}%` : '',
         backgroundImage: bcImgUrl ? `url(${bcImgUrl})` : '',
-        backgroundColor: bcImgUrl ? `rgba(255, 255, 255, ${1 - back?.image_opacity / 100})` : '',
       };
 
       if (back) {
@@ -458,6 +457,8 @@ export default {
 
         if (back.has_color) {
           canvasStyle['backgroundColor'] = back.color;
+        } else {
+          canvasStyle['backgroundColor'] = '#fff';
         }
 
         if (back.enable_border) {
@@ -967,7 +968,6 @@ export default {
   padding-top: $courseware-top-padding;
   padding-bottom: $courseware-bottom-padding;
   margin: 15px 0;
-  background-color: #fff;
   background-repeat: no-repeat;
   border-bottom-right-radius: 12px;
   border-bottom-left-radius: 12px;