diff --git a/src/store/user.js b/src/store/user.js
index 5d7933c..3fe712b 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -10,6 +10,7 @@ export const useUserStore = defineStore({
state: () => ({
nickname: '',
username: '',
+ email: '',
token: '',
role: '',
avatar: '',
diff --git a/src/utils/i18n/zh_CN.json b/src/utils/i18n/zh_CN.json
index 6c159f9..d50946c 100644
--- a/src/utils/i18n/zh_CN.json
+++ b/src/utils/i18n/zh_CN.json
@@ -457,5 +457,8 @@
},
"UserToken": {
"One": "用户Token"
+ },
+ "Email": {
+ "One": "邮箱"
}
}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 89fc86e..ce9eb32 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -93,10 +93,10 @@ import webauthImage from '@/assets/webauth.png';
import defaultImage from '@/assets/oidc.png';
const providerImageMap = {
- google: googleImage,
- github: githubImage,
- oidc: oidcImage,
- webauth: webauthImage,
+ Google: googleImage,
+ GitHub: githubImage,
+ OIDC: oidcImage,
+ WebAuth: webauthImage,
default: defaultImage,
};
diff --git a/src/views/my/info.vue b/src/views/my/info.vue
index 07ac27b..5d2df6d 100644
--- a/src/views/my/info.vue
+++ b/src/views/my/info.vue
@@ -5,12 +5,15 @@
{{ userStore.username }}
+
+ {{ userStore.email }}
+
{{ T('ChangePassword') }}
-
+
{{ T('HasBind') }}
@@ -55,7 +58,7 @@
}
getMyOauth()
const toBind = async (row) => {
- const res = await bind({ op: row.third_type }).catch(_ => false)
+ const res = await bind({ op: row.op}).catch(_ => false)
if (res) {
const { code, url } = res.data
window.open(url)
@@ -70,7 +73,7 @@
if (!cf) {
return false
}
- const res = await unbind({ op: row.third_type }).catch(_ => false)
+ const res = await unbind({ op: row.op }).catch(_ => false)
if (res) {
getMyOauth()
}
diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue
index 09044f2..db53c5e 100644
--- a/src/views/oauth/index.vue
+++ b/src/views/oauth/index.vue
@@ -11,7 +11,8 @@
-
+
+
@@ -34,17 +35,20 @@
-
-
-
+
+
+
{{ item.label }}
-
+
+
+
+
-
+
@@ -85,8 +89,8 @@
page: 1,
page_size: 10,
})
- const ops = [
- { value: 'github', label: 'Github' },
+ const types = [
+ { value: 'github', label: 'GitHub' },
{ value: 'google', label: 'Google' },
{ value: 'oidc', label: 'OIDC' }
]
@@ -134,6 +138,7 @@
const formData = reactive({
id: 0,
op: '',
+ oauth_type: '',
issuer: '',
client_id: '',
client_secret: '',
@@ -145,13 +150,14 @@
client_id: [{ required: true, message: T('ParamRequired', { param: 'client_id' }), trigger: 'blur' }],
client_secret: [{ required: true, message: T('ParamRequired', { param: 'client_secret' }), trigger: 'blur' }],
redirect_url: [{ required: true, message: T('ParamRequired', { param: 'redirect_url' }), trigger: 'blur' }],
- op: [{ required: true, message: T('ParamRequired', { param: 'op' }), trigger: 'blur' }],
+ oauth_type: [{ required: true, message: T('ParamRequired', { param: 'oauth_type' }), trigger: 'blur' }],
issuer: [{ required: true, message: T('ParamRequired', { param: 'issuer' }), trigger: 'blur' }],
}
const toEdit = (row) => {
formVisible.value = true
formData.id = row.id
formData.op = row.op
+ formData.oauth_type = row.oauth_type
formData.issuer = row.issuer
formData.client_id = row.client_id
formData.client_secret = row.client_secret
@@ -164,6 +170,7 @@
formVisible.value = true
formData.id = 0
formData.op = ''
+ formData.oauth_type = ''
formData.issuer = ''
formData.client_id = ''
formData.client_secret = ''
diff --git a/src/views/user/composables/edit.js b/src/views/user/composables/edit.js
index a88c7b0..1b12cb2 100644
--- a/src/views/user/composables/edit.js
+++ b/src/views/user/composables/edit.js
@@ -38,6 +38,7 @@ export function useSubmit (form, id) {
const router = useRouter()
const rules = reactive({
username: [{ required: true, message: T('ParamRequired', { param: T('Username') }) }],
+ email: [{ required: true, message: T('ParamRequired', { param: T('Email') }) }],
group_id: [{ required: true, message: T('ParamRequired', { param: T('Group') }) }],
// nickname: [{ required: true, message: '昵称是必须的' }],
status: [{ required: true, message: T('ParamRequired', { param: T('Status') }) }],
diff --git a/src/views/user/edit.vue b/src/views/user/edit.vue
index 4f4e163..596b524 100644
--- a/src/views/user/edit.vue
+++ b/src/views/user/edit.vue
@@ -4,6 +4,9 @@
+
+
+
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index ba4e529..d928cce 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -15,6 +15,7 @@
+