From a8738bbcae2a885f42efc9cb4af878ea6479e872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 5 May 2019 11:40:59 +0800 Subject: [PATCH] [Doc] Tabbar: update demo --- packages/tabbar/demo/index.vue | 18 +++++++++-- packages/tabbar/en-US.md | 19 ++++++++--- .../test/__snapshots__/demo.spec.js.snap | 32 +++++++++++++++++++ packages/tabbar/zh-CN.md | 16 ++++++++-- 4 files changed, 75 insertions(+), 10 deletions(-) diff --git a/packages/tabbar/demo/index.vue b/packages/tabbar/demo/index.vue index 7c0552fd4..c18661944 100644 --- a/packages/tabbar/demo/index.vue +++ b/packages/tabbar/demo/index.vue @@ -2,6 +2,15 @@ + {{ $t('tab') }} + {{ $t('tab') }} + {{ $t('tab') }} + {{ $t('tab') }} + + + + + {{ $t('tab') }} - + {{ $t('custom') }} @@ -58,11 +67,13 @@ export default { i18n: { 'zh-CN': { + badge: '显示徽标', customIcon: '自定义图标', customColor: '自定义颜色' }, 'en-US': { - customIcon: 'Custom icon', + badge: 'Show Badge', + customIcon: 'Custom Icon', customColor: 'Custom Color' } }, @@ -72,6 +83,7 @@ export default { active: 0, active2: 0, active3: 0, + active4: 0, icon: { normal: 'https://img.yzcdn.cn/public_files/2017/10/13/c547715be149dd3faa817e4a948b40c4.png', active: 'https://img.yzcdn.cn/public_files/2017/10/13/793c77793db8641c4c325b7f25bf130d.png' diff --git a/packages/tabbar/en-US.md b/packages/tabbar/en-US.md index d25968528..1b4938a8b 100644 --- a/packages/tabbar/en-US.md +++ b/packages/tabbar/en-US.md @@ -14,9 +14,9 @@ Vue.use(Tabbar).use(TabbarItem); ```html Tab - Tab - Tab - Tab + Tab + Tab + Tab ``` @@ -30,7 +30,18 @@ export default { } ``` -#### Custom icon +#### Show Badge + +```html + + Tab + Tab + Tab + Tab + +``` + +#### Custom Icon Use `icon` slot to custom icon diff --git a/packages/tabbar/test/__snapshots__/demo.spec.js.snap b/packages/tabbar/test/__snapshots__/demo.spec.js.snap index b933c13f1..6d6ccc52d 100644 --- a/packages/tabbar/test/__snapshots__/demo.spec.js.snap +++ b/packages/tabbar/test/__snapshots__/demo.spec.js.snap @@ -2,6 +2,38 @@ exports[`renders demo correctly 1`] = `
+
+
+
+
+ + +
+
标签
+
+
+
+ + +
+
标签
+
+
+
+ + +
+
标签
+
+
+
+ + +
+
标签
+
+
+
diff --git a/packages/tabbar/zh-CN.md b/packages/tabbar/zh-CN.md index 7bbb3e7c9..e54c30101 100644 --- a/packages/tabbar/zh-CN.md +++ b/packages/tabbar/zh-CN.md @@ -14,9 +14,9 @@ Vue.use(Tabbar).use(TabbarItem); ```html 标签 - 标签 - 标签 - 标签 + 标签 + 标签 + 标签 ``` @@ -30,6 +30,16 @@ export default { } ``` +#### 显示徽标 + +```html + + 标签 + 标签 + 标签 + 标签 + +``` #### 自定义图标