合并
This commit is contained in:
parent
1d6e41847d
commit
bfdc0c1075
@ -211,11 +211,7 @@
|
|||||||
|
|
||||||
// 生成数据
|
// 生成数据
|
||||||
const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
|
const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
|
||||||
<<<<<<< Updated upstream
|
|
||||||
console.log('这是菜单', menuList)
|
console.log('这是菜单', menuList)
|
||||||
=======
|
|
||||||
console.log("menulist",props.data.list);
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
const swiperHeight = computed(
|
const swiperHeight = computed(
|
||||||
() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180),
|
() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180),
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user