!15 商城装修

Merge pull request !15 from 疯狂的世界/master-vue3

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" />
     <!-- 基础组件：辅助线 -->

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
     );
   });