Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
867b3c6d
U
uni-app
项目概览
小浣熊撸代码
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
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,发现更多精彩内容 >>
提交
867b3c6d
编写于
3月 10, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修改部分中文报错信息
上级
0be095bf
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
24 addition
and
28 deletion
+24
-28
src/core/runtime/extra.js
src/core/runtime/extra.js
+2
-2
src/core/runtime/todo.js
src/core/runtime/todo.js
+1
-1
src/core/runtime/wrapper.js
src/core/runtime/wrapper.js
+3
-3
src/core/service/api/context/canvas.js
src/core/service/api/context/canvas.js
+1
-3
src/core/service/api/device/theme.js
src/core/service/api/device/theme.js
+1
-1
src/platforms/app-plus-nvue/service/api/context/live-pusher.js
...latforms/app-plus-nvue/service/api/context/live-pusher.js
+2
-2
src/platforms/app-plus/service/api/file/open-document.js
src/platforms/app-plus/service/api/file/open-document.js
+1
-1
src/platforms/app-plus/service/api/media/recorder.js
src/platforms/app-plus/service/api/media/recorder.js
+2
-2
src/platforms/app-plus/service/api/plugin/get-provider.js
src/platforms/app-plus/service/api/plugin/get-provider.js
+1
-1
src/platforms/app-plus/service/api/plugin/payment.js
src/platforms/app-plus/service/api/plugin/payment.js
+1
-1
src/platforms/app-plus/service/api/plugin/share.js
src/platforms/app-plus/service/api/plugin/share.js
+1
-1
src/platforms/app-plus/service/framework/app.js
src/platforms/app-plus/service/framework/app.js
+2
-2
src/platforms/app-plus/service/framework/navigator.js
src/platforms/app-plus/service/framework/navigator.js
+2
-2
src/platforms/app-plus/service/framework/plus-message.js
src/platforms/app-plus/service/framework/plus-message.js
+2
-2
src/platforms/app-plus/service/framework/webview/parser/sub-nvue-parser.js
...-plus/service/framework/webview/parser/sub-nvue-parser.js
+1
-1
src/platforms/h5/service/api/file/file.js
src/platforms/h5/service/api/file/file.js
+1
-3
未找到文件。
src/core/runtime/extra.js
浏览文件 @
867b3c6d
...
...
@@ -20,9 +20,9 @@ export function getProvider ({
isFn
(
success
)
&&
success
(
res
)
}
else
{
res
=
{
errMsg
:
'
getProvider:fail
:服务[
'
+
service
+
'
]不存在
'
errMsg
:
'
getProvider:fail
service not found
'
}
isFn
(
fail
)
&&
fail
(
res
)
}
isFn
(
complete
)
&&
complete
(
res
)
}
}
src/core/runtime/todo.js
浏览文件 @
867b3c6d
...
...
@@ -19,7 +19,7 @@ function createTodoApi (name) {
complete
})
{
const
res
=
{
errMsg
:
`
${
name
}
:fail
:暂不支持
${
name
}
方法
`
errMsg
:
`
${
name
}
:fail
method '
${
name
}
' not supported
`
}
isFn
(
fail
)
&&
fail
(
res
)
isFn
(
complete
)
&&
complete
(
res
)
...
...
src/core/runtime/wrapper.js
浏览文件 @
867b3c6d
...
...
@@ -35,7 +35,7 @@ function processArgs (methodName, fromArgs, argsOption = {}, returnValue = {}, k
keyOption
=
keyOption
(
fromArgs
[
key
],
fromArgs
,
toArgs
)
}
if
(
!
keyOption
)
{
// 不支持的参数
console
.
warn
(
`
__PLATFORM_TITLE__
${
methodName
}
暂不支持
${
key
}
`
)
console
.
warn
(
`
The '
${
methodName
}
' method of platform '__PLATFORM_TITLE__' does not support option '
${
key
}
'
`
)
}
else
if
(
isStr
(
keyOption
))
{
// 重写参数 key
toArgs
[
keyOption
]
=
fromArgs
[
key
]
}
else
if
(
isPlainObject
(
keyOption
))
{
// {name:newName,value:value}可重新指定参数 key:value
...
...
@@ -70,7 +70,7 @@ export default function wrapper (methodName, method) {
const
protocol
=
protocols
[
methodName
]
if
(
!
protocol
)
{
// 暂不支持的 api
return
function
()
{
console
.
error
(
`
__PLATFORM_TITLE__ 暂不支持
${
methodName
}
`
)
console
.
error
(
`
Platform '__PLATFORM_TITLE__' does not support '
${
methodName
}
'.
`
)
}
}
return
function
(
arg1
,
arg2
)
{
// 目前 api 最多两个参数
...
...
@@ -98,4 +98,4 @@ export default function wrapper (methodName, method) {
}
}
return
method
}
}
src/core/service/api/context/canvas.js
浏览文件 @
867b3c6d
...
...
@@ -226,9 +226,7 @@ function checkColor (e) {
a
=
a
>=
0
?
a
:
255
return
[
n
,
o
,
r
,
a
]
}
console
.
group
(
'
非法颜色:
'
+
e
)
console
.
error
(
'
不支持颜色:
'
+
e
)
console
.
groupEnd
()
console
.
error
(
'
unsupported color:
'
+
e
)
return
[
0
,
0
,
0
,
255
]
}
...
...
src/core/service/api/device/theme.js
浏览文件 @
867b3c6d
...
...
@@ -27,5 +27,5 @@ onMethod('onUIStyleChange', function (res) {
export
function
onUIStyleChange
(
callbackId
)
{
callbacks
.
push
(
callbackId
)
console
.
log
(
'
API uni.onUIStyleChange 已过时,请使用 uni.onThemeChange,详情:https://uniapp.dcloud.net.cn/api/system/theme
'
)
console
.
warn
(
'
The "uni.onUIStyleChange" API is deprecated, please use "uni.onThemeChange". Learn more: https://uniapp.dcloud.net.cn/api/system/theme.
'
)
}
src/platforms/app-plus-nvue/service/api/context/live-pusher.js
浏览文件 @
867b3c6d
...
...
@@ -69,11 +69,11 @@ class LivePusherContext {
export
function
createLivePusherContext
(
id
,
vm
)
{
if
(
!
vm
)
{
return
console
.
warn
(
'
uni.createLivePusherContext
必须传入第二个参数,即当前 vm 对象(this)
'
)
return
console
.
warn
(
'
uni.createLivePusherContext
: 2 arguments required, but only 1 present
'
)
}
const
elm
=
findElmById
(
id
,
vm
)
if
(
!
elm
)
{
return
console
.
warn
(
'
Can not find `
'
+
id
+
'
`
'
)
}
return
new
LivePusherContext
(
id
,
elm
)
}
}
src/platforms/app-plus/service/api/file/open-document.js
浏览文件 @
867b3c6d
...
...
@@ -17,7 +17,7 @@ export function openDocument ({
})
},
err
=>
{
invoke
(
callbackId
,
{
errMsg
:
'
openDocument:fail
文件[
'
+
filePath
+
'
]读取失败:
'
+
err
.
message
errMsg
:
'
openDocument:fail
'
+
err
.
message
})
})
}
src/platforms/app-plus/service/api/media/recorder.js
浏览文件 @
867b3c6d
...
...
@@ -53,14 +53,14 @@ const Recorder = {
pause
()
{
if
(
recorder
)
{
publishRecorderStateChange
(
'
error
'
,
{
errMsg
:
'
暂不支持录音pause操作
'
errMsg
:
'
Unsupported operation: pause
'
})
}
},
resume
()
{
if
(
recorder
)
{
publishRecorderStateChange
(
'
error
'
,
{
errMsg
:
'
暂不支持录音resume操作
'
errMsg
:
'
Unsupported operation: resume
'
})
}
}
...
...
src/platforms/app-plus/service/api/plugin/get-provider.js
浏览文件 @
867b3c6d
...
...
@@ -70,7 +70,7 @@ export function getProvider ({
})
}
else
{
invoke
(
callbackId
,
{
errMsg
:
'
getProvider:fail
服务[
'
+
service
+
'
]不支持
'
errMsg
:
'
getProvider:fail
service not found
'
})
}
}
src/platforms/app-plus/service/api/plugin/payment.js
浏览文件 @
867b3c6d
...
...
@@ -16,7 +16,7 @@ export function requestPayment (params, callbackId) {
})
=>
id
===
provider
)
if
(
!
service
)
{
invoke
(
callbackId
,
{
errMsg
:
'
requestPayment:fail
支付服务[
'
+
provider
+
'
]不存在
'
errMsg
:
'
requestPayment:fail
service not found
'
})
}
else
{
plus
.
payment
.
request
(
service
,
params
.
orderInfo
,
res
=>
{
...
...
src/platforms/app-plus/service/api/plugin/share.js
浏览文件 @
867b3c6d
...
...
@@ -154,7 +154,7 @@ export function share (params, callbackId, method = 'share') {
})
=>
id
===
provider
)
if
(
!
service
)
{
invoke
(
callbackId
,
{
errMsg
:
method
+
'
:fail
分享服务[
'
+
provider
+
'
]不存在
'
errMsg
:
method
+
'
:fail
service not found
'
})
}
else
{
if
(
service
.
authenticated
)
{
...
...
src/platforms/app-plus/service/framework/app.js
浏览文件 @
867b3c6d
...
...
@@ -57,7 +57,7 @@ export function getApp ({
return
defaultApp
}
console
.
error
(
'
[warn]: getApp()
操作失败,v3模式加速了首页 nvue 的启动速度,当在首页 nvue 中使用 getApp() 不一定可以获取真正的 App 对象。详情请参考:https://uniapp.dcloud.io/collocation/frame/window?id=getapp
'
'
[warn]: getApp()
failed. Learn more: https://uniapp.dcloud.io/collocation/frame/window?id=getapp.
'
)
}
...
...
@@ -236,4 +236,4 @@ export function registerApp (appVm) {
__uniConfig
.
ready
=
true
process
.
env
.
NODE_ENV
!==
'
production
'
&&
perf
(
'
registerApp
'
)
}
}
src/platforms/app-plus/service/framework/navigator.js
浏览文件 @
867b3c6d
...
...
@@ -23,7 +23,7 @@ export function navigate (path, callback, isAppLaunch) {
plus
.
navigator
.
closeSplashscreen
()
}
if
(
!
isAppLaunch
&&
todoNavigator
)
{
return
console
.
error
(
`
已存在待跳转页面
${
todoNavigator
.
path
}
,请不要连续多次跳转页面
${
path
}
`
)
return
console
.
error
(
`
Waiting to navigate to:
${
todoNavigator
.
path
}
, do not operate continuously:
${
path
}
.
`
)
}
if
(
__uniConfig
.
renderer
===
'
native
'
)
{
// 纯原生无需wait逻辑
// 如果是首页还未初始化,需要等一等,其他无需等待
...
...
@@ -88,4 +88,4 @@ export function navigateFinish () {
?
todoNavigator
.
navigate
()
:
registerWebviewReady
(
preloadWebview
.
id
,
todoNavigate
)
}
}
}
src/platforms/app-plus/service/framework/plus-message.js
浏览文件 @
867b3c6d
...
...
@@ -29,8 +29,8 @@ export function consumePlusMessage (type, args) {
*/
export
function
registerPlusMessage
(
type
,
callback
,
keepAlive
=
true
)
{
if
(
callbacks
[
type
])
{
return
console
.
warn
(
`
${
type
}
已注册:
`
+
(
callbacks
[
type
].
toString
()))
return
console
.
warn
(
`
'
${
type
}
' registered:
`
+
(
callbacks
[
type
].
toString
()))
}
callback
.
keepAlive
=
!!
keepAlive
callbacks
[
type
]
=
callback
}
}
src/platforms/app-plus/service/framework/webview/parser/sub-nvue-parser.js
浏览文件 @
867b3c6d
...
...
@@ -72,7 +72,7 @@ function initSubNVue (subNVue, routeOptions, webview) {
delete
style
.
type
if
(
isPopup
&&
!
subNVue
.
id
)
{
console
.
warn
(
'
subNVue[
'
+
subNVue
.
path
+
'
]
尚未配置
id
'
)
console
.
warn
(
'
subNVue[
'
+
subNVue
.
path
+
'
]
is missing
id
'
)
}
// TODO lazyload
...
...
src/platforms/h5/service/api/file/file.js
浏览文件 @
867b3c6d
...
...
@@ -17,9 +17,7 @@ export function getFileInfo ({
})
}).
catch
((
err
)
=>
{
invoke
(
callbackId
,
{
errMsg
:
'
getFileInfo:fail 文件[
'
+
filePath
+
'
] getFileInfo 失败:
'
+
err
.
message
errMsg
:
'
getFileInfo:fail
'
+
err
.
message
})
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录