Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
20岁爱吃必胜客
uni-app
提交
309f41d0
U
uni-app
项目概览
20岁爱吃必胜客
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
309f41d0
编写于
11月 28, 2019
作者:
雪洛
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'v3' of
https://github.com/dcloudio/uni-app
into v3
上级
b0e7ac94
55d58841
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
64 addition
and
56 deletion
+64
-56
lerna.json
lerna.json
+1
-1
packages/uni-app-plus-nvue/package.json
packages/uni-app-plus-nvue/package.json
+1
-1
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+5
-28
packages/uni-app-plus/dist/view.umd.min.js
packages/uni-app-plus/dist/view.umd.min.js
+1
-1
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-cli-shared/package.json
packages/uni-cli-shared/package.json
+1
-1
packages/uni-h5-ui/package.json
packages/uni-h5-ui/package.json
+1
-1
packages/uni-h5/package.json
packages/uni-h5/package.json
+1
-1
packages/uni-migration/package.json
packages/uni-migration/package.json
+1
-1
packages/uni-mp-alipay/package.json
packages/uni-mp-alipay/package.json
+1
-1
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
packages/uni-mp-qq/package.json
packages/uni-mp-qq/package.json
+1
-1
packages/uni-mp-toutiao/package.json
packages/uni-mp-toutiao/package.json
+1
-1
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
packages/uni-stat/package.json
packages/uni-stat/package.json
+1
-1
packages/uni-template-compiler/package.json
packages/uni-template-compiler/package.json
+1
-1
packages/vue-cli-plugin-hbuilderx/package.json
packages/vue-cli-plugin-hbuilderx/package.json
+1
-1
packages/vue-cli-plugin-uni-optimize/package.json
packages/vue-cli-plugin-uni-optimize/package.json
+1
-1
packages/vue-cli-plugin-uni/package.json
packages/vue-cli-plugin-uni/package.json
+2
-2
packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js
...-uni/packages/app-vue-style-loader/lib/addStylesClient.js
+10
-6
packages/webpack-uni-mp-loader/package.json
packages/webpack-uni-mp-loader/package.json
+1
-1
packages/webpack-uni-pages-loader/package.json
packages/webpack-uni-pages-loader/package.json
+1
-1
src/platforms/app-plus/service/framework/plugins/lifecycle.js
...platforms/app-plus/service/framework/plugins/lifecycle.js
+3
-1
src/platforms/app-plus/view/bridge/subscribe/index.js
src/platforms/app-plus/view/bridge/subscribe/index.js
+25
-0
未找到文件。
lerna.json
浏览文件 @
309f41d0
...
...
@@ -12,5 +12,5 @@
"message"
:
"chore(release): publish %s"
}
},
"version"
:
"2.0.0-alpha-2432019112500
1
"
"version"
:
"2.0.0-alpha-2432019112500
2
"
}
packages/uni-app-plus-nvue/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-app-plus-nvue"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app app-plus-nvue"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
309f41d0
...
...
@@ -5171,35 +5171,10 @@ var serviceContext = (function () {
let
result
;
const
page
=
showPage
({
url
:
'
__uniappchooselocation
'
,
data
:
{
keyword
:
options
.
keyword
},
data
:
options
,
style
:
{
animationType
:
options
.
animationType
||
'
slide-in-bottom
'
,
titleNView
:
{
autoBackButton
:
false
,
titleText
:
options
.
titleText
||
'
选择位置
'
,
titleColor
:
'
#ffffff
'
,
backgroundColor
:
'
rgba(0,0,0,1)
'
,
buttons
:
[{
// text: options.cancelText || "取消",
// fontSize: "17px",
type
:
'
close
'
,
float
:
'
left
'
,
onclick
:
()
=>
{
page
.
close
();
}
},
{
text
:
options
.
doneText
||
'
完成
'
,
fontSize
:
'
17px
'
,
width
:
'
60px
'
,
onclick
:
()
=>
{
page
.
sendMessage
({
type
:
'
done
'
});
}
}]
},
titleNView
:
false
,
popGesture
:
'
close
'
,
scrollIndicator
:
'
none
'
},
...
...
@@ -12242,7 +12217,9 @@ var serviceContext = (function () {
disableScroll
,
onPageScroll
,
onPageReachBottom
,
onReachBottomDistance
onReachBottomDistance
,
windowTop
:
0
,
// TODO
windowBottom
:
0
// TODO
}
}
...
...
packages/uni-app-plus/dist/view.umd.min.js
浏览文件 @
309f41d0
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
packages/uni-app-plus/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-cli-shared/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-cli-shared"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-cli-shared"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-h5-ui/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-h5-ui"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app h5 ui"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-h5/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-h5"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app h5"
,
"main"
:
"dist/index.umd.min.js"
,
"repository"
:
{
...
...
packages/uni-migration/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-migration"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app migration"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-alipay/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-mp-alipay"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app mp-alipay"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-qq/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-mp-qq"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app mp-qq"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-toutiao/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app mp-toutiao"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-stat/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-stat"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
""
,
"main"
:
"dist/index.js"
,
"repository"
:
{
...
...
packages/uni-template-compiler/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/uni-template-compiler"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-template-compiler"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-hbuilderx/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/vue-cli-plugin-hbuilderx"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"HBuilderX plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni-optimize/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/vue-cli-plugin-uni-optimize"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app optimize plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/vue-cli-plugin-uni/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/vue-cli-plugin-uni"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app plugin for vue-cli 3"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
@@ -17,7 +17,7 @@
"author"
:
"fxy060608"
,
"license"
:
"Apache-2.0"
,
"dependencies"
:
{
"@dcloudio/uni-stat"
:
"^2.0.0-alpha-2432019112500
1
"
,
"@dcloudio/uni-stat"
:
"^2.0.0-alpha-2432019112500
2
"
,
"buffer-json"
:
"^2.0.0"
,
"copy-webpack-plugin"
:
"^4.6.0"
,
"cross-env"
:
"^5.2.0"
,
...
...
packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js
浏览文件 @
309f41d0
...
...
@@ -226,13 +226,17 @@ var UPX_RE = /([+-]?\d+(\.\d+)?)[r|u]px/g
var
VAR_STATUS_BAR_HEIGHT
=
/var
\(
--status-bar-height
\)
/gi
var
VAR_WINDOW_TOP
=
/var
\(
--window-top
\)
/gi
var
VAR_WINDOW_BOTTOM
=
/var
\(
--window-bottom
\)
/gi
var
statusBarHeight
=
false
function
processCss
(
css
)
{
if
(
!
uni
.
canIUse
(
'
css.var
'
))
{
//不支持 css 变量
if
(
!
uni
.
canIUse
(
'
css.var
'
))
{
//不支持 css 变量
if
(
statusBarHeight
===
false
)
{
statusBarHeight
=
plus
.
navigator
.
getStatusbarHeight
()
}
var
offset
=
{
statusBarHeight
:
plus
.
navigator
.
getStatusbarHeight
()
,
top
:
0
,
bottom
:
0
statusBarHeight
:
statusBarHeight
,
top
:
window
.
__WINDOW_TOP
||
0
,
bottom
:
window
.
__WINDOW_BOTTOM
||
0
}
css
=
css
.
replace
(
VAR_STATUS_BAR_HEIGHT
,
offset
.
statusBarHeight
+
'
px
'
)
.
replace
(
VAR_WINDOW_TOP
,
offset
.
top
+
'
px
'
)
...
...
@@ -242,4 +246,4 @@ function processCss(css) {
.
replace
(
UPX_RE
,
function
(
a
,
b
)
{
return
uni
.
upx2px
(
b
)
+
'
px
'
})
}
\ No newline at end of file
}
packages/webpack-uni-mp-loader/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/webpack-uni-mp-loader"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"webpack-uni-mp-loader"
,
"main"
:
"index.js"
,
"repository"
:
{
...
...
packages/webpack-uni-pages-loader/package.json
浏览文件 @
309f41d0
{
"name"
:
"@dcloudio/webpack-uni-pages-loader"
,
"version"
:
"2.0.0-alpha-2432019112500
1
"
,
"version"
:
"2.0.0-alpha-2432019112500
2
"
,
"description"
:
"uni-app pages.json loader"
,
"main"
:
"lib/index.js"
,
"repository"
:
{
...
...
src/platforms/app-plus/service/framework/plugins/lifecycle.js
浏览文件 @
309f41d0
...
...
@@ -37,7 +37,9 @@ function parsePageCreateOptions (vm, route) {
disableScroll
,
onPageScroll
,
onPageReachBottom
,
onReachBottomDistance
onReachBottomDistance
,
windowTop
:
0
,
// TODO
windowBottom
:
0
// TODO
}
}
...
...
src/platforms/app-plus/view/bridge/subscribe/index.js
浏览文件 @
309f41d0
...
...
@@ -19,12 +19,37 @@ const passiveOptions = supportsPassive ? {
passive
:
false
}
:
false
function
onCssVar
({
windowTop
,
windowBottom
})
{
global
.
__WINDOW_TOP
=
windowTop
global
.
__WINDOW_BOTTOM
=
windowBottom
if
(
uni
.
canIUse
(
'
css.var
'
))
{
const
style
=
document
.
documentElement
.
style
style
.
setProperty
(
'
--window-top
'
,
windowTop
+
'
px
'
)
style
.
setProperty
(
'
--window-bottom
'
,
windowBottom
+
'
px
'
)
style
.
setProperty
(
'
--status-bar-height
'
,
plus
.
navigator
.
getStatusbarHeight
()
+
'
px
'
)
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
console
.
log
(
`--window-top=
${
windowTop
}
`
)
console
.
log
(
`--window-bottom=
${
windowBottom
}
`
)
}
}
}
function
onPageCreate
({
windowTop
,
windowBottom
,
disableScroll
,
onPageScroll
,
onPageReachBottom
,
onReachBottomDistance
},
pageId
)
{
onCssVar
({
windowTop
,
windowBottom
})
if
(
disableScroll
)
{
document
.
addEventListener
(
'
touchmove
'
,
disableScrollListener
,
passiveOptions
)
}
else
if
(
onPageScroll
||
onPageReachBottom
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录