Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
8ec89527
U
uni-app
项目概览
DCloud
/
uni-app
3 个月 前同步成功
通知
718
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8ec89527
编写于
3月 27, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
540d65e2
4a19265c
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
18 addition
and
15 deletion
+18
-15
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+5
-1
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+6
-7
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
src/platforms/app-plus/service/api/index.js
src/platforms/app-plus/service/api/index.js
+5
-1
src/platforms/app-plus/service/api/require-native-plugin.js
src/platforms/app-plus/service/api/require-native-plugin.js
+0
-4
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
8ec89527
...
@@ -229,6 +229,10 @@ TODOS.forEach(function (name) {
...
@@ -229,6 +229,10 @@ TODOS.forEach(function (name) {
});
});
function
requireNativePlugin
(
pluginName
)
{
function
requireNativePlugin
(
pluginName
)
{
/* eslint-disable no-undef */
if
(
typeof
weex
!==
'
undefined
'
)
{
return
weex
.
requireModule
(
pluginName
)
}
/* eslint-disable no-undef */
/* eslint-disable no-undef */
return
__requireNativePlugin__
(
pluginName
)
return
__requireNativePlugin__
(
pluginName
)
}
}
...
...
packages/uni-app-plus/package.json
浏览文件 @
8ec89527
{
{
"name"
:
"@dcloudio/uni-app-plus"
,
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"0.0.20
4
"
,
"version"
:
"0.0.20
5
"
,
"description"
:
"uni-app app-plus"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
8ec89527
...
@@ -690,10 +690,10 @@ if (typeof Proxy !== 'undefined') {
...
@@ -690,10 +690,10 @@ if (typeof Proxy !== 'undefined') {
if
(
extraApi
[
name
])
{
if
(
extraApi
[
name
])
{
return
promisify
(
name
,
extraApi
[
name
])
return
promisify
(
name
,
extraApi
[
name
])
}
}
}
if
(
todoApis
[
name
])
{
if
(
todoApis
[
name
])
{
return
promisify
(
name
,
todoApis
[
name
])
return
promisify
(
name
,
todoApis
[
name
])
}
}
}
if
(
!
hasOwn
(
wx
,
name
)
&&
!
hasOwn
(
protocols
,
name
))
{
if
(
!
hasOwn
(
wx
,
name
)
&&
!
hasOwn
(
protocols
,
name
))
{
return
return
}
}
...
@@ -703,11 +703,10 @@ if (typeof Proxy !== 'undefined') {
...
@@ -703,11 +703,10 @@ if (typeof Proxy !== 'undefined') {
}
else
{
}
else
{
uni
.
upx2px
=
upx2px
;
uni
.
upx2px
=
upx2px
;
{
Object
.
keys
(
todoApis
).
forEach
(
name
=>
{
Object
.
keys
(
todoApis
).
forEach
(
name
=>
{
uni
[
name
]
=
promisify
(
name
,
todoApis
[
name
]);
uni
[
name
]
=
promisify
(
name
,
todoApis
[
name
]);
});
});
{
Object
.
keys
(
extraApi
).
forEach
(
name
=>
{
Object
.
keys
(
extraApi
).
forEach
(
name
=>
{
uni
[
name
]
=
promisify
(
name
,
todoApis
[
name
]);
uni
[
name
]
=
promisify
(
name
,
todoApis
[
name
]);
});
});
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
8ec89527
{
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"0.0.91
4
"
,
"version"
:
"0.0.91
5
"
,
"description"
:
"uni-app mp-weixin"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
src/platforms/app-plus/service/api/index.js
浏览文件 @
8ec89527
export
function
requireNativePlugin
(
pluginName
)
{
export
function
requireNativePlugin
(
pluginName
)
{
/* eslint-disable no-undef */
if
(
typeof
weex
!==
'
undefined
'
)
{
return
weex
.
requireModule
(
pluginName
)
}
/* eslint-disable no-undef */
/* eslint-disable no-undef */
return
__requireNativePlugin__
(
pluginName
)
return
__requireNativePlugin__
(
pluginName
)
}
}
src/platforms/app-plus/service/api/require-native-plugin.js
已删除
100644 → 0
浏览文件 @
540d65e2
export
default
function
requireNativePlugin
(
pluginName
)
{
/* eslint-disable no-undef */
return
__requireNativePlugin__
(
pluginName
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录