diff --git a/packages/checkbox/demo/index.vue b/packages/checkbox/demo/index.vue index 631a0ae00..2e433b9b1 100644 --- a/packages/checkbox/demo/index.vue +++ b/packages/checkbox/demo/index.vue @@ -34,7 +34,7 @@ @@ -122,8 +122,8 @@ export default { result2: [], result3: [], 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' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } }; }, diff --git a/packages/checkbox/en-US.md b/packages/checkbox/en-US.md index bcfcd1932..a781f018b 100644 --- a/packages/checkbox/en-US.md +++ b/packages/checkbox/en-US.md @@ -47,7 +47,7 @@ Use icon slot to custom icon ``` @@ -57,8 +57,8 @@ export default { data() { checked: true, icon: { - normal: '//img.yzcdn.cn/icon-normal.png', - active: '//img.yzcdn.cn/icon-active.png' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } } } diff --git a/packages/checkbox/test/__snapshots__/demo.spec.js.snap b/packages/checkbox/test/__snapshots__/demo.spec.js.snap index df99b2cb6..5d9665f16 100644 --- a/packages/checkbox/test/__snapshots__/demo.spec.js.snap +++ b/packages/checkbox/test/__snapshots__/demo.spec.js.snap @@ -32,7 +32,7 @@ exports[`renders demo correctly 1`] = `
diff --git a/packages/checkbox/zh-CN.md b/packages/checkbox/zh-CN.md index 060d5d718..9265bc0d6 100644 --- a/packages/checkbox/zh-CN.md +++ b/packages/checkbox/zh-CN.md @@ -49,7 +49,7 @@ export default { ``` @@ -59,8 +59,8 @@ export default { data() { checked: true, icon: { - normal: '//img.yzcdn.cn/icon-normal.png', - active: '//img.yzcdn.cn/icon-active.png' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } } } diff --git a/packages/radio/demo/index.vue b/packages/radio/demo/index.vue index d4fda16ab..3b84c6e50 100644 --- a/packages/radio/demo/index.vue +++ b/packages/radio/demo/index.vue @@ -22,45 +22,63 @@ - - {{ $t('radio') }} - + + {{ $t('radio') }} 1 + + + {{ $t('radio') }} 2 + + - - {{ $t('customIcon') }} - - + + {{ $t('radio') }} 1 + + + + {{ $t('radio') }} 2 + + + - + @@ -96,9 +114,11 @@ export default { radio1: '1', radio2: '2', radio3: '1', + radio4: '1', + radio5: '1', 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' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } }; } @@ -110,7 +130,7 @@ export default { &-group { padding: 0 17px; - .van-radio { + .van-radio:not(:last-child) { margin-bottom: 10px; } } diff --git a/packages/radio/en-US.md b/packages/radio/en-US.md index 2804c635c..7dc3b9f6e 100644 --- a/packages/radio/en-US.md +++ b/packages/radio/en-US.md @@ -44,7 +44,10 @@ export default { ### Custom Color ```html -Radio + + Radio 1 + Radio 2 + ``` ### Custom Icon @@ -52,23 +55,33 @@ export default { Use icon slot to custom icon ```html - - Custom Icon - - + + + Radio 1 + + + + Radio 2 + + + ``` ```js export default { data() { - checked: true, + radio: '1', icon: { - normal: '//img.yzcdn.cn/icon-normal.png', - active: '//img.yzcdn.cn/icon-active.png' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } } } diff --git a/packages/radio/test/__snapshots__/demo.spec.js.snap b/packages/radio/test/__snapshots__/demo.spec.js.snap index 8332e972c..b59f49ae6 100644 --- a/packages/radio/test/__snapshots__/demo.spec.js.snap +++ b/packages/radio/test/__snapshots__/demo.spec.js.snap @@ -27,18 +27,33 @@ exports[`renders demo correctly 1`] = `
-
-
diff --git a/packages/radio/zh-CN.md b/packages/radio/zh-CN.md index 8b987bece..15cc5fcef 100644 --- a/packages/radio/zh-CN.md +++ b/packages/radio/zh-CN.md @@ -45,32 +45,47 @@ export default { ### 自定义颜色 +通过`checked-color`属性设置选中状态的图标颜色 + ```html -复选框 + + 单选框 1 + 单选框 2 + ``` ### 自定义图标 -通过 icon 插槽自定义图标,可以通过 `slot-scope` 判断是否为选中状态 +通过`icon`插槽自定义图标,并通过`slot-scope`判断是否为选中状态 ```html - - 自定义图标 - - + + + 单选框 1 + + + + 单选框 2 + + + ``` ```js export default { data() { - checked: true, + radio: '1' icon: { - normal: '//img.yzcdn.cn/icon-normal.png', - active: '//img.yzcdn.cn/icon-active.png' + active: 'https://img.yzcdn.cn/vant/user-active.png', + inactive: 'https://img.yzcdn.cn/vant/user-inactive.png' } } }