Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
味无味_
uni-app
提交
3cde694c
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,发现更多精彩内容 >>
提交
3cde694c
编写于
2月 12, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
ff5bff1e
92118e1e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
20 deletion
+19
-20
src/core/helpers/protocol/network/upload-file.js
src/core/helpers/protocol/network/upload-file.js
+6
-5
src/core/service/api/context/background-audio.js
src/core/service/api/context/background-audio.js
+1
-1
src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
+6
-7
src/platforms/app-plus/view/components/picker/index.vue
src/platforms/app-plus/view/components/picker/index.vue
+6
-7
未找到文件。
src/core/helpers/protocol/network/upload-file.js
浏览文件 @
3cde694c
import
getRealPath
from
'
uni-platform/helpers/get-real-path
'
// App端可以只使用files不传filePath和name
// import getRealPath from 'uni-platform/helpers/get-real-path'
export
const
uploadFile
=
{
url
:
{
type
:
String
,
required
:
true
},
files
:
{
type
:
Array
},
filePath
:
{
type
:
String
,
validator
(
value
,
params
)
{
params
.
type
=
getRealPath
(
value
)
}
type
:
String
},
name
:
{
type
:
String
...
...
src/core/service/api/context/background-audio.js
浏览文件 @
3cde694c
...
...
@@ -119,7 +119,7 @@ class BackgroundAudioManager {
this
.
_operate
(
'
stop
'
)
}
seek
(
position
)
{
this
.
_operate
(
'
play
'
,
{
this
.
_operate
(
'
seek
'
,
{
currentTime
:
position
})
}
...
...
src/platforms/app-plus/service/api/ad/rewarded-video-ad.js
浏览文件 @
3cde694c
...
...
@@ -5,6 +5,8 @@ const eventNames = [
'
error
'
]
const
ERROR_CODE_LIST
=
[
-
5001
,
-
5002
,
-
5003
,
-
5004
,
-
5005
,
-
5006
]
class
RewardedVideoAd
{
constructor
(
adpid
)
{
this
.
_options
=
{
...
...
@@ -21,7 +23,7 @@ class RewardedVideoAd {
})
this
.
_isLoad
=
false
this
.
_adError
=
false
this
.
_adError
=
''
this
.
_loadPromiseResolve
=
null
this
.
_loadPromiseReject
=
null
const
rewardAd
=
this
.
_rewardAd
=
plus
.
ad
.
createRewardedVideoAd
(
this
.
_options
)
...
...
@@ -40,9 +42,9 @@ class RewardedVideoAd {
rewardAd
.
onError
((
e
)
=>
{
const
{
code
,
message
}
=
e
const
data
=
{
code
:
code
,
errMsg
:
message
}
this
.
_adError
=
(
code
&&
code
<
5005
)
this
.
_adError
=
message
this
.
_dispatchEvent
(
'
error
'
,
data
)
if
(
code
===
5005
&&
this
.
_loadPromiseReject
!=
null
)
{
if
(
(
code
===
-
5005
||
ERROR_CODE_LIST
.
index
(
code
)
===
-
1
)
&&
this
.
_loadPromiseReject
!=
null
)
{
this
.
_loadPromiseReject
(
data
)
this
.
_loadPromiseReject
=
null
}
...
...
@@ -66,14 +68,11 @@ class RewardedVideoAd {
this
.
_rewardAd
.
show
()
resolve
()
}
else
{
reject
(
new
Error
(
''
))
reject
(
new
Error
(
this
.
_adError
))
}
})
}
_loadAd
()
{
if
(
this
.
_adError
)
{
return
}
this
.
_isLoad
=
false
this
.
_rewardAd
.
load
()
}
...
...
src/platforms/app-plus/view/components/picker/index.vue
浏览文件 @
3cde694c
...
...
@@ -27,6 +27,7 @@ function padLeft (num) {
return
num
>
9
?
num
:
(
`0
${
num
}
`
)
}
function
getDate
(
str
,
mode_
)
{
str
=
String
(
str
||
''
)
const
date
=
new
Date
()
if
(
mode_
===
mode
.
TIME
)
{
str
=
str
.
split
(
'
:
'
)
...
...
@@ -72,10 +73,7 @@ export default {
},
fields
:
{
type
:
String
,
default
:
'
day
'
,
validator
(
val
)
{
return
Object
.
values
(
fields
).
indexOf
(
val
)
>=
0
}
default
:
''
},
start
:
{
type
:
String
,
...
...
@@ -90,7 +88,7 @@ export default {
return
year
case
fields
.
MONTH
:
return
year
+
'
-01
'
case
fields
.
DAY
:
default
:
return
year
+
'
-01-01
'
}
}
...
...
@@ -110,7 +108,7 @@ export default {
return
year
case
fields
.
MONTH
:
return
year
+
'
-12
'
case
fields
.
DAY
:
default
:
return
year
+
'
-12-31
'
}
}
...
...
@@ -151,7 +149,7 @@ export default {
this
.
_showPicker
(
Object
.
assign
({},
this
.
$props
))
},
_showPicker
(
data
)
{
if
(
this
.
mode
===
mode
.
TIME
||
this
.
mode
===
mode
.
DATE
)
{
if
(
(
data
.
mode
===
mode
.
TIME
||
data
.
mode
===
mode
.
DATE
)
&&
!
data
.
fields
)
{
plus
.
nativeUI
[
this
.
mode
===
mode
.
TIME
?
'
pickTime
'
:
'
pickDate
'
]((
res
)
=>
{
const
date
=
res
.
date
this
.
$trigger
(
'
change
'
,
{},
{
...
...
@@ -167,6 +165,7 @@ export default {
maxDate
:
getDate
(
this
.
end
,
mode
.
DATE
)
})
}
else
{
data
.
fields
=
Object
.
values
(
fields
).
includes
(
data
.
fields
)
?
data
.
fields
:
fields
.
DAY
let
res
=
{
event
:
'
cancel
'
}
this
.
page
=
showPage
({
url
:
'
__uniapppicker
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录