diff --git a/src/api/login.js b/src/api/login.js
index 76b2aed..f9dc8b6 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -17,6 +17,14 @@
   })
 }
 
+// 获取二维码
+export function getQrCode() {
+  return request({
+    url: 'qrCode/getCode',
+    method: 'post'
+  })
+}
+
 // 获取用户信息
 export function getInfo() {
   return request({

diff --git a/src/api/login.js b/src/api/login.js
index 76b2aed..f9dc8b6 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -17,6 +17,14 @@
   })
 }
 
+// 获取二维码
+export function getQrCode() {
+  return request({
+    url: 'qrCode/getCode',
+    method: 'post'
+  })
+}
+
 // 获取用户信息
 export function getInfo() {
   return request({
diff --git a/src/views/login/faceLogin.vue b/src/views/login/faceLogin.vue
index a80c3c9..64d3fae 100644
--- a/src/views/login/faceLogin.vue
+++ b/src/views/login/faceLogin.vue
@@ -104,7 +104,9 @@
     },
     // 关闭摄像头
     stopNavigator() {
-      this.thisVideo.srcObject.getTracks()[0].stop()
+      if (this.thisVideo != null && this.thisVideo.srcObject !== null) {
+        this.thisVideo.srcObject.getTracks()[0].stop()
+      }
     }
   }
 }

diff --git a/src/api/login.js b/src/api/login.js
index 76b2aed..f9dc8b6 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -17,6 +17,14 @@
   })
 }
 
+// 获取二维码
+export function getQrCode() {
+  return request({
+    url: 'qrCode/getCode',
+    method: 'post'
+  })
+}
+
 // 获取用户信息
 export function getInfo() {
   return request({
diff --git a/src/views/login/faceLogin.vue b/src/views/login/faceLogin.vue
index a80c3c9..64d3fae 100644
--- a/src/views/login/faceLogin.vue
+++ b/src/views/login/faceLogin.vue
@@ -104,7 +104,9 @@
     },
     // 关闭摄像头
     stopNavigator() {
-      this.thisVideo.srcObject.getTracks()[0].stop()
+      if (this.thisVideo != null && this.thisVideo.srcObject !== null) {
+        this.thisVideo.srcObject.getTracks()[0].stop()
+      }
     }
   }
 }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7713fc7..967ad70 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -43,6 +43,10 @@
           <el-tab-pane label="人脸登录" name="face">
             <face-login ref="faceCapture" @cameraReady="handleCameraReady" @captured="handleFaceCaptured" />
           </el-tab-pane>
+
+          <el-tab-pane label="扫码登录" name="qrcode">
+            <qr-code-login ref="qrcode" />
+          </el-tab-pane>
         </el-tabs>
       </div>
       <div class="clear-div"/>
@@ -61,6 +65,7 @@
 import { RSAencrypt } from '@/utils/security'
 import kaptchaComp from '@/views/login/kaptcha/kaptcha'
 import FaceLogin from '@/views/login/faceLogin'
+import QrCodeLogin from '@/views/login/qrcodeLogin'
 import { removeCurrentSys, setToken } from '@/utils/auth'
 import { faceLogin } from '@/api/login'
 
@@ -69,6 +74,7 @@
   components: {
     // 注册组件
     FaceLogin,
+    QrCodeLogin,
     kaptchaComp: kaptchaComp
   },
   data() {
@@ -197,6 +203,11 @@
         this.tryFaceLogin = false
         this.tryCount = 0
         this.faceList = []
+        if (this.loginType === 'qrcode') {
+          console.log('111')
+          // 二维码扫码登录
+          this.$refs.qrcode.initQrCode()
+        }
       }
     },
     handleCameraReady() {

diff --git a/src/api/login.js b/src/api/login.js
index 76b2aed..f9dc8b6 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -17,6 +17,14 @@
   })
 }
 
+// 获取二维码
+export function getQrCode() {
+  return request({
+    url: 'qrCode/getCode',
+    method: 'post'
+  })
+}
+
 // 获取用户信息
 export function getInfo() {
   return request({
diff --git a/src/views/login/faceLogin.vue b/src/views/login/faceLogin.vue
index a80c3c9..64d3fae 100644
--- a/src/views/login/faceLogin.vue
+++ b/src/views/login/faceLogin.vue
@@ -104,7 +104,9 @@
     },
     // 关闭摄像头
     stopNavigator() {
-      this.thisVideo.srcObject.getTracks()[0].stop()
+      if (this.thisVideo != null && this.thisVideo.srcObject !== null) {
+        this.thisVideo.srcObject.getTracks()[0].stop()
+      }
     }
   }
 }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7713fc7..967ad70 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -43,6 +43,10 @@
           <el-tab-pane label="人脸登录" name="face">
             <face-login ref="faceCapture" @cameraReady="handleCameraReady" @captured="handleFaceCaptured" />
           </el-tab-pane>
+
+          <el-tab-pane label="扫码登录" name="qrcode">
+            <qr-code-login ref="qrcode" />
+          </el-tab-pane>
         </el-tabs>
       </div>
       <div class="clear-div"/>
@@ -61,6 +65,7 @@
 import { RSAencrypt } from '@/utils/security'
 import kaptchaComp from '@/views/login/kaptcha/kaptcha'
 import FaceLogin from '@/views/login/faceLogin'
+import QrCodeLogin from '@/views/login/qrcodeLogin'
 import { removeCurrentSys, setToken } from '@/utils/auth'
 import { faceLogin } from '@/api/login'
 
@@ -69,6 +74,7 @@
   components: {
     // 注册组件
     FaceLogin,
+    QrCodeLogin,
     kaptchaComp: kaptchaComp
   },
   data() {
@@ -197,6 +203,11 @@
         this.tryFaceLogin = false
         this.tryCount = 0
         this.faceList = []
+        if (this.loginType === 'qrcode') {
+          console.log('111')
+          // 二维码扫码登录
+          this.$refs.qrcode.initQrCode()
+        }
       }
     },
     handleCameraReady() {
diff --git a/src/views/login/qrCodeLogin.vue b/src/views/login/qrCodeLogin.vue
new file mode 100644
index 0000000..73c1c0c
--- /dev/null
+++ b/src/views/login/qrCodeLogin.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="login-container">
+    <div class="qrcode-login">
+      <div class="qrcode-image">
+        <el-image
+          :src="qrCodeImg"
+          fit="cover"
+        />
+      </div>
+      <div class="qrcode-desc"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getQrCode } from '@/api/login'
+export default {
+  name: 'QrCodeLogin',
+  data() {
+    return {
+      qrCodeImg: ''
+    }
+  },
+  methods: {
+    initQrCode() {
+      getQrCode().then(response => {
+        console.log(response)
+        if (response.code === 200) {
+          this.qrCodeImg = response.data.qrcodeImgUrl
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>