zimhy · TomCat-Vim · Apr 1, 2016 · Apr 2, 2016 · Apr 2, 2016 · Apr 3, 2016
diff --git a/Server/ArtEducation0331/WebContent/jsp/css/index.css b/Server/ArtEducation0331/WebContent/jsp/css/index.css
@@ -5,15 +5,15 @@
   background-position: top;
   background-repeat: no-repeat;
   background-attachment: fixed;
-  background-size: 100%;
+  background-size: cover;
 }
 .qrcode {
-  /*width: 200px;*/
-  /*height: 100px;*/
+  padding: 10px 10px 0 10px;
   background-color: #fff;
   position: absolute;
   right: 20%;
   bottom: 30%;
+  border-radius: 4px;
 }
 .qrcode div {
   display: inline-block;
@@ -29,11 +29,14 @@
   display: block;
   margin-bottom:10px;
   text-align: center;
+  font-size: 16px;
+  font-weight: bold;
+  color: #000;
 }
 .qrcode:before{
   content: '扫描二维码下载App';
   position: absolute;
-  bottom: 140px;
+  bottom: 150px;
   font-size: 20px;
   font-weight: bold;
   color: white;

diff --git a/Server/ArtEducation0331/WebContent/jsp/css/school.css b/Server/ArtEducation0331/WebContent/jsp/css/school.css
@@ -1,3 +1,6 @@
+hr {
+  border-top: 1px solid #000;
+}
 button {
   width: 130px;
 }
@@ -20,8 +23,68 @@ img {
   height:100%;
   width:100%;
 }
-.tinfo td {
+.tinfo td,
+.tdbasic{
   font-size: 18px;
   line-height: 3em;
   padding: 5px;
-}
+}
+
+
+textarea {
+  width: 100%;
+}
+
+.radiobox div{
+  display: inline-block;
+  margin-left: 20px;
+}
+
+.tuli:before {
+  content: '图例:';
+}
+.tuli li {
+  text-decoration: none;
+  display: inline-block;
+  margin-left: 20px;
+  padding: 3px;
+}
+
+.smfailed {
+  background-color: #e26a88;
+}
+
+.smwaiting {
+  background-color: #f6c1d2;
+}
+
+.smunfilled {
+  background-color: #6dd0db;
+}
+
+.smfull {
+  background-color: #3fa6d3;
+}
+
+.smsuspended {
+  background-color: #e3bb44;
+}
+
+.smgoing {
+  background-color: #e3e2df;
+}
+
+
+.smonlinepaid {
+  background-color: #fbbeff;
+}
+.smonlineunpaid {
+  background-color: #F400FF;
+}
+.smdiscount {
+  background-color: #f98451;
+}
+.smundiscount {
+  background-color: #f74c24;
+}
+
diff --git a/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css b/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css
@@ -30,7 +30,8 @@
 }
 .sidebar a:hover,
 .sidebar a:focus,
-.sidebar a:active
+.sidebar a:active,
+.sidebar .active
 {
   text-decoration: none;
   background-color: #00b976;

diff --git a/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css b/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css
@@ -3,6 +3,7 @@
 ============================================================================= */
 .page-title {
   height: 150px;
+  letter-spacing: 5px;
   text-align: center;
   line-height: 150px;
   font-size: 48px;
@@ -11,31 +12,17 @@
   text-shadow: -3px -3px 5px #264E7F;
 }
 /* numbered buttons */
-#status-buttons a{ 
-  width: 96px;
+.status-buttons {
+  width: 196px;
   height: 96px;
-  color:#333; 
-  display:inline-block; 
-  font-size:24px; 
-  margin-right:20px; 
+  color:#080808;
+  font-size:24px;
+  font-weight: bold;
+  margin:0 auto;
   text-align:center;
 }
-#status-buttons a:first-child {
-  margin-right: 40px;
-}
-#status-buttons a:nth-child(3) {
-  margin-right: 15px;
-}
-#status-buttons a:hover {
-  text-decoration: none;
-}
-#status-buttons a:active,
-#status-buttons a:focus {
-  text-decoration:none; 
-  color:#00BC8C;
-}
 
-#status-buttons span{
+.status-buttons span{
   color: #fff;
   background:#080808;
   text-align: center; 
@@ -46,13 +33,9 @@
   width:50px;
   border-radius:100%;
 }
-#status-buttons a.active {
-  color: #00BC8C;
-}
-#status-buttons a.active span{ 
-  background:#00BC8C; 
+.error {
+  color: red;
 }
-
 /* ANIMATION STYLINGS
 ============================================================================= */
 #signup-form            { position:relative; min-height:300px; overflow:hidden; padding:30px; }

diff --git a/Server/ArtEducation0331/WebContent/jsp/degreeConst.json b/Server/ArtEducation0331/WebContent/jsp/degreeConst.json
diff --git a/Server/ArtEducation0331/WebContent/jsp/fieldConst.json b/Server/ArtEducation0331/WebContent/jsp/fieldConst.json
diff --git a/Server/ArtEducation0331/WebContent/jsp/img/ph.png b/Server/ArtEducation0331/WebContent/jsp/img/ph.png
diff --git a/Server/ArtEducation0331/WebContent/jsp/index.jsp b/Server/ArtEducation0331/WebContent/jsp/index.jsp
@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
 <html >
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">
@@ -13,25 +14,32 @@
   <body>
     <header class="container-fluid">
       <div class="row">
-        <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+        <div class="col-md-6"><a href="index.jsp"><img class="logo" src="" alt="website logo"></a>
           <p class="slogan">艺宝,您身边的艺术教师!</p>
         </div>
         <div class="col-md-6">
           <div class="login">
             <a href="signup/signup.html">教师入驻</a>
             <a href="#" class="ssin">教师登录</a>
             <a href="#" class="ssin">机构登录</a>
+
+            <% if(session.getAttribute("resultCode")=="9001"){ %>
+                  <p>用户名或邮箱不存在</p>
+            <%session.removeAttribute("resultCode");}else if(session.getAttribute("resultCode")=="9002"){ %>
+                  <p>密码错误</p>
+            <%session.removeAttribute("resultCode");}else if(session.getAttribute("resultCode")=="9009"){ %>
+                 <p>其他原因导致登录失败</p>
+            <%session.removeAttribute("resultCode");} %>
+
           </div>
           <div class="signin">
-            <form action="" method="post">
+            <form action="/ArtEducation/teacher/login.action" method="post">
               <table class="formtable">
-                <tr><td>邮箱：</td><td><input type="text" name="username" required></td></tr>
+                <tr><td>账户：</td><td><input type="text" name="username" required></td></tr>
                 <tr><td>密码：</td><td><input type="password" name="password" required></td></tr>
-                <tr><td>验证码：</td><td><input type="text" name="" required></td></tr>
-                <tr><td></td><td><a href=""><img src="" alt="验证码图片"></a></td></tr>
               </table>
               <div class="submit">
-                <input class="btn btn-default" type="submit" value="登录">
+                <button class="btn btn-primary" type="submit">登录</button>
                 <button type="button" class="btn btn-default" id="dismiss">关闭</button>
               </div>
             </form>

diff --git a/Server/ArtEducation0331/WebContent/jsp/js/constSer.js b/Server/ArtEducation0331/WebContent/jsp/js/constSer.js
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js b/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js
@@ -1,45 +1,53 @@
-angular.module('formSignup',['ngAnimate','ui.router','constSer'])
-.config(function($stateProvider,$urlRouterProvider) { 
-  $stateProvider
-    .state('signup',{
-      url:'/signup',
-      templateUrl:'signup-form.html',
-      controller:'formController'
-    })
-    .state('signup.basic',{
-      url:'/basic',
-      templateUrl:'signup-basic.html'
-    })
-    .state('signup.idinfo',{
-      url:'/idinfo',
-      templateUrl:'signup-id.html'
-    })
-    .state('signup.verification',{
-      url:'/verification',
-      templateUrl:'signup-veri.html'
-    });
-  $urlRouterProvider.otherwise('/signup/basic');
-})
-.controller('formController',function($scope,fieldConst,degreeConst,teAgeConst) {
-  $scope.formData = {
-    field:"钢琴",
-    sex:"male",
-    degree:"专科",
-    teachingAge:"0~1年"
-  };
-
-  $scope.chkPwd = function () {
-    if ($scope.checkPwd === $scope.formData.pwd) {
-      return true;
-    } else {
-      return false;
-    }
-  };
-
-  $scope.processForm = function() {
-    setTimeout("window.location='../index.html'",5000);
-  };
-  $scope.fieldOpts = fieldConst.query();
-  $scope.degreeOpts = degreeConst.query();
-  $scope.teAgeOpts = teAgeConst.query();
-});
+//angular.module('formSignup',['ngAnimate','ui.router','constSer'])
+//.config(function($stateProvider,$urlRouterProvider) {
+//  $stateProvider
+//    .state('signup',{
+//      url:'/signup',
+//      templateUrl:'signup-form.html',
+//      controller:'formController'
+//    })
+//    .state('signup.basic',{
+//      url:'/basic',
+//      templateUrl:'signup-basic.html'
+//    })
+//    .state('signup.idinfo',{
+//      url:'/idinfo',
+//      templateUrl:'signup-id.html'
+//    })
+//    .state('signup.verification',{
+//      url:'/verification',
+//      templateUrl:'signup-veri.html'
+//    });
+//  $urlRouterProvider.otherwise('/signup/basic');
+//})
+//.controller('formController',function($scope,$interval,fieldConst,degreeConst,teAgeConst) {
+//  $scope.formData = {
+//    field:"钢琴",
+//    sex:"male",
+//    degree:"专科",
+//    teachingAge:"0~1年"
+//  };
+//
+//  $scope.chkPwd = function () {
+//    if ($scope.checkPwd === $scope.formData.pwd) {
+//      return true;
+//    } else {
+//      return false;
+//    }
+//  };
+//
+//  $scope.timecount = 5;
+//
+//  $scope.processForm = function() {
+//    $interval(function () {
+//      $scope.timecount--
+//      console.log($scope.timecount)
+//      if($scope.timecount===0) {window.location='../index.html'}
+//    },1000,5,true)
+//
+//
+//  };
+//  $scope.fieldOpts = fieldConst.query();
+//  $scope.degreeOpts = degreeConst.query();
+//  $scope.teAgeOpts = teAgeConst.query();
+//});
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/smApp.js b/Server/ArtEducation0331/WebContent/jsp/js/smApp.js
@@ -1,4 +1,4 @@
-angular.module('smApp',['ngAnimate','ui.router','ui.date','constSer'])
+angular.module('smApp',['ngAnimate','ui.router','ui.date'])
   .config(function ($stateProvider,$urlRouterProvider) {
     $stateProvider
       .state('sm',{
@@ -32,7 +32,7 @@ angular.module('smApp',['ngAnimate','ui.router','ui.date','constSer'])
       });
     $urlRouterProvider.otherwise('/sm/teacherManager');
   })
-  .controller('smController',function ($scope,fieldConst,degreeConst,teAgeConst) {
+  .controller('smController',function ($scope) {
     $scope.profileInfo = {};