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

This commit is contained in:
pangxie1991 2016-12-30 20:47:22 +08:00
commit 4bf7b19a52
4 changed files with 32 additions and 20 deletions

36
dist/icon/index.wxss vendored
View File

@ -2,11 +2,11 @@
@font-face { @font-face {
font-family: 'zuiicon'; font-family: 'zuiicon';
src: url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.eot'); src: url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.eot');
src: url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.eot?#iefix') format('embedded-opentype'), src: url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.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-834207527b.woff2') format('woff2'),
url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.woff') format('woff'), url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.woff') format('woff'),
url('https://b.yzcdn.cn/zui/font/zuiicon-ca855b1878.ttf') format('truetype') url('https://b.yzcdn.cn/zui/font/zuiicon-834207527b.ttf') format('truetype')
} }
.zui-icon { .zui-icon {
@ -47,13 +47,19 @@
/* DO NOT EDIT! Generated by fount */ /* DO NOT EDIT! Generated by fount */
.zui-icon-arrow:before { content: '\e800'; } /* '' */ .zui-icon-album:before { content: '\e800'; } /* '' */
.zui-icon-certificate:before { content: '\e801'; } /* '' */ .zui-icon-arrow:before { content: '\e801'; } /* '' */
.zui-icon-check:before { content: '\e802'; } /* '' */ .zui-icon-camera:before { content: '\e802'; } /* '' */
.zui-icon-checked:before { content: '\e803'; } /* '' */ .zui-icon-certificate:before { content: '\e803'; } /* '' */
.zui-icon-close:before { content: '\e804'; } /* '' */ .zui-icon-check:before { content: '\e804'; } /* '' */
.zui-icon-gift:before { content: '\e805'; } /* '' */ .zui-icon-checked:before { content: '\e805'; } /* '' */
.zui-icon-location:before { content: '\e806'; } /* '' */ .zui-icon-close:before { content: '\e806'; } /* '' */
.zui-icon-message:before { content: '\e807'; } /* '' */ .zui-icon-gift:before { content: '\e807'; } /* '' */
.zui-icon-store:before { content: '\e808'; } /* '' */ .zui-icon-location:before { content: '\e808'; } /* '' */
.zui-icon-shopping-cart:before { content: '\e809'; } /* '' */ .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'; } /* '' */

View File

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

View File

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

View File

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