From 524d88b9af00c52e3b1b07d9420073e973d45018 Mon Sep 17 00:00:00 2001
From: zhengpengju <zhengpengju4905@dingtalk.com>
Date: Tue, 28 Apr 2020 09:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E8=88=AA=E5=8F=8A?=
 =?UTF-8?q?=E4=BA=BA=E4=BA=BA=E9=80=9A=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2e5106291bda5fd09ef206226185bde8941fd1c3
---
 projects/WebSPA/wwwroot/pages/login.html |  7 ++++++-
 projects/WebSPA/wwwroot/pages/login.js   | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/projects/WebSPA/wwwroot/pages/login.html b/projects/WebSPA/wwwroot/pages/login.html
index e7e74514..93d73d77 100644
--- a/projects/WebSPA/wwwroot/pages/login.html
+++ b/projects/WebSPA/wwwroot/pages/login.html
@@ -1,8 +1,13 @@
 <div class="page js_show">
     <div style="background-color: #fff; height: 100%; min-height: 480px;">
+        <div class="weui-header">
+            <div class="weui-header-left"> <a class="icon icon-109" style="color:#fff" href="javascript:" v-on:click="closeWindow()">关闭</a> </div>
+            <h1 class="weui-header-title"></h1>
+            <div class="weui-header-right"></div>
+        </div> 
         <form class="weui-form" id="form" method="post">
             <div class="weui-form__text-area">
-                <h2 class="weui-avatar-circle center" style="margin-bottom:24px"><img class="weui-media-box__thumb" src="/images/avatar.svg" alt=""></h2>
+                <h2 class="weui-avatar-circle center" style="margin:24px"><img class="weui-media-box__thumb" src="/images/avatar.svg" alt=""></h2>
             </div>
             <div class="weui-cells weui-cells_form">
                 <div class="weui-cell">
diff --git a/projects/WebSPA/wwwroot/pages/login.js b/projects/WebSPA/wwwroot/pages/login.js
index 0a63f9bf..625c7601 100644
--- a/projects/WebSPA/wwwroot/pages/login.js
+++ b/projects/WebSPA/wwwroot/pages/login.js
@@ -78,6 +78,16 @@
                         enterKeyup() {
                             document.addEventListener("keyup", this.enterKey);
                         },
+                        closeWindow(){
+                            if(window.api){
+                                window.api.execScript(
+                                    {
+                                        name: window.api.winName,
+                                        script: "api.closeWin()"
+                                    }
+                                )
+                            }
+                        },
                     }
                 })
             });