diff --git a/open-isle-cli/src/main.js b/open-isle-cli/src/main.js index 2e8b8c30a..b284c951d 100644 --- a/open-isle-cli/src/main.js +++ b/open-isle-cli/src/main.js @@ -9,11 +9,11 @@ import { checkToken, clearToken } from './utils/auth' import { initTheme } from './utils/theme' // Configurable API domain and port -// export const API_DOMAIN = 'http://127.0.0.1' -// export const API_PORT = 8081 +export const API_DOMAIN = 'http://127.0.0.1' +export const API_PORT = 8081 -export const API_DOMAIN = 'http://47.82.99.208' -export const API_PORT = 8080 +// export const API_DOMAIN = 'http://47.82.99.208' +// export const API_PORT = 8080 // export const API_BASE_URL = API_PORT ? `${API_DOMAIN}:${API_PORT}` : API_DOMAIN export const API_BASE_URL = ""; diff --git a/open-isle-cli/src/router/index.js b/open-isle-cli/src/router/index.js index bde81096b..a870d149c 100644 --- a/open-isle-cli/src/router/index.js +++ b/open-isle-cli/src/router/index.js @@ -6,6 +6,7 @@ import SiteStatsPageView from '../views/SiteStatsPageView.vue' import PostPageView from '../views/PostPageView.vue' import LoginPageView from '../views/LoginPageView.vue' import SignupPageView from '../views/SignupPageView.vue' +import SignupReasonPageView from '../views/SignupReasonPageView.vue' import NewPostPageView from '../views/NewPostPageView.vue' import SettingsPageView from '../views/SettingsPageView.vue' import ProfileView from '../views/ProfileView.vue' @@ -52,6 +53,11 @@ const routes = [ name: 'signup', component: SignupPageView }, + { + path: '/signup-reason', + name: 'signup-reason', + component: SignupReasonPageView + }, { path: '/settings', name: 'settings', diff --git a/open-isle-cli/src/utils/google.js b/open-isle-cli/src/utils/google.js index bde09a552..a529f88ed 100644 --- a/open-isle-cli/src/utils/google.js +++ b/open-isle-cli/src/utils/google.js @@ -1,7 +1,7 @@ import { API_BASE_URL, GOOGLE_CLIENT_ID, toast } from '../main' import { setToken, loadCurrentUser } from './auth' -export function googleSignIn(redirect) { +export function googleSignIn(redirect, reason) { if (!window.google || !GOOGLE_CLIENT_ID) { toast.error('Google 登录不可用') return @@ -13,7 +13,7 @@ export function googleSignIn(redirect) { const res = await fetch(`${API_BASE_URL}/api/auth/google`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ idToken: credential }) + body: JSON.stringify({ idToken: credential, reason }) }) const data = await res.json() if (res.ok && data.token) { diff --git a/open-isle-cli/src/views/MessagePageView.vue b/open-isle-cli/src/views/MessagePageView.vue index f68ae9ca3..17ac717ee 100644 --- a/open-isle-cli/src/views/MessagePageView.vue +++ b/open-isle-cli/src/views/MessagePageView.vue @@ -181,6 +181,15 @@ 已提交审核 +