From 6061592084da0a3aeff2ced79dcd42b415c279ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 25 Jun 2022 17:17:30 +0800
Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E4=BC=98=E5=8C=96OAuth=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 7 +++----
 src/views/login.vue       | 2 +-
 src/views/socialLogin.vue | 9 ++++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 27bdcf4..e347df7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -42,11 +42,12 @@ const useUserStore = defineStore('user', {
     /**
      * 三方授权登录
      * @param {*} data 
+		 * @param { *} param { authSource : ''}
      * @returns 
      */
-    oauthLogin(data) {
+    oauthLogin(data, param) {
       return new Promise((resolve, reject) => {
-        oauthCallback(data, { authSource: this.authSource }).then(res => {
+        oauthCallback(data, param).then(res => {
           const { code, data } = res
           if (code == 200) {
             setToken(data.token)
@@ -59,8 +60,6 @@ const useUserStore = defineStore('user', {
             console.log('login error ', res)
             reject(res) //catch处理
           }
-        }).catch(error => {
-          reject(error)
         })
       })
     },
diff --git a/src/views/login.vue b/src/views/login.vue
index 49f66de..4d7d246 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -56,7 +56,7 @@
       <div class="other-login">
         <el-divider>{{ $t('login.otherLoginWay') }}</el-divider>
         <img src="../assets/icons/gitee-fill-round.png" alt="" class="login-icon" @click="onAuth('GITEE')" />
-        <img src="../assets/icons/github-fill.png" alt="" class="login-icon" />
+        <img src="../assets/icons/github-fill.png" alt="" class="login-icon" @click="onAuth('GITHUB')" />
         <img src="../assets/icons/wechat-fill.png" alt="" class="login-icon" />
       </div>
     </el-form>
diff --git a/src/views/socialLogin.vue b/src/views/socialLogin.vue
index bc49002..e09f9ea 100644
--- a/src/views/socialLogin.vue
+++ b/src/views/socialLogin.vue
@@ -30,18 +30,20 @@ const userStore = useUserStore()
 const loginForm = ref(undefined)
 const callbackQuery = ref(undefined)
 const redirect = ref(undefined)
+const authSource = ref('')
 const loading = ref(false)
 callbackQuery.value = getQueryObject()
 redirect.value = route.query.redirect
+authSource.value = route.query.authSource
+
 const userInfo = computed(() => {
   return userStore.userInfo
 })
-console.log(userInfo.value)
 if (callbackQuery.value && callbackQuery.value.state != null) {
   loading.value = true
   // 调用action的登录方法
   userStore
-    .oauthLogin(callbackQuery.value)
+    .oauthLogin(callbackQuery.value, { authSource: authSource.value })
     .then(() => {
       proxy.$modal.msgSuccess(proxy.$t('login.loginSuccess'))
       router.push({ path: redirect.value || '/' })
@@ -57,6 +59,7 @@ if (callbackQuery.value && callbackQuery.value.state != null) {
 @import '@/assets/styles/login.scss';
 .loading {
   text-align: center;
-  color: #fff;
+  color: #ccc;
+	padding: 10px;
 }
 </style>