yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/15/MERGE
疯狂的世界 2023-11-13 01:16:15 +00:00 committed by Gitee
parent 63c831464d 7adf5dd257
commit 1a979ea90e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sheep/components/s-block-item/s-block-item.vue
View File

@ -18,7 +18,7 @@
<!-- 基础组件：标题栏 --> <!-- 基础组件：标题栏 -->
<s-title-block v-if="type === 'titleBlock'" :data="data" :styles="styles" /> <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" /> <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
<!-- 基础组件：辅助线 --> <!-- 基础组件：辅助线 -->

6
sheep/components/s-image-cube/s-image-cube.vue
View File

@ -3,10 +3,10 @@
<view v-for="(item, index) in data.list" :key="index"> <view v-for="(item, index) in data.list" :key="index">
<view <view
class="cube-img-wrap" class="cube-img-wrap"
:style="[parseImgStyle(item), { margin: data.space + 'rpx' }]" :style="[parseImgStyle(item), { margin: data.space + 'px' }]"
@tap="sheep.$router.go(item.url)" @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> </view>
</view> </view>
@ -49,7 +49,7 @@
const cell = computed(() => { const cell = computed(() => {
return ( return (
(windowWidth - (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 4
); );
}); });