From cb9a63f477333037d8d3c9f37dead47298975eee Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Sep 2018 17:54:56 +0800 Subject: [PATCH] [bugfix] Tab: hairline (#502) --- example/app.json | 1 + example/config.js | 4 ++++ example/pages/dialog/index.js | 3 +++ example/pages/dialog/index.json | 8 ++++++++ example/pages/dialog/index.wxml | 0 example/pages/dialog/index.wxss | 0 example/pages/notice-bar/index.wxss | 1 + example/pages/notify/index.js | 2 +- example/pages/notify/index.wxss | 1 + example/pages/stepper/index.wxss | 1 + example/pages/switch-cell/index.wxss | 1 + example/pages/switch/index.wxss | 1 + example/pages/tag/index.wxss | 1 + example/pages/toast/index.js | 2 +- example/pages/tree-select/index.wxss | 1 + packages/dialog/README.md | 0 packages/dialog/dialog.js | 0 packages/dialog/index.js | 0 packages/dialog/index.json | 0 packages/dialog/index.pcss | 0 packages/dialog/index.wxml | 0 packages/notify/README.md | 2 +- packages/tab/README.md | 2 +- packages/tabs/index.pcss | 1 + 24 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 example/pages/dialog/index.js create mode 100644 example/pages/dialog/index.json create mode 100644 example/pages/dialog/index.wxml create mode 100644 example/pages/dialog/index.wxss create mode 100644 example/pages/notice-bar/index.wxss create mode 100644 example/pages/notify/index.wxss create mode 100644 example/pages/stepper/index.wxss create mode 100644 example/pages/switch-cell/index.wxss create mode 100644 example/pages/switch/index.wxss create mode 100644 example/pages/tag/index.wxss create mode 100644 example/pages/tree-select/index.wxss create mode 100644 packages/dialog/README.md create mode 100644 packages/dialog/dialog.js create mode 100644 packages/dialog/index.js create mode 100644 packages/dialog/index.json create mode 100644 packages/dialog/index.pcss create mode 100644 packages/dialog/index.wxml diff --git a/example/app.json b/example/app.json index 72abe890..43f85ad5 100644 --- a/example/app.json +++ b/example/app.json @@ -7,6 +7,7 @@ "pages/card/index", "pages/cell/index", "pages/col/index", + "pages/dialog/index", "pages/field/index", "pages/icon/index", "pages/loading/index", diff --git a/example/config.js b/example/config.js index 66ce11f4..5652101f 100644 --- a/example/config.js +++ b/example/config.js @@ -100,6 +100,10 @@ export default [ path: '/actionsheet', title: 'Actionsheet 上拉菜单' }, + { + path: '/dialog', + title: 'Dialog 弹出框' + }, { path: '/toast', title: 'Toast 轻提示' diff --git a/example/pages/dialog/index.js b/example/pages/dialog/index.js new file mode 100644 index 00000000..cc11dfda --- /dev/null +++ b/example/pages/dialog/index.js @@ -0,0 +1,3 @@ +import Page from '../../common/page'; + +Page(); diff --git a/example/pages/dialog/index.json b/example/pages/dialog/index.json new file mode 100644 index 00000000..0df4617d --- /dev/null +++ b/example/pages/dialog/index.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "Dialog 弹出框", + "usingComponents": { + "demo-block": "../../components/demo-block/index", + "van-button": "../../dist/button/index", + "van-dialog": "../../dist/dialog/index" + } +} diff --git a/example/pages/dialog/index.wxml b/example/pages/dialog/index.wxml new file mode 100644 index 00000000..e69de29b diff --git a/example/pages/dialog/index.wxss b/example/pages/dialog/index.wxss new file mode 100644 index 00000000..e69de29b diff --git a/example/pages/notice-bar/index.wxss b/example/pages/notice-bar/index.wxss new file mode 100644 index 00000000..f86246c4 --- /dev/null +++ b/example/pages/notice-bar/index.wxss @@ -0,0 +1 @@ +/* pages/notice-bar/index.wxss */ \ No newline at end of file diff --git a/example/pages/notify/index.js b/example/pages/notify/index.js index 948dc9c4..9cc88b08 100644 --- a/example/pages/notify/index.js +++ b/example/pages/notify/index.js @@ -1,5 +1,5 @@ import Page from '../../common/page'; -import Notify from '../../dist/notify/index'; +import Notify from '../../dist/notify/notify'; Page({ showNotify() { diff --git a/example/pages/notify/index.wxss b/example/pages/notify/index.wxss new file mode 100644 index 00000000..4810b9e0 --- /dev/null +++ b/example/pages/notify/index.wxss @@ -0,0 +1 @@ +/* pages/notify/index.wxss */ \ No newline at end of file diff --git a/example/pages/stepper/index.wxss b/example/pages/stepper/index.wxss new file mode 100644 index 00000000..1f476854 --- /dev/null +++ b/example/pages/stepper/index.wxss @@ -0,0 +1 @@ +/* pages/stepper/index.wxss */ \ No newline at end of file diff --git a/example/pages/switch-cell/index.wxss b/example/pages/switch-cell/index.wxss new file mode 100644 index 00000000..2ddba4a1 --- /dev/null +++ b/example/pages/switch-cell/index.wxss @@ -0,0 +1 @@ +/* pages/switch-cell/index.wxss */ \ No newline at end of file diff --git a/example/pages/switch/index.wxss b/example/pages/switch/index.wxss new file mode 100644 index 00000000..b2652f4f --- /dev/null +++ b/example/pages/switch/index.wxss @@ -0,0 +1 @@ +/* pages/switch/index.wxss */ \ No newline at end of file diff --git a/example/pages/tag/index.wxss b/example/pages/tag/index.wxss new file mode 100644 index 00000000..10416bfb --- /dev/null +++ b/example/pages/tag/index.wxss @@ -0,0 +1 @@ +/* pages/tag/index.wxss */ \ No newline at end of file diff --git a/example/pages/toast/index.js b/example/pages/toast/index.js index 2a1ffc45..9de30a1b 100644 --- a/example/pages/toast/index.js +++ b/example/pages/toast/index.js @@ -1,5 +1,5 @@ import Page from '../../common/page'; -import Toast from '../../dist/toast/index'; +import Toast from '../../dist/toast/toast'; Page({ showToast() { diff --git a/example/pages/tree-select/index.wxss b/example/pages/tree-select/index.wxss new file mode 100644 index 00000000..a05c6e76 --- /dev/null +++ b/example/pages/tree-select/index.wxss @@ -0,0 +1 @@ +/* pages/tree-select/index.wxss */ \ No newline at end of file diff --git a/packages/dialog/README.md b/packages/dialog/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/dialog/dialog.js b/packages/dialog/dialog.js new file mode 100644 index 00000000..e69de29b diff --git a/packages/dialog/index.js b/packages/dialog/index.js new file mode 100644 index 00000000..e69de29b diff --git a/packages/dialog/index.json b/packages/dialog/index.json new file mode 100644 index 00000000..e69de29b diff --git a/packages/dialog/index.pcss b/packages/dialog/index.pcss new file mode 100644 index 00000000..e69de29b diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml new file mode 100644 index 00000000..e69de29b diff --git a/packages/notify/README.md b/packages/notify/README.md index 2f8a3566..0d52b388 100644 --- a/packages/notify/README.md +++ b/packages/notify/README.md @@ -15,7 +15,7 @@ ### 基础用法 ```js -import Notify from 'path/to/vant-weapp/dist/notify/index'; +import Notify from 'path/to/vant-weapp/dist/notify/notify'; Notify('通知内容') ``` diff --git a/packages/tab/README.md b/packages/tab/README.md index fb386ff0..abd1441e 100644 --- a/packages/tab/README.md +++ b/packages/tab/README.md @@ -118,7 +118,7 @@ Page({ | active | 当前激活标签的索引 | `String` `Number` | `0` | | color | 标签颜色 | `String` | `#f44` | | type | 样式风格，可选值为 `card` | `String` | `line` | -| duration | 动画时间 (单位秒)) | `Number` | `0.2` | +| duration | 动画时间 (单位秒) | `Number` | `0.2` | | line-width | 底部条宽度 (px) | `Number` | 与当前标签等宽 | | swipe-threshold | 滚动阈值，设置标签数量超过多少个可滚动 | `Number` | `4` | diff --git a/packages/tabs/index.pcss b/packages/tabs/index.pcss index 210b9e47..a368d30a 100644 --- a/packages/tabs/index.pcss +++ b/packages/tabs/index.pcss @@ -1,4 +1,5 @@ @import '../common/style/var.pcss'; +@import '../common/style/hairline.pcss'; $van-tabs-line-height: 44px; $van-tabs-card-height: 30px;