Skip to content

T
tongmeng-app
提交 4054514d authored 作者: Mangostiffy's avatar Mangostiffy
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 92cdad7f 964e29cd
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 2 行增加 和 1514 行删除
src/main/java/com/mall/controller/tongmeng/oneclassfy/OneClassfyController.java
浏览文件 @ 4054514d
...@@ -104,7 +104,7 @@ public class OneClassfyController extends BaseController { ...@@ -104,7 +104,7 @@ public class OneClassfyController extends BaseController {
icomPath =OssUtil.upload(file); icomPath =OssUtil.upload(file);
pd.put("icom", icomPath); pd.put("icom", icomPath);
}else{ }else{
pd.put("icom",request.getParameter("ICOM")); pd.put("icom",request.getParameter("icom"));
} }
pd.put("classify_id",request.getParameter("classify_id")); pd.put("classify_id",request.getParameter("classify_id"));
pd.put("name",request.getParameter("name")); pd.put("name",request.getParameter("name"));
......
src/main/webapp/WEB-INF/jsp/tongmeng/appuser/appuser_edit.jsp deleted 100644 → 0
浏览文件 @ 92cdad7f
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
%>
<!DOCTYPE html>
<html lang="en">
<head>
<!-- 下拉框 -->
<link rel="stylesheet" href="static/ace/css/chosen.css" />
<!-- jsp文件头和头部 -->
<%@ include file="../../system/index/top.jsp"%>
<!-- 日期框 -->
<link rel="stylesheet" href="static/ace/css/datepicker.css" />
</head>
<body class="no-skin">
<!-- /section:basics/navbar.layout -->
<div class="main-container" id="main-container">
<!-- /section:basics/sidebar -->
<div class="main-content">
<div class="main-content-inner">
<div class="page-content">
<div class="row">
<div class="col-xs-12">
<form action="${msg }.do" name="Form" id="Form" method="post">
<input type="hidden" name="OPENID" id="OPENID" value="${pd.openid}"/>
<div id="zhongxin" style="padding-top: 13px;">
<table id="table_report" class="table table-striped table-bordered table-hover">
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">头像:</td>
<td><input type="text" name="HEADPORTRAIT" id="HEADPORTRAIT" value="${pd.headportrait}" maxlength="255" placeholder="这里输入头像" title="头像" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">昵称:</td>
<td><input type="text" name="NICKNAME" id="NICKNAME" value="${pd.nickname}" maxlength="50" placeholder="这里输入昵称" title="昵称" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
<td><input type="number" name="GENDER" id="GENDER" value="${pd.gender}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">手机号:</td>
<td><input type="text" name="MOBILE" id="MOBILE" value="${pd.mobile}" maxlength="11" placeholder="这里输入手机号" title="手机号" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">真实名字:</td>
<td><input type="text" name="NAME" id="NAME" value="${pd.name}" maxlength="50" placeholder="这里输入名称" title="名称" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">身份证:</td>
<td><input type="text" name="ID_CARD" id="ID_CARD" value="${pd.id_card}" maxlength="50" placeholder="这里输入身份证" title="身份证" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">生日:</td>
<td><input type="text" name="BIRTHDAY" id="BIRTHDAY" value="${pd.birthday}" maxlength="30" placeholder="这里输入生日" title="生日" style="width:98%;"/></td>
</tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">创建的时间:</td>
<td><input type="text" name="CREATE_TIME" id="CREATE_TIME" value="${pd.create_time}" maxlength="50" placeholder="这里输入创建的时间" title="创建的时间" style="width:98%;"/></td>
</tr>
<tr>
<td style="text-align: center;" colspan="10">
<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
<a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
</td>
</tr>
</table>
</div>
<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
</form>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
<!-- /.page-content -->
</div>
</div>
<!-- /.main-content -->
</div>
<!-- /.main-container -->
<!-- 页面底部js¨ -->
<%@ include file="../../system/index/foot.jsp"%>
<!-- 下拉框 -->
<script src="static/ace/js/chosen.jquery.js"></script>
<!-- 日期框 -->
<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
<!--提示框-->
<script type="text/javascript" src="static/js/jquery.tips.js"></script>
<script type="text/javascript">
$(top.hangge());
//保存
function save(){
if($("#GENDER").val()==""){
$("#GENDER").tips({
side:3,
msg:'请输入性别',
bg:'#AE81FF',
time:2
});
$("#GENDER").focus();
return false;
}
if($("#MOBILE").val()==""){
$("#MOBILE").tips({
side:3,
msg:'请输入手机号',
bg:'#AE81FF',
time:2
});
$("#MOBILE").focus();
return false;
}
if($("#OPENID").val()==""){
$("#OPENID").tips({
side:3,
msg:'请输入用户openID',
bg:'#AE81FF',
time:2
});
$("#OPENID").focus();
return false;
}
if($("#NAME").val()==""){
$("#NAME").tips({
side:3,
msg:'请输入名称',
bg:'#AE81FF',
time:2
});
$("#NAME").focus();
return false;
}
if($("#ID_CARD").val()==""){
$("#ID_CARD").tips({
side:3,
msg:'请输入身份证',
bg:'#AE81FF',
time:2
});
$("#ID_CARD").focus();
return false;
}
if($("#BIRTHDAY").val()==""){
$("#BIRTHDAY").tips({
side:3,
msg:'请输入生日',
bg:'#AE81FF',
time:2
});
$("#BIRTHDAY").focus();
return false;
}
if($("#HEADPORTRAIT").val()==""){
$("#HEADPORTRAIT").tips({
side:3,
msg:'请输入头像',
bg:'#AE81FF',
time:2
});
$("#HEADPORTRAIT").focus();
return false;
}
if($("#NICKNAME").val()==""){
$("#NICKNAME").tips({
side:3,
msg:'请输入昵称',
bg:'#AE81FF',
time:2
});
$("#NICKNAME").focus();
return false;
}
if($("#CREATE_TIME").val()==""){
$("#CREATE_TIME").tips({
side:3,
msg:'请输入创建的时间',
bg:'#AE81FF',
time:2
});
$("#CREATE_TIME").focus();
return false;
}
$("#Form").submit();
$("#zhongxin").hide();
$("#zhongxin2").show();
}
$(function() {
//日期框
$('.date-picker').datepicker({autoclose: true,todayHighlight: true});
});
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/tongmeng/banner/information.jsp deleted 100644 → 0
浏览文件 @ 92cdad7f
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%
String path = request.getContextPath();
String basePath = request.getScheme() + "://"
+ request.getServerName() + ":" + request.getServerPort()
+ path + "/";
%>
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/ace/css/chosen.css" />
<!-- jsp文件头和头部 -->
<%@ include file="../../system/index/top.jsp"%>
<!-- 日期框 -->
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/ace/css/datepicker.css" />
</head>
<style type="text/css">
.csshidden{
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
max-width: 300px
};
</style>
<body class="no-skin">
<!-- /section:basics/navbar.layout -->
<div class="main-container" id="main-container">
<!-- /section:basics/sidebar -->
<div class="main-content">
<div class="main-content-inner">
<div class="page-content">
<div class="col-xs-12">
<!-- 检索 -->
<form action="${pageContext.request.contextPath}/banner/foruminfoList.do'" method="post" name="Form" id="Form">
<table style="margin-top:5px;" id="zhongxin" >
<input type="hidden" name="TYPE" value="${pd.TYPE}"/>
<table style="margin-top:5px;">
<tr>
<td>
<div class="nav-search">
<span class="input-icon">
<input type="text" placeholder="编码号/资讯标题" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" "/>
<i class="ace-icon fa fa-search nav-search-icon"></i>
</span>
</div>
</td>
<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
<!-- <td style="vertical-align:top;padding-left:2px;">
<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
<option value=""></option>
<option value="">全部</option>
<option value="">1</option>
<option value="">2</option>
</select>
</td> -->
<c:if test="${QX.cha == 1 }">
<td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
</c:if>
<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
</tr>
</table>
<!-- 检索 -->
<table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">
<thead>
<tr>
<th class="center" style="width:35px;">
<label class="pos-rel"><input type="checkbox" class="ace" id="zcheckbox" /><span class="lbl"></span></label>
</th>
<th class="center" style="width:50px;">序号</th>
<th class="center">编码号</th>
<th class="center">资讯标题</th>
<th class="center">资讯封图</th>
<th class="center">创建时间</th>
<th class="center">操作</th>
</tr>
</thead>
<tbody>
<!-- 开始循环 -->
<c:choose>
<c:when test="${not empty varList}">
<c:if test="${QX.cha == 1 }">
<c:forEach items="${varList}" var="var" varStatus="vs">
<tr>
<td class='center'>
<label class="pos-rel"><input type='checkbox' name='ids' value="${var.information_id}" class="ace" /><span class="lbl"></span></label>
</td>
<td class='center' style="width: 30px;">${vs.index+1}</td>
<td class='center'>${var.show_id}</td>
<td class='center'>${var.title}</td>
<td class='center'><img src="${var.icom}" style="width: 50px"/></td>
<td class='center'>${var.create_time}</td>
<td class="center">
<div class="hidden-sm hidden-xs btn-group">
<c:if test="${QX.edit == 1 }">
<a class="btn btn-xs btn-success" title="编辑" onclick="result('${var.show_id}','${pd.bannerId }');">
<i class="ace-icon fa fa-exchange bigger-120" title="编辑"></i>
</a>
</c:if>
</div>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${QX.cha == 0 }">
<tr>
<td colspan="100" class="center">您无权查看</td>
</tr>
</c:if>
</c:when>
<c:otherwise>
<tr class="main_info">
<td colspan="100" class="center" >没有相关数据</td>
</tr>
</c:otherwise>
</c:choose>
</tbody>
</table>
<div class="page-header position-relative">
<table style="width:100%;">
<tr>
<td style="vertical-align:top;"><div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
</tr>
</table>
</div>
</form>
</div>
<!-- /.row -->
</div>
<!-- /.page-content -->
</div>
</div>
<!-- /.main-content -->
<input type="text" id="showId" style="visibility: hidden" />
<!-- 返回顶部 -->
<a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
<i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
</a>
</div>
<!-- /.main-container -->
<!-- basic scripts -->
<!-- 页面底部js¨ -->
<%@ include file="../../system/index/foot.jsp"%>
<!-- 删除时确认窗口 -->
<script src="${pageContext.request.contextPath}/static/ace/js/bootbox.js"></script>
<!-- ace scripts -->
<script src="${pageContext.request.contextPath}/static/ace/js/ace/ace.js"></script>
<!-- 下拉框 -->
<script src="${pageContext.request.contextPath}/static/ace/js/chosen.jquery.js"></script>
<!-- 日期框 -->
<script src="${pageContext.request.contextPath}/static/ace/js/date-time/bootstrap-datepicker.js"></script>
<!--提示框-->
<script type="text/javascript" src="${pageContext.request.contextPath}/static/js/jquery.tips.js"></script>
<script type="text/javascript">
$(top.hangge());//关闭加载状态
//检索
function tosearch(){
top.jzts();
$("#Form").submit();
}
$(function() {
//日期框
$('.date-picker').datepicker({
autoclose: true,
todayHighlight: true,
clearBtn:true
});
//下拉框
if(!ace.vars['touch']) {
$('.chosen-select').chosen({allow_single_deselect:true});
$(window)
.off('resize.chosen')
.on('resize.chosen', function() {
$('.chosen-select').each(function() {
var $this = $(this);
$this.next().css({'width': $this.parent().width()});
});
}).trigger('resize.chosen');
$(document).on('settings.ace.chosen', function(e, event_name, event_val) {
if(event_name != 'sidebar_collapsed') return;
$('.chosen-select').each(function() {
var $this = $(this);
$this.next().css({'width': $this.parent().width()});
});
});
$('#chosen-multiple-style .btn').on('click', function(e){
var target = $(this).find('input[type=radio]');
var which = parseInt(target.val());
if(which == 2) $('#form-field-select-4').addClass('tag-input-style');
else $('#form-field-select-4').removeClass('tag-input-style');
});
}
//复选框全选控制
var active_class = 'active';
$('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on('click', function(){
var th_checked = this.checked;//checkbox inside "TH" table header
$(this).closest('table').find('tbody > tr').each(function(){
var row = this;
if(th_checked) $(row).addClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', true);
else $(row).removeClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', false);
});
});
});
//bannner 与 foruminfo 互交
function result(showId,bannerId) {
$.ajax({
type: "POST",
url: '${pageContext.request.contextPath}/banner/bindingId.do?tm='+new Date().getTime(),
data: {'showId':showId,'bannerId':bannerId},
dataType:'json',
//beforeSend: validateData,
cache: false,
async:false,
success: function(data){
var liElement=document.createElement('input');
liElement.setAttribute('id','showId');
liElement.setAttribute('name','showId');
liElement.setAttribute('type','hidden');
liElement.setAttribute('value',showId);
document.getElementById('zhongxin').appendChild(liElement);
top.Dialog.close();//关闭窗口
}
});
}
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/tongmeng/oneclassfy/oneclassfy_edit.jsp
浏览文件 @ 4054514d
...@@ -35,16 +35,7 @@ ...@@ -35,16 +35,7 @@
<td style="width:75px;text-align: right;padding-top: 13px;">名称:</td> <td style="width:75px;text-align: right;padding-top: 13px;">名称:</td>
<td><input type="text" name="name" id="name" value="${pd.name}" maxlength="50" placeholder="这里输入名称" title="名称" style="width:98%;"/></td> <td><input type="text" name="name" id="name" value="${pd.name}" maxlength="50" placeholder="这里输入名称" title="名称" style="width:98%;"/></td>
</tr> </tr>
<tr>
<td style="width:75px;text-align: right;padding-top: 13px;">二级类型:</td>
<td>
<select id="ONE_CLASSFY_TAG" name="ONE_CLASSFY_TAG" ${msg=='edit'?'disabled="disabled" style="background-color: #F5F5F5"':'' } >
<option value="1" ${pd.one_classfy_tag =='1'?'selected':''}>没有二级</option>
<option value="2" ${pd.one_classfy_tag =='2'?'selected':''}>车牌</option>
<option value="3" ${pd.one_classfy_tag =='3'?'selected':''}>二级分类</option>
</select>
</td>
</tr>
<tr> <tr>
<td style="width:75px;text-align: right;padding-top: 13px;">封图:</td> <td style="width:75px;text-align: right;padding-top: 13px;">封图:</td>
<td> <td>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论