From 253cc876320556614062e10a90b213d2b8f34f4c Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Fri, 17 Feb 2017 10:39:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E6=94=AF=E6=8C=81=20:first-child=20=E5=92=8C=20:last-?=
 =?UTF-8?q?child=20=E8=BF=99=E4=B8=A4=E4=B8=AA=E4=BC=AA=E7=B1=BB=20(#13)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add package json

* 小程序已经支持 first-child 和 last-child 两个伪类
---
 dist/btn/index.wxss     |  5 +++--
 dist/cell/index.wxss    |  3 ++-
 example/btn/index.wxml  |  6 +++---
 example/cell/index.wxml | 16 ++++++++--------
 package.json            | 22 ++++++++++++++++++++++
 5 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 package.json

diff --git a/dist/btn/index.wxss b/dist/btn/index.wxss
index e4bf4478..7e945c87 100644
--- a/dist/btn/index.wxss
+++ b/dist/btn/index.wxss
@@ -133,8 +133,9 @@
   opacity: 1 ! important;
 }
 
-/* ::last-child */
-.zan-btn--last-child {
+/* :last-child */
+.zan-btn--last-child,
+.zan-btn:last-child {
   margin-bottom: 0;
   margin-right: 0;
 }
diff --git a/dist/cell/index.wxss b/dist/cell/index.wxss
index 0b64fca8..387480ef 100644
--- a/dist/cell/index.wxss
+++ b/dist/cell/index.wxss
@@ -25,7 +25,8 @@
   color: #666;
 }
 
-.zan-cell--last-child::after {
+.zan-cell--last-child::after,
+.zan-cell:last-child::after {
   display: none;
 }
 
diff --git a/example/btn/index.wxml b/example/btn/index.wxml
index 7006b5c3..4967a4d2 100644
--- a/example/btn/index.wxml
+++ b/example/btn/index.wxml
@@ -8,7 +8,7 @@
       <button class="zan-btn">取消订单</button>
       <button class="zan-btn zan-btn--primary">确认付款</button>
       <button class="zan-btn zan-btn--danger">确认付款</button>
-      <button class="zan-btn zan-btn--warn zan-btn--last-child">确认付款</button>
+      <button class="zan-btn zan-btn--warn">确认付款</button>
     </view>
   </view>
 
@@ -39,7 +39,7 @@
       <button class="zan-btn zan-btn--loading">取消订单</button>
       <button class="zan-btn zan-btn--loading zan-btn--primary">确认付款</button>
       <button class="zan-btn zan-btn--loading zan-btn--danger">确认付款</button>
-      <button class="zan-btn zan-btn--loading zan-btn--warn zan-btn--last-child">确认付款</button>
+      <button class="zan-btn zan-btn--loading zan-btn--warn">确认付款</button>
     </view>
   </view>
 
@@ -49,7 +49,7 @@
       <button class="zan-btn zan-btn--disabled" disabled>取消订单</button>
       <button class="zan-btn zan-btn--disabled zan-btn--primary" disabled>确认付款</button>
       <button class="zan-btn zan-btn--disabled zan-btn--danger" disabled>确认付款</button>
-      <button class="zan-btn zan-btn--disabled zan-btn--warn zan-btn--last-child" disabled>确认付款</button>
+      <button class="zan-btn zan-btn--disabled zan-btn--warn" disabled>确认付款</button>
     </view>
   </view>
 
diff --git a/example/cell/index.wxml b/example/cell/index.wxml
index 6272b0f3..d779392c 100644
--- a/example/cell/index.wxml
+++ b/example/cell/index.wxml
@@ -3,27 +3,27 @@
   <view class="doc-title">CELL</view>
 
   <view class="zan-panel">
-    <view class="zan-cell zan-cell--last-child">
+    <view class="zan-cell">
       <view class="zan-cell__bd">单行列表</view>
     </view>
   </view>
 
   <view class="zan-panel">
-    <view class="zan-cell zan-cell--last-child">
+    <view class="zan-cell">
       <view class="zan-cell__bd">单行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
   </view>
 
   <view class="zan-panel">
-    <view class="zan-cell zan-cell--last-child zan-cell--access">
+    <view class="zan-cell zan-cell--access">
       <view class="zan-cell__bd">单行列表</view>
       <view class="zan-cell__ft"></view>
     </view>
   </view>
 
   <view class="zan-panel">
-    <view class="zan-cell zan-cell--last-child zan-cell--access">
+    <view class="zan-cell zan-cell--access">
       <view class="zan-cell__bd">单行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
@@ -36,7 +36,7 @@
     <view class="zan-cell">
       <view class="zan-cell__bd">多行列表</view>
     </view>
-    <view class="zan-cell zan-cell--last-child">
+    <view class="zan-cell">
       <view class="zan-cell__bd">多行列表</view>
     </view>
   </view>
@@ -50,7 +50,7 @@
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
-    <view class="zan-cell zan-cell--last-child">
+    <view class="zan-cell">
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
@@ -65,7 +65,7 @@
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft"></view>
     </view>
-    <view class="zan-cell zan-cell--access zan-cell--last-child">
+    <view class="zan-cell zan-cell--access">
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft"></view>
     </view>
@@ -80,7 +80,7 @@
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
-    <view class="zan-cell zan-cell--access zan-cell--last-child">
+    <view class="zan-cell zan-cell--access">
       <view class="zan-cell__bd">多行列表</view>
       <view class="zan-cell__ft">详细信息</view>
     </view>
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..a735562a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "zanui-weapp",
+  "version": "2.0.0",
+  "description": "高颜值、好用、易扩展的小程序 UI 库，Powered by 有赞",
+  "main": "app.js",
+  "directories": {
+    "example": "example"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/youzan/zanui-weapp.git"
+  },
+  "author": "youzan",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/youzan/zanui-weapp/issues"
+  },
+  "homepage": "https://github.com/youzan/zanui-weapp#readme"
+}

From 01fe69253ba70f0a55852525b44696f45e958f06 Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Fri, 24 Feb 2017 16:33:34 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9Eswitch=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20(#14)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

小程序原生的switch组件不支持loading及disabled状态，所以组件库中新增自己实现的switch组件。
---
 app.json                   |  1 +
 changelog.md               |  4 +++
 dist/cell/index.wxss       |  4 +++
 dist/index.js              |  1 +
 dist/index.wxss            |  1 +
 dist/switch/index.js       | 25 ++++++++++++++
 dist/switch/index.wxml     | 15 +++++++++
 dist/switch/index.wxss     | 69 ++++++++++++++++++++++++++++++++++++++
 example/cell/index.js      | 18 ++++++----
 example/cell/index.wxml    | 12 +++++++
 example/dashboard/index.js |  5 +--
 example/switch/index.js    | 36 ++++++++++++++++++++
 example/switch/index.wxml  | 23 +++++++++++++
 example/switch/index.wxss  |  6 ++++
 14 files changed, 212 insertions(+), 8 deletions(-)
 create mode 100644 dist/switch/index.js
 create mode 100644 dist/switch/index.wxml
 create mode 100644 dist/switch/index.wxss
 create mode 100644 example/switch/index.js
 create mode 100644 example/switch/index.wxml
 create mode 100644 example/switch/index.wxss

diff --git a/app.json b/app.json
index 97f7a4c6..cccd4264 100644
--- a/app.json
+++ b/app.json
@@ -13,6 +13,7 @@
     "example/helper/index",
     "example/form/index",
     "example/steps/index",
+    "example/switch/index",
     "example/card/index",
     "example/toast/index",
     "example/icon/index",
diff --git a/changelog.md b/changelog.md
index e69de29b..7069156c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -0,0 +1,4 @@
+`ZanUI-WeApp` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。
+
+## 2.1.0
+- 新增`switch`组件
diff --git a/dist/cell/index.wxss b/dist/cell/index.wxss
index 387480ef..ee63bdde 100644
--- a/dist/cell/index.wxss
+++ b/dist/cell/index.wxss
@@ -47,3 +47,7 @@
   border-style: solid;
   transform: translateY(-50%) matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
 }
+.zan-cell--switch {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
diff --git a/dist/index.js b/dist/index.js
index 4f4469c1..6ba83f82 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2,3 +2,4 @@ exports.Tab = require('./tab/index');
 exports.Quantity = require('./quantity/index');
 exports.TopTips = require('./toptips/index');
 exports.Toast = require('./toast/index');
+exports.Switch = require('./switch/index');
diff --git a/dist/index.wxss b/dist/index.wxss
index 8cea86dd..d20deb49 100644
--- a/dist/index.wxss
+++ b/dist/index.wxss
@@ -15,3 +15,4 @@
 @import "toast/index.wxss";
 @import "toptips/index.wxss";
 @import "icon/index.wxss";
+@import "switch/index.wxss";
diff --git a/dist/switch/index.js b/dist/switch/index.js
new file mode 100644
index 00000000..c73c0cab
--- /dev/null
+++ b/dist/switch/index.js
@@ -0,0 +1,25 @@
+var Switch = {
+  _handleZanSwitchChange(e) {
+    var dataset = e.currentTarget.dataset;
+
+    var checked = !dataset.checked;
+    var loading = dataset.loading;
+    var disabled = dataset.disabled;
+    var componentId = dataset.componentId;
+
+    if (loading || disabled) return;
+
+    console.info('[zan:switch:change]', { checked, componentId });
+
+    if (this.handleZanSwitchChange) {
+      this.handleZanSwitchChange({
+        checked,
+        componentId
+      });
+    } else {
+      console.warn('页面缺少 handleZanSwitchChange 回调函数');
+    }
+  }
+};
+
+module.exports = Switch;
diff --git a/dist/switch/index.wxml b/dist/switch/index.wxml
new file mode 100644
index 00000000..b99d2e3b
--- /dev/null
+++ b/dist/switch/index.wxml
@@ -0,0 +1,15 @@
+<template name="zan-switch">
+  <view
+    class="zan-switch zan-switch--{{ checked ? 'on' : 'off' }} {{ disabled ? 'zan-swtich--disabled' : '' }}"
+    data-checked="{{ checked }}"
+    data-loading="{{ loading }}"
+    data-disabled="{{ disabled }}"
+    data-component-id="{{ componentId }}"
+    bindtap="_handleZanSwitchChange"
+  >
+    <view class="zan-switch__circle">
+      <view hidden="{{ !loading }}" class="zan-switch__loading"></view>
+    </view>
+    <view class="zan-switch__bg"></view>
+  </view>
+</template>
diff --git a/dist/switch/index.wxss b/dist/switch/index.wxss
new file mode 100644
index 00000000..796c9130
--- /dev/null
+++ b/dist/switch/index.wxss
@@ -0,0 +1,69 @@
+.zan-switch {
+  position: relative;
+  display: inline-block;
+  width: 52px;
+  height: 32px;
+  vertical-align: middle;
+  box-sizing: border-box;
+  border-radius: 16px;
+  background: #44DB5E;
+  border: 1px solid #44DB5E;
+}
+.zan-switch__circle {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  display: inline-block;
+  background: #fff;
+  border-radius: 15px;
+  box-sizing: border-box;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  z-index: 2;
+}
+.zan-switch__bg {
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  width: 52px;
+  height: 32px;
+  background: #fff;
+  border-radius: 26px;
+  display: inline-block;
+  border: 1px solid #e5e5e5;
+  box-sizing: border-box;
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transform: scale(0);
+  transform-origin: 36px 16px;
+}
+.zan-switch--on .zan-switch__circle {
+  transform: translateX(20px);
+}
+.zan-switch--off .zan-switch__bg {
+  transform: scale(1);
+}
+.zan-swtich--disabled {
+  opacity: 0.4;
+}
+.zan-switch__loading {
+  position: absolute;
+  left: 7px;
+  top: 7px;
+  width: 16px;
+  height: 16px;
+  background: url(https://img.yzcdn.cn/public_files/2017/02/24/9acec77d91106cd15b8107c4633d9155.png) no-repeat;
+  background-size: 16px 16px;
+  animation: zan-switch-loading 0.8s infinite linear;
+}
+
+@keyframes zan-switch-loading {
+  from {
+    transform: rotate(0);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
diff --git a/example/cell/index.js b/example/cell/index.js
index 99e7458d..609d03cb 100644
--- a/example/cell/index.js
+++ b/example/cell/index.js
@@ -1,13 +1,19 @@
-var app = getApp()
+var Zan = require('../../dist/index');
 
-Page({
+Page(Object.assign({}, Zan.Switch, {
   data: {
+    checked: false
   },
 
-  onLoad: function () {
-
+  onLoad() {
   },
 
-  onShow: function() {
+  onShow() {
   },
-})
+
+  handleZanSwitchChange(e) {
+    this.setData({
+      checked: e.checked
+    });
+  }
+}));
diff --git a/example/cell/index.wxml b/example/cell/index.wxml
index d779392c..ae55100a 100644
--- a/example/cell/index.wxml
+++ b/example/cell/index.wxml
@@ -1,3 +1,5 @@
+<import src="/dist/switch/index.wxml" />
+
 <view class="container">
 
   <view class="doc-title">CELL</view>
@@ -22,6 +24,16 @@
     </view>
   </view>
 
+  <view class="zan-panel">
+
+    <view class="zan-cell zan-cell--switch">
+      <view class="zan-cell__bd">开关</view>
+      <view class="zan-cell__ft">
+        <template is="zan-switch" data="{{ checked }}"/>
+      </view>
+    </view>
+  </view>
+
   <view class="zan-panel">
     <view class="zan-cell zan-cell--access">
       <view class="zan-cell__bd">单行列表</view>
diff --git a/example/dashboard/index.js b/example/dashboard/index.js
index 2f368b14..8c0d368b 100644
--- a/example/dashboard/index.js
+++ b/example/dashboard/index.js
@@ -1,5 +1,3 @@
-var app = getApp()
-
 Page({
   data: {
     list: [
@@ -42,6 +40,9 @@ Page({
       }, {
         name: 'Steps',
         path: '/example/steps/index'
+      }, {
+        name: 'Switch',
+        path: '/example/switch/index'
       }, {
         name: 'Tab',
         path: '/example/tab/index'
diff --git a/example/switch/index.js b/example/switch/index.js
new file mode 100644
index 00000000..b691471e
--- /dev/null
+++ b/example/switch/index.js
@@ -0,0 +1,36 @@
+var Zan = require('../../dist/index');
+
+Page(Object.assign({}, Zan.Switch, {
+  data: {
+    sync: {
+      checked: false
+    },
+    async: {
+      checked: true,
+      loading: false
+    },
+  },
+
+  handleZanSwitchChange(e) {
+    var componentId = e.componentId;
+    var checked = e.checked;
+
+    if (componentId == 'sync') {
+      // 同步开关
+      this.setData({
+        [`${componentId}.checked`]: checked
+      });
+    } else if (componentId == 'async') {
+      // 异步开关
+      this.setData({
+        [`${componentId}.loading`]: true
+      });
+      setTimeout(() => {
+        this.setData({
+          [`${componentId}.loading`]: false,
+          [`${componentId}.checked`]: checked
+        });
+      }, 500);
+    }
+  }
+}));
diff --git a/example/switch/index.wxml b/example/switch/index.wxml
new file mode 100644
index 00000000..96db5649
--- /dev/null
+++ b/example/switch/index.wxml
@@ -0,0 +1,23 @@
+<import src="/dist/switch/index.wxml" />
+
+<view class="container">
+
+  <view class="doc-title">SWITCH</view>
+
+  <view class="zan-panel-title">同步开关</view>
+  <view class="zan-panel">
+    <template is="zan-switch" data="{{ ...sync, componentId: 'sync' }}" />
+  </view>
+
+  <view class="zan-panel-title">异步开关</view>
+  <view class="zan-panel">
+    <template is="zan-switch" data="{{ ...async, componentId: 'async' }}" />
+  </view>
+
+  <view class="zan-panel-title">开关不可用</view>
+  <view class="zan-panel">
+    <template is="zan-switch" data="{{ checked: false, disabled: true, componentId: 'switch3' }}" />
+    <template is="zan-switch" data="{{ checked: true, disabled: true, componentId: 'switch4' }}" />
+  </view>
+
+</view>
diff --git a/example/switch/index.wxss b/example/switch/index.wxss
new file mode 100644
index 00000000..87217462
--- /dev/null
+++ b/example/switch/index.wxss
@@ -0,0 +1,6 @@
+.zan-panel {
+  padding: 10px;
+}
+.zan-switch {
+  margin-right: 8px;
+}

From d9b5d181d1e6f841101790a5d52ffc1fe80f2d63 Mon Sep 17 00:00:00 2001
From: everywill <everywillatchina@gmail.com>
Date: Thu, 2 Mar 2017 02:09:24 -0600
Subject: [PATCH 3/6] =?UTF-8?q?=E7=AB=96=E7=9B=B4=E6=96=B9=E5=90=91steps?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0done=E5=92=8Ccur=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=EF=BC=8C=E5=8F=96=E6=B6=88=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAstep=E6=97=B6=E4=B8=8A=E4=B8=8B=E4=B8=A4?=
 =?UTF-8?q?=E4=BE=A7=E7=9A=84=E8=BF=9E=E6=8E=A5=E7=BA=BF=20(#17)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* style: badge上标大小改变更加灵活

* style: panel-title的行高跟随字号

* style: 绝对定位的元素width或height为auto，left，right，top，bottom不为auto时，auto的margin将计算为0，同初始值

* style: 垂直steps增加cur和done状态的区别

* style: revert previous change

* style: 当只有一个step时，取消step上下两侧的连接线
---
 dist/steps/wxss/vstep.wxss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dist/steps/wxss/vstep.wxss b/dist/steps/wxss/vstep.wxss
index 70d89473..4dfa57f8 100644
--- a/dist/steps/wxss/vstep.wxss
+++ b/dist/steps/wxss/vstep.wxss
@@ -49,6 +49,12 @@
 }
 
 .zan-steps--vsteps .zan-steps__step--done .zan-steps__circle {
+  width: 5px;
+  height: 5px;
+  background-color: #09bb07;
+}
+
+.zan-steps--vsteps .zan-steps__step--cur .zan-steps__circle {
   width: 13px;
   height: 13px;
   background: transparent url("https://b.yzcdn.cn/v2/image/wap/success_small@2x.png");
@@ -72,7 +78,7 @@
   z-index: 1;
 }
 
-.zan-steps--vsteps .zan-steps__step--last-child .zan-steps__title::before {
+.zan-steps--vsteps .zan-steps__step--last-child .zan-steps__title::after {
   content: '';
   position: absolute;
   top: 50%;

From 0f0f269f40cf471a34b842ed9a24ab71aab9dd75 Mon Sep 17 00:00:00 2001
From: everywill <everywillatchina@gmail.com>
Date: Thu, 2 Mar 2017 02:10:37 -0600
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96=20(#15?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* style: badge上标大小改变更加灵活

* style: panel-title的行高跟随字号

* style: 绝对定位的元素width或height为auto，left，right，top，bottom不为auto时，auto的margin将计算为0，同初始值
---
 dist/badge/index.wxss | 10 +++++-----
 dist/card/index.wxss  |  1 -
 dist/panel/index.wxss |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dist/badge/index.wxss b/dist/badge/index.wxss
index a712f29f..eecdb63c 100644
--- a/dist/badge/index.wxss
+++ b/dist/badge/index.wxss
@@ -5,13 +5,13 @@
   position: absolute;
   top: -8px;
   right: 0px;
-  height: 16px;
-  min-width: 16px;
-  line-height: 16px;
-  padding: 0 4px;
+  height: 1.6em;
+  min-width: 1.6em;
+  line-height: 1.6;
+  padding: 0 .4em;
   font-size: 10px;
   font-family: tahoma;
-  border-radius: 10px;
+  border-radius: .8em;
   background: #FF4444;
   color: #fff;
   text-align: center;
diff --git a/dist/card/index.wxss b/dist/card/index.wxss
index 5829a31d..27a4376c 100644
--- a/dist/card/index.wxss
+++ b/dist/card/index.wxss
@@ -20,7 +20,6 @@
 
 .zan-card__img {
   position: absolute;
-  margin: auto;
   top: 0;
   left: 0;
   right: 0;
diff --git a/dist/panel/index.wxss b/dist/panel/index.wxss
index 51c0650a..02a85335 100644
--- a/dist/panel/index.wxss
+++ b/dist/panel/index.wxss
@@ -8,7 +8,7 @@
 
 .zan-panel-title {
   font-size: 14px;
-  line-height: 14px;
+  line-height: 1;
   color: #999;
   padding: 20px 15px 0 15px;
 }

From 3674ddbf90414c089d147c95882fdaa431be4dfe Mon Sep 17 00:00:00 2001
From: Neo Tan <neotan12@hotmail.com>
Date: Thu, 30 Mar 2017 20:10:01 +0800
Subject: [PATCH 5/6] Appended a slash ("/"), or the URL won't work. (#18)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30e3c7a7..813352b3 100644
--- a/README.md
+++ b/README.md
@@ -158,5 +158,5 @@ Page(Object.assign({}, Zan.Toast, {
 [ZanUI WeApp]: https://github.com/youzan/zanui-weapp
 [MIT]: http://opensource.org/licenses/MIT
 [Bower]: https://bower.io/
-[小程序简易教程]: https://mp.weixin.qq.com/debug/wxadoc/dev
+[小程序简易教程]: https://mp.weixin.qq.com/debug/wxadoc/dev/
 [小程序框架介绍]: https://mp.weixin.qq.com/debug/wxadoc/dev/framework/MINA.html

From a7c07f24beb5716b24cd6d4ed9a019f4aec67205 Mon Sep 17 00:00:00 2001
From: pangxie1991 <chenyao1102@gmail.com>
Date: Fri, 7 Apr 2017 16:49:16 +0800
Subject: [PATCH 6/6] tab fix scroll-view height

---
 dist/tab/index.wxml  | 6 +++++-
 example/tab/index.js | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dist/tab/index.wxml b/dist/tab/index.wxml
index 8b6fd6f9..628d1a60 100644
--- a/dist/tab/index.wxml
+++ b/dist/tab/index.wxml
@@ -1,7 +1,11 @@
 <template name="zan-tab">
   <view class="zan-tab">
       <block wx:if="{{tab.scroll}}">
-        <scroll-view class="zan-tab__bd zan-tab__bd--scroll {{fixed ? 'zan-tab__bd--fixed' : ''}}" scroll-x="true">
+        <scroll-view
+          class="zan-tab__bd zan-tab__bd--scroll {{ fixed ? 'zan-tab__bd--fixed' : '' }}"
+          scroll-x="true"
+          style="height: {{ tab.height ? tab.height + 'px' : 'auto' }}"
+        >
           <template is="zan-tab-list" data="{{ tab, componentId }}"></template>
         </scroll-view>
       </block>
diff --git a/example/tab/index.js b/example/tab/index.js
index 691f5a80..3fce2d04 100644
--- a/example/tab/index.js
+++ b/example/tab/index.js
@@ -43,7 +43,8 @@ Page(Object.assign({}, Zan.Tab, {
         title: '最新商品6'
       }],
       selectedId: '1',
-      scroll: true
+      scroll: true,
+      height: 45
     },
     tab3: {
       list: [{
@@ -66,7 +67,8 @@ Page(Object.assign({}, Zan.Tab, {
         title: '商品6'
       }],
       selectedId: '1',
-      scroll: true
+      scroll: true,
+      height: 45
     }
   },