Skip to content

Commit 842613b

Browse files
author
cunjinli
committed
扩展库0.1.4
1 parent 24aa269 commit 842613b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+509
-217
lines changed

‎package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "weui-miniprogram",
3-
"version": "0.1.2",
3+
"version": "0.1.4",
44
"description": "",
55
"main": "miniprogram_dist/index.js",
66
"scripts": {
@@ -31,11 +31,12 @@
3131
},
3232
"repository": {
3333
"type": "git",
34-
"url": "https://github.com/wechat-miniprogram/weui-miniprogram"
34+
"url": ""
3535
},
36-
"author": "cunjinli,rockhou,xushengni,tomylin",
36+
"author": "xushengni,tomylin,cunjinli,rockhou",
3737
"license": "MIT",
3838
"devDependencies": {
39+
"@tencent/tslint-config-wxapp": "0.0.2",
3940
"autoprefixer": "^6.5.1",
4041
"babel-core": "^6.26.3",
4142
"babel-loader": "^7.1.5",

‎src/weui-wxss/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
node_modules
33
npm-debug.log
44
dist
5+
dist/*
56
.DS_Store
67
*.swp

‎src/weui-wxss/src/app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"example/progress/progress",
2323

2424
"example/actionsheet/actionsheet",
25+
"example/half-screen-dialog/half-screen-dialog",
2526
"example/dialog/dialog",
2627
"example/msg/msg",
2728
"example/msg/msg_text",
@@ -31,7 +32,7 @@
3132
"example/picker/picker",
3233
"example/toast/toast",
3334

34-
"example/navigation_bar/navigation_bar",
35+
"example/navigation-bar/navigation-bar",
3536
"example/tabbar/tabbar",
3637

3738
"example/searchbar/searchbar"

‎src/weui-wxss/src/app.wxss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ page{
1717
}
1818

1919
.page__ft{
20-
padding-bottom: 10px;
2120
text-align: center;
21+
padding:0 0 10px;
22+
padding:0 0 calc(10px + constant(safe-area-inset-bottom));
23+
padding:0 0 calc(10px + env(safe-area-inset-bottom));
2224
}
2325

26+
2427
.page__title {
2528
text-align: left;
2629
font-size: 20px;

‎src/weui-wxss/src/example/button/button.wxml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
<button class="weui-btn" type="warn" disabled="true">警告类操作</button>
1515

1616
<view class="button-sp-area">
17-
<button class="weui-btn" type="primary" plain="true">按钮</button>
18-
<button class="weui-btn" type="primary" disabled="true" plain="true">按钮</button>
19-
20-
<button class="weui-btn" type="default" plain="true">按钮</button>
21-
<button class="weui-btn" type="default" disabled="true" plain="true">按钮</button>
22-
2317
<button class="weui-btn mini-btn" type="primary" size="mini">按钮</button>
2418
<button class="weui-btn mini-btn" type="default" size="mini">按钮</button>
2519
<button class="weui-btn mini-btn" type="warn" size="mini">按钮</button>

‎src/weui-wxss/src/example/dialog/dialog.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
Page({
2+
data: {
3+
showDialog: false
4+
},
5+
openConfirm: function () {
6+
wx.showModal({
7+
title: '弹窗标题',
8+
content: '弹窗内容，告知当前状态、信息和解决方法，描述文字尽量控制在三行内',
9+
confirmText: "主操作",
10+
cancelText: "辅助操作",
11+
success: function (res) {
12+
console.log(res);
13+
if (res.confirm) {
14+
console.log('用户点击主操作')
15+
}else{
16+
console.log('用户点击辅助操作')
17+
}
18+
}
19+
});
20+
},
221
openDialog: function () {
22+
this.setData({
23+
istrue: true
24+
})
25+
},
26+
closeDialog: function () {
27+
this.setData({
28+
istrue: false
29+
})
330
}
431
});

‎src/weui-wxss/src/example/dialog/dialog.wxml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<view class="page">
22
<view class="page__hd">
33
<view class="page__title">Dialog</view>
4-
<view class="page__desc">对话框，采用小程序原生的modal</view>
4+
<view class="page__desc">对话框</view>
55
</view>
66
<view class="page__bd">
77
<view class="weui-btn-area">
8-
<button class="weui-btn" type="default" bindtap="openDialog">Dialog</button>
8+
<button class="weui-btn" type="default" bindtap="openConfirm">原生 Dialog</button>
9+
<button class="weui-btn" type="default" bindtap="openDialog">模拟 Dialog</button>
910
</view>
10-
<view class="weui-demo-dialog">
11-
<view class="weui-mask"></view>
12-
<view class="weui-dialog__wrp">
13-
<view class="weui-dialog">
11+
<view class="weui-demo-dialog {{istrue ? 'weui-demo-dialog_show' : ''}}">
12+
<view class="weui-mask" bindtap="closeDialog"></view>
13+
<view class="weui-dialog__wrp" bindtap="closeDialog">
14+
<view class="weui-dialog" catchtap="stopEvent">
1415
<view class="weui-dialog__hd">
1516
<view class="weui-dialog__title">标题</view>
1617
</view>
1718
<view class="weui-dialog__bd">
18-
详细内容
19+
<image class="weui-article__img" src="../images/pic_article.png" mode="aspectFill" style="max-width:100%;"/>
1920
</view>
2021
<view class="weui-dialog__ft">
21-
<view class="weui-dialog__btn weui-dialog__btn_default">取消</view>
22-
<view class="weui-dialog__btn">确定</view>
22+
<view class="weui-dialog__btn weui-dialog__btn_default" bindtap="closeDialog">取消</view>
23+
<view class="weui-dialog__btn" bindtap="closeDialog">确定</view>
2324
</view>
2425
</view>
2526
</view>

‎src/weui-wxss/src/example/dialog/dialog.wxss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ page{
22
background-color: #FFFFFF;
33
}
44
.weui-demo-dialog{
5+
visibility:hidden;
6+
opacity:0;
7+
transition:opacity .3s;
58
}
69
.weui-demo-dialog_show{
10+
visibility:visible;
11+
opacity:1;
712
}

‎src/weui-wxss/src/example/gallery/gallery.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
Page({});
1+
Page({
2+
openGallery: function () {
3+
this.setData({
4+
istrue: true
5+
})
6+
},
7+
closeGallery: function () {
8+
this.setData({
9+
istrue: false
10+
})
11+
}
12+
});

‎src/weui-wxss/src/example/gallery/gallery.wxml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<view class="page__desc">画廊，模拟小程序原生的wx.previewImage。</view>
55
</view>
66
<view class="page__bd">
7-
<view class="weui-gallery weui-gallery_show">
7+
<view class="weui-btn-area">
8+
<button class="weui-btn" type="default" bindtap="openGallery">Gallery</button>
9+
</view>
10+
<view class="weui-gallery {{istrue ? 'weui-gallery_show' : ''}}" bindtap="closeGallery">
811
<view class="weui-gallery__info">1/17</view>
912
<view class="weui-gallery__img__wrp">
1013
<image mode="aspectFit" class="weui-gallery__img" src="../images/pic_160.png"></image>

0 commit comments

Comments
 (0)