diff --git a/package.json b/package.json
index d2e7fd3..4669f99 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "element-themex": "^1.0.3",
     "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
+    "js-base64": "^3.6.0",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "mockjs": "1.0.1-beta3",

diff --git a/package.json b/package.json
index d2e7fd3..4669f99 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "element-themex": "^1.0.3",
     "element-ui": "^2.13.2",
     "event-source-polyfill": "^1.0.5",
+    "js-base64": "^3.6.0",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "mockjs": "1.0.1-beta3",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3db2592..a2f54f4 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -53,6 +53,8 @@
 import { RSAencrypt } from '@/utils/security'
 import kaptchaComp from '@/views/login/kaptcha/kaptcha'
 
+let Base64 = require('js-base64').Base64
+
 export default {
   name: 'Login',
   components: {// 注册组件
@@ -130,8 +132,23 @@
   },
   mounted: function() {
     // 自适应图片高度
-    var rightHeight = window.getComputedStyle(this.$refs.element).height
+    const rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
+
+    // 传递参数免密直接登录
+    const path = window.location.href.split('token=') // 分割url
+    if (path.length > 1) {
+      const userToken = path[1] // 获取加密的信息
+      const userLogin = Base64.decode(userToken) // 解密base64码
+
+      // 如果不需要验证码则直接登录
+      if (this.showKaptcha === false) {
+        this.loginForm.username = userLogin.split(';')[0] // 用户名
+        this.loginForm.password = userLogin.split(';')[1] // 密码
+
+        this.handleLogin() // 处理登录
+      }
+    }
   },
   methods: {
     showPwd() { // 明文显示密码