diff --git a/pages/index/index.uvue b/pages/index/index.uvue index 0e2d1d465fc613c2fc622b1685886429b4146060..698095dcc1b7da26b9cd472a132ac980642893ad 100644 --- a/pages/index/index.uvue +++ b/pages/index/index.uvue @@ -17,7 +17,7 @@ 账号密码登录 - + 一键登录 diff --git a/uni_modules/uni-id-pages-x/config.uts b/uni_modules/uni-id-pages-x/config.uts index 30ca80568f99f855c7a8224d90245d8aae3d724e..5036b3998003c2d8e1346959ce4665869a7ab98f 100644 --- a/uni_modules/uni-id-pages-x/config.uts +++ b/uni_modules/uni-id-pages-x/config.uts @@ -14,7 +14,7 @@ export default { }, "loginTypes":[ "username", - // #ifdef APP-ANDROID && uniVersion >= 3.98 + // #ifdef uniVersion >= 3.98 "univerify", // #endif "smsCode", diff --git a/uni_modules/uni-id-pages-x/init.uts b/uni_modules/uni-id-pages-x/init.uts index 82c0eaad710df4a411ff07946639443f18650a1c..f7217a4d45652cc1b198fddb5ade771fe87690bc 100644 --- a/uni_modules/uni-id-pages-x/init.uts +++ b/uni_modules/uni-id-pages-x/init.uts @@ -15,7 +15,7 @@ const loginTypes = configLoginTypes == null ? [] as string[] : configLoginTypes; const debug = config.getBoolean('debug') as boolean; -// #ifdef APP-ANDROID && uniVersion >= 3.98 +// #ifdef uniVersion >= 3.98 import Univerify from '@/uni_modules/uni-id-pages-x/lib/Univerify.uts' // #endif @@ -78,7 +78,7 @@ export default async function () { }) } - // #ifdef APP-ANDROID && uniVersion >= 3.98 + // #ifdef uniVersion >= 3.98 // 如果uni-id-pages配置的登录功能有一键登录,有则执行预登录(异步) if (loginTypes.includes('univerify')) { const myUniverify = new Univerify() diff --git a/uni_modules/uni-id-pages-x/lib/Univerify.uts b/uni_modules/uni-id-pages-x/lib/Univerify.uts index 6aa856ecfc4d126ace5cd1d4dcc3178cf7c82174..fd41aeeb1da3b0ce17e34421aadac19db4b14724 100644 --- a/uni_modules/uni-id-pages-x/lib/Univerify.uts +++ b/uni_modules/uni-id-pages-x/lib/Univerify.uts @@ -17,7 +17,7 @@ const loginTypes = config.getArray('loginTypes'); // buttonsList.push(buttons) // }) -// #ifdef APP-ANDROID && uniVersion >= 3.98 +// #ifdef uniVersion >= 3.98 const univerifyManager = uni.getUniverifyManager(); export default class Univerify { diff --git a/uni_modules/uni-id-pages-x/pages/login/login.uvue b/uni_modules/uni-id-pages-x/pages/login/login.uvue index 5013305dd614b0f928dc37bfa02e40bf27fe7a89..be8e94d1fcce2f2dd84951a4ac6fd209131fe6d0 100644 --- a/uni_modules/uni-id-pages-x/pages/login/login.uvue +++ b/uni_modules/uni-id-pages-x/pages/login/login.uvue @@ -33,7 +33,7 @@