解决冲突

2025-04-06 03:58:05 +08:00 · 2018-07-21 23:03:47 +08:00 · 2018-07-21 23:03:47 +08:00 · 13b4104e2f
commit 13b4104e2f
parent f906f64bc7 b2adb9ede0
73 changed files with 2357 additions and 9295 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,29 @@
 `ZanUI-WeApp` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。

+## [v3.0.8](https://github.com/youzan/zanui-weapp/tree/v3.0.8) (2018-07-12)
+[Full Changelog](https://github.com/youzan/zanui-weapp/compare/v3.0.7...v3.0.8)
+
+**Bug Fixes**
+
+- 修复 Toast 组件未传入 timeout 时不会自动关闭的问题 [\#361](https://github.com/youzan/zanui-weapp/pull/361) ([pangxie1991](https://github.com/pangxie1991))
+- 修复 DateTime 组件接收非标准 iso 格式时间初始时间错误的问题 [\#355](https://github.com/youzan/zanui-weapp/pull/355) ([realywithoutname](https://github.com/realywithoutname))
+
+## [v3.0.7](https://github.com/youzan/zanui-weapp/tree/v3.0.7) (2018-07-10)
+[Full Changelog](https://github.com/youzan/zanui-weapp/compare/v3.0.6...v3.0.7)
+
+**new feature**
+- \[new feature\] 新增 checkbox 组件 [\#341](https://github.com/youzan/zanui-weapp/pull/341) ([jerryni](https://github.com/jerryni))
+
+**Improvements**
+
+- Tab 组件支持选中项自动滑动到中间位置 [\#347](https://github.com/youzan/zanui-weapp/pull/347) ([rex-zsd](https://github.com/rex-zsd))
+- 增加部分组件自定义样式类，方便自定义样式 [\#352](https://github.com/youzan/zanui-weapp/pull/352) ([pangxie1991](https://github.com/pangxie1991))
+
+**Bug Fixes**
+
+- 修复 Toptips 组件在示例小程序上的问题 [\#351](https://github.com/youzan/zanui-weapp/pull/351) ([pangxie1991](https://github.com/pangxie1991))
+- 修复 DateTime 组件设置初始时间时报错的问题 [\#350](https://github.com/youzan/zanui-weapp/pull/350) ([realywithoutname](https://github.com/realywithoutname))
+
 ## [v3.0.6](https://github.com/youzan/zanui-weapp/tree/v3.0.6) (2018-07-08)
 [Full Changelog](https://github.com/youzan/zanui-weapp/compare/v3.0.5...v3.0.6)

--- a/dist/btn/index.wxml
+++ b/dist/btn/index.wxml
@ -18,6 +18,7 @@
  bindgetuserinfo="bindgetuserinfo"
  bindgetphonenumber="bindgetphonenumber"
  binderror="binderror"
+  bindopensetting="bindopensetting"
 >
  <slot></slot>
 </button>
--- a/dist/btn/native-button-behaviors.js
+++ b/dist/btn/native-button-behaviors.js
@ -56,11 +56,18 @@ module.exports = Behavior({

      this.triggerEvent('getphonenumber', detail);
    },
-    binderror: function binderror() {
+    bindopensetting: function bindopensetting() {
      var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
          _ref4$detail = _ref4.detail,
          detail = _ref4$detail === undefined ? {} : _ref4$detail;

+      this.triggerEvent('opensetting', detail);
+    },
+    binderror: function binderror() {
+      var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref5$detail = _ref5.detail,
+          detail = _ref5$detail === undefined ? {} : _ref5$detail;
+
      this.triggerEvent('error', detail);
    }
  }
--- a/dist/cell-group/index.js
+++ b/dist/cell-group/index.js
@ -6,6 +6,12 @@ var CELL_PATH = '../cell/index';
 var FIELD_PATH = '../field/index';

 Component({
+  properties: {
+    titleWidth: {
+      type: Number,
+      value: null
+    }
+  },
  relations: (_relations = {}, _relations[CELL_PATH] = {
    type: 'child',
    linked: function linked() {
@ -46,10 +52,14 @@ Component({
      var elementUpdateTimeout = setTimeout(function () {
        _this.setData({ elementUpdateTimeout: 0 });
        var elements = _this.getRelationNodes(childPath);
+        var titleWidth = _this.properties.titleWidth;
+
+
        if (elements.length > 0) {
          var lastIndex = elements.length - 1;

          elements.forEach(function (cell, index) {
+            titleWidth && cell.setTitleWidth(titleWidth);
            cell.updateIsLastElement(index === lastIndex);
          });
        }
--- a/dist/cell/index.js
+++ b/dist/cell/index.js
@ -5,7 +5,7 @@ var warn = function warn(msg, getValue) {
 };

 Component({
-  externalClasses: ['cell-class'],
+  externalClasses: ['cell-class', 'title-class'],
  options: {
    multipleSlots: true
  },
@ -44,10 +44,12 @@ Component({
    url: {
      type: String,
      value: ''
-    }
+    },
+    noBorder: Boolean
  },
  data: {
-    isLastCell: true
+    isLastCell: true,
+    titleWidth: 'auto'
  },
  methods: {
    footerTap: function footerTap() {
@ -73,6 +75,14 @@ Component({
    // 用于被 cell-group 更新，标志是否是最后一个 cell
    updateIsLastElement: function updateIsLastElement(isLastCell) {
      this.setData({ isLastCell: isLastCell });
+    },
+
+
+    // 设置统一的title区域宽度
+    setTitleWidth: function setTitleWidth(titleWidth) {
+      this.setData({
+        titleWidth: titleWidth + 'px'
+      });
    }
  }
 });
--- a/dist/cell/index.wxml
+++ b/dist/cell/index.wxml
@ -1,15 +1,18 @@
 <view 
  catchtap="cellTap"
-  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }}"
+  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }} {{  noBorder ? 'no-border' : ''}}"
 >

  <view class="zan-cell__icon">
    <slot name="icon"></slot>
  </view>

-  <view class="zan-cell__bd">
+  <view class="title-class zan-cell__title" style="width: {{ titleWidth }}">
    <view wx:if="{{ title }}" class="zan-cell__text">{{ title }}</view>
    <view wx:if="{{ label }}" class="zan-cell__desc">{{ label }}</view>
+  </view>
+
+  <view class="zan-cell__bd">
    <slot></slot>
  </view>

--- a/dist/cell/index.wxss
+++ b/dist/cell/index.wxss
@ -1 +1 @@
-.zan-cell{position:relative;padding:12px 15px;display:-webkit-box;display:flex;-webkit-box-align:center;align-items:center;line-height:1.4;background-color:#fff;font-size:14px}.zan-cell::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px;left:15px;right:0}.zan-cell .zan-cell__icon{margin-right:5px}.zan-cell .zan-cell__icon:empty{display:none}.zan-cell__bd{-webkit-box-flex:1;flex:1}.zan-cell__text{line-height:24px;font-size:14px}.zan-cell__desc{line-height:1.2;font-size:12px;color:#666}.zan-cell__ft{position:relative;text-align:right;color:#666}.zan-cell__no-pading{padding:0}.zan-cell__no-pading .zan-cell__bd_padding{padding:12px 0 12px 15px}.zan-cell__no-pading .zan-cell__bd_padding .zan-form__input{height:26px}.zan-cell__no-pading .zan-cell__ft_padding{padding:12px 15px 12px 0}.zan-cell.last-cell::after{display:none}.zan-cell--access .zan-cell__ft{padding-right:13px}.zan-cell--access .zan-cell__ft::after{position:absolute;top:50%;right:2px;content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8c8;border-style:solid;-webkit-transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0);transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0)}.zan-cell--switch{padding-top:6px;padding-bottom:6px}
+.zan-cell{position:relative;padding:12px 15px;display:-webkit-box;display:flex;-webkit-box-align:center;align-items:center;line-height:1.4;background-color:#fff;font-size:14px}.zan-cell::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px;left:15px;right:0}.zan-cell__icon{margin-right:5px}.zan-cell__icon:empty{display:none}.zan-cell__title{min-width:65px;padding-right:10px}.zan-cell__title:empty{display:none}.zan-cell__bd{-webkit-box-flex:1;flex:1}.zan-cell__text{line-height:24px;font-size:14px}.zan-cell__desc{line-height:1.2;font-size:12px;color:#666}.zan-cell__ft{position:relative;text-align:right;color:#666}.zan-cell__no-pading{padding:0}.zan-cell__no-pading .zan-cell__bd_padding{padding:12px 0 12px 15px}.zan-cell__no-pading .zan-cell__bd_padding .zan-form__input{height:26px}.zan-cell__no-pading .zan-cell__ft_padding{padding:12px 15px 12px 0}.zan-cell.last-cell::after,.zan-cell.no-border::after{display:none}.zan-cell--access .zan-cell__ft{padding-right:13px}.zan-cell--access .zan-cell__ft::after{position:absolute;top:50%;right:2px;content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8c8;border-style:solid;-webkit-transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0);transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0)}.zan-cell--switch{padding-top:6px;padding-bottom:6px}
--- a/dist/checkbox/index.wxml
+++ b/dist/checkbox/index.wxml
@ -1,25 +1,13 @@
 <view
  class="checkbox-class zan-checkbox {{ isInGroup ? 'zan-checkbox__item' : ''}} {{ type === 'list' ? 'zan-checkbox__list-item' : ''}}"
  bindtap="{{ labelDisabled ? '' : 'handleClick' }}"
-  data-id="test"
  >
  <zan-icon
    type="{{ checked ? 'checked' : 'check'}}"
-    class="zan-checkbox__icon {{ 'zan-checkbox--' + shape }} {{ disabled ? 'zan-checkbox--disabled' : '' }} {{ checked ? 'zan-checkbox--checked' : '' }}"
+    class="zan-checkbox__icon {{ disabled ? 'zan-checkbox--disabled' : '' }} {{ checked ? 'zan-checkbox--checked' : '' }}"
    bindtap="{{ labelDisabled ? 'handleClick': '' }}"
  ></zan-icon>
  <text class="zan-checkbox__label">
    <slot></slot>
  </text>
 </view>
-
-<wxs module="parse">
-function getColor(color) {
-  color = color || '#ff4444'
-  return color;
-}
-
-module.exports = {
-  getColor: getColor
-};
-</wxs>
--- a/dist/datetime-picker/date-picker.js
+++ b/dist/datetime-picker/date-picker.js
@ -37,7 +37,7 @@ module.exports = function () {
    date = date || this._date || new Date();

    // toUTCString ISO 格式部分 ios 手机会失败
-    if (typeof date === 'string' && date.indexOf('-') > 0) {
+    if (new Date(date).toString() === 'Invalid Date' && typeof date === 'string' && date.indexOf('-') > 0) {
      date = iso2utc(date);
    }

--- a/dist/datetime-picker/index.js
+++ b/dist/datetime-picker/index.js
@ -184,8 +184,13 @@ Component({
        return +item[value[index]];
      });

+      var day = data.slice(0, 3);
+      var time = data.slice(3, 6);
+      var date = new Date(day.join('/') + ' ' + time.join(':'));
+
      this.triggerEvent('change', {
-        value: data
+        value: data,
+        date: date
      });

      // 手动触发 columnchange
--- a/dist/dialog/data.js
+++ b/dist/dialog/data.js
@ -20,5 +20,7 @@ module.exports = {
  // 取消按钮文案
  cancelButtonText: '取消',
  // 取消按钮颜色
-  cancelButtonColor: '#333'
+  cancelButtonColor: '#333',
+  // 点击按钮自动关闭 dialog
+  autoClose: true
 };
--- a/dist/dialog/dialog.js
+++ b/dist/dialog/dialog.js
@ -2,21 +2,37 @@

 var defaultData = require('./data');

-// options 使用参数
-// pageCtx 页面 page 上下文
-function Dialog(options, pageCtx) {
-  var parsedOptions = Object.assign({
-    // 自定义 btn 列表
-    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色 }
-    buttons: []
-  }, defaultData, options);
+function getDialogCtx(_ref) {
+  var selector = _ref.selector,
+      pageCtx = _ref.pageCtx;

  var ctx = pageCtx;
  if (!ctx) {
    var pages = getCurrentPages();
    ctx = pages[pages.length - 1];
  }
-  var dialogCtx = ctx.selectComponent(parsedOptions.selector);
+  return ctx.selectComponent(selector);
+}
+
+function getParsedOptions() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+  return Object.assign({
+    // 自定义 btn 列表
+    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色 }
+    buttons: []
+  }, defaultData, options);
+}
+
+// options 使用参数
+// pageCtx 页面 page 上下文
+function Dialog(options, pageCtx) {
+  var parsedOptions = getParsedOptions(options);
+
+  var dialogCtx = getDialogCtx({
+    selector: parsedOptions.selector,
+    pageCtx: pageCtx
+  });

  if (!dialogCtx) {
    console.error('无法找到对应的dialog组件，请于页面中注册并在 wxml 中声明 dialog 自定义组件');
@ -60,9 +76,29 @@ function Dialog(options, pageCtx) {
      showCustomBtns: showCustomBtns,
      key: '' + new Date().getTime(),
      show: true,
-      promiseFunc: { resolve: resolve, reject: reject }
+      promiseFunc: { resolve: resolve, reject: reject },
+      openTypePromiseFunc: null
    }));
  });
 }

+Dialog.close = function (options, pageCtx) {
+  var parsedOptions = getParsedOptions(options);
+
+  var dialogCtx = getDialogCtx({
+    selector: parsedOptions.selector,
+    pageCtx: pageCtx
+  });
+
+  if (!dialogCtx) {
+    return;
+  }
+
+  dialogCtx.setData({
+    show: false,
+    promiseFunc: null,
+    openTypePromiseFunc: null
+  });
+};
+
 module.exports = Dialog;
--- a/dist/dialog/index.js
+++ b/dist/dialog/index.js
@ -1,6 +1,7 @@
 'use strict';

 var _f = function _f() {};
+var needResponseOpenTypes = ['getUserInfo', 'getPhoneNumber', 'openSetting'];

 Component({
  properties: {},
@ -9,7 +10,7 @@ Component({
    // 标题
    title: '',
    // 自定义 btn 列表
-    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色 }
+    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色, openType: 微信开放能力 }
    buttons: [],
    // 内容
    message: ' ',
@ -30,13 +31,17 @@ Component({
    // 取消按钮颜色
    cancelButtonColor: '#333',
    key: '',
+    autoClose: true,
    show: false,
    showCustomBtns: false,
-    promiseFunc: {}
+    promiseFunc: {},
+    openTypePromiseFunc: {}
  },

  methods: {
    handleButtonClick: function handleButtonClick(e) {
+      var _this = this;
+
      var _e$currentTarget = e.currentTarget,
          currentTarget = _e$currentTarget === undefined ? {} : _e$currentTarget;
      var _currentTarget$datase = currentTarget.dataset,
@ -53,15 +58,22 @@ Component({
      // 重置展示


-      this.setData({
-        show: false
-      });
+      if (this.data.autoClose) {
+        this.setData({ show: false });
+      }

      // 自定义按钮，全部 resolve 形式返回，根据 type 区分点击按钮
      if (this.data.showCustomBtns) {
-        resolve({
-          type: dataset.type
-        });
+        var isNeedOpenDataButton = needResponseOpenTypes.indexOf(dataset.openType) > -1;
+        var resolveData = { type: dataset.type };
+        // 如果需要 openData，就额外返回一个 promise，用于后续 open 数据返回
+        if (isNeedOpenDataButton) {
+          resolveData.openDataPromise = new Promise(function (resolve, reject) {
+            _this.setData({ openTypePromiseFunc: { resolve: resolve, reject: reject } });
+          });
+          resolveData.hasOpenDataPromise = true;
+        }
+        resolve(resolveData);
        return;
      }

@ -75,6 +87,47 @@ Component({
          type: 'cancel'
        });
      }
+
+      this.setData({ promiseFunc: {} });
+    },
+
+
+    // 以下为处理微信按钮开放能力的逻辑
+    handleUserInfoResponse: function handleUserInfoResponse(_ref2) {
+      var detail = _ref2.detail;
+
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'getUserInfo:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+    handlePhoneResponse: function handlePhoneResponse(_ref3) {
+      var detail = _ref3.detail;
+
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'getPhoneNumber:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+    handleOpenSettingResponse: function handleOpenSettingResponse(_ref4) {
+      var detail = _ref4.detail;
+
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'openSetting:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+    __handleOpenDataResponse: function __handleOpenDataResponse(_ref5) {
+      var _ref5$type = _ref5.type,
+          type = _ref5$type === undefined ? 'resolve' : _ref5$type,
+          _ref5$data = _ref5.data,
+          data = _ref5$data === undefined ? {} : _ref5$data;
+
+      var promiseFuncs = this.data.openTypePromiseFunc || {};
+      var responseFunc = promiseFuncs[type] || _f;
+
+      responseFunc(data);
+      this.setData({ openTypePromiseFunc: null });
    }
  }
 });
--- a/dist/dialog/index.wxml
+++ b/dist/dialog/index.wxml
@ -23,8 +23,12 @@
          class="zan-dialog__button"
          custom-class="{{ index === 0 ? 'zan-dialog__button-inside--first' : 'zan-dialog__button-inside' }}"
          data-type="{{ item.type }}"
+          data-open-type="{{ item.openType }}"
          open-type="{{ item.openType }}"
          bind:btnclick="handleButtonClick"
+          bind:getuserinfo="handleUserInfoResponse"
+          bind:getphonenumber="handlePhoneResponse"
+          bind:opensetting="handleOpenSettingResponse"
        >
          <view
            style="color: {{ item.color || '#333' }}"
--- a/dist/loadmore/index.js
+++ b/dist/loadmore/index.js
@ -0,0 +1,14 @@
+'use strict';
+
+Component({
+  properties: {
+    type: {
+      type: String,
+      value: 'loading'
+    },
+    text: {
+      type: String,
+      value: ''
+    }
+  }
+});
--- a/dist/loadmore/index.json
+++ b/dist/loadmore/index.json
@ -0,0 +1,3 @@
+{
+  "component": true
+}
--- a/dist/loadmore/index.wxml
+++ b/dist/loadmore/index.wxml
@ -1,24 +1,12 @@
-<template name="zan-loadmore">
-
-  <block wx:if="{{nomore}}">
-    <view class="zan-loadmore zan-loadmore--nomore">
-      <view class="zan-loadmore__tips">
-        <view class="zan-loadmore__dot"></view>
-      </view>
-    </view>
+<view class="zan-loadmore">
+  <block wx:if="{{ type === 'loading' }}">
+    <view class="zan-loading"></view>
+    <view class="zan-loadmore__tips">加载中...</view>
  </block>
-
-  <block wx:elif="{{nodata}}">
-    <view class="zan-loadmore zan-loadmore--nodata">
-      <view class="zan-loadmore__tips">{{ nodata_str || '暂无数据' }}</view>
-    </view>
+  <block wx:elif="{{ type === 'text' }}">
+    <view class="zan-loadmore__line"></view>
+    <text wx:if="{{ text }}" class="zan-loadmore__text">{{ text }}</text>
+    <view wx:else class="zan-loadmore__dot"></view>
+    <view class="zan-loadmore__line"></view>
  </block>
-
-  <block wx:elif="{{loading}}">
-    <view class="zan-loadmore">
-      <view class="zan-loading"></view>
-      <view class="zan-loadmore__tips">加载中...</view>
-    </view>
-  </block>
-
-</template>
+</view>
--- a/dist/loadmore/index.wxss
+++ b/dist/loadmore/index.wxss
@ -1 +1 @@
-.zan-loadmore{position:relative;width:65%;margin:21px auto;line-height:20px;font-size:14px;text-align:center;vertical-align:middle}.zan-loading{width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:weuiLoading 1s steps(12,end) infinite;animation:weuiLoading 1s steps(12,end) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iciIgd2lkdGg9JzEyMHB4JyBoZWlnaHQ9JzEyMHB4JyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICAgIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiBmaWxsPSJub25lIiBjbGFzcz0iYmsiPjwvcmVjdD4KICAgIDxyZWN0IHg9JzQ2LjUnIHk9JzQwJyB3aWR0aD0nNycgaGVpZ2h0PScyMCcgcng9JzUnIHJ5PSc1JyBmaWxsPScjRTlFOUU5JwogICAgICAgICAgdHJhbnNmb3JtPSdyb3RhdGUoMCA1MCA1MCkgdHJhbnNsYXRlKDAgLTMwKSc+CiAgICA8L3JlY3Q+CiAgICA8cmVjdCB4PSc0Ni41JyB5PSc0MCcgd2lkdGg9JzcnIGhlaWdodD0nMjAnIHJ4PSc1JyByeT0nNScgZmlsbD0nIzk4OTY5NycKICAgICAgICAgIHRyYW5zZm9ybT0ncm90YXRlKDMwIDUwIDUwKSB0cmFuc2xhdGUoMCAtMzApJz4KICAgICAgICAgICAgICAgICByZXBlYXRDb3VudD0naW5kZWZpbml0ZScvPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyM5Qjk5OUEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSg2MCA1MCA1MCkgdHJhbnNsYXRlKDAgLTMwKSc+CiAgICAgICAgICAgICAgICAgcmVwZWF0Q291bnQ9J2luZGVmaW5pdGUnLz4KICAgIDwvcmVjdD4KICAgIDxyZWN0IHg9JzQ2LjUnIHk9JzQwJyB3aWR0aD0nNycgaGVpZ2h0PScyMCcgcng9JzUnIHJ5PSc1JyBmaWxsPScjQTNBMUEyJwogICAgICAgICAgdHJhbnNmb3JtPSdyb3RhdGUoOTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNBQkE5QUEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxMjAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNCMkIyQjInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxNTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNCQUI4QjknCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxODAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNDMkMwQzEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyMTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNDQkNCQ0InCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyNDAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNEMkQyRDInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyNzAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNEQURBREEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgzMDAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNFMkUyRTInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgzMzAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0Pgo8L3N2Zz4=) no-repeat;background-size:100%}.zan-loadmore .zan-loading{margin-right:4px}.zan-loadmore__tips{display:inline-block;vertical-align:middle;height:20px;line-height:20px}.zan-loadmore--nodata,.zan-loadmore--nomore{color:#999}.zan-loadmore--nodata::after,.zan-loadmore--nomore::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-top-width:1px}.zan-loadmore--nodata{margin-top:120px}.zan-loadmore--nodata .zan-loadmore__tips{position:relative;top:-11px;background:#f9f9f9;padding:0 6px;z-index:1}.zan-loadmore--nomore .zan-loadmore__tips{position:relative;top:-11px;background:#f9f9f9;padding:0 6px;z-index:1}.zan-loadmore__dot{position:absolute;left:50%;top:10px;margin-left:-2px;margin-top:-2px;content:" ";width:4px;height:4px;border-radius:50%;background-color:#e5e5e5;display:inline-block;vertical-align:middle}
+.zan-loadmore{display:-webkit-box;display:flex;-webkit-box-align:center;align-items:center;-webkit-box-pack:center;justify-content:center;min-height:24px;line-height:24px;font-size:12px}.zan-loadmore__line{-webkit-box-flex:1;flex:1;height:1px;position:relative}.zan-loadmore__line::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px}.zan-loadmore__dot,.zan-loadmore__text{margin:0 5px}.zan-loadmore__dot{content:"";width:4px;height:4px;border-radius:50%;background-color:#e5e5e5;display:inline-block;vertical-align:middle}.zan-loading{width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:weuiLoading 1s steps(12,end) infinite;animation:weuiLoading 1s steps(12,end) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iciIgd2lkdGg9JzEyMHB4JyBoZWlnaHQ9JzEyMHB4JyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICAgIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiBmaWxsPSJub25lIiBjbGFzcz0iYmsiPjwvcmVjdD4KICAgIDxyZWN0IHg9JzQ2LjUnIHk9JzQwJyB3aWR0aD0nNycgaGVpZ2h0PScyMCcgcng9JzUnIHJ5PSc1JyBmaWxsPScjRTlFOUU5JwogICAgICAgICAgdHJhbnNmb3JtPSdyb3RhdGUoMCA1MCA1MCkgdHJhbnNsYXRlKDAgLTMwKSc+CiAgICA8L3JlY3Q+CiAgICA8cmVjdCB4PSc0Ni41JyB5PSc0MCcgd2lkdGg9JzcnIGhlaWdodD0nMjAnIHJ4PSc1JyByeT0nNScgZmlsbD0nIzk4OTY5NycKICAgICAgICAgIHRyYW5zZm9ybT0ncm90YXRlKDMwIDUwIDUwKSB0cmFuc2xhdGUoMCAtMzApJz4KICAgICAgICAgICAgICAgICByZXBlYXRDb3VudD0naW5kZWZpbml0ZScvPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyM5Qjk5OUEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSg2MCA1MCA1MCkgdHJhbnNsYXRlKDAgLTMwKSc+CiAgICAgICAgICAgICAgICAgcmVwZWF0Q291bnQ9J2luZGVmaW5pdGUnLz4KICAgIDwvcmVjdD4KICAgIDxyZWN0IHg9JzQ2LjUnIHk9JzQwJyB3aWR0aD0nNycgaGVpZ2h0PScyMCcgcng9JzUnIHJ5PSc1JyBmaWxsPScjQTNBMUEyJwogICAgICAgICAgdHJhbnNmb3JtPSdyb3RhdGUoOTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNBQkE5QUEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxMjAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNCMkIyQjInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxNTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNCQUI4QjknCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgxODAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNDMkMwQzEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyMTAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNDQkNCQ0InCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyNDAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNEMkQyRDInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgyNzAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNEQURBREEnCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgzMDAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0PgogICAgPHJlY3QgeD0nNDYuNScgeT0nNDAnIHdpZHRoPSc3JyBoZWlnaHQ9JzIwJyByeD0nNScgcnk9JzUnIGZpbGw9JyNFMkUyRTInCiAgICAgICAgICB0cmFuc2Zvcm09J3JvdGF0ZSgzMzAgNTAgNTApIHRyYW5zbGF0ZSgwIC0zMCknPgogICAgPC9yZWN0Pgo8L3N2Zz4=) no-repeat;background-size:100%}.zan-loadmore__tips{display:inline-block;vertical-align:middle;height:24px;line-height:24px}
--- a/dist/radio/index.js
+++ b/dist/radio/index.js
@ -0,0 +1,33 @@
+'use strict';
+
+Component({
+  behaviors: ['wx://form-field'],
+
+  externalClasses: ['radio-class', 'radio-color'],
+
+  properties: {
+    items: Array,
+    type: String
+  },
+
+  methods: {
+    radioChange: function radioChange(e) {
+      this.selectItem(e.detail.value);
+      this.triggerEvent('change', e);
+    },
+    selectItem: function selectItem(value) {
+      var items = this.data.items;
+
+
+      items.forEach(function (item) {
+        if (item.name === value) {
+          item.checked = true;
+        } else {
+          item.checked = false;
+        }
+      });
+
+      this.setData({ items: items });
+    }
+  }
+});
--- a/dist/radio/index.json
+++ b/dist/radio/index.json
@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "zan-icon": "../icon/index"
+  }
+}
--- a/dist/radio/index.wxml
+++ b/dist/radio/index.wxml
@ -0,0 +1,28 @@
+<radio-group
+  class="zan-radio radio-class"
+  bindchange="radioChange"
+  wx:if="{{ items && items.length }}"
+>
+  <label
+    class="zan-radio__label {{ type === 'list' ? 'zan-radio__list-item' : 'zan-radio__item'}}"
+    wx:for="{{ items }}"
+    wx:key="{{ item.value }}"
+    wx:for-item="item"
+    wx:for-index="index"
+  >
+    <view class="zan-radio__icon-wrap">
+      <view class="zan-radio__icon {{ item.disabled ? 'zan-radio--disabled' : '' }} {{ item.checked ? 'zan-radio--checked radio-color' : '' }}">
+        <view class="zan-radio__icon-inside"></view>
+      </view>
+      <radio
+        class="zan-radio__origin"
+        value="{{ item.name }}"
+        checked="{{ item.checked }}"
+        disabled="{{ item.disabled }}"
+      />
+    </view>
+    <view class="zan-radio__name">
+      {{item.value}}
+    </view>
+  </label>
+</radio-group>
--- a/dist/radio/index.wxss
+++ b/dist/radio/index.wxss
@ -0,0 +1 @@
+.zan-radio{display:block;padding:0 10px;font-size:14px}.zan-radio__item{display:block;margin-top:10px;height:20px}.zan-radio__item:last-child{margin-bottom:10px}.zan-radio__list-item{display:block;padding:10px 10px 10px 0;border-bottom:1px solid #e5e5e5}.zan-radio__list-item .zan-radio__icon-wrap{float:right;margin-top:3px}.zan-radio__icon-wrap{position:relative;width:14px;height:15px;display:-webkit-inline-box;display:inline-flex;-webkit-box-align:center;align-items:center;color:#aaa}.zan-radio__icon-wrap .zan-radio__origin{opacity:0;width:14px;height:20px}.zan-radio__icon-wrap .zan-radio__icon{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border:1px solid #dcdfe6;border-radius:100%;width:14px;height:14px;background-color:#fff;cursor:pointer;box-sizing:border-box}.zan-radio__icon-wrap .zan-radio__icon .zan-radio__icon-inside{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:4px;height:4px;border-radius:50%}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--checked{border-color:#06bf04;background:#06bf04}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--checked .zan-radio__icon-inside{background-color:#fff}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--disabled{opacity:.6}.zan-radio__name{display:inline-block;margin-left:10px}
--- a/dist/toast/toast.js
+++ b/dist/toast/toast.js
@ -1,6 +1,7 @@
 'use strict';

 var TOAST_CONFIG_KEY = 'zanui.__zanToastPageConfig';
+var DEFAULT_SHOW_TOAST_TIME = 3000;

 var timeoutData = {
  timeoutId: 0,
@ -55,11 +56,13 @@ function Toast(optionsOrMsg, pageCtx) {
  }));

  var timeoutId = 0;
-
-  if (parsedOptions.timeout >= 0) {
+  // toast 计时，如果小于0，就不会去关闭。
+  // 如果不传，就取默认值
+  var timeoutOption = parsedOptions.timeout || DEFAULT_SHOW_TOAST_TIME;
+  if (timeoutOption >= 0) {
    timeoutId = setTimeout(function () {
      toastCtx.clear();
-    }, parsedOptions.timeout || 3000);
+    }, timeoutOption);
  }

  timeoutData = {
@ -78,7 +81,7 @@ Toast.setDefaultOptions = function () {
    type: options.type || '',
    icon: options.icon || '',
    image: options.image || '',
-    timeout: options.timeout || 3000
+    timeout: options.timeout || DEFAULT_SHOW_TOAST_TIME
  };

  if (type === 'global') {
--- a/doc.config.js
+++ b/doc.config.js
@ -55,7 +55,9 @@ module.exports = {
        label: '表单',
        include: {
          checkbox: require('./packages/checkbox/README.md'),
+          datetime_picker: require('./packages/datetime-picker/README.md'),
          field: require('./packages/field/README.md'),
+          radio: require('./packages/radio/README.md'),
          search: require('./packages/search/README.md'),
          select: require('./packages/select/README.md'),
          stepper: require('./packages/stepper/README.md'),
@ -78,7 +80,6 @@ module.exports = {
        label: '交互',
        include: {
          actionsheet: require('./packages/actionsheet/README.md'),
-          datetime_picker: require('./packages/datetime-picker/README.md'),
          dialog: require('./packages/dialog/README.md'),
          popup: require('./packages/popup/README.md'),
          tab: require('./packages/tab/README.md'),
--- a/example/app.json
+++ b/example/app.json
@ -17,6 +17,7 @@
    "pages/noticebar/index",
    "pages/panel/index",
    "pages/popup/index",
+    "pages/radio/index",
    "pages/stepper/index",
    "pages/steps/index",
    "pages/switch/index",
@ -27,7 +28,8 @@
    "pages/toast/index",
    "pages/tree-select/index",
    "pages/select/index",
-    "pages/datetime/index"
+    "pages/datetime/index",
+    "pages/loadmore/index"
  ],
  "window": {
    "navigationBarBackgroundColor": "#FAFAFA",
--- a/example/pages/cell/index.wxml
+++ b/example/pages/cell/index.wxml
@ -53,7 +53,7 @@
        bindtap="handleTap"
      ></zan-cell>
      <block wx:if="{{ show }}">
-        <zan-cell title="单行列表" label="附加描述" value="详细信息"></zan-cell>
+        <zan-cell no-border title="单行列表" label="附加描述" value="不想有 border"></zan-cell>
        <zan-cell title="表单">
          <input slot="footer" type="digit" placeholder="带小数点的数字键盘"/>
        </zan-cell>
--- a/example/pages/dashboard/config.js
+++ b/example/pages/dashboard/config.js
@ -17,9 +17,6 @@ export default {
      }, {
        name: 'Cell 单元格',
        path: '/pages/cell/index'
-      }, {
-        name: 'Checkbox 复选框',
-        path: '/pages/checkbox/index'
      }, {
        name: 'Helper 基础样式',
        path: '/pages/helper/index'
@ -41,27 +38,18 @@ export default {
      }, {
        name: 'Popup 弹出层',
        path: '/pages/popup/index'
-      }, {
-        name: 'Select 选择',
-        path: '/pages/select/index'
-      }, {
-        name: 'Stepper 计数器',
-        path: '/pages/stepper/index'
      }, {
        name: 'Steps 步骤条',
        path: '/pages/steps/index'
-      }, {
-        name: 'Switch 开关',
-        path: '/pages/switch/index'
-      }, {
-        name: 'Search 搜索',
-        path: '/pages/search/index'
      }, {
        name: 'Tab 标签',
        path: '/pages/tab/index'
      }, {
        name: 'Tag 标记',
        path: '/pages/tag/index'
+      }, {
+        name: 'Loadmore 加载更多',
+        path: '/pages/loadmore/index'
      }
    ]
  },
@ -69,12 +57,29 @@ export default {
    title: '表单',
    content: [
      {
-        name: 'Field 输入框',
-        path: '/pages/field/index'
-      },
-      {
+        name: 'Checkbox 复选框',
+        path: '/pages/checkbox/index'
+      }, {
        name: 'Datetime 时间选择器',
        path: '/pages/datetime/index'
+      }, {
+        name: 'Field 输入框',
+        path: '/pages/field/index'
+      }, {
+        name: 'Radio 单选框',
+        path: '/pages/radio/index'
+      }, {
+        name: 'Search 搜索',
+        path: '/pages/search/index'
+      }, {
+        name: 'Select 选择',
+        path: '/pages/select/index'
+      }, {
+        name: 'Stepper 计数器',
+        path: '/pages/stepper/index'
+      }, {
+        name: 'Switch 开关',
+        path: '/pages/switch/index'
      }
    ]
  },
@ -93,9 +98,6 @@ export default {
      }, {
        name: 'TopTips 顶部提示',
        path: '/pages/toptips/index'
-      }, {
-        name: 'Datetime 时间选择器',
-        path: '/pages/datetime/index'
      }
    ]
  }
--- a/example/pages/datetime/index.js
+++ b/example/pages/datetime/index.js
@ -13,5 +13,9 @@ Page({

  nativeChange ({detail}) {
    this.setData({pickerView2: detail.value.join('-')})
+  },
+
+  change ({ detail: { value, date } }) {
+    console.log('value is', value, 'and date is', date)
  }
 })
--- a/example/pages/dialog/index.js
+++ b/example/pages/dialog/index.js
@ -1,4 +1,5 @@
 const Dialog = require('../../dist/dialog/dialog');
+const Toast = require('../../dist/toast/toast');

 Page({
  toggleBaseDialog() {
@ -76,6 +77,60 @@ Page({
    });
  },

+  toggleOpenDialog() {
+    Dialog({
+      title: '弹窗',
+      message: '获取用户数据',
+      selector: '#zan-open-dialog',
+      buttons: [{
+        text: '用户信息',
+        type: 'userInfo',
+        openType: 'getUserInfo'
+      }, {
+        text: '获取手机号',
+        type: 'tel',
+        openType: 'getPhoneNumber'
+      }, {
+        text: '打开授权页',
+        type: 'setting',
+        openType: 'openSetting'
+      }]
+    }).then(({ type, hasOpenDataPromise, openDataPromise }) => {
+      console.log(type);
+
+      // 如果没有 open 数据返回，就不处理
+      if (!hasOpenDataPromise) {
+        return;
+      }
+
+      openDataPromise.then((data) => {
+        console.log('成功获取信息', data);
+      }).catch((data) => {
+        console.log('获取信息失败', data);
+      });
+    });
+  },
+
+  toggleCloseDialog() {
+    Dialog({
+      title: '弹窗',
+      message: '这是一个自由控制关闭的弹窗',
+      selector: '#zan-close-dialog',
+      autoClose: false
+    }).then(() => {
+      console.log('=== dialog resolve ===', 'type: confirm');
+      Toast.loading({
+        selector: '#zan-toast'
+      });
+
+      // 2s 后自动关闭弹窗
+      setTimeout(() => {
+        Dialog.close({ selector: '#zan-close-dialog' });
+        Toast.clear();
+      }, 2000);
+    });
+  },
+
  onShareAppMessage() {
    return {
      title: 'ZanUI-WeApp',
--- a/example/pages/dialog/index.json
+++ b/example/pages/dialog/index.json
@ -4,6 +4,7 @@
    "doc-page": "../../components/doc-page/index",
    "zan-dialog": "../../dist/dialog/index",
    "zan-button": "../../dist/btn/index",
-    "zan-button-group": "../../dist/btn-group/index"
+    "zan-button-group": "../../dist/btn-group/index",
+    "zan-toast": "../../dist/toast/index"
  }  
 }
--- a/example/pages/dialog/index.wxml
+++ b/example/pages/dialog/index.wxml
@ -4,10 +4,16 @@
    <zan-button bindtap="toggleWithoutTitleDialog">Dialog - 无标题</zan-button>
    <zan-button bindtap="toggleButtonDialog">Dialog - 自定义显示按钮</zan-button>
    <zan-button bindtap="toggleVerticalDialog">Dialog - 按钮纵向排布</zan-button>
+    <zan-button bindtap="toggleOpenDialog">Dialog - 获取 Open 数据的弹窗</zan-button>
+    <zan-button bindtap="toggleCloseDialog">Dialog - 控制弹窗关闭</zan-button>
  </zan-button-group>

  <zan-dialog id="zan-base-dialog"></zan-dialog>
  <zan-dialog id="zan-no-title-dialog"></zan-dialog>
  <zan-dialog id="zan-button-dialog"></zan-dialog>
  <zan-dialog id="zan-vertical-dialog"></zan-dialog>
+  <zan-dialog id="zan-open-dialog"></zan-dialog>
+  <zan-dialog id="zan-close-dialog"></zan-dialog>
+
+  <zan-toast id="zan-toast"></zan-toast>
 </doc-page>
--- a/example/pages/loadmore_bak/index.js
+++ b/example/pages/loadmore_bak/index.js
--- a/example/pages/loadmore/index.json
+++ b/example/pages/loadmore/index.json
@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "loadmore 加载",
+  "usingComponents": {
+    "zan-panel": "../../dist/panel/index",
+    "zan-loadmore": "../../dist/loadmore/index",
+    "doc-page": "../../components/doc-page/index"
+  }
+}
--- a/example/pages/loadmore/index.wxml
+++ b/example/pages/loadmore/index.wxml
@ -0,0 +1,11 @@
+<doc-page title="LOADMORE" without-padding>
+  <zan-panel title="nodata">
+    <zan-loadmore type="text"></zan-loadmore>
+  </zan-panel>
+  <zan-panel title="loading">
+    <zan-loadmore type="loading"></zan-loadmore>
+  </zan-panel>
+  <zan-panel title="text">
+      <zan-loadmore type="text" text="暂无数据"></zan-loadmore>
+  </zan-panel>
+</doc-page>
--- a/example/pages/loadmore/index.wxss
+++ b/example/pages/loadmore/index.wxss
@ -0,0 +1,5 @@
+
+
+zan-loadmore {
+  margin: 15px;
+}
--- a/example/pages/loadmore_bak/index.json
+++ b/example/pages/loadmore_bak/index.json
@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "Loadmore 加载"
-}
--- a/example/pages/loadmore_bak/index.wxml
+++ b/example/pages/loadmore_bak/index.wxml
@ -1,9 +0,0 @@
-<import src="/dist/loadmore/index.wxml" />
-<view class="container">
-
-  <view class="doc-title zan-hairline--bottom">LOADMORE</view>
-
-  <template is="zan-loadmore" data="{{ loading: true }}" />
-  <template is="zan-loadmore" data="{{ nodata: true }}" />
-  <template is="zan-loadmore" data="{{ nomore: true }}" />
-</view>
--- a/example/pages/radio/index.js
+++ b/example/pages/radio/index.js
@ -0,0 +1,19 @@
+Page({
+
+  data: {
+    items: [
+      {name: 'USA', value: '美国'},
+      {name: 'CHN', value: '中国', checked: 'true'}
+    ],
+
+    items1: [
+      {name: 'USA', value: '美国'},
+      {name: 'BRA', value: '巴西', disabled: true },
+      {name: 'CHN', value: '中国', checked: 'true'}
+    ]
+  },
+
+  handleRadioChange: function(e) {
+    console.log('radio发生change事件，携带value值为：', e.detail)
+  }
+});
--- a/example/pages/radio/index.json
+++ b/example/pages/radio/index.json
@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "Radio 单选框",
+  "usingComponents": {
+    "zan-radio": "../../dist/radio/index",
+    "zan-panel": "../../dist/panel/index",
+    "zan-cell": "../../dist/cell/index",
+    "doc-page": "../../components/doc-page/index"
+  }
+}
--- a/example/pages/radio/index.wxml
+++ b/example/pages/radio/index.wxml
@ -0,0 +1,35 @@
+<doc-page title="radio" without-padding>
+  <zan-panel title='基本用法'>
+    <zan-radio
+      items="{{ items }}"
+    ></zan-radio>
+  </zan-panel>
+
+  <zan-panel title='禁用状态'>
+    <zan-radio
+      items="{{ items1 }}"
+    ></zan-radio>
+  </zan-panel>
+
+  <zan-panel title='事件'>
+    <zan-radio
+      items="{{ items }}"
+      bind:change="handleRadioChange"
+    ></zan-radio>
+  </zan-panel>
+
+  <zan-panel title='自定义样式'>
+    <zan-radio
+      items="{{ items }}"
+      radio-color="radio-color"
+      radio-class="radio-demo"
+    ></zan-radio>
+  </zan-panel>
+
+  <zan-panel title='列表模式'>
+    <zan-radio
+      items="{{ items }}"
+      type="list"
+    ></zan-radio>
+  </zan-panel>
+</doc-page>
--- a/example/pages/radio/index.wxss
+++ b/example/pages/radio/index.wxss
@ -0,0 +1,8 @@
+.radio-demo {
+  font-size: 12px !important;
+}
+
+.radio-color {
+  background-color: red !important;
+  border-color: red !important;
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "zanui-weapp",
-  "version": "3.0.7",
+  "version": "3.0.9",
  "description": "高颜值、好用、易扩展的小程序 UI 库，Powered by 有赞",
  "main": "app.js",
  "directories": {
@ -42,8 +42,12 @@
    "babel-preset-env": "^1.7.0",
    "babel-preset-stage-0": "^6.24.1",
    "cross-env": "^5.1.4",
+    "eslint": "^5.1.0",
    "eslint-config-airbnb": "^16.1.0",
+    "eslint-plugin-import": "^2.13.0",
    "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-react": "^7.10.0",
+    "eslint-plugin-vue": "^4.7.0",
    "fs-extra": "^4.0.2",
    "gh-pages": "^1.1.0",
    "gulp": "^3.9.1",
--- a/packages/badge/README.md
+++ b/packages/badge/README.md
@ -44,4 +44,4 @@
 | color | 字体颜色 | String | `#fff`
 | background-color | 背景颜色 | String | `#f44`
 | font-size | 字体大小 | Number | 10
-| box-shadow | 为了更好的控制宽度，使用了box-shadow来实现badge的边框，可以根据box-shadow的语法自行修改颜色和宽度 | String | `0 0 0 2px #fff`
+| box-shadow | 同css box-shadow语法 | String | `0 0 0 2px #fff`
--- a/packages/btn/index.wxml
+++ b/packages/btn/index.wxml
@ -18,6 +18,7 @@
  bindgetuserinfo="bindgetuserinfo"
  bindgetphonenumber="bindgetphonenumber"
  binderror="binderror"
+  bindopensetting="bindopensetting"
 >
  <slot></slot>
 </button>
--- a/packages/btn/native-button-behaviors.js
+++ b/packages/btn/native-button-behaviors.js
@ -42,6 +42,9 @@ module.exports = Behavior({
    bindgetphonenumber({ detail = {} } = {}) {
      this.triggerEvent('getphonenumber', detail);
    },
+    bindopensetting({ detail = {}} = {}) {
+      this.triggerEvent('opensetting', detail);
+    },
    binderror({ detail = {} } = {}) {
      this.triggerEvent('error', detail);
    }
--- a/packages/capsule/README.md
+++ b/packages/capsule/README.md
@ -17,7 +17,7 @@ Panel 提供了一块白色的展示区域，使用方式如下
 ```
 | 参数       | 说明      | 类型       | 默认值       | 必须      |
 |-----------|-----------|-----------|-------------|-------------|
-| type | capsule的主体颜色 | String | ''（有danger这个主题色） | |
+| type | capsule的主体颜色，可选值：danger | String | '' | |
 | color | 自定义capsule颜色 | String | - | |
 | leftText | 左侧文案 | String | - | |
 | rightText | 右侧文案 | String | - | |
--- a/packages/cell/README.md
+++ b/packages/cell/README.md
@ -49,6 +49,7 @@
 | title         | String      | 否       | 无    | 左侧标题                                                                                                 |
 | label         | Boolean     | 否       | false | 标题下方的描述信息                                                                                       |
 | value         | String      | 否       | 取消  | 右侧内容                                                                                                 |
+| noBorder        | Boolean      | 否      | false   | 不显示下边线 |
 | isLink        | Boolean      | 否       | false    | 是否展示右侧箭头并开启尝试以 url 跳转 |
 | url        | String      | 否      | -    | 当 isLink 设置为 true 时，点击 cell 会尝试跳转到该路径 |
 | linkType      | String      | 否       | navigateTo    | 链接跳转类型，可选值为 `navigateTo`，`redirectTo`，`switchTab`，`reLaunch`                               |
--- a/packages/cell/index.js
+++ b/packages/cell/index.js
@ -43,7 +43,8 @@ Component({
    url: {
      type: String,
      value: ''
-    }
+    },
+    noBorder: Boolean
  },
  data: {
    isLastCell: true,
--- a/packages/cell/index.pcss
+++ b/packages/cell/index.pcss
@ -8,63 +8,72 @@
  line-height: 1.4;
  background-color: #fff;
  font-size: 14px;
+
+  &::after {
+    @mixin hairline;
+    border-bottom-width: 1px;
+    left: 15px;
+    right: 0;
+  }
+
+  &__icon {
+    margin-right: 5px;
+
+    &:empty {
+      display: none
+    }
+  }
+
+  &__title {
+    padding-right: 10px;
+    &:empty {
+      display: none;
+    }
+  }
+
+  &__bd {
+    flex: 1;
+  }
+
+  &__text {
+    line-height: 24px;
+    font-size: 14px;
+  }
+
+  &__desc {
+    line-height: 1.2;
+    font-size: 12px;
+    color: #666;
+  }
+
+  &__ft {
+    position: relative;
+    text-align: right;
+    color: #666;
+  }
+
+  &__no-pading{
+    padding: 0;
+
+    .zan-cell__bd_padding {
+      padding: 12px 0 12px 15px;
+
+      .zan-form__input{
+        height: 26px;
+      }
+    }
+
+    .zan-cell__ft_padding {
+      padding: 12px 15px 12px 0;
+    }
+  }
+
+  &.last-cell::after, &.no-border::after {
+    display: none;
+  }
+
 }

-.zan-cell::after {
-  @mixin hairline;
-  border-bottom-width: 1px;
-  left: 15px;
-  right: 0;
-}
-
-.zan-cell .zan-cell__icon {
-  margin-right: 5px;
-}
-.zan-cell .zan-cell__icon:empty {
-  display: none
-}
-
-.zan-cell__title {
-  padding-right: 10px;
-}
-
-.zan-cell__title:empty {
-  display: none;
-}
-
-.zan-cell__bd {
-  flex: 1;
-}
-.zan-cell__text {
-  line-height: 24px;
-  font-size: 14px;
-}
-.zan-cell__desc {
-  line-height: 1.2;
-  font-size: 12px;
-  color: #666;
-}
-.zan-cell__ft {
-  position: relative;
-  text-align: right;
-  color: #666;
-}
-.zan-cell__no-pading{
-  padding: 0;
-}
-.zan-cell__no-pading .zan-cell__bd_padding {
-  padding: 12px 0 12px 15px;
-}
-.zan-cell__no-pading .zan-cell__bd_padding .zan-form__input{
-  height: 26px;
-}
-.zan-cell__no-pading .zan-cell__ft_padding {
-  padding: 12px 15px 12px 0;
-}
-
-.zan-cell.last-cell::after {
-  display: none;
-}

 .zan-cell--access .zan-cell__ft {
  padding-right: 13px;
--- a/packages/cell/index.wxml
+++ b/packages/cell/index.wxml
@ -1,6 +1,6 @@
 <view 
  catchtap="cellTap"
-  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }}"
+  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }} {{  noBorder ? 'no-border' : ''}}"
 >

  <view class="zan-cell__icon">
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@ -1,25 +1,13 @@
 <view
  class="checkbox-class zan-checkbox {{ isInGroup ? 'zan-checkbox__item' : ''}} {{ type === 'list' ? 'zan-checkbox__list-item' : ''}}"
  bindtap="{{ labelDisabled ? '' : 'handleClick' }}"
-  data-id="test"
  >
  <zan-icon
    type="{{ checked ? 'checked' : 'check'}}"
-    class="zan-checkbox__icon {{ 'zan-checkbox--' + shape }} {{ disabled ? 'zan-checkbox--disabled' : '' }} {{ checked ? 'zan-checkbox--checked' : '' }}"
+    class="zan-checkbox__icon {{ disabled ? 'zan-checkbox--disabled' : '' }} {{ checked ? 'zan-checkbox--checked' : '' }}"
    bindtap="{{ labelDisabled ? 'handleClick': '' }}"
  ></zan-icon>
  <text class="zan-checkbox__label">
    <slot></slot>
  </text>
 </view>
-
-<wxs module="parse">
-function getColor(color) {
-  color = color || '#ff4444'
-  return color;
-}
-
-module.exports = {
-  getColor: getColor
-};
-</wxs>
--- a/packages/datetime-picker/README.md
+++ b/packages/datetime-picker/README.md
@ -35,7 +35,7 @@
 | not-use           | `Array`   | `否`     | 无                  | 不需要显示的列 可选择`years`, `months`, `days`, `hours`, `minutes`, `seconds`中的多个                 |
 | picker-view       | `Boolean` | `否`     | 无                  | 如果为 true，相当于 picker-view 组件                                                                  |
 | format            | `String`  | `否`     | YYYY-MM-DD HH:mm:ss | 设置选中的时间显示的格式，支持 _YYYY，yyyy，YY，yy，MM，M，DD，dd，D，d，HH， hh，H，h，mm，m，ss，s_ |
-| bindchange        | `String`  | `是`     | 无                  | 用户点击`确认`触发该事件，返回值为按“年，月，日，时，分，秒”顺序的数组，可以通过`detail.value`获取    |
+| bindchange        | `String`  | `是`     | 无                  | 用户点击`确认`触发该事件，返回值为按“年，月，日，时，分，秒”顺序的数组，可以通过`detail.value`获取；3.0.8 后新增 date 值，表示当前选择时间的对象    |
 | bindcancel        | `String`  | `否`     | 无                  | 用户点击`取消`触发该事件                                                                              |

 ### 方法
@ -46,4 +46,4 @@

 ### 增强优化

-* 支持可选择时间区域限制
+支持可选择时间区域限制
--- a/packages/datetime-picker/date-picker.js
+++ b/packages/datetime-picker/date-picker.js
@ -28,12 +28,11 @@ module.exports = class DatePicker {
    date = date || this._date || new Date

    // toUTCString ISO 格式部分 ios 手机会失败
-    if (typeof date === 'string' && date.indexOf('-') > 0) {
+    if (new Date(date).toString() === 'Invalid Date' && typeof date === 'string' && date.indexOf('-') > 0) {
      date = iso2utc(date)
    }
    
    let d = new Date(date);
-    console.log(d);
    
    let y = d.getFullYear();
    let m = d.getMonth() + 1;
--- a/packages/datetime-picker/index.js
+++ b/packages/datetime-picker/index.js
@ -149,8 +149,13 @@ Component({
        return +item[value[index]];
      });

+      let day = data.slice(0, 3)
+      let time = data.slice(3, 6)
+      let date = new Date(`${ day.join('/') } ${ time.join(':') }`)
+
      this.triggerEvent('change', {
-        value: data
+        value: data,
+        date
      });

      // 手动触发 columnchange
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@ -64,18 +64,39 @@ Dialog({
    text: '取消',
    type: 'cancel'
  }]
-}).then(({ type }) => {
+}).then(({ type, hasOpenDataPromise, openDataPromise }) => {
  // type 可以用于判断具体是哪一个按钮被点击
  console.log('=== dialog with custom buttons ===', `type: ${type}`);
+
+  // - 在使用自定义按钮的情况下，可以将按钮的 openType 设置为微信原生按钮支持的 open-type
+  // - 如果设置的 openType 为 'getUserInfo', 'getPhoneNumber', 'openSetting' 其中之一
+  //       就认为是需要返回相应的数据
+  //       为了处理方便，增加 flag 值 hasOpenDataPromise，表示是否有微信开放数据返回
+  //       这时，通过利用 openDataPromise，可以获取开放数据返回的具体信息
+  if (hasOpenDataPromise) {
+    openDataPromise.then((data) => {
+      console.log('成功获取信息', data);
+    }).catch((data) => {
+      console.log('获取信息失败', data);
+    });
+  }
 });
 ```

+#### 方法
+| 方法名       | 参数      | 返回值       | 介绍       |
+|-----------|-----------|-----------|-------------|
+| Dialog | `options` 弹窗展示参数，具体见下方具体参数, `pageCtx` 页面上下文，可以不传，默认使用当前页面 | - | 展示弹窗 |
+| Dialog.close | `options` 和弹窗展示参数一致，这里只需要 selector | - | 关闭弹窗 |
+
+
 ### 具体参数
 | 参数       | 说明      | 类型       | 默认值       | 必须      |
 |-----------|-----------|-----------|-------------|-------------|
 | message | 弹窗内容 | String  | - | 必须 |
 | selector | 显示弹窗对应组件节点的选择器 | String  | - | 必须 |
 | title | 弹窗标题 | String | - | |
+| autoClose | 点击按钮后是否自动关闭弹窗 | Boolean | true | |
 | buttonsShowVertical | 按钮是否纵向展示 | Boolean  | false | |
 | showConfirmButton | 是否展示确认按钮 | Boolean  | true | |
 | confirmButtonText | 确认按钮文案 | String  | 确定 | |
@ -106,6 +127,12 @@ buttons 数据格式
  text: '取消',
  // 按钮类型，用于在 then 中接受点击事件时，判断是哪一个按钮被点击
  type: 'cancel'
+}, {
+  text: '获取用户信息',
+  type: 'userInfo',
+  // 利用 OpenType 设置微信按钮的开放能力
+  // 设置对应的值以后，这个按钮就会具有调用微信原生按钮支持的开放能力
+  openType: 'getUserInfo'
 }]
 ```

--- a/packages/dialog/data.js
+++ b/packages/dialog/data.js
@ -18,5 +18,7 @@ module.exports = {
  // 取消按钮文案
  cancelButtonText: '取消',
  // 取消按钮颜色
-  cancelButtonColor: '#333'
+  cancelButtonColor: '#333',
+  // 点击按钮自动关闭 dialog
+  autoClose: true
 };
--- a/packages/dialog/dialog.js
+++ b/packages/dialog/dialog.js
@ -1,22 +1,33 @@
 const defaultData = require('./data');

-// options 使用参数
-// pageCtx 页面 page 上下文
-function Dialog(options, pageCtx) {
-  const parsedOptions = {
+function getDialogCtx({ selector, pageCtx }) {
+  let ctx = pageCtx;
+  if (!ctx) {
+    const pages = getCurrentPages();
+    ctx = pages[pages.length - 1];
+  }
+  return ctx.selectComponent(selector);
+}
+
+function getParsedOptions(options = {}) {
+  return {
    // 自定义 btn 列表
    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色 }
    buttons: [],
    ...defaultData,
    ...options
  };
+}

-  let ctx = pageCtx;
-  if (!ctx) {
-    const pages = getCurrentPages();
-    ctx = pages[pages.length - 1];
-  }
-  const dialogCtx = ctx.selectComponent(parsedOptions.selector);
+// options 使用参数
+// pageCtx 页面 page 上下文
+function Dialog(options, pageCtx) {
+  const parsedOptions = getParsedOptions(options);
+
+  const dialogCtx = getDialogCtx({
+    selector: parsedOptions.selector,
+    pageCtx
+  });

  if (!dialogCtx) {
    console.error('无法找到对应的dialog组件，请于页面中注册并在 wxml 中声明 dialog 自定义组件');
@ -59,9 +70,29 @@ function Dialog(options, pageCtx) {
      showCustomBtns,
      key: `${(new Date()).getTime()}`,
      show: true,
-      promiseFunc: { resolve, reject }
+      promiseFunc: { resolve, reject },
+      openTypePromiseFunc: null
    });
  });
 }

+Dialog.close = function (options, pageCtx) {
+  const parsedOptions = getParsedOptions(options);
+
+  const dialogCtx = getDialogCtx({
+    selector: parsedOptions.selector,
+    pageCtx
+  });
+
+  if (!dialogCtx) {
+    return;
+  }
+
+  dialogCtx.setData({
+    show: false,
+    promiseFunc: null,
+    openTypePromiseFunc: null
+  });
+};
+
 module.exports = Dialog;
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@ -1,4 +1,5 @@
 const _f = function () {};
+const needResponseOpenTypes = ['getUserInfo', 'getPhoneNumber', 'openSetting'];

 Component({
  properties: {},
@ -7,7 +8,7 @@ Component({
    // 标题
    title: '',
    // 自定义 btn 列表
-    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色 }
+    // { type: 按钮类型，回调时以此作为区分依据，text: 按钮文案, color: 按钮文字颜色, openType: 微信开放能力 }
    buttons: [],
    // 内容
    message: ' ',
@ -28,9 +29,11 @@ Component({
    // 取消按钮颜色
    cancelButtonColor: '#333',
    key: '',
+    autoClose: true,
    show: false,
    showCustomBtns: false,
-    promiseFunc: {}
+    promiseFunc: {},
+    openTypePromiseFunc: {}
  },

  methods: {
@ -42,15 +45,22 @@ Component({
      const { resolve = _f, reject = _f } = this.data.promiseFunc || {};

      // 重置展示
-      this.setData({
-        show: false
-      });
+      if (this.data.autoClose) {
+        this.setData({ show: false });
+      }

      // 自定义按钮，全部 resolve 形式返回，根据 type 区分点击按钮
      if (this.data.showCustomBtns) {
-        resolve({
-          type: dataset.type
-        });
+        const isNeedOpenDataButton = needResponseOpenTypes.indexOf(dataset.openType) > -1;
+        const resolveData = { type: dataset.type };
+        // 如果需要 openData，就额外返回一个 promise，用于后续 open 数据返回
+        if (isNeedOpenDataButton) {
+          resolveData.openDataPromise = new Promise((resolve, reject) => {
+            this.setData({ openTypePromiseFunc: { resolve, reject } });
+          });
+          resolveData.hasOpenDataPromise = true;
+        }
+        resolve(resolveData);
        return;
      }

@ -64,6 +74,38 @@ Component({
          type: 'cancel'
        });
      }
+
+      this.setData({ promiseFunc: {} });
+    },
+
+    // 以下为处理微信按钮开放能力的逻辑
+    handleUserInfoResponse({ detail }) {
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'getUserInfo:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+
+    handlePhoneResponse({ detail }) {
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'getPhoneNumber:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+
+    handleOpenSettingResponse({ detail }) {
+      this.__handleOpenDataResponse({
+        type: detail.errMsg === 'openSetting:ok' ? 'resolve' : 'reject',
+        data: detail
+      });
+    },
+
+    __handleOpenDataResponse({ type = 'resolve', data = {} }) {
+      const promiseFuncs = this.data.openTypePromiseFunc || {};
+      const responseFunc = promiseFuncs[type] || _f;
+
+      responseFunc(data);
+      this.setData({ openTypePromiseFunc: null });
    }
  }
 });
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@ -23,8 +23,12 @@
          class="zan-dialog__button"
          custom-class="{{ index === 0 ? 'zan-dialog__button-inside--first' : 'zan-dialog__button-inside' }}"
          data-type="{{ item.type }}"
+          data-open-type="{{ item.openType }}"
          open-type="{{ item.openType }}"
          bind:btnclick="handleButtonClick"
+          bind:getuserinfo="handleUserInfoResponse"
+          bind:getphonenumber="handlePhoneResponse"
+          bind:opensetting="handleOpenSettingResponse"
        >
          <view
            style="color: {{ item.color || '#333' }}"
--- a/packages/icon/README.md
+++ b/packages/icon/README.md
@ -20,6 +20,5 @@

 ![](https://img.yzcdn.cn/public_files/2017/12/03/c582397894f57f1c72fb28118588f833.jpeg?imageView2/2/w/500/h/0/q/100)
 ![](https://img.yzcdn.cn/public_files/2017/12/03/ab37f55520dfdcdf8dbe8951025e379a.jpeg?imageView2/2/w/500/h/0/q/100)
-![](https://img.yzcdn.cn/public_files/2017/12/03/ab37f55520dfdcdf8dbe8951025e379a.jpeg?imageView2/2/w/500/h/0/q/100)
 ![](https://img.yzcdn.cn/public_files/2017/12/03/e862638f5cab9c0c7d2be38702c162df.jpeg?imageView2/2/w/500/h/0/q/100)
 ![](https://img.yzcdn.cn/public_files/2017/12/03/dfa76b99ca1c37671628e1c7b224dbb9.jpeg?imageView2/2/w/500/h/0/q/100)
--- a/packages/loadmore/README.md
+++ b/packages/loadmore/README.md
@ -1,26 +1,26 @@
 ## Loadmore 加载

 ### 使用指南
-在 app.wxss 中引入组件库所有样式
-```css
-@import "path/to/zanui-weapp/dist/index.wxss";
+在 index.json 中引入组件
+```json
+  {
+    ...
+    "usingComponents": {
+      "zan-loadmore": "../../dist/loadmore/index"
+    }
+    ...
+  }
 ```

-在需要使用的页面里引入组件库模板
+在页面上直接使用 zan-loadmore 标签即可
 ```html
-<import src="path/to/zanui-weapp/dist/loadmore/index.wxml" />
-
-<!-- 直接使用 zan-loadmore 模板，并且直接传入设置值 -->
-<template is="zan-loadmore" data="{{ loading: true }}"></template>
+  <zan-loadmore type="text"></zan-loadmore>
+  <zan-loadmore type="loading"></zan-loadmore>
+  <zan-loadmore type="text" text="暂无数据"></zan-loadmore>
 ```

-### 代码演示
-`loadmore` 支持三种状态，loading, nodata, nomore。传入指定的值即可显示
-```html
-<!-- 加载更多 -->
-<template is="zan-loadmore" data="{{ loading: true }}"></template>
-<!-- 没有可以显示的数据 -->
-<template is="zan-loadmore" data="{{ nodata: true }}"></template>
-<!-- 没有更多的数据了 -->
-<template is="zan-loadmore" data="{{ nomore: true }}"></template>
-```
+### 具体参数
+| 名称    | 类型            | 是否必须 | 默认  | 描述              |
+| ------- | --------------- | -------- | ----- | ----------------- |
+| type  | String | 是       | loading | 可选`loading`, `text` |
+| text  | String | 否       | 暂无数据 | 文案 |
--- a/packages/loadmore/index.js
+++ b/packages/loadmore/index.js
@ -0,0 +1,12 @@
+Component({
+  properties: {
+    type: {
+      type: String,
+      value: 'loading'
+    },
+    text: {
+      type: String,
+      value: ''
+    }
+  }
+});
--- a/packages/loadmore/index.json
+++ b/packages/loadmore/index.json
@ -0,0 +1,3 @@
+{
+  "component": true
+}
--- a/packages/loadmore/index.pcss
+++ b/packages/loadmore/index.pcss
@ -1,12 +1,36 @@
@import "../common/_mixins";

 .zan-loadmore {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 24px;
+  line-height: 24px;
+  font-size: 12px;
+}
+
+.zan-loadmore__line {
+  flex: 1;
+  height: 1px;
  position: relative;
-  width: 65%;
-  margin: 21px auto;
-  line-height: 20px;
-  font-size: 14px;
-  text-align: center;
+
+  &::after {
+    @mixin hairline;
+    border-bottom-width: 1px;
+  }
+}
+
+.zan-loadmore__text, .zan-loadmore__dot {
+  margin: 0 5px;
+}
+
+.zan-loadmore__dot {
+  content: "";
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #E5E5E5;
+  display: inline-block;
  vertical-align: middle;
 }

@ -21,58 +45,9 @@
  background-size: 100%;
 }

-.zan-loadmore .zan-loading {
-  margin-right: 4px;
-}
-
 .zan-loadmore__tips {
  display: inline-block;
  vertical-align: middle;
-  height: 20px;
-  line-height: 20px;
-}
-
-.zan-loadmore--nodata,
-.zan-loadmore--nomore {
-  color: #999;
-
-  &::after {
-    @mixin hairline;
-    border-top-width: 1px;
-  }
-}
-
-.zan-loadmore--nodata {
-  margin-top: 120px;
-}
-
-.zan-loadmore--nodata .zan-loadmore__tips {
-  position: relative;
-  top: -11px;
-  background: #f9f9f9;
-  padding: 0 6px;
-  z-index: 1;
-}
-
-.zan-loadmore--nomore .zan-loadmore__tips {
-  position: relative;
-  top: -11px;
-  background: #f9f9f9;
-  padding: 0 6px;
-  z-index: 1;
-}
-
-.zan-loadmore__dot {
-  position: absolute;
-  left: 50%;
-  top: 10px;
-  margin-left: -2px;
-  margin-top: -2px;
-  content: " ";
-  width: 4px;
-  height: 4px;
-  border-radius: 50%;
-  background-color: #E5E5E5;
-  display: inline-block;
-  vertical-align: middle;
+  height: 24px;
+  line-height: 24px;
 }
--- a/packages/loadmore/index.wxml
+++ b/packages/loadmore/index.wxml
@ -1,24 +1,12 @@
-<template name="zan-loadmore">
-
-  <block wx:if="{{nomore}}">
-    <view class="zan-loadmore zan-loadmore--nomore">
-      <view class="zan-loadmore__tips">
-        <view class="zan-loadmore__dot"></view>
-      </view>
-    </view>
+<view class="zan-loadmore">
+  <block wx:if="{{ type === 'loading' }}">
+    <view class="zan-loading"></view>
+    <view class="zan-loadmore__tips">加载中...</view>
  </block>
-
-  <block wx:elif="{{nodata}}">
-    <view class="zan-loadmore zan-loadmore--nodata">
-      <view class="zan-loadmore__tips">{{ nodata_str || '暂无数据' }}</view>
-    </view>
+  <block wx:elif="{{ type === 'text' }}">
+    <view class="zan-loadmore__line"></view>
+    <text wx:if="{{ text }}" class="zan-loadmore__text">{{ text }}</text>
+    <view wx:else class="zan-loadmore__dot"></view>
+    <view class="zan-loadmore__line"></view>
  </block>
-
-  <block wx:elif="{{loading}}">
-    <view class="zan-loadmore">
-      <view class="zan-loading"></view>
-      <view class="zan-loadmore__tips">加载中...</view>
-    </view>
-  </block>
-
-</template>
+</view>
--- a/packages/radio/README.md
+++ b/packages/radio/README.md
@ -0,0 +1,106 @@
+## Radio 单选框
+
+### 使用指南
+在 index.json 中引入组件
+```json
+{
+  "usingComponents": {
+    "zan-radio": "/packages/radio/index"
+  }
+}
+```
+
+### 代码演示
+
+#### 基础数据结构
+
+```js
+items: [
+  {name: 'USA', value: '美国'},
+  {name: 'BRA', value: '巴西', disabled: true },
+  {name: 'CHN', value: '中国', checked: 'true'}
+]
+```
+
+#### 基础用法
+
+```html
+<zan-radio items="{{ items }}"></zan-radio>
+```
+
+#### 禁用状态
+
+```html
+<zan-radio items="{{ items }}"></zan-radio>
+```
+
+```js
+Page({
+  data: {
+    items: [
+      {name: 'USA', value: '美国'},
+      {name: 'BRA', value: '巴西', disabled: true },
+      {name: 'CHN', value: '中国', checked: 'true'}
+    ]
+  }
+})
+```
+
+#### 自定义样式
+
+```html
+<zan-radio
+  items="{{ items }}"
+  radio-color="radio-color"
+  radio-class="radio-demo"
+></zan-radio>
+```
+
+```css
+.radio-demo {
+  font-size: 12px !important;
+}
+
+.radio-color {
+  color: red !important;
+}
+```
+
+#### 事件
+
+```html
+<zan-panel title='事件'>
+  <zan-radio
+    items="{{ items }}"
+    bind:change="handleRadioChange"
+  ></zan-radio>
+</zan-panel>
+```
+
+```js
+Page({
+  handleRadioChange: function(e) {
+    console.log('radio发生change事件，携带value值为：', e.detail)
+  }
+})
+```
+
+#### 列表模式
+
+```html
+<zan-radio items="{{ items }}" type="list"></zan-radio>
+```
+
+### 参数
+| 参数       | 说明      | 类型       | 默认值       | 必须      |
+|-----------|-----------|-----------|-------------|-------------|
+| items | 单选数组 | Array | [] | - |
+| type | 显示类型: list | String | - | |
+| radio-class | radio样式类| String| -|
+| radio-color | radio选中颜色 | String | #06bf04|
+
+### 事件
+
+| 事件名称       | 说明      | 回调参数       |
+| ---- | --- | ---|
+| change | 数值改变时触发 | event |
--- a/packages/radio/index.js
+++ b/packages/radio/index.js
@ -0,0 +1,31 @@
+Component({
+  behaviors: ['wx://form-field'],
+
+  externalClasses: ['radio-class', 'radio-color'],
+
+  properties: {
+    items: Array,
+    type: String
+  },
+
+  methods: {
+    radioChange(e) {
+      this.selectItem(e.detail.value)
+      this.triggerEvent('change', e)
+    },
+
+    selectItem(value) {
+      let { items } = this.data;
+
+      items.forEach(item => {
+        if ( item.name === value ) {
+          item.checked = true;
+        } else {
+          item.checked = false;
+        }
+      })
+
+      this.setData({ items })
+    }
+  }
+});
--- a/packages/radio/index.json
+++ b/packages/radio/index.json
@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "zan-icon": "../icon/index"
+  }
+}
--- a/packages/radio/index.pcss
+++ b/packages/radio/index.pcss
@ -0,0 +1,79 @@
+.zan-radio {
+    display: block;
+    padding: 0 10px;
+    font-size: 14px;
+
+    &__item {
+        display: block;
+        margin-top: 10px;
+        height: 20px;
+
+        &:last-child {
+            margin-bottom: 10px;
+        }
+    }
+
+    &__list-item {
+        display: block;
+        padding: 10px 10px 10px 0;
+        border-bottom: 1px solid #e5e5e5;
+        .zan-radio__icon-wrap {
+            float: right;
+            margin-top: 3px;
+        }
+    }
+
+    &__icon-wrap {
+        position: relative;
+        width: 14px;
+        height: 15px;
+        display: inline-flex;
+        align-items: center;
+        color: #aaa;
+        .zan-radio__origin {
+            opacity: 0;
+            width: 14px;
+            height: 20px;
+        }
+        .zan-radio__icon {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%,-50%);
+            border: 1px solid #dcdfe6;
+            border-radius: 100%;
+            width: 14px;
+            height: 14px;
+            background-color: #fff;
+            cursor: pointer;
+            box-sizing: border-box;
+
+            .zan-radio__icon-inside {
+                position: absolute;
+                left: 50%;
+                top: 50%;
+                transform: translate(-50%,-50%);
+                width: 4px;
+                height: 4px;
+                border-radius: 50%;
+            }
+
+            &.zan-radio--checked {
+                border-color: #06bf04;
+                background: #06bf04;
+                .zan-radio__icon-inside {
+                    background-color: #fff;
+                }
+            }
+
+            &.zan-radio--disabled {
+                opacity: .6;
+            }
+        }
+    }
+
+    &__name {
+        display: inline-block;
+        margin-left: 10px;
+    }
+}
--- a/packages/radio/index.wxml
+++ b/packages/radio/index.wxml
@ -0,0 +1,28 @@
+<radio-group
+  class="zan-radio radio-class"
+  bindchange="radioChange"
+  wx:if="{{ items && items.length }}"
+>
+  <label
+    class="zan-radio__label {{ type === 'list' ? 'zan-radio__list-item' : 'zan-radio__item'}}"
+    wx:for="{{ items }}"
+    wx:key="{{ item.value }}"
+    wx:for-item="item"
+    wx:for-index="index"
+  >
+    <view class="zan-radio__icon-wrap">
+      <view class="zan-radio__icon {{ item.disabled ? 'zan-radio--disabled' : '' }} {{ item.checked ? 'zan-radio--checked radio-color' : '' }}">
+        <view class="zan-radio__icon-inside"></view>
+      </view>
+      <radio
+        class="zan-radio__origin"
+        value="{{ item.name }}"
+        checked="{{ item.checked }}"
+        disabled="{{ item.disabled }}"
+      />
+    </view>
+    <view class="zan-radio__name">
+      {{item.value}}
+    </view>
+  </label>
+</radio-group>
--- a/packages/toast/README.md
+++ b/packages/toast/README.md
@ -46,10 +46,10 @@ Toast.loading({
 | Toast.resetDefaultOptions | `type` 可选 global/page | - | 重置默认配置，对所有 Toast 生效 |

 #### options 具体参数如下
-| 参数       | 说明      | 类型       | 默认值       | 可选值      |
-|-----------|-----------|-----------|-------------|-------------|
-| message | toast 显示文案 | String | - | |
-| type | 提示类型	 | String | - | loading success fail |
-| icon | toast 显示图标，可以用 icon 里面支持的所有图标	 | String | - | - |
-| image | toast 显示图标，为图片的链接，传入此值后会覆盖 icon 值 | String | - | |
-| timeout | toast 显示时间，小于0则会一直显示，需要手动调用 Toast.clear 清除 | Number | - | |
+| 参数       | 说明      | 类型       | 默认值       |
+|-----------|-----------|-----------|-------------|
+| message | toast 显示文案 | String | - |
+| type | 提示类型, 可选值：loading，success，fail | String | - |
+| icon | toast 显示图标，可以用 icon 里面支持的所有图标	 | String | - |
+| image | toast 显示图标，为图片的链接，传入此值后会覆盖 icon 值 | String | - |
+| timeout | toast 显示时间，小于0则会一直显示，需要手动调用 Toast.clear 清除 | Number | - |
--- a/packages/toast/toast.js
+++ b/packages/toast/toast.js
@ -1,4 +1,5 @@
 const TOAST_CONFIG_KEY = 'zanui.__zanToastPageConfig';
+const DEFAULT_SHOW_TOAST_TIME = 3000;

 let timeoutData = {
  timeoutId: 0,
@ -58,11 +59,13 @@ function Toast(optionsOrMsg, pageCtx) {
  });

  let timeoutId = 0;
-
-  if (parsedOptions.timeout >= 0) {
+  // toast 计时，如果小于0，就不会去关闭。
+  // 如果不传，就取默认值
+  const timeoutOption = parsedOptions.timeout || DEFAULT_SHOW_TOAST_TIME;
+  if (timeoutOption >= 0) {
    timeoutId = setTimeout(() => {
      toastCtx.clear();
-    }, parsedOptions.timeout || 3000);
+    }, timeoutOption);
  }


@ -79,7 +82,7 @@ Toast.setDefaultOptions = function (options = {}, type = 'page') {
    type: options.type || '',
    icon: options.icon || '',
    image: options.image || '',
-    timeout: options.timeout || 3000
+    timeout: options.timeout || DEFAULT_SHOW_TOAST_TIME
  };

  if (type === 'global') {
				`@ -0,0 +1 @@`
				.zan-radio{display:block;padding:0 10px;font-size:14px}.zan-radio__item{display:block;margin-top:10px;height:20px}.zan-radio__item:last-child{margin-bottom:10px}.zan-radio__list-item{display:block;padding:10px 10px 10px 0;border-bottom:1px solid #e5e5e5}.zan-radio__list-item .zan-radio__icon-wrap{float:right;margin-top:3px}.zan-radio__icon-wrap{position:relative;width:14px;height:15px;display:-webkit-inline-box;display:inline-flex;-webkit-box-align:center;align-items:center;color:#aaa}.zan-radio__icon-wrap .zan-radio__origin{opacity:0;width:14px;height:20px}.zan-radio__icon-wrap .zan-radio__icon{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border:1px solid #dcdfe6;border-radius:100%;width:14px;height:14px;background-color:#fff;cursor:pointer;box-sizing:border-box}.zan-radio__icon-wrap .zan-radio__icon .zan-radio__icon-inside{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:4px;height:4px;border-radius:50%}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--checked{border-color:#06bf04;background:#06bf04}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--checked .zan-radio__icon-inside{background-color:#fff}.zan-radio__icon-wrap .zan-radio__icon.zan-radio--disabled{opacity:.6}.zan-radio__name{display:inline-block;margin-left:10px}