From 85246262a1cddcca4bec47bbe8e2ba1ef102c505 Mon Sep 17 00:00:00 2001
From: Weilanwl <1273753708@qq.com>
Date: Sun, 3 Mar 2019 22:51:19 +0800
Subject: [PATCH] 2019-3-3 22:51:13
---
demo/app.json | 3 +-
demo/app.wxss | 4 ++
demo/pages/about/test/custom.js | 19 ++++++
demo/pages/about/test/custom.json | 3 +
demo/pages/about/test/custom.wxml | 6 ++
demo/pages/about/test/custom.wxss | 22 +++++++
demo/pages/about/test/list.wxml | 6 +-
demo/pages/basics/button/button.js | 3 +
demo/pages/basics/button/button.wxml | 2 +-
demo/pages/basics/home/home.js | 13 ----
demo/pages/component/bar/bar.wxss | 2 +-
demo/pages/plugin/drawer/drawer.wxml | 96 ++++++++++++++++++++++++++--
demo/project.config.json | 30 +++++----
13 files changed, 172 insertions(+), 37 deletions(-)
create mode 100644 demo/pages/about/test/custom.js
create mode 100644 demo/pages/about/test/custom.json
create mode 100644 demo/pages/about/test/custom.wxml
create mode 100644 demo/pages/about/test/custom.wxss
diff --git a/demo/app.json b/demo/app.json
index b327cc3..471f13c 100644
--- a/demo/app.json
+++ b/demo/app.json
@@ -35,7 +35,8 @@
"pages/about/home/home",
"custom-tab-bar/index",
"pages/plugin/drawer/drawer",
- "pages/plugin/verticalnav/verticalnav"
+ "pages/plugin/verticalnav/verticalnav",
+ "pages/about/test/custom"
],
"window": {
"navigationBarBackgroundColor": "#39b54a",
diff --git a/demo/app.wxss b/demo/app.wxss
index 3a7b80b..189c6f8 100644
--- a/demo/app.wxss
+++ b/demo/app.wxss
@@ -1,6 +1,10 @@
@import "icon.wxss";
@import "colorui.wxss";
+.cu-btn.button-hover {
+ pointer-events: none;
+}
+
.cu-modal.show {
z-index: 99999;
}
diff --git a/demo/pages/about/test/custom.js b/demo/pages/about/test/custom.js
new file mode 100644
index 0000000..7dd2801
--- /dev/null
+++ b/demo/pages/about/test/custom.js
@@ -0,0 +1,19 @@
+const app = getApp()
+
+Page({
+ data: {
+
+ },
+ onLoad: function () {
+ wx.getSystemInfo({
+ success: e => {
+ let custom = wx.getMenuButtonBoundingClientRect();
+ this.setData({
+ StatusBar: e.statusBarHeight,
+ Custom: custom,
+ CustomBar: custom.bottom + custom.top - e.statusBarHeight
+ })
+ }
+ })
+ },
+})
diff --git a/demo/pages/about/test/custom.json b/demo/pages/about/test/custom.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/demo/pages/about/test/custom.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/demo/pages/about/test/custom.wxml b/demo/pages/about/test/custom.wxml
new file mode 100644
index 0000000..ab4ad77
--- /dev/null
+++ b/demo/pages/about/test/custom.wxml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/demo/pages/about/test/custom.wxss b/demo/pages/about/test/custom.wxss
new file mode 100644
index 0000000..25f7268
--- /dev/null
+++ b/demo/pages/about/test/custom.wxss
@@ -0,0 +1,22 @@
+.custom {
+ background-color: #333;
+}
+.bar{
+ display: flex;
+ align-items: center;
+ background: #555;
+ position: fixed;
+ top: 0;
+ width: 50%;
+}
+.StatusBar {
+ position: fixed;
+ background-color: #da0000;
+ width: 75%;
+ top: 0;
+ left: 0;
+}
+.border-custom{
+ background-color: #fff;
+ border-radius: 50px;
+}
\ No newline at end of file
diff --git a/demo/pages/about/test/list.wxml b/demo/pages/about/test/list.wxml
index 68275f1..0ab7055 100644
--- a/demo/pages/about/test/list.wxml
+++ b/demo/pages/about/test/list.wxml
@@ -9,7 +9,7 @@
filter：blur引起的ios花屏测试
-
+
+ 胶囊按钮的Api测试
+
\ No newline at end of file
diff --git a/demo/pages/basics/button/button.js b/demo/pages/basics/button/button.js
index a20e9a6..a65cc62 100644
--- a/demo/pages/basics/button/button.js
+++ b/demo/pages/basics/button/button.js
@@ -15,4 +15,7 @@ Page({
bordersize: e.detail.value
})
},
+ input(){
+ console.log();
+ }
});
diff --git a/demo/pages/basics/button/button.wxml b/demo/pages/basics/button/button.wxml
index 691e0a4..2a6be9f 100644
--- a/demo/pages/basics/button/button.wxml
+++ b/demo/pages/basics/button/button.wxml
@@ -15,7 +15,7 @@
-
+
-
- Tab{{index}}
- 点击头像打开抽屉
-
- 返回上一页
-
-
+
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+ Tab{{index}}
+ 点击头像打开抽屉
+
+ 返回上一页
+
+
+
diff --git a/demo/project.config.json b/demo/project.config.json
index c975017..fee2092 100644
--- a/demo/project.config.json
+++ b/demo/project.config.json
@@ -11,7 +11,7 @@
"newFeature": true
},
"compileType": "miniprogram",
- "libVersion": "2.5.2",
+ "libVersion": "2.6.1",
"appid": "wxfd5241d66a07713f",
"projectname": "ColorUI2.0-demo",
"debugOptions": {
@@ -36,7 +36,7 @@
"list": []
},
"miniprogram": {
- "current": 32,
+ "current": 33,
"list": [
{
"id": 0,
@@ -201,13 +201,13 @@
"query": "",
"scene": null
},
- {
- "id": -1,
- "name": "3.4 扩展-垂直导航",
- "pathName": "pages/plugin/home/home",
- "query": "",
- "scene": null
- },
+ {
+ "id": -1,
+ "name": "3.4 扩展-垂直导航",
+ "pathName": "pages/plugin/home/home",
+ "query": "",
+ "scene": null
+ },
{
"id": -1,
"name": "-----关于-首页-----",
@@ -233,10 +233,18 @@
"query": ""
},
{
- "id": -1,
+ "id": 32,
"name": "4.3 --- filter：blur引起的ios花屏测试",
"pathName": "pages/about/test/filter",
- "query": ""
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "4.3 --- 胶囊按钮的Api测试",
+ "pathName": "pages/about/test/custom",
+ "query": "",
+ "scene": null
}
]
}