diff --git a/docs/demos/views/goods-action.vue b/docs/demos/views/goods-action.vue index c8a35efd3..9ede4ec29 100644 --- a/docs/demos/views/goods-action.vue +++ b/docs/demos/views/goods-action.vue @@ -3,16 +3,16 @@ - 客服 + {{ $t('button1') }} - 购物车 + {{ $t('button2') }} - 加入购物车 + {{ $t('button3') }} - 立即购买 + {{ $t('button4') }} @@ -23,20 +23,30 @@ export default { i18n: { 'zh-CN': { - + clickIcon: '点击图标', + clickButton: '点击按钮', + button1: '客服', + button2: '购物车', + button3: '加入购物车', + button4: '立即购买' }, 'en-US': { - + clickIcon: 'Click Icon', + clickButton: 'Click Button', + button1: 'Icon1', + button2: 'Icon2', + button3: 'Button1', + button4: 'Button2' } }, methods: { onClickMiniBtn() { - Toast('点击图标'); + Toast(this.$t('clickIcon')); }, onClickBigBtn() { - Toast('点击按钮'); + Toast(this.$t('clickButton')); } } }; diff --git a/docs/demos/views/submit-bar.vue b/docs/demos/views/submit-bar.vue index 9b985a3bd..c02a6ff44 100644 --- a/docs/demos/views/submit-bar.vue +++ b/docs/demos/views/submit-bar.vue @@ -3,7 +3,7 @@ @@ -12,8 +12,8 @@ @@ -22,7 +22,7 @@ @@ -30,12 +30,12 @@ - 全选 + {{ $t('check') }} - 您的收货地址不支持同城送, 修改地址 > + {{ $t('tip2') }}{{ $t('tip3') }} @@ -46,10 +46,22 @@ export default { i18n: { 'zh-CN': { - + submit: '提交订单', + tip1: '您的收货地址不支持同城送, 我们已为您推荐快递', + tip2: '您的收货地址不支持同城送, ', + tip3: '修改地址', + check: '全选', + clickButton: '点击按钮', + clickLink: '修改地址' }, 'en-US': { - + submit: 'Submit', + tip1: 'Some tips', + tip2: 'Some tips, ', + tip3: 'Link', + check: 'Label', + clickButton: 'Click button', + clickLink: 'Click Link' } }, @@ -61,11 +73,10 @@ export default { methods: { onClickButton() { - Toast('点击按钮'); + Toast(this.$t('clickButton')); }, - - onClickEditAddress() { - Toast('修改地址'); + onClickLink() { + Toast(this.$t('clickLink')); } } }; diff --git a/docs/markdown/en-US/goods-action.md b/docs/markdown/en-US/goods-action.md index b5cd451f8..5620b8b75 100644 --- a/docs/markdown/en-US/goods-action.md +++ b/docs/markdown/en-US/goods-action.md @@ -19,16 +19,16 @@ Vue.component(GoodsActionMiniBtn.name, GoodsActionMiniBtn); ```html - 客服 + Icon1 - 购物车 + Icon2 - 加入购物车 + Button1 - 立即购买 + Button2 ``` @@ -37,10 +37,10 @@ Vue.component(GoodsActionMiniBtn.name, GoodsActionMiniBtn); export default { methods: { onClickMiniBtn() { - Toast('点击图标'); + Toast('Click Icon'); }, onClickBigBtn() { - Toast('点击按钮'); + Toast('Click Button'); } } } @@ -52,13 +52,13 @@ export default { | Attribute | Description | Type | Default | Accepted Values | |-----------|-----------|-----------|-------------|-------------| -| icon | 图标 | `String` | - | Icon 组件支持的所有图标 | -| iconClass | 图标额外类名 | `String` | `''` | - | -| url | 跳转链接 | `String` | `javascript:;` | - | +| icon | Icon | `String` | - | Icon 组件支持的所有图标 | +| iconClass | Icon class name | `String` | `''` | - | +| url | Link URL | `String` | `javascript:;` | - | #### GoodsActionBigBtn | Attribute | Description | Type | Default | Accepted Values | |-----------|-----------|-----------|-------------|-------------| -| url | 跳转链接 | `String` | `javascript:;` | - | -| primary | 是否主行动按钮,主行动按钮默认为红色 | `Boolean` | `false` | - | +| url | Link URL | `String` | `javascript:;` | - | +| primary | Is primary button (red color) | `Boolean` | `false` | - | diff --git a/docs/markdown/en-US/submit-bar.md b/docs/markdown/en-US/submit-bar.md index 34851f346..9f3c827b3 100644 --- a/docs/markdown/en-US/submit-bar.md +++ b/docs/markdown/en-US/submit-bar.md @@ -1,31 +1,5 @@ ## SubmitBar - - - - ### Install ``` javascript import { SubmitBar } from 'vant'; @@ -40,72 +14,73 @@ Vue.component(SubmitBar.name, SubmitBar); ```html ``` #### Disabled -禁用状态下不会触发`submit`事件 +`submit` event will not triggerd when disabled. ```html ``` #### Loading -加载状态下不会触发`submit`事件 +`submit` event will not triggerd when loading. ```html ``` #### Advanced Usage -通过 slot 插入自定义内容 +Use slot to add custom contents. ```html - 全选 + Check - 您的收货地址不支持同城送, 修改地址 > + Some tips, Link ``` ### API -| Attribute | Description | Type | Default | 必须 | +| Attribute | Description | Type | Default | Accepted Values | |-----------|-----------|-----------|-------------|-------------| -| price | 价格(单位分) | `Number` | - | 是 | -| buttonText | 按钮文字 | `String` | - | 是 | -| buttonType | 按钮类型 | `String` | `danger` | 否 | -| tip | 提示文案 | `String` | - | 否 | -| disabled | 是否禁用按钮 | `Boolean` | `false` | 否 | -| loading | 是否显示加载中的按钮 | `Boolean` | `false` | 否 | +| price | Price | `Number` | - | - | +| label | Price label | `String` | `合计:` | - | +| buttonText | Button text | `String` | - | - | +| buttonType | Button type | `String` | `danger` | - | +| tip | Tip | `String` | - | - | +| disabled | Whether to disable button | `Boolean` | `false` | - | +| loading | Whether to show loading icon | `Boolean` | `false` | - | ### Event | Event | Description | Attribute | |-----------|-----------|-----------| -| submit | 按钮点击事件回调 | - | +| submit | Triggerd when click submit button | - | ### Slot | Name | Description | |-----------|-----------| -| default | 自定义订单栏左侧内容 | -| tip | 提示文案中的额外操作和说明 | +| default | Custom left content | +| tip | Custom tips | diff --git a/docs/markdown/zh-CN/submit-bar.md b/docs/markdown/zh-CN/submit-bar.md index 052f5508c..079eb3d16 100644 --- a/docs/markdown/zh-CN/submit-bar.md +++ b/docs/markdown/zh-CN/submit-bar.md @@ -15,7 +15,7 @@ Vue.component(SubmitBar.name, SubmitBar); ``` @@ -28,7 +28,7 @@ Vue.component(SubmitBar.name, SubmitBar); :price="3050" buttonText="提交订单" tip="您的收货地址不支持同城送, 我们已为您推荐快递" - @submit="onClickButton" + @submit="onSubmit" /> ``` @@ -40,7 +40,7 @@ Vue.component(SubmitBar.name, SubmitBar); loading :price="3050" buttonText="提交订单" - @submit="onClickButton" + @submit="onSubmit" /> ``` @@ -51,25 +51,26 @@ Vue.component(SubmitBar.name, SubmitBar); 全选 - 您的收货地址不支持同城送, 修改地址 > + 您的收货地址不支持同城送, 修改地址 ``` ### API -| 参数 | 说明 | 类型 | 默认值 | 必须 | +| 参数 | 说明 | 类型 | 默认值 | 可选值 | |-----------|-----------|-----------|-------------|-------------| -| price | 价格(单位分) | `Number` | - | 是 | -| buttonText | 按钮文字 | `String` | - | 是 | -| buttonType | 按钮类型 | `String` | `danger` | 否 | -| tip | 提示文案 | `String` | - | 否 | -| disabled | 是否禁用按钮 | `Boolean` | `false` | 否 | -| loading | 是否显示加载中的按钮 | `Boolean` | `false` | 否 | +| price | 价格(单位分) | `Number` | - | - | +| label | 价格文案 | `String` | `合计:` | - | +| buttonText | 按钮文字 | `String` | - | - | +| buttonType | 按钮类型 | `String` | `danger` | - | +| tip | 提示文案 | `String` | - | - | +| disabled | 是否禁用按钮 | `Boolean` | `false` | - | +| loading | 是否显示加载中的按钮 | `Boolean` | `false` | - | ### Event diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js index 794ba2a67..0fe0f04a1 100644 --- a/docs/src/doc.config.js +++ b/docs/src/doc.config.js @@ -540,11 +540,11 @@ module.exports = { }, { path: '/goods-action', - title: 'GoodsAction (In translation)' + title: 'GoodsAction' }, { path: '/submit-bar', - title: 'SubmitBar (In translation)' + title: 'SubmitBar' }, { path: '/sku', diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js index a96dbbcd3..c24301b2d 100644 --- a/packages/locale/lang/en-US.js +++ b/packages/locale/lang/en-US.js @@ -68,5 +68,8 @@ export default { pullingText: 'Pull to refresh...', loosingText: 'Loose to refresh...', loadingText: 'Loading...' + }, + vanSubmitBar: { + label: 'Total:' } }; diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index cbf0f6e7b..21b04abf8 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -72,5 +72,8 @@ export default { pullingText: '下拉即可刷新...', loosingText: '释放即可刷新...', loadingText: '加载中...' + }, + vanSubmitBar: { + label: '合计:' } }; diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue index 7db8251ec..8efb3e0c5 100644 --- a/packages/submit-bar/index.vue +++ b/packages/submit-bar/index.vue @@ -7,7 +7,7 @@
@@ -33,6 +33,7 @@ export default { tip: String, type: Number, price: Number, + label: String, loading: Boolean, disabled: Boolean, buttonText: String,