Merge branch 'master' of gitlab.qima-inc.com:weapp/zui

.weappbuild.js

@@ -0,0 +1,6 @@
+let version = '1.2.0';
+
+module.exports = {
+  "dist": "./dist1",
+  "zip": `zui_${version}`
+}

dist/tab/index.wxss

@@ -40,6 +40,9 @@
   display: block;
   white-space: nowrap;
 }
+.zui-tab__bd--scroll .zui-tab__item {
+  min-width: 80px;
+}
 .zui-tab__bd--scroll .zui-tab__text {
   margin: 0 20px;
 }

example/tab/index.js

@@ -44,6 +44,29 @@ Page(Object.assign({}, ZUI.Tab, {
       }],
       selectedId: '1',
       scroll: true
+    },
+    tab3: {
+      list: [{
+        id: '1',
+        title: '商品1'
+      }, {
+        id: '2',
+        title: '商品2'
+      }, {
+        id: '3',
+        title: '商品3'
+      }, {
+        id: '4',
+        title: '商品4'
+      }, {
+        id: '5',
+        title: '商品5'
+      }, {
+        id: '6',
+        title: '商品6'
+      }],
+      selectedId: '1',
+      scroll: true
     }
   },
 

example/tab/index.wxml

@@ -7,4 +7,7 @@
   <view style="margin: 20px 0">
     <template is="zui-tab" data="{{tab: tab2, componentId: 'tab2'}}"></template>
   </view>
+  <view style="margin: 20px 0">
+    <template is="zui-tab" data="{{tab: tab3, componentId: 'tab3'}}"></template>
+  </view>
 </view>