From f5e114cf085a9855295666c14a402479a659a8ca Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 9 Oct 2018 11:47:28 +0800 Subject: [PATCH] [improvement] Cell: optimize border (#1902) --- .../test/__snapshots__/demo.spec.js.snap | 14 +++++------ .../test/__snapshots__/index.spec.js.snap | 24 +++++++++---------- .../test/__snapshots__/demo.spec.js.snap | 6 ++--- .../test/__snapshots__/demo.spec.js.snap | 4 ++-- packages/cell/index.vue | 4 ++-- .../cell/test/__snapshots__/demo.spec.js.snap | 20 ++++++++-------- .../test/__snapshots__/demo.spec.js.snap | 6 ++--- .../test/__snapshots__/demo.spec.js.snap | 16 ++++++------- .../test/__snapshots__/demo.spec.js.snap | 10 ++++---- .../test/__snapshots__/demo.spec.js.snap | 2 +- .../test/__snapshots__/index.spec.js.snap | 4 ++-- .../test/__snapshots__/demo.spec.js.snap | 4 ++-- .../test/__snapshots__/demo.spec.js.snap | 16 ++++++------- .../test/__snapshots__/index.spec.js.snap | 2 +- .../test/__snapshots__/demo.spec.js.snap | 4 ++-- .../test/__snapshots__/demo.spec.js.snap | 4 ++-- .../test/__snapshots__/demo.spec.js.snap | 6 ++--- .../test/__snapshots__/demo.spec.js.snap | 4 ++-- .../test/__snapshots__/demo.spec.js.snap | 6 ++--- packages/vant-css/src/cell.css | 7 ++++-- packages/vant-css/src/mixins/hairline.css | 23 ++++++++++++++---- 21 files changed, 102 insertions(+), 84 deletions(-) diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap index b555d5f23..34e5699e2 100644 --- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
-
+
姓名 @@ -21,7 +21,7 @@ exports[`renders demo correctly 1`] = `
-
+
电话 @@ -37,7 +37,7 @@ exports[`renders demo correctly 1`] = `
-
+
地区 @@ -53,11 +53,11 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
详细地址 @@ -76,7 +76,7 @@ exports[`renders demo correctly 1`] = `
-
+
邮政编码 @@ -92,7 +92,7 @@ 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 d651318c1..c6a9d58a6 100644 --- a/packages/address-edit/test/__snapshots__/index.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap @@ -3,7 +3,7 @@ exports[`create a AddressEdit 1`] = `
-
+
姓名 @@ -19,7 +19,7 @@ exports[`create a AddressEdit 1`] = `
-
+
电话 @@ -35,7 +35,7 @@ exports[`create a AddressEdit 1`] = `
-
+
地区 @@ -51,11 +51,11 @@ exports[`create a AddressEdit 1`] = `
-
+
-
+
详细地址 @@ -113,7 +113,7 @@ exports[`create a AddressEdit 1`] = ` exports[`create a AddressEdit with props 1`] = `
-
+
姓名 @@ -129,7 +129,7 @@ exports[`create a AddressEdit with props 1`] = `
-
+
电话 @@ -145,7 +145,7 @@ exports[`create a AddressEdit with props 1`] = `
-
+
地区 @@ -161,11 +161,11 @@ exports[`create a AddressEdit with props 1`] = `
-
+
-
+
详细地址 @@ -184,7 +184,7 @@ exports[`create a AddressEdit with props 1`] = `
-
+
邮政编码 @@ -200,7 +200,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 ba7d797b7..d9de9b5ba 100644 --- a/packages/address-list/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap @@ -6,7 +6,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -16,7 +16,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -30,7 +30,7 @@ exports[`renders demo correctly 1`] = `
以下地址超出配送范围
-
+
diff --git a/packages/button/test/__snapshots__/demo.spec.js.snap b/packages/button/test/__snapshots__/demo.spec.js.snap index 1a6fa580a..9803e29e5 100644 --- a/packages/button/test/__snapshots__/demo.spec.js.snap +++ b/packages/button/test/__snapshots__/demo.spec.js.snap @@ -11,8 +11,8 @@ exports[`renders demo correctly 1`] = `
- - + +
diff --git a/packages/cell/index.vue b/packages/cell/index.vue index 1d136527b..9967802ca 100644 --- a/packages/cell/index.vue +++ b/packages/cell/index.vue @@ -4,9 +4,9 @@ b({ center, required, + borderless: !border, clickable: isLink || clickable - }), - { 'van-hairline': border } + }) ]" @click="onClick" > diff --git a/packages/cell/test/__snapshots__/demo.spec.js.snap b/packages/cell/test/__snapshots__/demo.spec.js.snap index 431a08069..8668eb376 100644 --- a/packages/cell/test/__snapshots__/demo.spec.js.snap +++ b/packages/cell/test/__snapshots__/demo.spec.js.snap @@ -4,7 +4,7 @@ exports[`renders demo correctly 1`] = `
-
+
单元格 @@ -12,7 +12,7 @@ exports[`renders demo correctly 1`] = `
内容
-
+
单元格
描述信息
@@ -24,7 +24,7 @@ exports[`renders demo correctly 1`] = `
-
+
内容
@@ -34,7 +34,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -48,7 +48,7 @@ exports[`renders demo correctly 1`] = `
-
+
单元格 @@ -58,7 +58,7 @@ exports[`renders demo correctly 1`] = `
-
+
单元格 @@ -68,7 +68,7 @@ exports[`renders demo correctly 1`] = `
-
+
单元格 @@ -82,7 +82,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -92,7 +92,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -104,7 +104,7 @@ exports[`renders demo correctly 1`] = `
-
+
单元格 diff --git a/packages/checkbox/test/__snapshots__/demo.spec.js.snap b/packages/checkbox/test/__snapshots__/demo.spec.js.snap index 50dd9812f..8f1dee5e9 100644 --- a/packages/checkbox/test/__snapshots__/demo.spec.js.snap +++ b/packages/checkbox/test/__snapshots__/demo.spec.js.snap @@ -91,7 +91,7 @@ exports[`renders demo correctly 1`] = `
-
+
复选框a @@ -108,7 +108,7 @@ exports[`renders demo correctly 1`] = `
-
+
复选框b @@ -125,7 +125,7 @@ exports[`renders demo correctly 1`] = `
-
+
复选框c diff --git a/packages/collapse/test/__snapshots__/demo.spec.js.snap b/packages/collapse/test/__snapshots__/demo.spec.js.snap index 4fe18e2be..33708bd00 100644 --- a/packages/collapse/test/__snapshots__/demo.spec.js.snap +++ b/packages/collapse/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞微商城 @@ -20,7 +20,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞零售 @@ -33,7 +33,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞美业 @@ -50,7 +50,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞微商城 @@ -65,7 +65,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞零售 @@ -78,7 +78,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞美业 @@ -95,7 +95,7 @@ exports[`renders demo correctly 1`] = `
-
+
有赞微商城 @@ -112,7 +112,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap index 815447e8d..5e0a6e95b 100644 --- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap +++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap @@ -3,7 +3,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -17,7 +17,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -35,7 +35,7 @@ exports[`renders demo correctly 1`] = `