Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
0601fa17
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
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,发现更多精彩内容 >>
提交
0601fa17
编写于
11月 18, 2022
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
c3b10d57
79583aad
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
12 deletion
+44
-12
packages/uni-app/dist/app.js
packages/uni-app/dist/app.js
+4
-3
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
+26
-8
src/platforms/app-plus/service/api/device/soter-authentication.js
...forms/app-plus/service/api/device/soter-authentication.js
+14
-1
未找到文件。
packages/uni-app/dist/app.js
浏览文件 @
0601fa17
...
...
@@ -17,10 +17,11 @@ function init() {
index
=
res
.
findIndex
(
function
(
fn
)
{
return
fn
.
toString
().
includes
(
'
onReady
'
);
});
onReadyFn
=
res
[
index
];
}
res
.
splice
(
index
,
1
);
res
.
push
(
onReadyFn
);
if
(
index
!==
-
1
)
{
res
.
splice
(
index
,
1
);
res
.
push
(
onReadyFn
);
}
}
console
.
log
(
'
Merge mounted:
'
,
res
);
return
res
;
};
}
...
...
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
浏览文件 @
0601fa17
...
...
@@ -10,7 +10,8 @@ const {
getNVueMainEntry
,
nvueJsPreprocessOptions
,
nvueHtmlPreprocessOptions
,
getTemplatePath
getTemplatePath
,
uts
}
=
require
(
'
@dcloudio/uni-cli-shared
'
)
const
fileLoader
=
require
(
'
@dcloudio/uni-cli-shared/lib/file-loader
'
)
const
{
...
...
@@ -179,6 +180,13 @@ const rules = [webpack.version[0] > 4 ? {
{
resourceQuery
:
/vue&type=template/
,
use
:
[
htmlPreprocessorLoader
]
},
{
type
:
'
javascript/auto
'
,
resourceQuery
:
/uts-proxy/
,
use
:
[{
loader
:
require
.
resolve
(
'
@dcloudio/uni-cli-shared/lib/uts/uts-loader.js
'
)
}]
}
].
concat
(
cssLoaders
)
...
...
@@ -220,8 +228,10 @@ if (process.env.UNI_USING_V3_NATIVE) {
return
''
}
}]
plugins
.
push
(
new
CopyWebpackPlugin
(
CopyWebpackPluginVersion
>
5
?
{
patterns
}
:
patterns
))
}
catch
(
e
)
{
}
plugins
.
push
(
new
CopyWebpackPlugin
(
CopyWebpackPluginVersion
>
5
?
{
patterns
}
:
patterns
))
}
catch
(
e
)
{}
}
if
(
process
.
env
.
UNI_USING_NATIVE
||
process
.
env
.
UNI_USING_V3_NATIVE
)
{
...
...
@@ -321,7 +331,9 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
}
})
}
plugins
.
push
(
new
CopyWebpackPlugin
(
CopyWebpackPluginVersion
>
5
?
{
patterns
}
:
patterns
))
plugins
.
push
(
new
CopyWebpackPlugin
(
CopyWebpackPluginVersion
>
5
?
{
patterns
}
:
patterns
))
}
try
{
...
...
@@ -334,7 +346,7 @@ try {
dir
:
process
.
env
.
UNI_INPUT_DIR
}))
}
}
catch
(
e
)
{
}
}
catch
(
e
)
{}
module
.
exports
=
function
()
{
return
{
...
...
@@ -361,7 +373,9 @@ module.exports = function () {
}
})
]
},
webpack
.
version
[
0
]
>
4
?
{}
:
{
namedModules
:
false
}),
},
webpack
.
version
[
0
]
>
4
?
{}
:
{
namedModules
:
false
}),
output
:
{
path
:
process
.
env
.
UNI_OUTPUT_DIR
,
filename
:
'
[name].js
'
...
...
@@ -382,12 +396,16 @@ module.exports = function () {
'
?
'
+
JSON
.
stringify
({
type
:
'
stat
'
})
}),
'
@vue/composition-api
'
:
require
.
resolve
(
'
@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api
'
)
},
modules
:
[
'
node_modules
'
,
path
.
resolve
(
process
.
env
.
UNI_CLI_CONTEXT
,
'
node_modules
'
),
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
node_modules
'
)
],
plugins
:
[
new
uts
.
UTSResolverPlugin
()
]
},
resolveLoader
:
{
...
...
@@ -447,4 +465,4 @@ module.exports = function () {
zlib
:
false
}
}
}
}
src/platforms/app-plus/service/api/device/soter-authentication.js
浏览文件 @
0601fa17
...
...
@@ -130,8 +130,14 @@ export function startSoterAuthentication ({
}
const
realAuthMode
=
enrolledRequestAuthMode
[
0
]
if
(
realAuthMode
===
'
fingerPrint
'
)
{
let
waiting
=
null
let
waitingTimer
const
waitingTitle
=
authContent
||
t
(
'
uni.startSoterAuthentication.authContent
'
)
if
(
plus
.
os
.
name
.
toLowerCase
()
===
'
android
'
)
{
plus
.
nativeUI
.
showWaiting
(
authContent
||
t
(
'
uni.startSoterAuthentication.authContent
'
)).
onclose
=
function
()
{
waiting
=
plus
.
nativeUI
.
showWaiting
(
waitingTitle
)
waiting
.
onclose
=
function
()
{
plus
.
fingerprint
.
cancel
()
}
}
...
...
@@ -145,6 +151,13 @@ export function startSoterAuthentication ({
},
(
e
)
=>
{
switch
(
e
.
code
)
{
case
e
.
AUTHENTICATE_MISMATCH
:
if
(
waiting
)
{
clearTimeout
(
waitingTimer
)
waiting
.
setTitle
(
'
无法识别
'
)
waitingTimer
=
setTimeout
(()
=>
{
waiting
&&
waiting
.
setTitle
(
waitingTitle
)
},
1000
)
}
// 微信小程序没有这个回调,如果要实现此处回调需要多次触发需要用事件publish实现
// invoke(callbackId, {
// authMode: realAuthMode,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录