From 819c0b6478fb3385c8457cd03e04fdf0d3b90a70 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 10:11:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
index 957b4e8..bd86f6b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" name="viewport" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <title>閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</title>
     <meta name="description" content="閽绘帰宸ョ▼淇℃伅鍖栫郴缁�">
     <!--[if lt IE 9]>
@@ -22,18 +23,25 @@
         }  
         html,body{
         	height: 100%;
+            touch-action: manipulation;
+        }
+        html {
+            touch-action: manipulation;
         }
         #logo-text{
-        	color: rgba(51, 51, 51, 1);
-        	font-size: 44px;
-        	margin-left: 0px;
+        	/*color: rgba(51, 51, 51, 1);*/
+        	font-size: 40px;
+        	margin-left: 25px;
+            color: white;
+            margin-bottom: 20px;
         }
         .page-con{
         	border-width: 0px;
         	margin-left: 0px;
         	/*text-align: left;*/
-        	left: 524px;
+        	left: 38%;
         	padding: 0px;
+            color: white;
         }
         .bar-line{
         	display: block;
@@ -91,16 +99,16 @@
 	<span class="bar-line"></span>
     <form name="loginform" id="loginform">
         <input type="hidden" id="redirectUrl" name="redirectUrl" value="${redirectUrl}" >
-        <div><span id="logo-text">閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</span></div>
+        <div><span id="logo-text">鍖椾含甯傚湴闈㈡矇闄嶇洃娴嬬綉寤鸿宸ョ▼</span></div>
 
             <div class="input-container" style="margin-top:25px;position:relative;">
             	<img src="images/loginPage/user3.png" style="margin-right:5px;"/>
-                <input id="username" name="username" class="txt" type="text" autocomplete="off" placeholder="璇疯緭鍏ョ敤鎴峰悕/閭" > 
+                <input id="username" name="username" class="txt" value="admin" type="text" autocomplete="off" placeholder="璇疯緭鍏ョ敤鎴峰悕/閭" >
                 <div class="error-tip"></div>
             </div>
             <div class="login-input input-container" style="margin-top:30px;position:relative;">
             	<img class="password-icon" src="images/loginPage/pass1.png"/>
-                <input name="password" id="password" class="txt" type="password" placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�" autocomplete="off"  >
+                <input name="password" id="password"  value="admin123" class="txt" type="password" placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�" autocomplete="off"  >
                 <div class="error-tip"></div>
             </div>
 
@@ -133,5 +141,21 @@
 <script  th:src="@{/ajax/libs/encrypt/jsencrypt.min.js}"></script>
 <script  th:src="@{/loginPage/process/login.js}"></script>
 
+<script type="text/javascript">
+    window.addEventListener('wheel', function (event) {
+        if (event.ctrlKey === true || event.metaKey) {
+            event.preventDefault();
+        }
+    }, { passive: false });
+
+    //firefox
+    window.addEventListener('DOMMouseScroll', function (event) {
+        if (event.ctrlKey === true || event.metaKey) {
+            event.preventDefault();
+        }
+    }, { passive: false })
+
+</script>
+
 </body>
 </html>

--
Gitblit v1.9.1