From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/views/login.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/zhitan-vue/src/views/login.vue b/zhitan-vue/src/views/login.vue
index c99007b..ceb89f5 100644
--- a/zhitan-vue/src/views/login.vue
+++ b/zhitan-vue/src/views/login.vue
@@ -83,10 +83,11 @@
</template>
<script setup>
-import { getCodeImg } from "@/api/login"
+import { getCodeImg, authBinding } from "@/api/login"
import Cookies from "js-cookie"
import { encrypt, decrypt } from "@/utils/jsencrypt"
import useUserStore from "@/store/modules/user"
+import {ElMessage} from "element-plus";
const userStore = useUserStore()
const route = useRoute()
@@ -125,13 +126,13 @@
const register = ref(false)
const redirect = ref(undefined)
-watch(
- route,
- (newRoute) => {
- redirect.value = newRoute.query && newRoute.query.redirect
- },
- { immediate: true }
-)
+// watch(
+// route,
+// (newRoute) => {
+// redirect.value = newRoute.query && newRoute.query.redirect
+// },
+// { immediate: true }
+// )
function handleLogin() {
proxy.$refs.loginRef.validate((valid) => {
@@ -193,19 +194,34 @@
}
}
+/**
+ * 绗笁鏂圭櫥褰�
+ * @param type
+ */
+const doSocialLogin = () => {
+ console.log("doSocialLogin")
+ authBinding().then((res) => {
+ console.log(res);
+ if (res.code === 200) {
+ // 鑾峰彇鎺堟潈鍦板潃璺宠浆
+ window.location.href = res.data;
+ } else {
+ ElMessage.error(res.msg);
+ }
+ });
+};
+// 闈炲崟鐐圭櫥褰曟斁寮�涓嬭竟涓よ锛屽惁鍒欐敞閲婃帀
getCode()
getCookie()
+// 鍗曠偣鐧诲綍鏀惧紑涓嬭竟涓�琛岋紝鍚﹀垯娉ㄩ噴鎺�
+// doSocialLogin()
</script>
<style lang="scss" scoped>
.login {
display: flex;
align-items: center;
-<<<<<<< HEAD
height: 100vh;
-=======
- height: 100%;
->>>>>>> bf185c5d6a86eaa6a27d93b6d5942234d5bebb24
background-image: url("@/assets/images/login-background.png");
background-repeat: no-repeat;
background-size: cover;
--
Gitblit v1.9.3