Merge branch 'hotfix/fix_tab_scroll_view_height' into 'master'

Hotfix/fix tab scroll view height



See merge request !1

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

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;

dist/card/index.wxss

@@ -20,7 +20,6 @@
 
 .zan-card__img {
   position: absolute;
-  margin: auto;
   top: 0;
   left: 0;
   right: 0;

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;
 }

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%;

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>

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
     }
   },