From eeee7d78bb734ad51d061b31514b3baf6e99391b Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Tue, 20 Dec 2016 10:47:51 +0800 Subject: [PATCH 1/3] helper doc --- app.json | 1 + dist/helper/index.wxss | 7 +++-- pages/dashboard/index.wxml | 4 +++ pages/helper/index.js | 13 ++++++++ pages/helper/index.wxml | 61 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 pages/helper/index.js create mode 100644 pages/helper/index.wxml diff --git a/app.json b/app.json index 5094cf0b..f9666e75 100644 --- a/app.json +++ b/app.json @@ -10,6 +10,7 @@ "pages/tab/index", "pages/quantity/index", "pages/toptips/index", + "pages/helper/index", "pages/steps/index", "pages/toast/index" ], diff --git a/dist/helper/index.wxss b/dist/helper/index.wxss index cd9ebf50..a27e12bc 100644 --- a/dist/helper/index.wxss +++ b/dist/helper/index.wxss @@ -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 { diff --git a/pages/dashboard/index.wxml b/pages/dashboard/index.wxml index 1252400b..ea7f1b1b 100644 --- a/pages/dashboard/index.wxml +++ b/pages/dashboard/index.wxml @@ -29,6 +29,10 @@ Label + + Helper + + Quantity diff --git a/pages/helper/index.js b/pages/helper/index.js new file mode 100644 index 00000000..99e7458d --- /dev/null +++ b/pages/helper/index.js @@ -0,0 +1,13 @@ +var app = getApp() + +Page({ + data: { + }, + + onLoad: function () { + + }, + + onShow: function() { + }, +}) diff --git a/pages/helper/index.wxml b/pages/helper/index.wxml new file mode 100644 index 00000000..4f21ce32 --- /dev/null +++ b/pages/helper/index.wxml @@ -0,0 +1,61 @@ + + + + + + pull-right: 往右靠 + + + + + + zui-text-deleted:被删除的效果 + + + + + + + zui-font-12:字号12 + zui-font-bold:加粗 + + + + + + + + zui-font-16:字号16 + zui-font-bold:加粗 + + + + + + + zui-arrow:箭头 + + + + + + + + zui-ellipsis:单行点点点 + ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 + + + + + + + + zui-ellipsis--l2:单行点点点 + ->我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符我是占位的字符 + + + + + + + From d1240481fdd5ed8515c27522c5994ee26f28ec36 Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Tue, 20 Dec 2016 10:59:05 +0800 Subject: [PATCH 2/3] namecard doc --- app.json | 1 + pages/dashboard/index.wxml | 4 ++++ pages/helper/index.wxml | 15 +++++++++++++++ pages/namecard/index.js | 13 +++++++++++++ pages/namecard/index.wxml | 17 +++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 pages/namecard/index.js create mode 100644 pages/namecard/index.wxml diff --git a/app.json b/app.json index f9666e75..4efc4633 100644 --- a/app.json +++ b/app.json @@ -12,6 +12,7 @@ "pages/toptips/index", "pages/helper/index", "pages/steps/index", + "pages/namecard/index", "pages/toast/index" ], "window":{ diff --git a/pages/dashboard/index.wxml b/pages/dashboard/index.wxml index ea7f1b1b..a2180e07 100644 --- a/pages/dashboard/index.wxml +++ b/pages/dashboard/index.wxml @@ -33,6 +33,10 @@ Helper + + Namecard + + Quantity diff --git a/pages/helper/index.wxml b/pages/helper/index.wxml index 4f21ce32..4220999f 100644 --- a/pages/helper/index.wxml +++ b/pages/helper/index.wxml @@ -31,6 +31,21 @@ + + + + 字体颜色 + zui-c-red: 红色 + zui-c-gray: 灰色 + zui-c-gray-dark: 再灰一点点 + zui-c-gray-darker: 更深的灰色 + zui-c-black: 黑色 + zui-c-blue: 蓝色 + zui-c-green: 绿色 + + + + zui-arrow:箭头 diff --git a/pages/namecard/index.js b/pages/namecard/index.js new file mode 100644 index 00000000..99e7458d --- /dev/null +++ b/pages/namecard/index.js @@ -0,0 +1,13 @@ +var app = getApp() + +Page({ + data: { + }, + + onLoad: function () { + + }, + + onShow: function() { + }, +}) diff --git a/pages/namecard/index.wxml b/pages/namecard/index.wxml new file mode 100644 index 00000000..cf4bf5a4 --- /dev/null +++ b/pages/namecard/index.wxml @@ -0,0 +1,17 @@ + + + + + + + + + 描述内容~ + + + + + From b0ec47d9c18fda420b93a6f1a00a8778b1b063bf Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Tue, 20 Dec 2016 11:09:39 +0800 Subject: [PATCH 3/3] form doc --- app.json | 1 + dist/form/index.wxss | 1 + pages/dashboard/index.wxml | 4 ++++ pages/form/index.js | 13 +++++++++++++ pages/form/index.wxml | 22 ++++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 pages/form/index.js create mode 100644 pages/form/index.wxml diff --git a/app.json b/app.json index 4efc4633..8582c598 100644 --- a/app.json +++ b/app.json @@ -11,6 +11,7 @@ "pages/quantity/index", "pages/toptips/index", "pages/helper/index", + "pages/form/index", "pages/steps/index", "pages/namecard/index", "pages/toast/index" diff --git a/dist/form/index.wxss b/dist/form/index.wxss index e29ddc75..e45daddf 100644 --- a/dist/form/index.wxss +++ b/dist/form/index.wxss @@ -14,4 +14,5 @@ } .zui-form__input { + min-height: 26px; } diff --git a/pages/dashboard/index.wxml b/pages/dashboard/index.wxml index a2180e07..4351064e 100644 --- a/pages/dashboard/index.wxml +++ b/pages/dashboard/index.wxml @@ -33,6 +33,10 @@ Helper + + Form + + Namecard diff --git a/pages/form/index.js b/pages/form/index.js new file mode 100644 index 00000000..99e7458d --- /dev/null +++ b/pages/form/index.js @@ -0,0 +1,13 @@ +var app = getApp() + +Page({ + data: { + }, + + onLoad: function () { + + }, + + onShow: function() { + }, +}) diff --git a/pages/form/index.wxml b/pages/form/index.wxml new file mode 100644 index 00000000..f72dc660 --- /dev/null +++ b/pages/form/index.wxml @@ -0,0 +1,22 @@ + + + + + 收货人 + + + + 联系电话 + + + + +