diff --git a/app.js b/app.js
index 725edee2..beb8eaca 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,5 @@
App({
- globalData:{
- }
-})
+ globalData: {
+ },
+});
diff --git a/app.json b/app.json
index 01d17956..96f17368 100644
--- a/app.json
+++ b/app.json
@@ -15,7 +15,9 @@
"example/steps/index",
"example/namecard/index",
"example/toast/index",
- "example/vsteps/index"
+ "example/vsteps/index",
+ "example/icon/index",
+ "example/dialog/index"
],
"window":{
"navigationBarBackgroundColor": "#FAFAFA",
@@ -23,5 +25,6 @@
"navigationBarTextStyle":"black",
"backgroundTextStyle":"dark",
"backgroundColor": "#f9f9f9"
- }
+ },
+ "debug": true
}
diff --git a/dist/dialog/index.wxss b/dist/dialog/index.wxss
index 79eec609..36f4393c 100644
--- a/dist/dialog/index.wxss
+++ b/dist/dialog/index.wxss
@@ -1,41 +1,26 @@
-.zui-dialog,
.zui-dialog__mask {
- position: absolute;
+ position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 10;
-}
-
-.zui-dialog__mask {
background: rgba(0, 0, 0, 0.7);
+ display: none;
}
-
-@keyframes slideUp {
- 0% {
- transform: translateY(100%);
- opacity: 0;
- }
- 10% {
- opacity: 1;
- }
- 100% {
- transform: translateY(0);
- opacity: 1;
- }
-}
-
.zui-dialog__container {
- position: absolute;
+ position: fixed;
bottom: 0;
width: 750rpx;
background: white;
- transform: translateY(0);
- opacity: 0;
+ transform: translateY(150%);
transition: all 0.4s ease;
- animation: slideUp 0.4s ease ;
- animation-fill-mode: forwards;
- animation-delay: 0.1s;
z-index: 11;
}
+.zui-dialog--show .zui-dialog__container {
+ transform: translateY(0);
+}
+.zui-dialog--show .zui-dialog__mask {
+ display: block;
+}
+
diff --git a/dist/icon/index.wxss b/dist/icon/index.wxss
new file mode 100644
index 00000000..5766cafd
--- /dev/null
+++ b/dist/icon/index.wxss
@@ -0,0 +1,59 @@
+/* DO NOT EDIT! Generated by fount */
+
+@font-face {
+ font-family: 'zuiicon';
+ src: url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.eot');
+ src: url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.eot?#iefix') format('embedded-opentype'),
+ url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.woff2') format('woff2'),
+ url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.woff') format('woff'),
+ url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.ttf') format('truetype')
+}
+
+.zui-icon {
+ display: inline-block;
+}
+.zui-icon::before {
+ font-family: "zuiicon" !important;
+ font-style: normal;
+ font-weight: normal;
+ speak: none;
+
+ display: inline-block;
+ text-decoration: inherit;
+ width: 1em;
+ text-align: center;
+
+ /* For safety - reset parent styles, that can break glyph codes*/
+ font-variant: normal;
+ text-transform: none;
+
+ /* fix buttons height, for twitter bootstrap */
+ line-height: 1em;
+
+ /* Animation center compensation - margins should be symmetric */
+ /* remove if not needed */
+ /* margin-left: .2em; */
+
+ /* you can be more comfortable with increased icons size */
+ /* font-size: 120%; */
+
+ /* Font smoothing. That was taken from TWBS */
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ /* Uncomment for 3D effect */
+ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+/* DO NOT EDIT! Generated by fount */
+
+
+.zui-icon-arrow:before { content: '\e800'; } /* '' */
+.zui-icon-certificate:before { content: '\e801'; } /* '' */
+.zui-icon-check:before { content: '\e802'; } /* '' */
+.zui-icon-checked:before { content: '\e803'; } /* '' */
+.zui-icon-close:before { content: '\e804'; } /* '' */
+.zui-icon-gift:before { content: '\e805'; } /* '' */
+.zui-icon-location:before { content: '\e806'; } /* '' */
+.zui-icon-message:before { content: '\e807'; } /* '' */
+.zui-icon-store:before { content: '\e808'; } /* '' */
+.zui-icon-shopping-cart:before { content: '\e809'; } /* '' */
diff --git a/dist/index.wxss b/dist/index.wxss
index e5cce069..c88e23bc 100644
--- a/dist/index.wxss
+++ b/dist/index.wxss
@@ -15,3 +15,4 @@
@import "toast/index.wxss";
@import "toptips/index.wxss";
@import "vsteps/index.wxss";
+@import "icon/index.wxss";
diff --git a/dist/quantity/index.js b/dist/quantity/index.js
index 332bcce4..e3d1870b 100644
--- a/dist/quantity/index.js
+++ b/dist/quantity/index.js
@@ -4,7 +4,7 @@ function handle(e, num) {
var disabled = dataset.disabled;
var quantity = +dataset.quantity;
- if (disabled == 'true') return null;
+ if (disabled) return null;
callback.call(this, componentId, quantity + num);
}
diff --git a/dist/tab/index.wxml b/dist/tab/index.wxml
index 955a447d..beb4670b 100644
--- a/dist/tab/index.wxml
+++ b/dist/tab/index.wxml
@@ -6,7 +6,7 @@
-
+
diff --git a/example/dashboard/index.js b/example/dashboard/index.js
index 99e7458d..2125f85d 100644
--- a/example/dashboard/index.js
+++ b/example/dashboard/index.js
@@ -2,6 +2,60 @@ var app = getApp()
Page({
data: {
+ list: [
+ {
+ name: 'Badge',
+ path: '/example/badge/index'
+ }, {
+ name: 'Button',
+ path: '/example/btn/index'
+ }, {
+ name: 'Cell',
+ path: '/example/cell/index'
+ }, {
+ name: 'Dialog',
+ path: '/example/dialog/index'
+ }, {
+ name: 'Form',
+ path: '/example/form/index'
+ }, {
+ name: 'Helper',
+ path: '/example/helper/index'
+ }, {
+ name: 'Icon',
+ path: '/example/icon/index'
+ }, {
+ name: 'Label',
+ path: '/example/label/index'
+ }, {
+ name: 'Loadmore',
+ path: '/example/loadmore/index'
+ }, {
+ name: 'Namecard',
+ path: '/example/namecard/index'
+ }, {
+ name: 'Panel',
+ path: '/example/panel/index'
+ }, {
+ name: 'Quantity',
+ path: '/example/quantity/index'
+ }, {
+ name: 'Steps',
+ path: '/example/steps/index'
+ }, {
+ name: 'Vsteps',
+ path: '/example/vsteps/index'
+ }, {
+ name: 'Tab',
+ path: '/example/tab/index'
+ }, {
+ name: 'Toast',
+ path: '/example/toast/index'
+ }, {
+ name: 'Toptips',
+ path: '/example/toptips/index'
+ }
+ ]
},
onLoad: function () {
diff --git a/example/dashboard/index.wxml b/example/dashboard/index.wxml
index 50b6d6e4..5891b85a 100644
--- a/example/dashboard/index.wxml
+++ b/example/dashboard/index.wxml
@@ -1,64 +1,8 @@
-
- Button
-
-
-
- Loadmore
-
-
-
- Panel
-
-
-
- Cell
-
-
-
- Badge
-
-
-
- Tab
-
-
-
- Label
-
-
-
- Helper
-
-
-
- Form
-
-
-
- Namecard
-
-
-
- Quantity
-
-
-
- Toptips
-
-
-
- Steps
-
-
-
- Vsteps
-
-
-
- Toast
+
+ {{ item.name }}
diff --git a/example/dialog/index.js b/example/dialog/index.js
new file mode 100644
index 00000000..3f7c936f
--- /dev/null
+++ b/example/dialog/index.js
@@ -0,0 +1,20 @@
+var app = getApp()
+
+Page({
+ data: {
+ showDialog: false
+ },
+
+ toggleDialog() {
+ this.setData({
+ showDialog: !this.data.showDialog
+ });
+ },
+
+ onLoad: function () {
+
+ },
+
+ onShow: function() {
+ },
+})
diff --git a/example/dialog/index.wxml b/example/dialog/index.wxml
new file mode 100644
index 00000000..7faacbf8
--- /dev/null
+++ b/example/dialog/index.wxml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+ 内容
+
+
+
+
diff --git a/example/icon/index.js b/example/icon/index.js
new file mode 100644
index 00000000..abe6625e
--- /dev/null
+++ b/example/icon/index.js
@@ -0,0 +1,16 @@
+Page({
+ data: {
+ icons: [
+ 'arrow',
+ 'certificate',
+ 'check',
+ 'checked',
+ 'close',
+ 'gift',
+ 'location',
+ 'message',
+ 'store',
+ 'shopping-cart',
+ ]
+ }
+});
diff --git a/example/icon/index.wxml b/example/icon/index.wxml
new file mode 100644
index 00000000..34b6cc8a
--- /dev/null
+++ b/example/icon/index.wxml
@@ -0,0 +1,14 @@
+
+
+
+
+ zui-icon-{{ icon }}
+
+
+
+
+
+ zui-icon-{{ icon }}
+
+
+
diff --git a/example/icon/index.wxss b/example/icon/index.wxss
new file mode 100644
index 00000000..4f9436cd
--- /dev/null
+++ b/example/icon/index.wxss
@@ -0,0 +1,14 @@
+.icon-wrap {
+ width: 33.33333%;
+ height: 100px;
+ float: left;
+ text-align: center;
+}
+.icon-classname {
+ color: #999;
+ font-size: 10px;
+}
+.zui-icon {
+ font-size: 40px;
+ margin: 20px;
+}