Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-aiberle

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -89,7 +89,7 @@ public class AdminOrderHandlers {
 	 */
 	@RequestMapping("/selectShopOrder")
 	public ModelAndView selectShopOrder(HttpServletRequest request,
-			@RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize, 
+			@RequestParam(value= "pageSize",defaultValue= "20" ,required=false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO) throws Exception {
 		ModelAndView mv = new ModelAndView("admin/order/orderList");
 		String orderStatus = request.getParameter("orderStatus");

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/main/login.jsp

@@ -30,12 +30,12 @@
 	<input type="hidden" id="TenantId" name="TenantId" value="" />
 	<div class="header"></div>
 	<div class="loginWraper">
-		<div id="loginform" class="loginBox bk-gray radius box-shadow">
+		<div id="loginform" class="loginBox">
 			<form class="form form-horizontal"
 				action="${pageContext.request.contextPath }/login" method="post">
 				<input type="hidden"
 					value="<%=session.getAttribute("loginToken")%>" name="loginToken">
-				<c:if test="${!empty isShowDiv}">
+				<%--<c:if test="${!empty isShowDiv}">
 				<c:choose>
 					<c:when test="${isShowDiv == true }">
 						<div id="errorDiv"
@@ -54,57 +54,78 @@
 						</div>
 					</c:otherwise>
 				</c:choose>
-				</c:if>
+				</c:if>--%>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60d;</i></label>
-					<div class="formControls col-8">
+					<h4 class="formControls col-12">欢迎登录</h4>
+				</div>
+				<div class="row cl">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60d;</i></label>
+					<div class="formControls col-9">
 						<input id="adminLoginName" autocomplete="off" name="adminLoginName" type="text"
 							value="${loginName }" placeholder="请输入账号" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60e;</i></label>
-					<div class="formControls col-8">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60e;</i></label>
+					<div class="formControls col-9">
 						<input id="adminLoginPwd" autocomplete="off" name="adminLoginPwd" type="password"
 							value="${loginPwd }" placeholder="请输入密码" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<div class="formControls col-8 col-offset-3">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60e;</i></label>
+					<div class="formControls col-11">
 						<input class="input-text size-L" autocomplete="off" id="verifyCode" name="verifyCode"
 							type="text" placeholder="验证码"
 							onblur="if(this.value==''){this.value='验证码:'}"
 							onclick="if(this.value=='验证码:'){this.value='';}" value="验证码:"
 							style="width: 150px;"> <img
 							src="${pageContext.request.contextPath }/verify.image"
-							id="verifyCode"> <a id="kanbuq" href="javascript:;">看不清，换一张</a>
+							id="verifyCode"> <a id="kanbuq" href="javascript:;">换一张</a>
 					</div>
 				</div>
 				<div class="row">
-			        <div class="formControls col-8 col-offset-3">
+			        <div class="formControls col-11 col-offset-1">
 			          <label for="online">
 			            <input type="checkbox" name="online" id="online" value="true">使我保持登录状态
 			          </label>
 			        </div>
 		      	</div>
 				<div class="row">
-					<div class="formControls" style="margin: 0 auto;text-align: center;">
+					<div class="formControls col-11 col-offset-1">
 						<input name="" type="submit" class="btn btn-iamberry"
 							onsubmit="checkLogin()"
 							value="立即登录"> <input
-							name="" type="reset" class="btn btn-default radius size-L"
+							name="" type="reset" class="btn btn-default size-L"
 							value="&nbsp;取&nbsp;&nbsp;&nbsp;&nbsp;消&nbsp;" style="display:none;">
 					</div>
 				</div>
 			</form>
 		</div>
+		<div class="right-box">
+
+		</div>
+	</div>
+	<div class="left-bg">
+
 	</div>
-	<div class="footer">Copyright 深圳爱贝源科技有限公司</div>
+	<div class="right-bg">
+
+	</div>
+	<div class="bottom-bg">
+
+	</div>
+	<%--<div class="footer">Copyright 深圳爱贝源科技有限公司</div>--%>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/iamberry/common/js/utils/md5.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/js/utils/md5.js"></script>
 	<script type="text/javascript">
+
+		var  errorMsg = '${divText }';
+		if(errorMsg!=null){
+            alert(errorMsg);
+		}
 		$(function() {
 			$("#kanbuq").click(
 					function() {

iamberry-wechat-web/src/main/webapp/common/admin/css/H-ui.login.css

@@ -9,18 +9,21 @@ Created & Modified by guojunhui.
 body{font-size:14px}
 
 .header,.footer{ position:absolute; left:0; right:0; width:100%; z-index:99}
-.header{top:0; height:60px; background:#e9004c url(../images/logo.png) no-repeat 0 center}
-.btn-iamberry{background:#e9004c;color:#fff;border:0;border-radius: 25px;padding: 6px 12px;width: 150px;height:35px;}
-.btn-iamberry:hover{background:#cf0044;}
-.loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1; background:#3283AC url(../images/admin-login-bg.jpg) no-repeat center;}
-.loginBox{ position:absolute; width:617px; height:374px; background-color: rgba(255,255,255,0.8);border:1px solid #e9004c\9;border:1px solid rgba(230,0,76,.3); left:50%; top:50%; margin-left:-309px; margin-top:-184px; padding-top:38px;border-radius:10px;-webkit-box-shadow: 0 0 4px rgba(230,0,76,0.3);
-    box-shadow: 0 0 4px rgba(230,0,76,0.3);}
+.header{top:0; height:60px; background:url(../images/logo.png) no-repeat  center bottom;background-size:auto 80% ;}
+.btn-iamberry{background:#e5e5e6;color:#fff;border:0;padding: 6px 0;width: 100%;height:45px;}
+.btn-iamberry:hover{background:#666;}
+.left-bg{position: absolute;left: 0;top: 0;width: 150px;height: 150px;background: url(../images/left-1.png) top left no-repeat;background-size: 100%;}
+.right-bg{position: absolute;right: 0;top: 50%;margin-top: -71px; width: 44px;height: 142px;background: url(../images/right-1.png) right center no-repeat;background-size:auto 100%;}
+.bottom-bg{position: absolute;bottom: 0;left: 50%;margin-left: -140px; width: 271px;height: 66px;background: url(../images/bottom-1.png) center bottom no-repeat;background-size:100% auto;}
+.loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1;}
+.loginBox{ position:absolute; width:400px; height:374px; right:52%; top:50%; margin-left:0; margin-top:-184px; padding-top:0;}
+.right-box{position: absolute;width: 500px;height: 400px;left: 52%;top: 50%;margin-left: 0;margin-top: -200px;padding-top: 16px;background: url(../images/login-1.png) center center no-repeat;background-size: 100%;}
 @media (max-width:617px) {
 	.loginbox{ width:100%; position:static; margin-top:0; margin-left:0;}
 }
 .loginBox .row{margin-top:20px;}
 .loginBox .row .form-label .Hui-iconfont{ font-size:24px}
-.loginBox .input-text{ width:360px;border-radius: 25px;border:1px solid rgba(230,0,76,.3);}
+.loginBox .input-text{ width:360px;}
 @media (max-width:617px) {
 	.loginBox .input-text{ width:80%}
 }