From 0db87f78b3443ad6bb2fc3638b9917e94db559ab Mon Sep 17 00:00:00 2001 From: linju-json Date: Tue, 6 Jul 2021 18:16:07 +0800 Subject: [PATCH] =?UTF-8?q?2=E4=BF=AE=E5=A4=8D=E4=BB=85=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=80=E7=A7=8D=E5=BF=AB=E6=8D=B7=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=BE=85=E7=BB=AD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 22 ------ README.md | 2 +- common/appInit.js | 72 +++++++++++++++--- components/uni-agreements/uni-agreements.vue | 7 +- .../uni-quick-login/uni-quick-login.vue | 5 +- manifest.json | 15 +++- pages.json | 2 +- pages/ucenter/login-page/index/index.vue | 55 ++++++++----- static/login-index/apple.jpg | Bin 7707 -> 0 bytes static/login-index/weixin.jpg | Bin 7707 -> 0 bytes uni-starter.config.js | 2 +- 11 files changed, 119 insertions(+), 63 deletions(-) delete mode 100644 static/login-index/apple.jpg delete mode 100644 static/login-index/weixin.jpg diff --git a/App.vue b/App.vue index e96fdc4..7e2ee3c 100644 --- a/App.vue +++ b/App.vue @@ -19,28 +19,6 @@ // #endif // #ifdef APP-PLUS - //一键登录 功能预登录 - plus.oauth.getServices(oauthServices => { - // console.log(oauthServices); - oauthServices.forEach(({ - _id - }, item) => { - if (_id == 'provider') { - uni.preLogin({ - provider: item, - complete: e => { - console.log(e); - } - }) - } - }) - uni.preloadPage({ - url: "/pages/ucenter/login-page/index/index" - }); - }, err => { - console.error('获取服务供应商失败：' + JSON.stringify(err)); - }) - //idfa有需要的用户在应用首次启动时自己获取存储到storage中 //https://ask.dcloud.net.cn/article/36107 /*if(~plus.storage.getItem('idfa')){ diff --git a/README.md b/README.md index 853b8f9..226a985 100644 --- a/README.md +++ b/README.md @@ -455,7 +455,7 @@ uni-starter ### 注意事项 1. 真机运行需要制作自定义基座，制作后选择运行到自定义基座 -2. 苹果登录的图标，需要满足苹果应用市场的审核规范请勿随便修改；如需修改请先阅读:[Human Interface Guidelines](https://developer.apple.com/design/human-interface-guidelines/sign-in-with-apple/overview/buttons/) +2. 苹果登录的图标，需要满足苹果应用市场的审核规范请勿随便修改；如需修改请先阅读:[Sign in with Apple Button](https://appleid.apple.com/signinwithapple/button) 3. 应用登录功能，默认不勾选同意隐私权限是响应安卓应用市场的规范；请勿修改该逻辑。 ### FAQ：常见问题 diff --git a/common/appInit.js b/common/appInit.js index 8b005ef..007a8ab 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -7,17 +7,64 @@ import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-ch import interceptorChooseImage from '@/uni_modules/json-interceptor-chooseImage/js_sdk/main.js'; // #endif const db = uniCloud.database() -export default function() { - // #ifndef H5 +export default async function() { + let loginConfig = uniStarterConfig.router.login + //清除有配置但设备环境不支持的登陆项 + // #ifdef APP-PLUS + await new Promise((callBack)=>{ + plus.oauth.getServices(oauthServices => { + loginConfig = loginConfig.filter(item=>{ + if(["univerify", "weixin", "apple"].includes(item)){ + let index = oauthServices.findIndex(e=>e.id==item) + if(index==-1){ + return false + }else{ + return oauthServices[index].nativeClient + } + }else{ + return true + } + }) + + if(loginConfig.includes('univerify')){ //一键登录 功能预登录 + uni.preLogin({ + provider:'univerify', + complete: e => { + console.log(e); + } + }) + } + callBack() + }, err => { + console.error('获取服务供应商失败：' + JSON.stringify(err)); + }) + }) + // #endif + + // #ifndef APP-PLUS + loginConfig = loginConfig.filter(item=>{ + return ![ + 'univerify', + 'apple', + // #ifdef H5 + 'weixin' + // #endif + ].includes(item) + }) + // #endif + + uniStarterConfig.router.login = loginConfig + + // uniStarterConfig挂载到getApp().globalData.config + // #ifdef MP-WEIXIN setTimeout(()=>{ // #endif - // uniStarterConfig挂载到getApp(). - const app = getApp({allowDefault: true}) - app.globalData.config = uniStarterConfig; - // #ifndef H5 - },30) + getApp({allowDefault: true}).globalData.config = uniStarterConfig; + // #ifdef MP-WEIXIN + },100) // #endif + // 初始化appVersion（仅app生效） initAppVersion(); @@ -257,12 +304,15 @@ export default function() { && pages[pages.length - 1].route.split('/')[2]!='login-page' ) { + + console.log(9527777,login); + //一键登录（univerify）、账号（username）、验证码登录（短信smsCode） - if (login[0] == 'univerify') { - if(e.url == url) { e.url += '?' } //添加参数之前判断是否带了`？`号如果没有就补上，因为当开发场景本身有参数的情况下是已经带了`？`号 - e.url += "univerify_first=true" - } else if (login[0] == 'username') { + if (login[0] == 'username') { e.url = "/pages/ucenter/login-page/pwd-login/pwd-login" + }else{ + if(e.url == url) { e.url += '?' } //添加参数之前判断是否带了`？`号如果没有就补上，因为当开发场景本身有参数的情况下是已经带了`？`号 + e.url += "type="+login[0] } }else{ //拦截强制登录页面 diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue index 3b0c001..86a60ce 100644 --- a/components/uni-agreements/uni-agreements.vue +++ b/components/uni-agreements/uni-agreements.vue @@ -4,10 +4,10 @@ 同意 - + @@ -56,6 +56,9 @@ display: flex; flex-direction: row; } +.item{ + flex-direction: row; +} .agreement{ color:#04498c; } diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue index 26143f2..5774eaa 100644 --- a/components/uni-quick-login/uni-quick-login.vue +++ b/components/uni-quick-login/uni-quick-login.vue @@ -123,7 +123,7 @@ }) }) // #endif - //添加已配置且可用的第三方快捷登陆项 + //添加可用的第三方快捷登陆项 servicesList = servicesList.concat(this.oauthServices.map( ({id})=>{ return {...this.config[id],id} })) @@ -169,7 +169,8 @@ uni.navigateBack(); } else { uni.navigateTo({ - url: path + url: path, + animationType:'slide-in-left' }) } }, diff --git a/manifest.json b/manifest.json index 5fa1e94..690f7a6 100644 --- a/manifest.json +++ b/manifest.json @@ -57,14 +57,20 @@ ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] }, - "ios" : {}, + "ios" : { + "capabilities" : { + "entitlements" : { + "com.apple.developer.associated-domains" : [ "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com" ] + } + } + }, "sdkConfigs" : { "oauth" : { "apple" : {}, "weixin" : { "appid" : "wxffdd8fa6ec4ef2a0", "appsecret" : "", - "UniversalLinks" : "" + "UniversalLinks" : "https://static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com/uni-universallinks/__UNI__03B096E" }, "univerify" : {} }, @@ -72,7 +78,7 @@ "share" : { "weixin" : { "appid" : "wxffdd8fa6ec4ef2a0", - "UniversalLinks" : "" + "UniversalLinks" : "https://static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com/uni-universallinks/__UNI__03B096E" } }, "geolocation" : {}, @@ -108,5 +114,6 @@ }, "h5" : { "template" : "" - } + }, + "_spaceID" : "76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e" } diff --git a/pages.json b/pages.json index 1ea6903..5664ca2 100644 --- a/pages.json +++ b/pages.json @@ -185,7 +185,7 @@ "path": "pages/ucenter/settings/settings" } ], - "current": 1 + "current": 0 }, "tabBar": { "color": "#7A7E83", diff --git a/pages/ucenter/login-page/index/index.vue b/pages/ucenter/login-page/index/index.vue index ded8cb9..086eb7f 100644 --- a/pages/ucenter/login-page/index/index.vue +++ b/pages/ucenter/login-page/index/index.vue @@ -2,15 +2,21 @@ 登录后即可展示自己 - - - - - - 未注册的手机号验证通过后将自动注册 - + + + + + + + + @@ -20,24 +26,28 @@ export default { data() { return { - first_type:"", + type:"", phone: "", agree: false } }, - computed: { + computed: { + loginConfig() { + return getApp().globalData.config.router.login + }, isPhone() { return /^1\d{10}$/.test(this.phone); }, imgSrc(){ - return '/static/login-index/'+this.first_type+'.jpg' + return '/static/login-index/'+this.type+'.png' } }, onLoad(e) { - this.first_type = e.first_type + this.type = e.type + //是否优先启动一键登录。即：页面一加载就启动一键登录 //#ifdef APP-PLUS - if (this.first_type == "univerify") { + if (this.type == "univerify") { const pages = getCurrentPages(); currentWebview = pages[pages.length - 1].$getAppWebview(); currentWebview.setStyle({ @@ -48,7 +58,8 @@ }, onReady() { //#ifdef APP-PLUS - if (univerify_first) { + if (this.type == "univerify") { + this.type == loginConfig[1] // console.log('开始一键登录'); setTimeout(() => { this.$refs.uniQuickLogin.login_before('univerify') @@ -69,7 +80,7 @@ }, methods: { quickLogin(){ - this.$refs.uniQuickLogin.login_before(this.first_type) + this.$refs.uniQuickLogin.login_before(this.type) }, sendShortMsg() { if (!this.agree) { @@ -99,8 +110,14 @@ + \ No newline at end of file diff --git a/static/login-index/apple.jpg b/static/login-index/apple.jpg deleted file mode 100644 index 37cc85586936cf6083afd68c81623aa08c836aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7707 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 diff --git a/static/login-index/weixin.jpg b/static/login-index/weixin.jpg deleted file mode 100644 index 37cc85586936cf6083afd68c81623aa08c836aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7707 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 diff --git a/uni-starter.config.js b/uni-starter.config.js index 720fcdf..0e52d78 100644 --- a/uni-starter.config.js +++ b/uni-starter.config.js @@ -31,7 +31,7 @@ module.exports = { 根据数组的第0项，决定登录方式的第一优先级。 */ // "login": ["username","smsCode","univerify", "weixin", "apple"], - "login": ["weixin","username"], + "login": ["username","weixin","apple","smsCode"], }, //关于应用 "about": { -- GitLab