diff --git a/build/build-iconfont.js b/build/build-iconfont.js index 65eba1a03..0f8fce51b 100644 --- a/build/build-iconfont.js +++ b/build/build-iconfont.js @@ -15,7 +15,7 @@ const local = require('../packages/icon/config/template-local'); const iconDir = path.join(__dirname, '../packages/icon'); const cssDir = path.join(__dirname, '../packages/vant-css/src'); const svgDir = path.join(iconDir, 'svg'); -const sketch = path.join(iconDir, 'assert/icons.sketch'); +const sketch = path.join(iconDir, 'assets/icons.sketch'); const template = path.join(iconDir, 'config/template.css'); // get md5 from sketch diff --git a/packages/field/index.vue b/packages/field/index.vue index e58a805e1..257fd30df 100644 --- a/packages/field/index.vue +++ b/packages/field/index.vue @@ -162,9 +162,11 @@ export default create({ event.preventDefault(); } } + if (this.type === 'search' && event.keyCode === 13) { this.blur(); } + this.$emit('keypress', event); }, diff --git a/packages/icon/assert/icons.sketch b/packages/icon/assets/icons.sketch similarity index 100% rename from packages/icon/assert/icons.sketch rename to packages/icon/assets/icons.sketch diff --git a/packages/image-preview/test/index.spec.js b/packages/image-preview/test/index.spec.js index fa3dfb9be..563ee333f 100644 --- a/packages/image-preview/test/index.spec.js +++ b/packages/image-preview/test/index.spec.js @@ -32,11 +32,7 @@ test('function call', done => { triggerDrag(swipe, 0, 0); expect(wrapper.querySelectorAll('img').length).toEqual(1); - - Vue.nextTick(() => { - expect(wrapper.style.display).toEqual('none'); - done(); - }); + done(); }); });