From 4255eaf9a7d93a489adaacf41b33655a4ca15a1c Mon Sep 17 00:00:00 2001
From: pangxie1991 <chenyao1102@gmail.com>
Date: Tue, 20 Dec 2016 11:23:39 +0800
Subject: [PATCH] =?UTF-8?q?zui=20doc=20&&=20=E5=91=BD=E5=90=8D=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/toast/index.js        | 16 ++++++++--------
 dist/toast/index.wxml      |  2 +-
 dist/toptips/index.js      |  4 ++--
 dist/toptips/index.wxml    |  2 +-
 example/helper/index.wxml  | 14 +++++++-------
 example/toast/index.wxml   |  2 +-
 example/toptips/index.wxml |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dist/toast/index.js b/dist/toast/index.js
index cac1274b..b48952d9 100644
--- a/dist/toast/index.js
+++ b/dist/toast/index.js
@@ -1,28 +1,28 @@
 module.exports = {
   showZuiToast(title, timeout) {
-    var componentToast = this.data.componentToast || {};
-    clearTimeout(componentToast.timer);
+    var zuiToast = this.data.zuiToast || {};
+    clearTimeout(zuiToast.timer);
 
     // 弹层设置~
-    componentToast = {
+    zuiToast = {
       show: true,
       title
     };
     this.setData({
-      componentToast
+      zuiToast
     });
 
-    componentToast.timer = setTimeout(() => {
+    zuiToast.timer = setTimeout(() => {
       this.clearZuiToast();
     }, timeout || 3000);
   },
 
   clearZuiToast() {
-    var componentToast = this.data.componentToast || {};
-    clearTimeout(componentToast.timer);
+    var zuiToast = this.data.zuiToast || {};
+    clearTimeout(zuiToast.timer);
 
     this.setData({
-      'componentToast.show': false
+      'zuiToast.show': false
     });
   }
 };
diff --git a/dist/toast/index.wxml b/dist/toast/index.wxml
index 5c835e68..3f2bb68a 100644
--- a/dist/toast/index.wxml
+++ b/dist/toast/index.wxml
@@ -1,3 +1,3 @@
 <template name="zui-toast">
-  <view class="zui-toast" wx:if="{{ componentToast.show }}" bindtap="clearToast">{{ componentToast.title }}</view>
+  <view class="zui-toast" wx:if="{{ zuiToast.show }}" bindtap="clearToast">{{ zuiToast.title }}</view>
 </template>
diff --git a/dist/toptips/index.js b/dist/toptips/index.js
index 4e58472d..526be4a6 100644
--- a/dist/toptips/index.js
+++ b/dist/toptips/index.js
@@ -21,7 +21,7 @@ module.exports = {
 
     // 展示出topTips
     this.setData({
-      componentTopTips: {
+      zuiTopTips: {
         show: true,
         content,
         options
@@ -31,7 +31,7 @@ module.exports = {
     // 设置定时器，定时关闭topTips
     timer = setTimeout(() => {
       this.setData({
-        'componentTopTips.show': false
+        'zuiTopTips.show': false
       });
       timer = undefined;
     }, options.duration);
diff --git a/dist/toptips/index.wxml b/dist/toptips/index.wxml
index 1ec925d8..9e00584b 100644
--- a/dist/toptips/index.wxml
+++ b/dist/toptips/index.wxml
@@ -1,3 +1,3 @@
 <template name="zui-toptips">
-  <view class="zui-toptips {{ componentTopTips.show ? 'zui-toptips--show' : '' }}">{{ componentTopTips.content }}</view>
+  <view class="zui-toptips {{ zuiTopTips.show ? 'zui-toptips--show' : '' }}">{{ zuiTopTips.content }}</view>
 </template>
diff --git a/example/helper/index.wxml b/example/helper/index.wxml
index 4220999f..0c5a21df 100644
--- a/example/helper/index.wxml
+++ b/example/helper/index.wxml
@@ -3,7 +3,7 @@
   <view class="zui-panel">
     <view class="zui-cell">
       <view class="zui-cell__bd">
-        <view class="pull-right">pull-right: 往右靠</view>
+        <view class="zui-pull-right">zui-pull-right: 往右靠</view>
       </view>
     </view>
 
@@ -15,18 +15,18 @@
 
     <view class="zui-cell">
       <view class="zui-cell__bd">
-        <view class="zui-font-12 zui-font-bold">
-          <view>zui-font-12：字号12</view>
-          <view>zui-font-bold：加粗</view>
+        <view>
+          <view class="zui-font-12">zui-font-12：字号12</view>
+          <view class="zui-font-12 zui-font-bold">zui-font-bold：再来个加粗</view>
         </view>
       </view>
     </view>
 
     <view class="zui-cell">
       <view class="zui-cell__bd">
-        <view class="zui-font-16 zui-font-bold">
-          <view>zui-font-16：字号16</view>
-          <view>zui-font-bold：加粗</view>
+        <view>
+          <view class="zui-font-16">zui-font-16：字号16</view>
+          <view class="zui-font-16 zui-font-bold">zui-font-bold：再来个加粗</view>
         </view>
       </view>
     </view>
diff --git a/example/toast/index.wxml b/example/toast/index.wxml
index 502cfd71..a7ec390d 100644
--- a/example/toast/index.wxml
+++ b/example/toast/index.wxml
@@ -12,4 +12,4 @@
   </view>
 </view>
 
-<template is="zui-toast" data="{{ componentToast }}"></template>
+<template is="zui-toast" data="{{ zuiToast }}"></template>
diff --git a/example/toptips/index.wxml b/example/toptips/index.wxml
index 795b6852..ca1a3e11 100644
--- a/example/toptips/index.wxml
+++ b/example/toptips/index.wxml
@@ -12,4 +12,4 @@
   </view>
 </view>
 
-<template is="zui-toptips" data="{{ componentTopTips }}"></template>
+<template is="zui-toptips" data="{{ zuiTopTips }}"></template>