diff --git a/docs/assets/design.sketch b/docs/assets/design.sketch index 00a02eba7..de2f91579 100755 Binary files a/docs/assets/design.sketch and b/docs/assets/design.sketch differ diff --git a/packages/vant-cli/site/common/style/base.less b/packages/vant-cli/site/common/style/base.less index 7bb9384f5..86c418300 100644 --- a/packages/vant-cli/site/common/style/base.less +++ b/packages/vant-cli/site/common/style/base.less @@ -7,7 +7,7 @@ body { color: @van-doc-black; font-size: 16px; font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica, - Segoe UI, Arial, Roboto, 'PingFang SC', 'Hiragino Sans GB', + Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei', sans-serif; background-color: @van-doc-background-color; -webkit-font-smoothing: antialiased; diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js index d6ed998fe..1d6ab5735 100644 --- a/src/number-keyboard/index.js +++ b/src/number-keyboard/index.js @@ -113,13 +113,13 @@ export default createComponent({ if (extraKeys.length === 1) { keys.push( { text: 0, wider: true }, - { text: extraKey[0], type: 'extra' } + { text: extraKeys[0], type: 'extra' } ); } else if (extraKeys.length === 2) { keys.push( - { text: extraKey[0], type: 'extra' }, + { text: extraKeys[0], type: 'extra' }, { text: 0 }, - { text: extraKey[1], type: 'extra' } + { text: extraKeys[1], type: 'extra' } ); } diff --git a/src/number-keyboard/test/__snapshots__/index.spec.js.snap b/src/number-keyboard/test/__snapshots__/index.spec.js.snap index 928a45c13..ad366e2b4 100644 --- a/src/number-keyboard/test/__snapshots__/index.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/index.spec.js.snap @@ -1,5 +1,52 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`extra-key prop 1`] = ` + +`; + exports[`extra-key slot 1`] = `