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

dist/icon/index.wxss

@@ -2,11 +2,11 @@
 
 @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')
+  src: url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.eot');
+  src: url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.eot?#iefix') format('embedded-opentype'),
+       url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.woff2') format('woff2'),
+       url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.woff') format('woff'),
+       url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.ttf') format('truetype')
 }
 
 .zui-icon {
@@ -47,13 +47,19 @@
 /* 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'; } /* '' */
+.zui-icon-album:before { content: '\e800'; } /* '' */
+.zui-icon-arrow:before { content: '\e801'; } /* '' */
+.zui-icon-camera:before { content: '\e802'; } /* '' */
+.zui-icon-certificate:before { content: '\e803'; } /* '' */
+.zui-icon-check:before { content: '\e804'; } /* '' */
+.zui-icon-checked:before { content: '\e805'; } /* '' */
+.zui-icon-close:before { content: '\e806'; } /* '' */
+.zui-icon-gift:before { content: '\e807'; } /* '' */
+.zui-icon-location:before { content: '\e808'; } /* '' */
+.zui-icon-message:before { content: '\e809'; } /* '' */
+.zui-icon-send:before { content: '\e80a'; } /* '' */
+.zui-icon-shopping-cart:before { content: '\e80b'; } /* '' */
+.zui-icon-sign:before { content: '\e80c'; } /* '' */
+.zui-icon-store:before { content: '\e80d'; } /* '' */
+.zui-icon-topay:before { content: '\e80e'; } /* '' */
+.zui-icon-tosend:before { content: '\e80f'; } /* '' */

dist/loadmore/index.wxss

@@ -57,7 +57,7 @@
 .zui-loadmore__dot {
   position: absolute;
   left: 50%;
-  top: 11px;
+  top: 10px;
   margin-left: -2px;
   margin-top: -2px;
   content: " ";

example/icon/index.js

@@ -1,7 +1,9 @@
 Page({
   data: {
     icons: [
+      'album',
       'arrow',
+      'camera',
       'certificate',
       'check',
       'checked',
@@ -9,8 +11,12 @@ Page({
       'gift',
       'location',
       'message',
-      'store',
+      'send',
       'shopping-cart',
+      'sign',
+      'store',
+      'topay',
+      'tosend'
     ]
   }
 });

example/loadmore/index.wxml

@@ -1,7 +1,7 @@
 <import src="/dist/loadmore/index.wxml" />
 
 <view class="container">
-  <template is="loadmore" data="{{loading: true}}" />
-  <template is="loadmore" data="{{nodata: true}}" />
-  <template is="loadmore" data="{{nomore: true}}" />
+  <template is="zui-loadmore" data="{{loading: true}}" />
+  <template is="zui-loadmore" data="{{nodata: true}}" />
+  <template is="zui-loadmore" data="{{nomore: true}}" />
 </view>