Merge branch 'main' of https://git.ishopex.cn/ecshopx/ecshopx-admin

src/view/decorate/index.vue

@@ -234,8 +234,10 @@ export default {
       }
     },
     headerVisible() {
-      // 仅商城装修(1001)展示页面设置挂件，1007 分类模版等不展示
-      return this.mode == 'page' && this.localScene == '1001'
+      // 商城装修(1001)、自定义页(1004)展示页面设置挂件；1007 分类模版等不展示
+      return (
+        this.mode == 'page' && (this.localScene == '1001' || this.localScene == '1004')
+      )
     },
     widgetCategories() {
       // 通用挂件：轮播、热区图、视频、文字轮播

src/view/decorate/wgts/wgt_slider/sliderDialog.vue

@@ -8,7 +8,6 @@
     <div
       class="wgts-slider-dialog-left"
       v-if="sliderForm.media_type === 'img'"
-      :style="`height:${h}px;background:#f5f5f7`"
     >
       <SpImage
         v-if="!sliderForm.imgUrl"
@@ -39,7 +38,7 @@
       />
     </div>
 
-    <div class="wgts-slider-dialog-left" v-else :style="`height:${h}px;background:#f5f5f7`">
+    <div class="wgts-slider-dialog-left" v-else>
       <SpImage v-if="!videoUrlStr" class="sp-image" fit="scale-down" />
       <video-player
         v-if="videoUrlStr"
@@ -470,6 +469,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
+    max-height: calc(72vh - 60px)!important;
 
     .overlay {
       position: absolute;
@@ -573,3 +573,11 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.wgts-slider-dialog {
+  .hz-u-img {
+    object-fit: cover;
+    max-height: calc(72vh - 60px) !important;
+  }
+}
+</style>