From 53a6f0b149058d500c952444a19fdde440ec3ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Thu, 6 Jan 2022 14:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 10 ++- pages.json | 5 +- pages/auth/auth.vue | 49 +++------------ pages/index/index.vue | 6 +- pages/user/index.vue | 46 ++++++++++---- public/date.js | 31 ++++++++++ public/userAuth.js | 110 +++++++++++++++++++++++++++++++++ router/index.js | 5 +- static/icon/checked-icon.png | Bin 0 -> 2083 bytes static/icon/unchecked-icon.png | Bin 0 -> 2077 bytes 10 files changed, 202 insertions(+), 60 deletions(-) create mode 100644 public/date.js create mode 100644 public/userAuth.js create mode 100644 static/icon/checked-icon.png create mode 100644 static/icon/unchecked-icon.png diff --git a/manifest.json b/manifest.json index e972d67..fbfbb3f 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,9 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "OAuth" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ @@ -43,7 +45,11 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "oauth" : { + "univerify" : {} + } + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index 55b8a11..3e5cc54 100644 --- a/pages.json +++ b/pages.json @@ -51,7 +51,10 @@ "name": "Auth", "style": { "navigationBarTitleText": "登录", - "navigationStyle":"custom" + "navigationStyle":"custom", + "app-plus":{ + "animationType":"slide-in-bottom" + } } }, { "path": "pages/store/goods", diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue index 5b7f192..db57790 100644 --- a/pages/auth/auth.vue +++ b/pages/auth/auth.vue @@ -2,8 +2,10 @@ - 关闭 - 一键登录 + + + + 一键登录 @@ -32,7 +34,7 @@ @@ -142,28 +162,28 @@ .user-flex{ position: relative; padding: $padding*2 $padding ($padding*2 + 60); - height: 108rpx; + height: 128rpx; .cover{ position: absolute; - width: 108rpx; - height: 108rpx; + width: 128rpx; + height: 128rpx; border-radius: 50%; border:solid 6rpx white; box-sizing: border-box; } .user-content{ - padding-left: 128rpx; - height: 108rpx; + padding-left: 158rpx; + height: 128rpx; display: flex; flex-direction: column; justify-content: center; .name{ line-height: 40rpx; font-weight: bold; - font-size: $title-size + 4; + font-size: $title-size + 8; } .tabs{ - padding-top: 5rpx; + padding-top: 10rpx; &-item{ background: rgba($color: #000000, $alpha: .3); font-size: $title-size-sm - 4; diff --git a/public/date.js b/public/date.js new file mode 100644 index 0000000..71410bd --- /dev/null +++ b/public/date.js @@ -0,0 +1,31 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 日期 + */ + +export default getDate = (type) =>{ + return new Promise((resolve, reject) => { + const date = new Date() + const year = date.getFullYear() + + const month = (date.getMonth() + 1) <= 9 ? '0' + (date.getMonth() + 1) : (date.getMonth() + 1) + const day = date.getDate() + + switch(type){ + case 'day': + resolve(year + '-' + month + '-' + day) + break + case 'month': + resolve(year + '-' + month) + break + case 'year': + resolve(year) + break + default: + resolve(year + '-' + month + '-' + day) + } + }) +} diff --git a/public/userAuth.js b/public/userAuth.js new file mode 100644 index 0000000..caf3074 --- /dev/null +++ b/public/userAuth.js @@ -0,0 +1,110 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 登录 + */ + +import { router } from '../router' +import { keyAuth } from '../apis/interfaces/auth' +import store from '../store' + +class userAuth { + constructor() { + this.univerfyConfig = { + fullScreen: true, + authButton: { + 'title': '一键登录', + 'normalColor': '#34CE98', + 'highlightColor': '#16b17a', + 'disabledColor': '#aae4cc', + }, + otherLoginButton: { + 'title': '其他手机号码', + 'borderColor': '#34CE98', + 'textColor': '#34CE98' + }, + privacyTerms: { + 'checkedImage': '/static/icon/checked-icon.png', + 'uncheckedImage': '/static/icon/unchecked-icon.png', + 'textColor': '#999', + 'termsColor': '#34CE98', + 'suffix': '并使用本机号码登录/注册', + 'privacyItems': [{ + 'url': 'https://www.baidu.com', + 'title': '隐私协议' + }, { + 'url': 'https://www.baidu.com', + 'title': '服务协议' + }] + }, + buttons: { + 'iconWidth': '45px', + 'list': [{ + "provider": '微信登录', + "iconPath": '/static/icons/wechat.png', + }] + } + } + } + // 预登录 + Login() { + return new Promise((resolve, reject) => { + uni.showLoading({ + title: '加载中', + mask: true + }) + uni.preLogin({ + provider: 'univerify', + success: res => { + this.keyLogin().then(() => { + resolve({ + auth: true + }) + }).catch(errMsg => { + reject(errMsg) + }) + }, + fail: err => { + router.push({ name: 'Auth' }) + }, + complete() { + uni.hideLoading() + } + }) + }) + } + // 一键登录 + keyLogin() { + return new Promise((resolve, reject) => { + uni.login({ + provider: 'univerify', + univerifyStyle: { + ...this.univerfyConfig + }, + success: authResult => { + keyAuth({ + access_token: authResult.authResult.access_token, + openid: authResult.authResult.openid + }).then(res => { + uni.closeAuthView() + store.commit('setToken', res.token_type + ' ' + res.access_token) + resolve() + }).catch(err => { + reject(err) + }) + }, + fail: err => { + uni.closeAuthView() + switch (err.code) { + case 30002: + router.push({ name: 'Auth', params: { keyPhone: 1 }}) + break + } + } + }) + }) + } +} + +export default userAuth diff --git a/router/index.js b/router/index.js index 3fa9ec7..874a5d7 100644 --- a/router/index.js +++ b/router/index.js @@ -11,11 +11,12 @@ const router = createRouter({ //全局路由前置守卫 router.beforeEach((to, from, next) => { next(); -}); +}); + // 全局路由后置守卫 router.afterEach((to, from) => { console.log('跳转结束') -}) +}) export { router, diff --git a/static/icon/checked-icon.png b/static/icon/checked-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d8e6d6c09ac638536b28f5b2e0675084067b2696 GIT binary patch literal 2083 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