From e25dde299aefc2eebdf306a6a0e138cbfe90083e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Sun, 1 Jul 2018 07:47:14 +0800
Subject: [PATCH] [Improvement] SwitchCell: add size prop (#1371)

---
 packages/address-edit/test/__snapshots__/demo.spec.js.snap  | 2 +-
 packages/address-edit/test/__snapshots__/index.spec.js.snap | 2 +-
 packages/switch-cell/en-US.md                               | 5 +++--
 packages/switch-cell/index.vue                              | 6 +++++-
 packages/switch-cell/test/__snapshots__/demo.spec.js.snap   | 6 +++---
 packages/switch-cell/zh-CN.md                               | 1 +
 packages/vant-css/src/switch-cell.css                       | 3 +++
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
index cb6844397..7a36e8910 100644
--- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
@@ -93,7 +93,7 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </div>
           <div class="van-cell__value">
-            <div title="设为默认收货地址" class="van-switch" style="font-size:30px;">
+            <div title="设为默认收货地址" class="van-switch" style="font-size:26px;">
               <div class="van-switch__node">
                 <!---->
               </div>
diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap
index a30a160e4..d401b3aec 100644
--- a/packages/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap
@@ -188,7 +188,7 @@ exports[`create a AddressEdit with props 1`] = `
         <!---->
       </div>
       <div class="van-cell__value">
-        <div title="设为默认收货地址" class="van-switch van-switch--on" style="font-size:30px;">
+        <div title="设为默认收货地址" class="van-switch van-switch--on" style="font-size:26px;">
           <div class="van-switch__node">
             <!---->
           </div>
diff --git a/packages/switch-cell/en-US.md b/packages/switch-cell/en-US.md
index bbbd1eb00..df516bde2 100644
--- a/packages/switch-cell/en-US.md
+++ b/packages/switch-cell/en-US.md
@@ -54,8 +54,9 @@ use `loading` property to keep component in loading state
 |-----------|-----------|-----------|-------------|
 | v-model | on-off state of the switch | `Boolean` | - |
 | title | the leftside title |  `String` | `''` |
-| loading | whether the component is in loading state |  `Boolean` | `false` |
-| disabled | whether to disable the component |  `Boolean` | `false` |
+| loading | whether switch is loading |  `Boolean` | `false` |
+| disabled | whether to disable switch |  `Boolean` | `false` |
+| size | Size of switch | `String` | `26px` |
 
 ### Event
 
diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue
index 6c1f38f6e..3b2b202d0 100644
--- a/packages/switch-cell/index.vue
+++ b/packages/switch-cell/index.vue
@@ -20,7 +20,11 @@ export default create({
     value: Boolean,
     border: Boolean,
     loading: Boolean,
-    disabled: Boolean
+    disabled: Boolean,
+    size: {
+      type: String,
+      default: '26px'
+    }
   },
 
   watch: {
diff --git a/packages/switch-cell/test/__snapshots__/demo.spec.js.snap b/packages/switch-cell/test/__snapshots__/demo.spec.js.snap
index 4d56a0ddd..adea272c3 100644
--- a/packages/switch-cell/test/__snapshots__/demo.spec.js.snap
+++ b/packages/switch-cell/test/__snapshots__/demo.spec.js.snap
@@ -10,7 +10,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value">
-          <div title="标题" class="van-switch van-switch--on" style="font-size:30px;">
+          <div title="标题" class="van-switch van-switch--on" style="font-size:26px;">
             <div class="van-switch__node">
               <!---->
             </div>
@@ -28,7 +28,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value">
-          <div title="标题" class="van-switch van-switch--on van-switch--disabled" style="font-size:30px;">
+          <div title="标题" class="van-switch van-switch--on van-switch--disabled" style="font-size:26px;">
             <div class="van-switch__node">
               <!---->
             </div>
@@ -46,7 +46,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value">
-          <div title="标题" class="van-switch van-switch--on" style="font-size:30px;">
+          <div title="标题" class="van-switch van-switch--on" style="font-size:26px;">
             <div class="van-switch__node">
               <div class="van-loading van-loading--circular van-loading--black van-switch__loading"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
             </div>
diff --git a/packages/switch-cell/zh-CN.md b/packages/switch-cell/zh-CN.md
index 4fcd0b042..32140bddf 100644
--- a/packages/switch-cell/zh-CN.md
+++ b/packages/switch-cell/zh-CN.md
@@ -56,6 +56,7 @@ export default {
 | title | 左侧标题 |  `String` | `''` |
 | loading | 是否为加载状态 |  `Boolean` | `false` |
 | disabled | 是否为禁用状态 |  `Boolean` | `false` |
+| size | 开关尺寸 | `String` | `26px` |
 
 ### Event
 
diff --git a/packages/vant-css/src/switch-cell.css b/packages/vant-css/src/switch-cell.css
index 133ad05e0..c96aa48e2 100644
--- a/packages/vant-css/src/switch-cell.css
+++ b/packages/vant-css/src/switch-cell.css
@@ -1,6 +1,9 @@
 @import './common/var.css';
 
 .van-switch-cell {
+  padding-top: 8px;
+  padding-bottom: 8px;
+
   .van-switch {
     float: right;
   }