From ca91a1b49862f6de0d26866215df598105126fff Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Sep 2018 17:47:15 +0800 Subject: [PATCH] [Improvement] Button: optimize loading (#1756) --- .../test/__snapshots__/demo.spec.js.snap | 9 ++-- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/index.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 3 +- packages/button/index.vue | 2 +- .../test/__snapshots__/demo.spec.js.snap | 51 +++++++------------ .../card/test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 18 +++---- .../test/__snapshots__/demo.spec.js.snap | 3 +- .../test/__snapshots__/demo.spec.js.snap | 12 ++--- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 12 ++--- .../sku/test/__snapshots__/demo.spec.js.snap | 9 ++-- .../test/__snapshots__/demo.spec.js.snap | 3 +- .../test/__snapshots__/demo.spec.js.snap | 14 ++--- .../test/__snapshots__/index.spec.js.snap | 3 +- packages/tab/demo/index.vue | 4 +- packages/tabs/index.vue | 4 +- .../test/__snapshots__/demo.spec.js.snap | 15 ++---- packages/vant-css/src/button.css | 4 -- 23 files changed, 72 insertions(+), 136 deletions(-) diff --git a/packages/actionsheet/test/__snapshots__/demo.spec.js.snap b/packages/actionsheet/test/__snapshots__/demo.spec.js.snap index 9e4a3dc9e..c93c354b6 100644 --- a/packages/actionsheet/test/__snapshots__/demo.spec.js.snap +++ b/packages/actionsheet/test/__snapshots__/demo.spec.js.snap @@ -3,18 +3,15 @@ exports[`renders demo correctly 1`] = `
- +
- +
- +
diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap index 935da4aff..35cb13b68 100644 --- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap @@ -103,12 +103,10 @@ exports[`renders demo correctly 1`] = `
- -
diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap index 67febb89d..c5c36e5f8 100644 --- a/packages/address-edit/test/__snapshots__/index.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap @@ -73,8 +73,7 @@ exports[`create a AddressEdit 1`] = `
- @@ -207,8 +206,7 @@ exports[`create a AddressEdit with props 1`] = `
- diff --git a/packages/address-list/test/__snapshots__/demo.spec.js.snap b/packages/address-list/test/__snapshots__/demo.spec.js.snap index aece16b0b..ba7d797b7 100644 --- a/packages/address-list/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap @@ -41,8 +41,7 @@ exports[`renders demo correctly 1`] = `
- + diff --git a/packages/button/index.vue b/packages/button/index.vue index 6fe9f6841..f21ec7a5f 100644 --- a/packages/button/index.vue +++ b/packages/button/index.vue @@ -19,7 +19,7 @@ @click="onClick" > - + {{ text }} diff --git a/packages/button/test/__snapshots__/demo.spec.js.snap b/packages/button/test/__snapshots__/demo.spec.js.snap index 8b2fcc606..d3186b523 100644 --- a/packages/button/test/__snapshots__/demo.spec.js.snap +++ b/packages/button/test/__snapshots__/demo.spec.js.snap @@ -4,52 +4,39 @@ exports[`renders demo correctly 1`] = `
- - + +
- - + +
- - + +
- - + +
- - - - + + + +
- +
- +
+ +
- - + 按钮
diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap index a0dd32b36..9593e4948 100644 --- a/packages/card/test/__snapshots__/demo.spec.js.snap +++ b/packages/card/test/__snapshots__/demo.spec.js.snap @@ -37,10 +37,8 @@ exports[`renders demo correctly 1`] = `
- - + +
diff --git a/packages/circle/test/__snapshots__/demo.spec.js.snap b/packages/circle/test/__snapshots__/demo.spec.js.snap index d1ba3c926..c353c6153 100644 --- a/packages/circle/test/__snapshots__/demo.spec.js.snap +++ b/packages/circle/test/__snapshots__/demo.spec.js.snap @@ -18,10 +18,8 @@ exports[`renders demo correctly 1`] = `
0%
- - + +
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap index 4187db50d..815447e8d 100644 --- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap +++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap @@ -29,8 +29,7 @@ exports[`renders demo correctly 1`] = ` - +
- +
diff --git a/packages/dialog/test/__snapshots__/demo.spec.js.snap b/packages/dialog/test/__snapshots__/demo.spec.js.snap index 2836136d4..a63a99b3e 100644 --- a/packages/dialog/test/__snapshots__/demo.spec.js.snap +++ b/packages/dialog/test/__snapshots__/demo.spec.js.snap @@ -3,18 +3,14 @@ exports[`renders demo correctly 1`] = `
- - + +
- +
- +
- -
diff --git a/packages/field/test/__snapshots__/demo.spec.js.snap b/packages/field/test/__snapshots__/demo.spec.js.snap index e0348a7df..9d19d7ade 100644 --- a/packages/field/test/__snapshots__/demo.spec.js.snap +++ b/packages/field/test/__snapshots__/demo.spec.js.snap @@ -151,8 +151,7 @@ exports[`renders demo correctly 1`] = `
- +
diff --git a/packages/goods-action/test/__snapshots__/demo.spec.js.snap b/packages/goods-action/test/__snapshots__/demo.spec.js.snap index 986b62bc9..ee7d70e4d 100644 --- a/packages/goods-action/test/__snapshots__/demo.spec.js.snap +++ b/packages/goods-action/test/__snapshots__/demo.spec.js.snap @@ -12,10 +12,8 @@ exports[`renders demo correctly 1`] = ` 购物车 - - 加入购物车 - - 立即购买 + 加入购物车 + 立即购买
@@ -32,10 +30,8 @@ exports[`renders demo correctly 1`] = ` 店铺 - - 加入购物车 - - 立即购买 + 加入购物车 + 立即购买
diff --git a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap index a3bf65d48..2a70873db 100644 --- a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap +++ b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap @@ -3,8 +3,7 @@ exports[`renders demo correctly 1`] = `
-
@@ -27,8 +26,7 @@ exports[`renders demo correctly 1`] = `
-
- - + +
diff --git a/packages/popup/test/__snapshots__/demo.spec.js.snap b/packages/popup/test/__snapshots__/demo.spec.js.snap index 4a3766382..817394605 100644 --- a/packages/popup/test/__snapshots__/demo.spec.js.snap +++ b/packages/popup/test/__snapshots__/demo.spec.js.snap @@ -3,19 +3,15 @@ exports[`renders demo correctly 1`] = `
- +
- + - + - +
diff --git a/packages/sku/test/__snapshots__/demo.spec.js.snap b/packages/sku/test/__snapshots__/demo.spec.js.snap index 1a6785772..2ab5cc837 100644 --- a/packages/sku/test/__snapshots__/demo.spec.js.snap +++ b/packages/sku/test/__snapshots__/demo.spec.js.snap @@ -5,22 +5,19 @@ exports[`renders demo correctly 1`] = `
- +
- +
- +
diff --git a/packages/steps/test/__snapshots__/demo.spec.js.snap b/packages/steps/test/__snapshots__/demo.spec.js.snap index ce66c4623..69d0b6b1b 100644 --- a/packages/steps/test/__snapshots__/demo.spec.js.snap +++ b/packages/steps/test/__snapshots__/demo.spec.js.snap @@ -38,8 +38,7 @@ exports[`renders demo correctly 1`] = ` - +
diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap index a9ca687aa..e54f1fd58 100644 --- a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap +++ b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap @@ -7,8 +7,7 @@ exports[`renders demo correctly 1`] = `
合计： ¥ 30.50
-
@@ -20,8 +19,7 @@ exports[`renders demo correctly 1`] = ` 您的收货地址不支持同城送, 我们已为您推荐快递
合计： ¥ 30.50
-
@@ -33,9 +31,8 @@ exports[`renders demo correctly 1`] = `
合计： ¥ 30.50
+
+
@@ -53,8 +50,7 @@ exports[`renders demo correctly 1`] = ` 全选
合计： ¥ 30.50
- diff --git a/packages/submit-bar/test/__snapshots__/index.spec.js.snap b/packages/submit-bar/test/__snapshots__/index.spec.js.snap index d894deb26..5d331b8b5 100644 --- a/packages/submit-bar/test/__snapshots__/index.spec.js.snap +++ b/packages/submit-bar/test/__snapshots__/index.spec.js.snap @@ -5,8 +5,7 @@ exports[`submit 1`] = `
合计： ¥ 0.00
-
diff --git a/packages/tab/demo/index.vue b/packages/tab/demo/index.vue index 00c187f65..a24b9e93f 100644 --- a/packages/tab/demo/index.vue +++ b/packages/tab/demo/index.vue @@ -9,7 +9,7 @@ - + {{ $t('content') }} {{ index }} @@ -113,7 +113,7 @@ export default { this.$toast(title); }, - subscribeSticky(e) { + onScroll(e) { console.log(e); } } diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue index 0ad2eac4b..d3bdab567 100644 --- a/packages/tabs/index.vue +++ b/packages/tabs/index.vue @@ -48,6 +48,7 @@ export default create({ }, props: { + color: String, sticky: Boolean, lineWidth: Number, swipeable: Boolean, @@ -70,8 +71,7 @@ export default create({ offsetTop: { type: Number, default: 0 - }, - color: String + } }, data() { diff --git a/packages/toast/test/__snapshots__/demo.spec.js.snap b/packages/toast/test/__snapshots__/demo.spec.js.snap index c77ae701f..dbef15fc0 100644 --- a/packages/toast/test/__snapshots__/demo.spec.js.snap +++ b/packages/toast/test/__snapshots__/demo.spec.js.snap @@ -3,22 +3,17 @@ exports[`renders demo correctly 1`] = `
- +
- +
- - + +
- +
`; diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css index d69ecc21a..eed4346c4 100644 --- a/packages/vant-css/src/button.css +++ b/packages/vant-css/src/button.css @@ -99,10 +99,6 @@ .van-loading { display: inline-block; } - - .van-button__text { - display: none; - } } /* mini图标默认宽度50px，文字不能超过4个 */