From f2c91d53edf4a15cbe1383617ac415399c8b531f Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Fri, 23 Dec 2016 14:45:42 +0800 Subject: [PATCH 1/4] vsteps --- app.json | 3 +- dist/index.wxss | 1 + dist/vsteps/index.wxss | 78 ++++++++++++++++++++++++++++++++++++ example/dashboard/index.wxml | 4 ++ example/vsteps/index.js | 13 ++++++ example/vsteps/index.wxml | 43 ++++++++++++++++++++ 6 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 dist/vsteps/index.wxss create mode 100644 example/vsteps/index.js create mode 100644 example/vsteps/index.wxml diff --git a/app.json b/app.json index 4374623a..01d17956 100644 --- a/app.json +++ b/app.json @@ -14,7 +14,8 @@ "example/form/index", "example/steps/index", "example/namecard/index", - "example/toast/index" + "example/toast/index", + "example/vsteps/index" ], "window":{ "navigationBarBackgroundColor": "#FAFAFA", diff --git a/dist/index.wxss b/dist/index.wxss index 8a66f808..e5cce069 100644 --- a/dist/index.wxss +++ b/dist/index.wxss @@ -14,3 +14,4 @@ @import "steps/index.wxss"; @import "toast/index.wxss"; @import "toptips/index.wxss"; +@import "vsteps/index.wxss"; diff --git a/dist/vsteps/index.wxss b/dist/vsteps/index.wxss new file mode 100644 index 00000000..04eb688c --- /dev/null +++ b/dist/vsteps/index.wxss @@ -0,0 +1,78 @@ + +.zui-vsteps { + position: relative; + padding: 15px; + color: #999; + font-size: 14px; +} + +.zui-vsteps::after { + left: 42px; +} + +.zui-vsteps--active { + color: #44BB00; +} + +.zui-vsteps__line { + position: absolute; + top: 0; + bottom: 0; + left: 22px; + width: 1px; + background-color: #e5e5e5; +} + +.zui-vsteps__content { + padding-left: 27px; +} + +.zui-vsteps__icons { + position: absolute; + left: 22px; + top: 50%; + transform: translate(-50%, -50%); + z-index: 2; + font-size: 0; + line-height: 0; + padding: 3px 0; + background-color: #fff; +} + +.zui-vsteps__icon { + +} + +.zui-vsteps__icon--normal { + width: 5px; + height: 5px; + background-color: #cacaca; + border-radius: 10px; +} + +.zui-vsteps__icon--active { + width: 13px; + height: 13px; +} + +.zui-vsteps--first-child .zui-vsteps__title::before { + content: ''; + position: absolute; + top: 0; + bottom: 50%; + left: 22px; + width: 1px; + background-color: #fff; + z-index: 1; +} + +.zui-vsteps--last-child .zui-vsteps__title::before { + content: ''; + position: absolute; + top: 50%; + bottom: 0%; + left: 22px; + width: 1px; + background-color: #fff; + z-index: 1; +} diff --git a/example/dashboard/index.wxml b/example/dashboard/index.wxml index 2c5e1792..50b6d6e4 100644 --- a/example/dashboard/index.wxml +++ b/example/dashboard/index.wxml @@ -53,6 +53,10 @@ Steps + + Vsteps + + Toast diff --git a/example/vsteps/index.js b/example/vsteps/index.js new file mode 100644 index 00000000..99e7458d --- /dev/null +++ b/example/vsteps/index.js @@ -0,0 +1,13 @@ +var app = getApp() + +Page({ + data: { + }, + + onLoad: function () { + + }, + + onShow: function() { + }, +}) diff --git a/example/vsteps/index.wxml b/example/vsteps/index.wxml new file mode 100644 index 00000000..c0b8a587 --- /dev/null +++ b/example/vsteps/index.wxml @@ -0,0 +1,43 @@ + + + + + + + + + + 卖家退款(2016-03-23 20:20:20) + + + + + + + + + + + 卖家退款(2016-03-23 20:20:20) + + + + + + + + + + + 卖家退款(2016-03-23 20:20:20) + + + + + From 1d06a3da7b4ea69e3af938e517efc2e0a0dd0c29 Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Fri, 23 Dec 2016 14:56:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?name=20card=20=E5=A2=9E=E5=8A=A0=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E6=96=B9=E4=BE=BF=E4=BA=9B=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/namecard/index.wxss | 16 ++++++++++++++++ example/namecard/index.wxml | 18 +++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dist/namecard/index.wxss b/dist/namecard/index.wxss index e3a745ba..8cc07f56 100644 --- a/dist/namecard/index.wxss +++ b/dist/namecard/index.wxss @@ -35,3 +35,19 @@ width: auto; position: relative; } + +.zui-namecard__detail-row { + overflow: hidden; + line-height: 20px; + min-height: 20px; + margin-bottom: 3px; +} + +.zui-namecard__right-col { + float: right; +} + +.zui-namecard__left-col { + margin-right: 80px; +} + diff --git a/example/namecard/index.wxml b/example/namecard/index.wxml index cf4bf5a4..c50b0a62 100644 --- a/example/namecard/index.wxml +++ b/example/namecard/index.wxml @@ -9,7 +9,23 @@ > - 描述内容~ + + ¥ 999.99 + + 商品名称是什么 + + + + + x2 + + 商品SKU1 + + + + + 已发货 + From 8ec6023f88410473c8d3b27b0a476f9f26af3cd3 Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Fri, 23 Dec 2016 15:01:46 +0800 Subject: [PATCH 3/4] toast toptips --- dist/toast/index.wxss | 2 +- dist/toptips/index.wxss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/toast/index.wxss b/dist/toast/index.wxss index e5fc81fd..ef1d5ce1 100644 --- a/dist/toast/index.wxss +++ b/dist/toast/index.wxss @@ -13,5 +13,5 @@ padding: 10px; text-align: center; border-radius: 4px; - z-index: 10; + z-index: 100; } diff --git a/dist/toptips/index.wxss b/dist/toptips/index.wxss index d5437271..3ae401a7 100644 --- a/dist/toptips/index.wxss +++ b/dist/toptips/index.wxss @@ -9,7 +9,7 @@ text-align: center; color: #FFF; background-color: #E64340; - z-index: 20; + z-index: 110; /* 动画部分 */ transition: all 0.4s ease; From ce431b8415310b89b9217053ce1a6fe1580889af Mon Sep 17 00:00:00 2001 From: pangxie1991 Date: Mon, 26 Dec 2016 15:01:43 +0800 Subject: [PATCH 4/4] toptips add min height --- dist/toptips/index.wxss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/toptips/index.wxss b/dist/toptips/index.wxss index 3ae401a7..a541db5b 100644 --- a/dist/toptips/index.wxss +++ b/dist/toptips/index.wxss @@ -3,6 +3,8 @@ position: fixed; -webkit-transform: translateZ(0) translateY(-100%); width: 100%; + /* 至少有一行的高度，保证第一次动画显示正常 */ + min-height: 32px; top: 0; line-height: 2.3; font-size: 14px;