From 9acc5e270e7f02c02ede25d643e16489349c63d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Mon, 31 Oct 2022 09:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                            |  1 +
 web/src/assets/svg-icons/icons/dingding.svg |  1 +
 web/src/views/system/login/css/style.css    |  8 +++++---
 web/src/views/system/login/page.vue         | 16 +++++++++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 web/src/assets/svg-icons/icons/dingding.svg

diff --git a/web/package.json b/web/package.json
index 41966e1..2d62458 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,6 +37,7 @@
     "lowdb": "^1.0.0",
     "nprogress": "^0.2.0",
     "qiankun": "^2.7.2",
+    "qrcodejs2": "^0.0.2",
     "screenfull": "^5.0.2",
     "sortablejs": "^1.10.1",
     "ua-parser-js": "^0.7.20",
diff --git a/web/src/assets/svg-icons/icons/dingding.svg b/web/src/assets/svg-icons/icons/dingding.svg
new file mode 100644
index 0000000..7db1949
--- /dev/null
+++ b/web/src/assets/svg-icons/icons/dingding.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666798594366" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2218" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 2C230.2 2 2 230.2 2 512s228.2 510 510 510 510-228.2 510-510S793.3 2 512 2z m235.9 442c-1 4.6-3.6 10.8-7.2 19.1l-0.5 0.5c-21.6 45.8-77.3 135.5-77.3 135.5l-0.5-0.5-16.5 28.3h78.8L574.3 826.8l34-136h-61.8l21.6-90.2c-17.5 4.1-38.1 9.8-62.3 18 0 0-33 19.1-94.8-37.1 0 0-41.7-37.1-17.5-45.8 10.3-4.1 50-8.8 81.4-12.9 42.2-5.7 68.5-8.8 68.5-8.8s-130.3 2.1-161.2-3.1c-30.9-4.6-70.1-56.7-78.3-102 0 0-12.9-24.7 27.8-12.9 40.2 11.8 209.2 45.8 209.2 45.8S321.4 375 307 358.5c-14.4-16.5-42.8-89.6-39.2-134.5 0 0 1.5-11.3 12.9-8.2 0 0 161.8 74.2 272.5 114.4C664.5 371.4 760.8 392 747.9 444z" fill="#ffffff" p-id="2219"></path></svg>
\ No newline at end of file
diff --git a/web/src/views/system/login/css/style.css b/web/src/views/system/login/css/style.css
index 05aac86..4428c16 100644
--- a/web/src/views/system/login/css/style.css
+++ b/web/src/views/system/login/css/style.css
@@ -121,7 +121,7 @@ img {
 
 /*-- form styling --*/
 .w3l-form-info {
-    padding-top: 6em;
+    padding-top: 2em;
 }
 .w3l-signinform{
     padding: 40px 40px;
@@ -241,8 +241,10 @@ img {
 .w3_info {
     padding: 1em 1em;
     background: transparent;
-    max-width: 450px;
+    width: 450px;
     display: grid;
+    position: fixed;
+    right: 12vw;
     margin-left: auto;
 }
 
@@ -317,7 +319,7 @@ h5 {
     color: #000;
 }
 .footer {
-    padding-top: 3em;
+    padding-top: 1em;
 }
 .footer p {
     text-align: center;
diff --git a/web/src/views/system/login/page.vue b/web/src/views/system/login/page.vue
index c4bc6d5..aef8bd7 100644
--- a/web/src/views/system/login/page.vue
+++ b/web/src/views/system/login/page.vue
@@ -68,9 +68,10 @@
                     </el-input>
                   </el-form-item>
                 </el-form>
-                <button class="btn btn-primary btn-block" @click="submit">
+                <button class="btn btn-primary btn-block" style="padding: 10px 10px;" @click="submit">
                   登录
                 </button>
+                <component v-if="componentTag" :is="componentTag"></component>
               </el-tab-pane>
             </el-tabs>
           </el-card>
@@ -125,16 +126,25 @@
 </template>
 <script>
 import base from './base.vue'
-
+const pluginImport = require('@/libs/util.import.plugin')
 export default {
   extends: base,
   name: 'page',
   data () {
     return {
-      activeName: 'first'
+      activeName: 'first',
+      componentTag: ''
     }
   },
   created () {
+    // 注册第三方登录插件
+    var componentTag = ''
+    try {
+      componentTag = pluginImport('dvadmin-third-web/src/login/index')
+    } catch (error) {
+      componentTag = ''
+    }
+    this.componentTag = componentTag
   },
   mounted () {
   },