Skip to content

B
boyueCEnd
Commit 7b04b7f8 authored by youjie's avatar youjie
Browse files
Options

授权

parent d4462fc9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 685 additions and 90 deletions
index.html
View file @ 7b04b7f8
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
<meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin-allow-popups">
<title>C-end</title> <title>C-end</title>
</head> </head>
<body> <body>
......
src/i18n/locales/zh-CN.ts
View file @ 7b04b7f8
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
phoneCode: '区号', phoneCode: '区号',
googleLoginFailed: '谷歌登录失败', googleLoginFailed: '谷歌登录失败',
isReceivePush: '「我同意接收优惠与电子报」', isReceivePush: '「我同意接收优惠与电子报」',
loginTypeNotSupport: '暂未实现该登录方式',
}, },
common: { common: {
language: '语言', language: '语言',
......
src/router/index.ts
View file @ 7b04b7f8
...@@ -23,6 +23,12 @@ const router = createRouter({ ...@@ -23,6 +23,12 @@ const router = createRouter({
component: () => import("../views/auth/register.vue"), component: () => import("../views/auth/register.vue"),
meta: { title: "login.register" }, meta: { title: "login.register" },
}, },
{
path: "/login2",
name: "login2",
component: () => import("../views/auth/register2.vue"),
meta: { title: "login.register" },
},
{ {
path: "/forgePassword", path: "/forgePassword",
name: "forgePassword", name: "forgePassword",
......
src/services/UserService.ts
View file @ 7b04b7f8
import OtaRequest from '@/api/OtaRequest' import OtaRequest,{ type HttpResponse} from '@/api/OtaRequest'
/** /**
* 用户服务 - 处理所有用户相关的 API 请求 * 用户服务 - 处理所有用户相关的 API 请求
...@@ -395,7 +395,7 @@ export interface ResetPasswordResponseDto { ...@@ -395,7 +395,7 @@ export interface ResetPasswordResponseDto {
*/ */
class UserService { class UserService {
/** /**
* 代理商自助注册 * 注册
* @param data 注册信息 * @param data 注册信息
* @returns 注册响应 * @returns 注册响应
*/ */
...@@ -446,6 +446,27 @@ class UserService { ...@@ -446,6 +446,27 @@ class UserService {
) )
return response as unknown as DistributorLoginResultDto return response as unknown as DistributorLoginResultDto
} }
/**
* 谷歌登录
* @param credential 谷歌token
* @returns
*/
static async GoogleLoginAsync(credential: string): Promise<HttpResponse> {
const data = {
credential
}
// OtaRequest 的响应拦截器会返回 response.data
const response = await OtaRequest.post(
'/member-auth/google-auth-bind',
data,
{
headers: {
}
}
)
return response as unknown as HttpResponse
}
/** /**
* 刷新访问令牌 * 刷新访问令牌
......
src/stores/user.ts
View file @ 7b04b7f8
...@@ -111,8 +111,8 @@ export const useUserStore = defineStore('user', { ...@@ -111,8 +111,8 @@ export const useUserStore = defineStore('user', {
*/ */
async setUserGoogleLoginAsync(credential: string): Promise<UserLoginResult> { async setUserGoogleLoginAsync(credential: string): Promise<UserLoginResult> {
try { try {
const response = await ErpUserService.GoogleLoginAsync(credential) const response = await UserService.GoogleLoginAsync(credential)
console.log('Google login response:', response)
if (response.data.resultCode === ApiResult.SUCCESS) { if (response.data.resultCode === ApiResult.SUCCESS) {
this.token = response.data.data.token || '' this.token = response.data.data.token || ''
this.userInfo = response.data.data || {} this.userInfo = response.data.data || {}
...@@ -124,7 +124,7 @@ export const useUserStore = defineStore('user', { ...@@ -124,7 +124,7 @@ export const useUserStore = defineStore('user', {
data: response.data.data data: response.data.data
} }
} else { } else {
ResultMessage.Error(response.data.message || i18n.global.t('login.googleLoginFailed')) ResultMessage.Error(response.data.message || '谷歌登录失败')
return { return {
status: 'ERROR', status: 'ERROR',
verify: false verify: false
...@@ -132,7 +132,7 @@ export const useUserStore = defineStore('user', { ...@@ -132,7 +132,7 @@ export const useUserStore = defineStore('user', {
} }
} catch (error: any) { } catch (error: any) {
console.error('Google login error:', error) console.error('Google login error:', error)
ResultMessage.Error(error.message || i18n.global.t('login.googleLoginFailed')) ResultMessage.Error(error.message || '谷歌登录失败')
return { return {
status: 'ERROR', status: 'ERROR',
verify: false verify: false
......
src/views/auth/Login.vue
View file @ 7b04b7f8
This diff is collapsed.
src/views/auth/components/header.vue
View file @ 7b04b7f8
...@@ -34,7 +34,7 @@ import { useRouter } from 'vue-router' ...@@ -34,7 +34,7 @@ import { useRouter } from 'vue-router'
const { t } = useI18n(); const { t } = useI18n();
const systemConfigStore = useSystemConfigStore() const systemConfigStore = useSystemConfigStore()
const currentStep = ref(inject('currentStep')) const currentStep = ref(inject('currentStep')??0)
const router = useRouter() const router = useRouter()
const goHome = (path:string)=>{ const goHome = (path:string)=>{
......
src/views/auth/register2.vue 0 → 100644
View file @ 7b04b7f8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment