alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/radio/README.md
+2 -2
View File
@@ -65,8 +65,8 @@ export default {
```html
<van-radio-group v-model="radio">
<van-radio name="1" checked-color="#07c160">Radio 1</van-radio>
<van-radio name="2" checked-color="#07c160">Radio 2</van-radio>
<van-radio name="1" checked-color="#ee0a24">Radio 1</van-radio>
<van-radio name="2" checked-color="#ee0a24">Radio 2</van-radio>
</van-radio-group>
```
src/radio/README.zh-CN.md
+2 -2
View File
@@ -77,8 +77,8 @@ export default {
```html
<van-radio-group v-model="radio">
<van-radio name="1" checked-color="#07c160">单选框 1</van-radio>
<van-radio name="2" checked-color="#07c160">单选框 2</van-radio>
<van-radio name="1" checked-color="#ee0a24">单选框 1</van-radio>
<van-radio name="2" checked-color="#ee0a24">单选框 2</van-radio>
</van-radio-group>
```
src/radio/demo/index.vue
+4 -8
View File
@@ -33,10 +33,10 @@
<demo-block :title="t('customColor')">
<van-radio-group v-model="radio3" class="demo-radio-group">
<van-radio name="1" checked-color="#07c160">
<van-radio name="1" checked-color="#ee0a24">
{{ t('radio') }} 1
</van-radio>
<van-radio name="2" checked-color="#07c160">
<van-radio name="2" checked-color="#ee0a24">
{{ t('radio') }} 2
</van-radio>
</van-radio-group>
@@ -44,12 +44,8 @@
<demo-block :title="t('customIconSize')">
<van-radio-group v-model="radioIconSize" class="demo-radio-group">
<van-radio name="1" checked-color="#07c160" icon-size="24px">
{{ t('radio') }} 1
</van-radio>
<van-radio name="2" checked-color="#07c160" icon-size="24px">
{{ t('radio') }} 2
</van-radio>
<van-radio name="1" icon-size="24px"> {{ t('radio') }} 1 </van-radio>
<van-radio name="2" icon-size="24px"> {{ t('radio') }} 2 </van-radio>
</van-radio-group>
</demo-block>
src/radio/test/__snapshots__/demo.spec.js.snap
+2 -4
View File
@@ -140,7 +140,7 @@ exports[`should render demo and match snapshot 1`] = `
>
<div class="van-radio__icon van-radio__icon--round van-radio__icon--checked">
<i class="van-badge__wrapper van-icon van-icon-success"
style="border-color: #07c160; background-color: rgb(7, 193, 96);"
style="border-color: #ee0a24; background-color: rgb(238, 10, 36);"
>
</i>
</div>
@@ -175,9 +175,7 @@ exports[`should render demo and match snapshot 1`] = `
<div class="van-radio__icon van-radio__icon--round van-radio__icon--checked"
style="font-size: 24px;"
>
<i class="van-badge__wrapper van-icon van-icon-success"
style="border-color: #07c160; background-color: rgb(7, 193, 96);"
>
<i class="van-badge__wrapper van-icon van-icon-success">
</i>
</div>
<span class="van-radio__label">