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

This commit is contained in:
Nino 2016-12-20 11:12:43 +08:00
commit b636b3d091
10 changed files with 174 additions and 3 deletions

View File

@ -10,7 +10,10 @@
"pages/tab/index",
"pages/quantity/index",
"pages/toptips/index",
"pages/helper/index",
"pages/form/index",
"pages/steps/index",
"pages/namecard/index",
"pages/toast/index"
],
"window":{

View File

@ -14,4 +14,5 @@
}
.zui-form__input {
min-height: 26px;
}

View File

@ -1,8 +1,8 @@
.pull-left {
.zui-pull-left {
float: left;
}
.pull-right {
.zui-pull-right {
float: right;
}
@ -50,9 +50,10 @@
}
.zui-ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-wrap: normal;
}
.zui-ellipsis--l2 {

View File

@ -29,6 +29,18 @@
<view class="zui-cell__bd">Label</view>
<view class="zui-cell__ft"></view>
</navigator>
<navigator class="zui-cell zui-cell--access" url="/pages/helper/index">
<view class="zui-cell__bd">Helper</view>
<view class="zui-cell__ft"></view>
</navigator>
<navigator class="zui-cell zui-cell--access" url="/pages/form/index">
<view class="zui-cell__bd">Form</view>
<view class="zui-cell__ft"></view>
</navigator>
<navigator class="zui-cell zui-cell--access" url="/pages/namecard/index">
<view class="zui-cell__bd">Namecard</view>
<view class="zui-cell__ft"></view>
</navigator>
<navigator class="zui-cell zui-cell--access" url="/pages/quantity/index">
<view class="zui-cell__bd">Quantity</view>
<view class="zui-cell__ft"></view>

13
pages/form/index.js Normal file
View File

@ -0,0 +1,13 @@
var app = getApp()
Page({
data: {
},
onLoad: function () {
},
onShow: function() {
},
})

22
pages/form/index.wxml Normal file
View File

@ -0,0 +1,22 @@
<view class="container">
<view class="zui-form">
<view class="zui-cell zui-form__item">
<text class="zui-form__title">收货人</text>
<input
class="zui-form__input zui-cell__bd"
placeholder="名字"
/>
</view>
<view class="zui-cell zui-form__item zui-cell--last-child">
<text class="zui-form__title">联系电话</text>
<input
class="zui-form__input zui-cell__bd"
type="number"
maxlength="20"
placeholder="手机或固定电话"
/>
</view>
</view>
</view>

13
pages/helper/index.js Normal file
View File

@ -0,0 +1,13 @@
var app = getApp()
Page({
data: {
},
onLoad: function () {
},
onShow: function() {
},
})

76
pages/helper/index.wxml Normal file
View File

@ -0,0 +1,76 @@
<view class="container">
<view class="zui-panel">
<view class="zui-cell">
<view class="zui-cell__bd">
<view class="pull-right">pull-right: 往右靠</view>
</view>
</view>
<view class="zui-cell">
<view class="zui-cell__bd">
<view class="zui-text-deleted">zui-text-deleted被删除的效果</view>
</view>
</view>
<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>
</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>
</view>
<view class="zui-cell">
<view class="zui-cell__bd">
<view class="">
<view>字体颜色</view>
<view class="zui-c-red">zui-c-red: 红色</view>
<view class="zui-c-gray">zui-c-gray: 灰色</view>
<view class="zui-c-gray-dark">zui-c-gray-dark: 再灰一点点</view>
<view class="zui-c-gray-darker">zui-c-gray-darker: 更深的灰色</view>
<view class="zui-c-black">zui-c-black: 黑色</view>
<view class="zui-c-blue">zui-c-blue: 蓝色</view>
<view class="zui-c-green">zui-c-green: 绿色</view>
</view>
</view>
</view>
<view class="zui-cell">
<view class="zui-cell__bd">
<view>zui-arrow箭头</view>
<view class="zui-arrow"></view>
</view>
</view>
<view class="zui-cell">
<view class="zui-cell__bd">
<view class="zui-ellipsis" style="width: 300px;">
zui-ellipsis单行点点点
->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符
</view>
</view>
</view>
<view class="zui-cell zui-cell--last-child">
<view class="zui-cell__bd">
<view class="zui-ellipsis--l2">
zui-ellipsis--l2单行点点点
->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符
</view>
</view>
</view>
</view>
</view>

13
pages/namecard/index.js Normal file
View File

@ -0,0 +1,13 @@
var app = getApp()
Page({
data: {
},
onLoad: function () {
},
onShow: function() {
},
})

17
pages/namecard/index.wxml Normal file
View File

@ -0,0 +1,17 @@
<view class="container">
<view class="zui-panel">
<view class="zui-namecard">
<view class="zui-namecard__thumb">
<image class="zui-namecard__img"
src="https://img.yzcdn.cn/upload_files/2016/12/06/9deca4d6fad5094bc78cb20339eb4264.png?imageView2/2/w/980/h/980/q/75/format/webp"
mode="aspectFit"
></image>
</view>
<view class="zui-namecard__detail">
描述内容~
</view>
</view>
</view>
</view>