From 493371c7a13e6ca181599a63e7e54129f30c4214 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 23 Nov 2017 20:23:42 +0800
Subject: [PATCH] [Improvement] SubmitBar: add left slot (#345)

* fix: Tabbar icon line-height

* [new feature] progress add showPivot prop

* [new feature] TabItem support vue-router

* [new feature] update document header style

* [Doc] add toast english ducoment

* [bugfix] Search box-sizing wrong

* [Doc] update vant-demo respo

* [Doc] translate theme & demo pages

* [Doc] add Internationalization document

* [bugfix] remove unnecessary props

* [fix] optimize clickoutside

* [new feature] optimize find-parent

* [new feature]: change document title accordinng to language

* [new feature] Pagination code review

* [improvement] adjust icon-font unicode

* [improvement] Icon spinner color inherit

* [improvement] icon default width

* [bugfix] DateTimePicker validate date props

* [bugfix] Tab item text ellipsis

* [improvement] optimize single line ellipsis

* [Improvement] optimzie staticClass

* [Improvement] Button: use sfc instread of jsx

* [Improvement] update actionsheet close icon style

* fix: yarn.lock

* fix: icon test cases

* [bugfix] errors during ssr

* [Improvement] SubmitBar add left slot
---
 docs/demos/views/submit-bar.vue    | 12 ++++++++++++
 docs/markdown/en-US/submit-bar.md  |  4 +++-
 docs/markdown/zh-CN/submit-bar.md  |  4 +++-
 packages/submit-bar/index.vue      |  1 +
 packages/vant-css/src/checkbox.css | 16 +++++++++-------
 packages/vant-css/src/radio.css    | 14 +++++++++-----
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/docs/demos/views/submit-bar.vue b/docs/demos/views/submit-bar.vue
index 335c8636b..9b985a3bd 100644
--- a/docs/demos/views/submit-bar.vue
+++ b/docs/demos/views/submit-bar.vue
@@ -33,6 +33,7 @@
         buttonText="提交订单"
         @submit="onClickButton"
       >
+        <van-checkbox v-model="checked">全选</van-checkbox>
         <span slot="tip">
           您的收货地址不支持同城送, <span class="van-edit-address" @click="onClickEditAddress">修改地址 ></span>
         </span>
@@ -52,6 +53,12 @@ export default {
     }
   },
 
+  data() {
+    return {
+      checked: true
+    };
+  },
+
   methods: {
     onClickButton() {
       Toast('点击按钮');
@@ -69,8 +76,13 @@ export default {
   .van-submit-bar {
     position: relative;
   }
+
   .van-edit-address {
     color: #38F;
   }
+
+  .van-checkbox {
+    margin-left: 15px;
+  }
 }
 </style>
diff --git a/docs/markdown/en-US/submit-bar.md b/docs/markdown/en-US/submit-bar.md
index 0cb502112..34851f346 100644
--- a/docs/markdown/en-US/submit-bar.md
+++ b/docs/markdown/en-US/submit-bar.md
@@ -71,7 +71,7 @@ Vue.component(SubmitBar.name, SubmitBar);
 ```
 
 #### Advanced Usage
-提示文案中的额外操作和说明
+通过 slot 插入自定义内容
 
 ```html
 <van-submit-bar
@@ -79,6 +79,7 @@ Vue.component(SubmitBar.name, SubmitBar);
   buttonText="提交订单"
   @submit="onClickButton"
 >
+  <van-checkbox v-model="checked">全选</van-checkbox>
   <span slot="tip">
     您的收货地址不支持同城送, <span @click="onClickEditAddress">修改地址 ></span>
   </span>
@@ -106,4 +107,5 @@ Vue.component(SubmitBar.name, SubmitBar);
 
 | Name | Description |
 |-----------|-----------|
+| default | 自定义订单栏左侧内容 |
 | tip | 提示文案中的额外操作和说明 |
diff --git a/docs/markdown/zh-CN/submit-bar.md b/docs/markdown/zh-CN/submit-bar.md
index 944ec64c5..052f5508c 100644
--- a/docs/markdown/zh-CN/submit-bar.md
+++ b/docs/markdown/zh-CN/submit-bar.md
@@ -45,7 +45,7 @@ Vue.component(SubmitBar.name, SubmitBar);
 ```
 
 #### 高级用法
-提示文案中的额外操作和说明
+通过 slot 插入自定义内容
 
 ```html
 <van-submit-bar
@@ -53,6 +53,7 @@ Vue.component(SubmitBar.name, SubmitBar);
   buttonText="提交订单"
   @submit="onClickButton"
 >
+  <van-checkbox v-model="checked">全选</van-checkbox>
   <span slot="tip">
     您的收货地址不支持同城送, <span @click="onClickEditAddress">修改地址 ></span>
   </span>
@@ -80,4 +81,5 @@ Vue.component(SubmitBar.name, SubmitBar);
 
 | Name | 说明 |
 |-----------|-----------|
+| default | 自定义订单栏左侧内容 |
 | tip | 提示文案中的额外操作和说明 |
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index 670390fb8..7db8251ec 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -4,6 +4,7 @@
       {{ tip }}<slot name="tip" />
     </div>
     <div class="van-submit-bar__bar">
+      <slot />
       <div class="van-submit-bar__price">
         <template v-if="hasPrice">
           <span class="van-submit-bar__price-text">合计：</span>
diff --git a/packages/vant-css/src/checkbox.css b/packages/vant-css/src/checkbox.css
index 44260750c..45fcd777d 100644
--- a/packages/vant-css/src/checkbox.css
+++ b/packages/vant-css/src/checkbox.css
@@ -8,7 +8,6 @@ $van-checkbox-size: 20px;
   .van-icon-success {
     color: $white;
     display: block;
-    line-height: 1;
     font-size: 12px;
     text-align: center;
     pointer-events: none;
@@ -23,11 +22,15 @@ $van-checkbox-size: 20px;
     }
   }
 
+  &__input,
+  &__label {
+    display: inline-block;
+    vertical-align: middle;
+  }
+
   &__input {
     position: relative;
     height: $van-checkbox-size;
-    margin-right: 15px;
-    float: left;
   }
 
   &__control {
@@ -36,13 +39,12 @@ $van-checkbox-size: 20px;
     left: 0;
     opacity: 0;
     margin: 0;
-    width: $van-checkbox-size;
-    height: $van-checkbox-size;
+    width: 100%;
+    height: 100%;
   }
 
   &__label {
-    display: block; 
-    margin-left: 37px;
+    margin-left: 10px;
     line-height: $van-checkbox-size;
   }
 
diff --git a/packages/vant-css/src/radio.css b/packages/vant-css/src/radio.css
index ec51ea503..47bcbf185 100644
--- a/packages/vant-css/src/radio.css
+++ b/packages/vant-css/src/radio.css
@@ -5,26 +5,30 @@ $van-radio-size: 20px;
 .van-radio {
   overflow: hidden;
 
+  &__input,
+  &__label {
+    display: inline-block;
+    vertical-align: middle;
+  }
+
   &__input {
     position: relative;
     height: $van-radio-size;
-    float: left;
   }
 
   &__control {
     position: absolute;
     top: 0;
     left: 0;
-    width: $van-radio-size;
-    height: $van-radio-size;
     opacity: 0;
     margin: 0;
+    width: 100%;
+    height: 100%;
   }
 
   &__label {
     line-height: $van-radio-size;
-    display: block;
-    margin-left: 37px;
+    margin-left: 10px;
   }
 
   .van-icon {