Merge branch 'master' of http://39.108.133.138:3000/2001010134/RaoYing

src/main/webapp/index.html

@@ -22,7 +22,7 @@
                 <ul>
                     <li>品优购欢迎您！</li>
                     <li>
-                        <a href="#">请登录</a>&nbsp;<a href="../register.html" class="style_red">免费注册</a>
+                        <a href="loginPage.html">请登录</a>&nbsp;<a href="register.html" class="style_red">免费注册</a>
                     </li>
                 </ul>
             </div>

src/main/webapp/loginPage.html

@@ -28,12 +28,12 @@
 
                 <div class="input-password">
 
-                    <input type="password" placeholder="密码">
+                    <input type="password" id="pass" placeholder="密码">
 
                     <div class="password">
 
                         <div class="checkPassword">
-                            <input type="checkbox">
+                            <input type="checkbox" onclick="xs()">
                             <p>显示密码</p>
                         </div>
 
@@ -43,9 +43,6 @@
 
                     </div>
 
-
-
-
                 </div>
             </div>
 
@@ -62,7 +59,7 @@
                     <!-- <div>
                         <span>下一步</span>
                     </div> -->
-                    <input type="submit" value="下一步">
+                    <input type="submit" value="登录">
                 </div>
 
             </div>
@@ -70,5 +67,14 @@
         </form>
     </div>
 </body>
-
+<script>
+    function xs(){
+        var a = document.getElementById("pass");
+        if (a.type=="password"){
+            a.type = "text"
+        }else {
+            a.type = "password"
+        }
+    }
+</script>
 </html>

src/main/webapp/register.html

@@ -37,7 +37,7 @@
 
                 <div class="secBox">
                     <div class="passWord">
-                        <input type="password" placeholder="密码">
+                        <input type="password" id="pass" placeholder="密码">
                     </div>
                     <div class="warning">使用 8 个或更多字符（字母、数字和符号的组合）</div>
                 </div>
@@ -46,7 +46,7 @@
             </div>
 
             <div class="checkPassword">
-                <input type="checkbox">
+                <input type="checkbox" onclick="xs()">
                 <p>显示密码</p>
             </div>
 
@@ -64,7 +64,7 @@
                     <!-- <div>
                         <span>下一步</span>
                     </div> -->
-                    <input type="submit" value="下一步">
+                    <input type="submit" value="登录">
                 </div>
 
             </div>
@@ -77,5 +77,14 @@
 
 
 </body>
-
+<script>
+    function xs(){
+        var a = document.getElementById("pass");
+        if (a.type=="password"){
+            a.type = "text"
+        }else {
+            a.type = "password"
+        }
+    }
+</script>
 </html>