diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
index d102e87fb5312bacd2e55e8e4b10108c50ce2af8..aa639256a4728d3d5abd833040bd04988cae7b02
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+#### v 2.0.0 (2019-08-01)
+
+- 【同步weui】 颜色规范、字体大小规范、间距规范对齐微信7.0新视觉风格
+- 【同步weui】 更新weui-cell、weui-uploader、weui-article、weui-footer、weui-msg、weui-panel、weui-search-bar等组件的UI
+- 【增强】 增加组件 slideview 右滑操作
+- 【增强】 增加组件 gallery 模拟原生全屏预览
+- 【增强】 增加组件 loading 加载中
+- 【增强】 增加组件 dialog 模拟原生弹窗
+- 【增强】 增加组件 half-screen-dialog 半屏弹窗
+- 【增强】 增加组件 navigation-bar 模拟原生顶部导航条
+- 【增强】 增加组件 tabbar 模拟原生底部tab
+- 【优化】 废弃组件 navbar
+
#### v 1.1.1 (2017-01-18)
- 【同步weui】 增加扩展类.weui-loading_transparent
@@ -18,4 +31,4 @@
初始发布
-- Initial release
\ No newline at end of file
+- Initial release
diff --git a/DIFF.md b/DIFF.md
old mode 100644
new mode 100755
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/dist/app.js b/dist/app.js
old mode 100644
new mode 100755
diff --git a/dist/app.json b/dist/app.json
old mode 100644
new mode 100755
index 050b0f5f46db47c6c82ae413778bdcf12e228e03..26f5fc9c360ba99c5d46c536b04804ecbee5d7f7
--- a/dist/app.json
+++ b/dist/app.json
@@ -1,13 +1,12 @@
{
"pages": [
"example/index",
-
"example/button/button",
"example/list/list",
+ "example/slideview/slideview",
"example/input/input",
"example/slider/slider",
"example/uploader/uploader",
-
"example/article/article",
"example/badge/badge",
"example/flex/flex",
@@ -15,12 +14,13 @@
"example/gallery/gallery",
"example/grid/grid",
"example/icons/icons",
+ "example/loading/loading",
"example/loadmore/loadmore",
"example/panel/panel",
"example/preview/preview",
"example/progress/progress",
-
"example/actionsheet/actionsheet",
+ "example/half-screen-dialog/half-screen-dialog",
"example/dialog/dialog",
"example/msg/msg",
"example/msg/msg_text",
@@ -29,17 +29,15 @@
"example/msg/msg_fail",
"example/picker/picker",
"example/toast/toast",
-
- "example/navbar/navbar",
+ "example/navigation-bar/navigation-bar",
"example/tabbar/tabbar",
-
"example/searchbar/searchbar"
],
"window": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "WeUI for 小程序",
- "navigationBarBackgroundColor": "#f8f8f8",
- "backgroundColor": "#f8f8f8"
+ "navigationBarBackgroundColor": "#EDEDED",
+ "backgroundColor": "#EDEDED"
},
"networkTimeout": {
"request": 10000,
@@ -47,5 +45,7 @@
"uploadFile": 10000,
"downloadFile": 10000
},
- "debug": true
-}
+ "style": "v2",
+ "debug": true,
+ "sitemapLocation": "sitemap42.json"
+}
\ No newline at end of file
diff --git a/dist/app.wxss b/dist/app.wxss
old mode 100644
new mode 100755
index 1a3d12496659d0e9cfbefdeddd762ad0da2656da..60d29e2be1948174cb453277163944a816709d18
--- a/dist/app.wxss
+++ b/dist/app.wxss
@@ -17,10 +17,13 @@ page{
}
.page__ft{
- padding-bottom: 10px;
text-align: center;
+ padding:0 0 10px;
+ padding:0 0 calc(10px + constant(safe-area-inset-bottom));
+ padding:0 0 calc(10px + env(safe-area-inset-bottom));
}
+
.page__title {
text-align: left;
font-size: 20px;
diff --git a/dist/example/actionsheet/actionsheet.js b/dist/example/actionsheet/actionsheet.js
old mode 100644
new mode 100755
diff --git a/dist/example/actionsheet/actionsheet.wxml b/dist/example/actionsheet/actionsheet.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/actionsheet/actionsheet.wxss b/dist/example/actionsheet/actionsheet.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/article/article.js b/dist/example/article/article.js
old mode 100644
new mode 100755
diff --git a/dist/example/article/article.wxml b/dist/example/article/article.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/article/article.wxss b/dist/example/article/article.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/badge/badge.js b/dist/example/badge/badge.js
old mode 100644
new mode 100755
diff --git a/dist/example/badge/badge.wxml b/dist/example/badge/badge.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/button/button.js b/dist/example/button/button.js
old mode 100644
new mode 100755
diff --git a/dist/example/button/button.wxml b/dist/example/button/button.wxml
old mode 100644
new mode 100755
index a81ef0764518a0837a07bda4d587f69f07232699..d50c2e53c8831a919aac4b54753d54f1e4581402
--- a/dist/example/button/button.wxml
+++ b/dist/example/button/button.wxml
@@ -14,12 +14,6 @@
-
-
-
-
-
-
diff --git a/dist/example/button/button.wxss b/dist/example/button/button.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/dialog/dialog.js b/dist/example/dialog/dialog.js
old mode 100644
new mode 100755
index 5459e87404d2c5bc42efc894f0fad5acd43a2261..f597169d0ca44273c0820f147c76f2462e7a6dc6
--- a/dist/example/dialog/dialog.js
+++ b/dist/example/dialog/dialog.js
@@ -1,5 +1,8 @@
Page({
- openConfirm: function () {
+ data: {
+ showDialog: false
+ },
+ openConfirm: function () {
wx.showModal({
title: '弹窗标题',
content: '弹窗内容,告知当前状态、信息和解决方法,描述文字尽量控制在三行内',
@@ -15,15 +18,14 @@ Page({
}
});
},
- openAlert: function () {
- wx.showModal({
- content: '弹窗内容,告知当前状态、信息和解决方法,描述文字尽量控制在三行内',
- showCancel: false,
- success: function (res) {
- if (res.confirm) {
- console.log('用户点击确定')
- }
- }
- });
+ openDialog: function () {
+ this.setData({
+ istrue: true
+ })
+ },
+ closeDialog: function () {
+ this.setData({
+ istrue: false
+ })
}
-});
\ No newline at end of file
+});
diff --git a/dist/example/dialog/dialog.wxml b/dist/example/dialog/dialog.wxml
old mode 100644
new mode 100755
index 44d953124f548c184bd1ac8011ecd944a667ce50..15ca9e7c1722a9853e76a8ae82eb7152507635ce
--- a/dist/example/dialog/dialog.wxml
+++ b/dist/example/dialog/dialog.wxml
@@ -1,12 +1,29 @@
Dialog
- 对话框,采用小程序原生的modal
+ 对话框
-
-
+
+
+
+
+
+
+
+
+ 标题
+
+
+
+
+
+ 取消
+ 确定
+
+
+
-
\ No newline at end of file
+
diff --git a/dist/example/dialog/dialog.wxss b/dist/example/dialog/dialog.wxss
old mode 100644
new mode 100755
index 922ad0ef6f63d2b5e483a49b5a6c76943e1d41ba..e2ff0ef375995a1cee690fd5f91ed9eee505d37e
--- a/dist/example/dialog/dialog.wxss
+++ b/dist/example/dialog/dialog.wxss
@@ -1,3 +1,12 @@
page{
background-color: #FFFFFF;
-}
\ No newline at end of file
+}
+.weui-demo-dialog{
+ visibility:hidden;
+ opacity:0;
+ transition:opacity .3s;
+}
+.weui-demo-dialog_show{
+ visibility:visible;
+ opacity:1;
+}
diff --git a/dist/example/flex/flex.js b/dist/example/flex/flex.js
old mode 100644
new mode 100755
diff --git a/dist/example/flex/flex.wxml b/dist/example/flex/flex.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/flex/flex.wxss b/dist/example/flex/flex.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/footer/footer.js b/dist/example/footer/footer.js
old mode 100644
new mode 100755
diff --git a/dist/example/footer/footer.wxml b/dist/example/footer/footer.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/footer/footer.wxss b/dist/example/footer/footer.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/gallery/gallery.js b/dist/example/gallery/gallery.js
old mode 100644
new mode 100755
index f16cc1a8255aae310cbd340c85f98ff26a7bfb2d..0706d0510f94c95330d267072b408d316c93197f
--- a/dist/example/gallery/gallery.js
+++ b/dist/example/gallery/gallery.js
@@ -1 +1,12 @@
-Page({});
\ No newline at end of file
+Page({
+ openGallery: function () {
+ this.setData({
+ istrue: true
+ })
+ },
+ closeGallery: function () {
+ this.setData({
+ istrue: false
+ })
+ }
+});
diff --git a/dist/example/gallery/gallery.wxml b/dist/example/gallery/gallery.wxml
old mode 100644
new mode 100755
index 82deb5d6df4c5d2b2aaede6a55eafe4895243616..92aaa8082e89a50c3affc2147079927245b39edb
--- a/dist/example/gallery/gallery.wxml
+++ b/dist/example/gallery/gallery.wxml
@@ -1,6 +1,20 @@
Gallery
- 画廊,建议采用小程序原生的wx.previewImage来实现。详情请看小程序文档。
+ 画廊,模拟小程序原生的wx.previewImage。
-
\ No newline at end of file
+
+
+
+
+
+ 1/17
+
+
+
+
+ 删除
+
+
+
+
diff --git a/dist/example/grid/grid.js b/dist/example/grid/grid.js
old mode 100644
new mode 100755
diff --git a/dist/example/grid/grid.wxml b/dist/example/grid/grid.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/icons/icons.js b/dist/example/icons/icons.js
old mode 100644
new mode 100755
diff --git a/dist/example/icons/icons.wxml b/dist/example/icons/icons.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/icons/icons.wxss b/dist/example/icons/icons.wxss
old mode 100644
new mode 100755
diff --git a/dist/example/images/base64.js b/dist/example/images/base64.js
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_footer.png b/dist/example/images/icon_footer.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_footer_link.png b/dist/example/images/icon_footer_link.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_intro.png b/dist/example/images/icon_intro.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_feedback.png b/dist/example/images/icon_nav_feedback.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_form.png b/dist/example/images/icon_nav_form.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_nav.png b/dist/example/images/icon_nav_nav.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_search.png b/dist/example/images/icon_nav_search.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_special.png b/dist/example/images/icon_nav_special.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_widget.png b/dist/example/images/icon_nav_widget.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_nav_z-index.png b/dist/example/images/icon_nav_z-index.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/icon_tabbar.png b/dist/example/images/icon_tabbar.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/logo.png b/dist/example/images/logo.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/pic_160.png b/dist/example/images/pic_160.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/pic_article.png b/dist/example/images/pic_article.png
old mode 100644
new mode 100755
diff --git a/dist/example/images/vcode.jpg b/dist/example/images/vcode.jpg
old mode 100644
new mode 100755
diff --git a/dist/example/index.js b/dist/example/index.js
old mode 100644
new mode 100755
index aee218e7c93bd9afa22ddab9ffe45c25a44a59c0..7a0f0d7c2adcfd49cc5ad042b689ebce30d39367
--- a/dist/example/index.js
+++ b/dist/example/index.js
@@ -5,25 +5,25 @@ Page({
id: 'form',
name: '表单',
open: false,
- pages: ['button', 'list', 'input', 'slider', 'uploader']
+ pages: ['button', 'list', 'slideview', 'input', 'slider', 'uploader']
},
{
id: 'widget',
name: '基础组件',
open: false,
- pages: ['article', 'badge', 'flex', 'footer', 'gallery', 'grid', 'icons', 'loadmore', 'panel', 'preview', 'progress']
+ pages: ['article', 'badge', 'flex', 'footer', 'gallery', 'grid', 'icons', 'loading', 'loadmore', 'panel', 'preview', 'progress']
},
{
id: 'feedback',
name: '操作反馈',
open: false,
- pages: ['actionsheet', 'dialog', 'msg', 'picker', 'toast']
+ pages: ['actionsheet', 'dialog', 'half-screen-dialog', 'msg', 'picker', 'toast']
},
{
id: 'nav',
name: '导航相关',
open: false,
- pages: ['navbar', 'tabbar']
+ pages: ['navigation-bar', 'tabbar']
},
{
id: 'search',
diff --git a/dist/example/index.wxml b/dist/example/index.wxml
old mode 100644
new mode 100755
diff --git a/dist/example/index.wxss b/dist/example/index.wxss
old mode 100644
new mode 100755
index 66294bbb97b10eb8dd29bcff8601777de1b6c92d..8bd5df2c15d95a0f949626ce441aa718838c0530
--- a/dist/example/index.wxss
+++ b/dist/example/index.wxss
@@ -1,5 +1,5 @@
/*!
- * WeUI v1.1.1 (https://github.com/weui/weui-wxss)
+ * WeUI v2.0.0 (https://github.com/weui/weui-wxss)
* Copyright 2019 Tencent, Inc.
* Licensed under the MIT license
*/
diff --git a/dist/example/input/input.js b/dist/example/input/input.js
old mode 100644
new mode 100755
diff --git a/dist/example/input/input.wxml b/dist/example/input/input.wxml
old mode 100644
new mode 100755
index 7669d1f560f6fff6b53fc51ab275b2c9afb33be7..4ebc9413b753dd94ac722592ae3c8dd97aec4f56
--- a/dist/example/input/input.wxml
+++ b/dist/example/input/input.wxml
@@ -24,7 +24,7 @@
复选列表项
-
+