From 7adf5dd257b7b6a38a2f5305ca6aeb8c643bc32c Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 12 Nov 2023 19:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6=E3=80=90?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E9=AD=94=E6=96=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-block-item/s-block-item.vue | 2 +-
 sheep/components/s-image-cube/s-image-cube.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 3d19d856..e4e4f0b0 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -18,7 +18,7 @@
     <!-- 基础组件：标题栏 -->
     <s-title-block v-if="type === 'titleBlock'" :data="data" :styles="styles" />
     <!-- 图文组件：广告魔方 -->
-    <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
+    <s-image-cube v-if="type === 'MagicCube'" :data="data" :styles="styles" />
     <!-- 图文组件：视频播放 -->
     <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
     <!-- 基础组件：辅助线 -->
diff --git a/sheep/components/s-image-cube/s-image-cube.vue b/sheep/components/s-image-cube/s-image-cube.vue
index 4d896641..a56669fa 100644
--- a/sheep/components/s-image-cube/s-image-cube.vue
+++ b/sheep/components/s-image-cube/s-image-cube.vue
@@ -3,10 +3,10 @@
     <view v-for="(item, index) in data.list" :key="index">
       <view
         class="cube-img-wrap"
-        :style="[parseImgStyle(item), { margin: data.space + 'rpx' }]"
+        :style="[parseImgStyle(item), { margin: data.space + 'px' }]"
         @tap="sheep.$router.go(item.url)"
       >
-        <image class="cube-img" :src="sheep.$url.cdn(item.src)" mode="aspectFill"></image>
+        <image class="cube-img" :src="sheep.$url.cdn(item.imgUrl)" mode="aspectFill"></image>
       </view>
     </view>
   </view>
@@ -49,7 +49,7 @@
   const cell = computed(() => {
     return (
       (windowWidth -
-        (props.styles.marginLeft + props.styles.marginRight + props.styles.padding * 2)) /
+        ((props.styles.marginLeft || 0) + (props.styles.marginRight || 0) + (props.styles.padding || 0) * 2)) /
       4
     );
   });