Skip to content

Commit

Permalink
商场 店铺 添加&列表
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhanghao-py
zhanghao-py committed Apr 15, 2014
1 parent 4fcce8c commit 4365899
Show file tree
Hide file tree
Showing 41 changed files with 1,231 additions and 310 deletions.
28 changes: 21 additions & 7 deletions ...tent/template/account/repository-list.jsp → WebContent/template/account/market-list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@
<div class="table-products">
<div class="row head ">
<div class="col-md-12">
<h4>用户组列表</h4>
<h4>商场列表</h4>
</div>
</div>

<div class="row filter-block">
<div class="col-md-8 col-md-offset-5">
<form action="account/repository/search" method="POST" id="repository-search-form">
<form action="account/market/search" method="POST" id="market-search-form">
<div class="ui-select">
<select>
<option>Filter users</option>
Expand All @@ -87,13 +87,19 @@
<table class="table table-hover">
<thead>
<tr>
<th class="col-md-3">
<th class="col-md-2">
<input type="checkbox">
名称
</th>
<th class="col-md-3">
<th class="col-md-2">
<span class="line"></span>描述
</th>
<th class="col-md-2">
<span class="line"></span>地址
</th>
<th class="col-md-2">
<span class="line"></span>电话
</th>
<th class="col-md-3">
<span class="line"></span>状态
</th>
Expand All @@ -106,9 +112,15 @@
<input type="checkbox" id="id">
<span id="name"></span>
</td>
<td class="description">
<td>
<span id="description"></span>
</td>
<td>
<span id="address"></span>
</td>
<td>
<span id="telephone"></span>
</td>
<td>
<span class="label label-success">Active</span>
<ul class="actions">
Expand Down Expand Up @@ -138,8 +150,8 @@
function searchRepositories(currentPage, pageSize) {
var url = $("#repository-search-form").attr('action');
var method = $("#repository-search-form").attr('method');
var url = $("#market-search-form").attr('action');
var method = $("#market-search-form").attr('method');
$.ajax({
type: method,
Expand Down Expand Up @@ -167,6 +179,8 @@
row.find("#id").val(e.id);
row.find("#name").text(e.name);
row.find("#description").text(e.description);
row.find("#address").text(e.address);
row.find("#telephone").text(e.telephone);
row.removeAttr("style");
Expand Down
26 changes: 18 additions & 8 deletions ...ntent/template/account/new-repository.jsp → WebContent/template/account/new-market.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,33 @@
<div id="pad-wrapper" class="new-user">
<div class="row header">
<div class="col-md-12">
<h3>创建新用户组</h3>
<h3>创建新商场</h3>
</div>
</div>

<div class="row form-wrapper">
<!-- left column -->
<div class="col-md-9 with-sidebar">
<div class="container">
<form class="new_user_form" id="new-repository-form" action="account/repository" method="POST">
<form class="new_user_form" id="new-market-form" action="account/market" method="POST">
<div class="col-md-12 field-box">
<label>名称:</label>
<label>商场名称:</label>
<input class="form-control" type="text" name="name" />
</div>
<div class="col-md-12 field-box">
<label>地址:</label>
<input class="col-md-9 form-control" type="text" name="address" />
</div>
<div class="col-md-12 field-box">
<label>电话:</label>
<input class="col-md-9 form-control" type="text" name="telephone" />
</div>
<div class="col-md-12 field-box">
<label>描述:</label>
<input class="col-md-9 form-control" type="text" name="description" />
</div>
<div class="col-md-11 field-box actions">
<input type="button" class="btn-glow primary" value="创建" id="new-repository-btn">
<input type="button" class="btn-glow primary" value="创建" id="new-market-btn">
<span>OR</span>
<input type="reset" value="取消" class="reset">
</div>
Expand Down Expand Up @@ -126,20 +134,22 @@
$("#new-repository-btn").click(function() {
$("#new-market-btn").click(function() {
var name = $("input[name=name]").val();
var address = $("input[name=address]").val();
var telephone = $("input[name=telephone]").val();
var description = $("input[name=description]").val();
var url = $("#new-repository-form").attr('action');
var method = $("#new-repository-form").attr('method');
var url = $("#new-market-form").attr('action');
var method = $("#new-market-form").attr('method');
$.ajax({
type: method,
url: url,
dataType: 'json',
data: {name: name, description: description},
data: {name: name, address: address, telephone: telephone, description: description},
success: function(data, textStatus, jqXHR){
console.log(data.statusInfo);
alert(data.statusInfo);
Expand Down
174 changes: 174 additions & 0 deletions WebContent/template/account/new-shop.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://"
+ request.getServerName() + ":" + request.getServerPort()
+ path + "/";
%>

<!DOCTYPE html>
<html>
<head>
<base href="<%=basePath%>">
<title>Detail Admin - New User Form</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- bootstrap -->
<link href="css/bootstrap/bootstrap.css" rel="stylesheet">
<link href="css/bootstrap/bootstrap-overrides.css" type="text/css" rel="stylesheet">

<!-- global styles -->
<link rel="stylesheet" type="text/css" href="css/compiled/layout.css">
<link rel="stylesheet" type="text/css" href="css/compiled/elements.css">
<link rel="stylesheet" type="text/css" href="css/compiled/icons.css">

<!-- libraries -->
<link rel="stylesheet" type="text/css" href="css/lib/font-awesome.css">

<!-- this page specific styles -->
<link rel="stylesheet" href="css/compiled/new-user.css" type="text/css" media="screen" />

<!-- open sans font -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>

<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>

<!-- navbar -->
<c:import url="../navbar.jsp"></c:import>
<!-- end navbar -->

<!-- sidebar -->
<c:import url="../slidebar.jsp"></c:import>
<!-- end sidebar -->


<!-- main container -->
<div class="content">

<div id="pad-wrapper" class="new-user">
<div class="row header">
<div class="col-md-12">
<h3>创建新商铺</h3>
</div>
</div>

<div class="row form-wrapper">
<!-- left column -->
<div class="col-md-9 with-sidebar">
<div class="container">
<form class="new_user_form" id="new-shop-form" action="account/shop" method="POST">
<div class="col-md-12 field-box">
<label>品牌:</label>
<input class="form-control" type="text" name="name" />
</div>
<div class="col-md-12 field-box">
<label>地址:</label>
<input class="col-md-9 form-control" type="text" name="address" />
</div>
<div class="col-md-12 field-box">
<label>电话:</label>
<input class="col-md-9 form-control" type="text" name="telephone" />
</div>
<div class="col-md-12 field-box">
<label>描述:</label>
<input class="col-md-9 form-control" type="text" name="description" />
</div>
<div class="col-md-12 field-box">
<label>商场:</label>
<div class="ui-select span5">
<select name="marketId">
<c:forEach items="${markets}" var="market">
<option value="${market.id}">${market.name}</option>
</c:forEach>
</select>
</div>
</div>
<div class="col-md-11 field-box actions">
<input type="button" class="btn-glow primary" value="创建" id="new-shop-btn">
<span>OR</span>
<input type="reset" value="取消" class="reset">
</div>
</form>
</div>
</div>

<!-- side right column -->
<div class="col-md-3 form-sidebar pull-right">
<div class="btn-group toggle-inputs hidden-tablet">
<button class="glow left active" data-input="normal">NORMAL INPUTS</button>
<button class="glow right" data-input="inline">INLINE INPUTS</button>
</div>
<div class="alert alert-info hidden-tablet">
<i class="icon-lightbulb pull-left"></i>
Click above to see difference between inline and normal inputs on a form
</div>
<h6>Sidebar text for instructions</h6>
<p>Add multiple users at once</p>
<p>Choose one of the following file types:</p>
</div>
</div>
</div>
</div>
<!-- end main container -->


<!-- scripts -->
<script src="lib/jquery-1.10.2.min.js"></script>
<script src="lib/bootstrap.min.js"></script>
<script src="lib/theme.js"></script>

<script type="text/javascript">
$(function () {
// toggle form between inline and normal inputs
var $buttons = $(".toggle-inputs button");
var $form = $("form.new_user_form");
$buttons.click(function () {
var mode = $(this).data("input");
$buttons.removeClass("active");
$(this).addClass("active");
if (mode === "inline") {
$form.addClass("inline-input");
} else {
$form.removeClass("inline-input");
}
});
$("#new-shop-btn").click(function() {
var name = $("input[name=name]").val();
var address = $("input[name=address]").val();
var telephone = $("input[name=telephone]").val();
var description = $("input[name=description]").val();
var url = $("#new-shop-form").attr('action');
var method = $("#new-shop-form").attr('method');
$.ajax({
type: method,
url: url,
dataType: 'json',
data: {name: name, address: address, telephone: telephone, description: description},
success: function(data, textStatus, jqXHR){
console.log(data.statusInfo);
alert(data.statusInfo);
}
});
});
});
</script>
</body>
</html>
12 changes: 6 additions & 6 deletions WebContent/template/account/new-user.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
<input name="password" class="col-md-9 form-control" type="text" value="000000" disabled/>
</div>
<div class="col-md-12 field-box">
<label>用户组:</label>
<label>店铺:</label>
<div class="ui-select span5">
<select name="repositoryId">
<c:forEach items="${repositories}" var="repository">
<option value="${repository.id}">${repository.name}</option>
<select name="shopId">
<c:forEach items="${shops}" var="shop">
<option value="${shop.id}">${shop.name}</option>
</c:forEach>
</select>
</div>
Expand Down Expand Up @@ -118,7 +118,7 @@
var username = $("input[name=username]").val();
var password = $("input[name=password]").val();
var repositoryId = $("select[name=repositoryId] option:selected").val();
var shopId = $("select[name=shopId] option:selected").val();
var url = $("#new-user-form").attr('action');
var method = $("#new-user-form").attr('method');
Expand All @@ -127,7 +127,7 @@
type: method,
url: url,
dataType: 'json',
data: {username: username, password: password, repositoryId: repositoryId},
data: {username: username, password: password, shopId: shopId},
success: function(data, textStatus, jqXHR){
console.log(data.statusInfo);
alert(data.statusInfo);
Expand Down
Loading

0 comments on commit 4365899

Please sign in to comment.