diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 52c10785..3d19d856 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,34 +1,57 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 5bf52c3a..50886d0e 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -21,12 +21,12 @@
:class="{ cur: state.cur == index }"
>
-
+
@@ -34,12 +34,12 @@
{{ item.badge.text }}
@@ -206,15 +206,9 @@
});
// 生成数据
- const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.col));
- const swiperHeight = computed(() => props.data.row * (props.data.layout == 1 ? 200 : 180));
+ const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
+ const swiperHeight = computed(() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180));
const windowWidth = sheep.$platform.device.windowWidth;
- const clWidth = computed(
- () =>
- (windowWidth -
- (props.styles.marginLeft + props.styles.marginRight + props.styles.padding * 2)) /
- props.data.col,
- );
// current 改变时会触发 change 事件
const swiperChange = (e) => {
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index e6c385b4..3cf62485 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -1,5 +1,5 @@
-
+
{{ item.badge.text }}
-
+
-
- {{ item.title.text }}
+
+ {{ item.title }}
-
- {{ item.tip.text }}
+
+ {{ item.subtitle }}
diff --git a/sheep/components/s-menu-list/s-menu-list.vue b/sheep/components/s-menu-list/s-menu-list.vue
index ecf6b12a..652df903 100644
--- a/sheep/components/s-menu-list/s-menu-list.vue
+++ b/sheep/components/s-menu-list/s-menu-list.vue
@@ -11,25 +11,25 @@
- {{ item.title.text }}
+ {{ item.title }}
- {{ item.tip.text }}
+ {{ item.subtitle }}