From b9ba9a1574d933c4c37a11eb72cec7610c193f17 Mon Sep 17 00:00:00 2001 From: Xia Zekun Date: Thu, 30 May 2024 09:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=89=E9=92=89=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cb34ffaeeee0d63e3c2211fdb69a77c3c5fab23e) --- src/main.js | 7 +++++++ src/views/user/Login.vue | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/main.js b/src/main.js index 5248b12..4857eea 100644 --- a/src/main.js +++ b/src/main.js @@ -21,8 +21,15 @@ import 'ant-design-vue/dist/antd.css' import Viewer from 'v-viewer' import 'viewerjs/dist/viewer.css' +// 引入 VConsole +import VConsole from 'vconsole' + Vue.config.productionTip = false +// 启动 VConsole +// eslint-disable-next-line no-new +if (window._CONFIG.vConsole) new VConsole() + Vue.use(Vant) Vue.use(VueI18n) Vue.prototype.$message = Toast diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index f92174a..b0ef935 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -28,6 +28,7 @@ import { getRSAPublicKey } from '@/utils/encryption' import { JSEncrypt } from 'jsencrypt' import { mapActions } from 'vuex' import { getAction } from '@api/manage' +import * as dd from 'dingtalk-jsapi' export default { name: 'LoginPage', @@ -43,11 +44,31 @@ export default { } }, created () { + // 尝试通过钉钉登录 + this.loginFromDingTalk() + + // 正常登录部分 this.getPublicKey() this.handleChangeCheckCode() }, methods: { ...mapActions(['Login']), + // 尝试通过钉钉登录 + loginFromDingTalk () { + if (dd.env.platform === 'notInDingTalk') { + console.log('请在钉钉内打开') + return false + } + const ddCorpId = window._CONFIG.ddCorpId + console.log('ddCorpId', ddCorpId) + dd.runtime.permission.requestAuthCode({ + cropId: ddCorpId, + onSuccess: function (info) { + console.log('dd requestAuthCode success:', info) + } + }) + }, + // 获取RSA公钥 getPublicKey () { // 获取公钥