diff --git a/src/views/login/index copy 2.vue b/src/views/login/index copy 2.vue
index d6534db..df46f78 100644
--- a/src/views/login/index copy 2.vue
+++ b/src/views/login/index copy 2.vue
@@ -73,11 +73,9 @@
-
{
} else {
dataPhone.value.phoneCode = aCheckCodeInput.join("");
}
-
http.post("/api/auth/token", dataPhone.value).then((resp) => {
if (resp.code == 200) {
var user = {
@@ -203,6 +200,7 @@ const handlePhoneSubmit = (formEl) => {
permissions: resp.data.permissions,
};
tools.data.set("user", user);
+ tools.data.set("isbind", resp.data.is_bind);
ElMessage.success("登录成功");
//loading.value = false;
Router.push("/");
@@ -236,7 +234,11 @@ const inputChange = (index, e) => {
const backSpace = (index, e) => {
aCheckCodeInputComputedRef.value.children[
index - 1
- ].children[0].children[0].children[0].focus();
+ ].children[0].children[0].children[0].focus();
+
+ aCheckCodeInputComputedRef.value.children[
+ index - 1
+ ].children[0].children[0].children[0].select();
};
let dis = ref(false);
@@ -269,8 +271,8 @@ const getCode = () => {
const scanLogin = reactive({
scanShow: true,
environment: false,
- redirect_uri: "http://lyt.zdool.com/",
- zydd_client_id: "ydlyt_dingoa",
+ redirect_uri: "http://demo35.ydool.net/",
+ zydd_client_id: "dss_dingoa",
zzd_client_id: "",
scanUrl: "",
code: "",
@@ -286,7 +288,30 @@ onBeforeUnmount(() => {
})
const loginListener = () => {
-
+ // console.log('进入message', event)
+ const code = event.data && event.data.code
+ if (code) {
+ // 根据 code 去获取用户信息
+ http.post(`/api/auth/dg/code_login?code=${code}`, ).then(response => {
+ if (response.code == 200) {
+ var user = {
+ token: response.data.token,
+ name: response.data.userInfo.userName,
+ menus: response.data.menuList,
+ permissions: response.data.permissions,
+ };
+ tools.data.set("user", user);
+ tools.data.set("isbind", response.data.is_bind);
+ ElMessage.success("登录成功");
+ //loading.value = false;
+ Router.push("/");
+ // 跳转到 首页路由
+ } else {
+ ElMessage.error(response.message)
+ }
+ })
+ console.log(code)
+ }
}
const tabLogin = ref(true)
@@ -393,10 +418,11 @@ const tabLogin = ref(true)
.el-input__wrapper {
padding: 0;
width: 100%;
- .el-input__inner{
+
+ .el-input__inner {
font-weight: 600;
}
-
+
}
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 322d040..972b861 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,53 +1,70 @@
-
-
-
+
+
+
-
@@ -191,6 +206,7 @@ const handlePhoneSubmit = (formEl) => {
} else {
dataPhone.value.phoneCode = aCheckCodeInput.join("");
}
+
http.post("/api/auth/token", dataPhone.value).then((resp) => {
if (resp.code == 200) {
var user = {
@@ -200,7 +216,6 @@ const handlePhoneSubmit = (formEl) => {
permissions: resp.data.permissions,
};
tools.data.set("user", user);
- tools.data.set("isbind", resp.data.is_bind);
ElMessage.success("登录成功");
//loading.value = false;
Router.push("/");
@@ -232,6 +247,9 @@ const inputChange = (index, e) => {
};
const backSpace = (index, e) => {
+
+ console.log(e)
+
aCheckCodeInputComputedRef.value.children[
index - 1
].children[0].children[0].children[0].focus();
@@ -271,12 +289,11 @@ const getCode = () => {
const scanLogin = reactive({
scanShow: true,
environment: false,
- redirect_uri: "http://demo35.ydool.net/",
- zydd_client_id: "dss_dingoa",
+ redirect_uri: "http://lyt.zdool.com/",
+ zydd_client_id: "ydlyt_dingoa",
zzd_client_id: "",
scanUrl: "",
code: "",
-
});
onMounted(() => {
scanLogin.scanUrl = `https://login.dg-work.cn/oauth2/auth.htm?response_type=code&client_id=${scanLogin.zydd_client_id}&redirect_uri=${scanLogin.redirect_uri}&scope=get_user_info&authType=QRCODE&embedMode=true`;
@@ -284,8 +301,8 @@ onMounted(() => {
});
// 解除监听
onBeforeUnmount(() => {
- window.removeEventListener('message', loginListener)
-})
+ window.removeEventListener("message", loginListener);
+});
const loginListener = () => {
// console.log('进入message', event)
@@ -314,94 +331,185 @@ const loginListener = () => {
}
}
-const tabLogin = ref(true)
+const tabLogin = ref(false);
-
+
+
+
+.login-btn-submit {
+ height: 3.125vw;
+ margin: 0 auto;
+ display: block;
+ border: none;
+ background: linear-gradient(#79c8ff, #3b93ff 50%);
+ width: 100%;
+ margin-bottom: 10px;
+
+}
+
+:deep(#rehtml-llq4lc0y .text-kbsp78ls) {
+ display: none;
+}
+
\ No newline at end of file