Merge remote-tracking branch 'origin/main'

main
862857010@qq.com 2 years ago
commit 30a9c330cf
  1. 10
      src/main/webapp/html/back/login.html
  2. 22
      src/main/webapp/html/back/main.html
  3. 46
      src/main/webapp/html/back/mobileLogin.html
  4. 46
      src/main/webapp/html/back/shijiazhuangLogin.html
  5. 4
      src/main/webapp/html/back/ybsjMap/js/config.js
  6. 333
      src/main/webapp/html/back/yuyue/reservationManagement.html
  7. 10
      src/main/webapp/html/back/yuyue/reservationRecord.html
  8. 10
      src/main/webapp/html/common/js/initParam.js

@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/favicon_1.ico" />
<link rel="stylesheet" href="/html/common/css/lncss.css" />
<title>一部手机游管理平台</title>
<title>衡水老白干景区管理平台</title>
<link href="/html/common/css/color_lv.css" rel="stylesheet" />
<link rel="stylesheet" href="/html/common/layui/css/layui.css">
<style>
@ -44,10 +44,10 @@
/*验证码*/
function changeValidateCode(obj) {
//获取当前的时间作为参数,无具体意义
//获取当前的时间作为参数,无具体意义
var timenow = new Date().getTime();
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
obj.src = ctx + "/login/gdAdminChart.do?d=" + timenow;
}
@ -200,4 +200,4 @@
</a>
</div>
</body>
</html>
</html>

@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>一部手机游管理平台</title>
<title>衡水老白干景区管理平台</title>
<link href="/html/common/css/pycs.css" rel="stylesheet" type="text/css" />
<!--tab标签页--------必须放在头部!!!--------->
<script src="/html/common/js/jquery-3.6.0.js"></script>
@ -20,7 +20,7 @@
<div class="phead">
<div class="plogo float-l">
<span class="img-logo"><!-- <img src="${ctx }/img/plogo.png" /> --></span>
<span class="logo-bt">一部手机游管理平台</span>
<span class="logo-bt">衡水老白干景区管理平台</span>
</div>
<div class="ptxt float-r" style="position:relative">
<div style=" position:absolute; left:-80px; top:0">
@ -34,7 +34,7 @@
<div class="user-set">
<p class="p-time" id="currentDate"></p>
<p>
<a href="javascript:cancellation()" style="color:#fff;">
<a href="javascript:cancellation()" style="color:#fff;">
<span class="i-return"></span> 注销
</a>
</p>
@ -98,7 +98,7 @@
weekday[6]="星期六";
var currentDate = date.getFullYear() + "年" + (date.getMonth()+ 1) + "月" + date.getDate() + "日 " + weekday[date.getDay()];
$("#currentDate").html(currentDate);
var iframe = document.getElementById("Psy");
window.onload = function() {
function auto_height() {
@ -145,7 +145,7 @@
sendZch2(s,obj.id);
}
} */
//关闭
function closethis(id){
document.getElementById("s"+id.substring(id.indexOf("e")+1,id.length)).className = "";
@ -165,12 +165,12 @@
sendZch2(s,obj.id);
}
$("#"+id).remove();
}
}
//关闭所有
function closeAll(){

@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/favicon_1.ico" />
<link rel="stylesheet" href="/html/common/css/lncss.css" />
<title>一部手机游管理平台</title>
<title>衡水老白干景区管理平台</title>
<link href="/html/common/css/color_lv.css" rel="stylesheet" />
<link rel="stylesheet" href="/html/common/layui/css/layui.css">
<script src="/html/common/layui/layui.all.js"></script>
@ -24,7 +24,7 @@
function time(o){
if (wait==0) {
o.removeAttribute("disabled");
o.innerHTML="点击获取手机验证码";
o.innerHTML="点击获取手机验证码";
o.style.backgroundColor="";
wait=60;
}else{
@ -37,9 +37,9 @@
},1000)
}
} */
var timer; //timer变量,控制时间
var curCount;//当前剩余秒数
function sendMessage() {
@ -49,7 +49,7 @@
$("#getCode").html("请在" + curCount + "秒内输入验证码");
timer = window.setInterval(SetRemainTime, 1000); //启动计时器,1秒执行一次
}
//timer处理函数
function SetRemainTime() {
if (curCount == 0) {
@ -63,10 +63,10 @@
$("#getCode").html("请在" + curCount + "秒内输入验证码");
}
}
//通过localStorage获取还剩多少时间
function getCount() {
var now=new Date().getTime();
var now=new Date().getTime();
if(localStorage.getItem('origTime')){
var old=localStorage.getItem('origTime');
var remainTime=(now - old)/1000;
@ -77,14 +77,14 @@
}else{
localStorage.setItem('origTime',now);
return 30;
}
}
}else{
localStorage.setItem('origTime',now);
return 30;
return 30;
}
}
$(function(){
if(userKey==undefined){
$("#hidMobileLogin").css("display","");
@ -118,11 +118,11 @@
$("#isMsg").attr("style","display:black;");
$("#mesg").text("网络异常,请重试!");
}
})
})
}
});
//切换登陆方式
@ -152,7 +152,7 @@
$("#telmesg").text("手机号不能为空");
return
}
if(!(/^1[3456789]\d{9}$/.test(mobile))){
if(!(/^1[3456789]\d{9}$/.test(mobile))){
$("#telisMsg").attr("style","display:black;");
$("#telmesg").text("手机号格式不正确");
return
@ -169,13 +169,13 @@
},
async:false,
success:function (res) {
},
error:function (error) {
$("#isMsg").attr("style","display:black;");
$("#mesg").text("网络异常,请重试!");
}
})
})
}
}
@ -204,10 +204,10 @@
/*验证码*/
function changeValidateCode(obj) {
//获取当前的时间作为参数,无具体意义
//获取当前的时间作为参数,无具体意义
var timenow = new Date().getTime();
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
obj.src = ctx + "/login/gdAdminChart.do?d=" + timenow;
}
@ -329,7 +329,7 @@
id="loginname" name="loginname" placeholder="请输入用户名" />
</div>
<div class="lgn-tr">
<span class="icon-pwd"></span>
<span class="icon-pwd"></span>
<input type="password" class="lgnipt" id="password" name="password" autocomplete="off" placeholder="请输入密码" />
</div>
<div class="lgn-tr" id="isChart" style="display: none;">
@ -383,4 +383,4 @@
</div>
</div>
</body>
</html>
</html>

@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/favicon_1.ico" />
<link rel="stylesheet" href="/html/common/css/lncss.css" />
<title>一部手机游管理平台</title>
<title>衡水老白干景区管理平台</title>
<link href="/html/common/css/color_lv.css" rel="stylesheet" />
<link rel="stylesheet" href="/html/common/layui/css/layui.css">
<script src="/html/common/layui/layui.all.js"></script>
@ -24,7 +24,7 @@
function time(o){
if (wait==0) {
o.removeAttribute("disabled");
o.innerHTML="点击获取手机验证码";
o.innerHTML="点击获取手机验证码";
o.style.backgroundColor="";
wait=60;
}else{
@ -37,9 +37,9 @@
},1000)
}
} */
var timer; //timer变量,控制时间
var curCount;//当前剩余秒数
function sendMessage() {
@ -49,7 +49,7 @@
$("#getCode").html("请在" + curCount + "秒内输入验证码");
timer = window.setInterval(SetRemainTime, 1000); //启动计时器,1秒执行一次
}
//timer处理函数
function SetRemainTime() {
if (curCount == 0) {
@ -63,10 +63,10 @@
$("#getCode").html("请在" + curCount + "秒内输入验证码");
}
}
//通过localStorage获取还剩多少时间
function getCount() {
var now=new Date().getTime();
var now=new Date().getTime();
if(localStorage.getItem('origTime')){
var old=localStorage.getItem('origTime');
var remainTime=(now - old)/1000;
@ -77,14 +77,14 @@
}else{
localStorage.setItem('origTime',now);
return 30;
}
}
}else{
localStorage.setItem('origTime',now);
return 30;
return 30;
}
}
$(function(){
if(userKey==undefined){
$("#hidMobileLogin").css("display","");
@ -118,11 +118,11 @@
$("#isMsg").attr("style","display:black;");
$("#mesg").text("网络异常,请重试!");
}
})
})
}
});
//切换登陆方式
@ -152,7 +152,7 @@
$("#telmesg").text("手机号不能为空");
return
}
if(!(/^1[3456789]\d{9}$/.test(mobile))){
if(!(/^1[3456789]\d{9}$/.test(mobile))){
$("#telisMsg").attr("style","display:black;");
$("#telmesg").text("手机号格式不正确");
return
@ -169,13 +169,13 @@
},
async:false,
success:function (res) {
},
error:function (error) {
$("#isMsg").attr("style","display:black;");
$("#mesg").text("网络异常,请重试!");
}
})
})
}
}
@ -204,10 +204,10 @@
/*验证码*/
function changeValidateCode(obj) {
//获取当前的时间作为参数,无具体意义
//获取当前的时间作为参数,无具体意义
var timenow = new Date().getTime();
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
//每次请求需要一个不同的参数,否则可能会返回同样的验证码
//这和浏览器的缓存机制有关系,也可以把页面设置为不缓存,这样就不用这个参数了。
obj.src = ctx + "/login/gdAdminChart.do?d=" + timenow;
}
@ -329,7 +329,7 @@
id="loginname" name="loginname" placeholder="请输入用户名" />
</div>
<div class="lgn-tr">
<span class="icon-pwd"></span>
<span class="icon-pwd"></span>
<input type="password" class="lgnipt" id="password" name="password" autocomplete="off" placeholder="请输入密码" />
</div>
<div class="lgn-tr" id="isChart" style="display: none;">
@ -383,4 +383,4 @@
</div>
</div>
</body>
</html>
</html>

@ -13,4 +13,8 @@ if(a.search("https://app.xawl.gov.cn/") != -1){
host="http://144.7.116.46:10001/";
yjyhost="http://144.7.116.46:10001/";
}else if (a.search("http://192.168.130.109:8083/"!=-1)){
host="http://192.168.130.109:8083/";
yjyhost="http://192.168.130.109:8083/";
}

@ -0,0 +1,333 @@
<!DOCTYPE html>
<html xmlns:th="http://www.w3.org/1999/XSL/Transform">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta name="description" content="A fully featured admin theme which can be used to build CRM, CMS, etc."/>
<meta name="author" content="Coderthemes"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<link rel="stylesheet" href="/html/common/layui/css/layui.css">
<link rel="stylesheet" href="/html/common/css/style.css">
</head>
<body>
<div class="layui-fluid">
<div class="layui-card" id="cz">
<form class="layui-form">
<div class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="app-forum-list"
style="min-height: 40px;height: auto">
<div class="layui-row layui-form-item">
<div class="layui-block">
<label class="layui-form-label">景区名称</label>
<div class="layui-input-block">
<input id="mname" name="mname" type="text" placeholder="请输入" autocomplete="off" value=""
class="layui-input">
</div>
</div>
<div class="layui-block">
<button class="layui-btn layui-btn-sm layuiadmin-btn-forum-list" type="button"
data-type="reload" id="sou">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
</button>
<button class="layui-btn layui-btn-sm layuiadmin-btn-forum-list" type="button" id="reset">
<i class="layui-icon layui-icon-refresh layuiadmin-button-btn"></i>重置
</button>
</div>
</div>
</div>
</form>
<div class="layui-card-body">
<div style="padding-bottom: 1px;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-forum-list" id="add">
<i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增
</button>
</div>
</div>
</div>
<table id="datatable" lay-filter="tablefilter"></table>
</div>
</body>
<script src="/html/common/js/jquery-3.6.0.js"></script>
<script src="/html/common/layui/layui.all.js"></script>
<script src="/html/common/js/initParam.js"></script>
<script src="/html/common/js/cjy_common.js"></script>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
class="layui-icon layui-icon-edit"></i>修改</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
</script>
<script>
var tablehight = tableHight();
layui.use('table', function () {
var table = layui.table;
table.render({
elem: '#datatable',
even: true, //隔行换色
url: ctx + 'appointmentSetting/appointmentSettingList', //数据接口
parseData: function(res){ // res 即为原始返回的数据
// JSON.parse(JSON.stringify(res))
console.log(res,';l;;;;')
return {
"code" : res.status,
"msg": res.msg,
"count": res.data.count,
"data":res.data.data
};
},
method: 'POST',
contentType: 'application/json',
cols: [[ //表头
// {field: 'ssort',title: '排序',width: '6%',templet: function(d) {return '<input id = "sort'+ (d.guid || ' ') +'" onblur="updateSort(\''+d.guid+'\')" value="' + (d.ssort || ' ') +'" type="text" style="width:25px"></input>'}},
// {field: 'xh', title: '序号', width: '2%', type: 'numbers'},
{field: 'sname', title: '景区名称', width: '14%', align: 'center'},
{
field: 'state', title: '是否启用', width: '8%', align: 'center', templet: function (d) {
console.log('lllll', d)
var ischecked = d.state != 1 ? '' : 'checked';
return '<input type="checkbox" name="state" lay-filter="state" lay-skin="switch" lay-text="是|否" ' + ischecked + ' value="' + d.id + '">'
}
},
{title: '操作', width: '41%', align: 'center', toolbar: '#barDemo'},
{fixed: 'fid', hide: true}
]],
id: 'tableId',
page: true, //开启分页
height: tablehight,
response: {
statusCode: 200 // 重新规定成功的状态码为 200,table 组件默认为 0
},
});
//搜索
var $ = layui.$, active = {
reload: function () {
table.reload('tableId', {
page: {curr: 1},
where: {
mtitle: $('#mtitle').val(),
mname: $('#mname').val()
}
});
}
};
//点击搜索按钮
$('#sou').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
//点击重置按钮
$('#reset').on('click', function () {
var form = layui.form;
$("#mname").val("");
form.render('select');
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
table.reload('tableId', {
page: {curr: 1},
where: {
mname: $('#mname').val()
}
});
});
//监听添加按钮
$('#add').on('click', function () {
layer.open({
type: 2,
title: '新增',
area: ['90%', '90%'],
maxmin: true,
content: "/html/back/scenicBasic/scenicBasicInfoAdd.html",
success: function (index, layero) {
$(':focus').blur();//让按钮失去焦点
},
/*end: function(index, layero){
table.reload('tableId', {page : {curr : 1}});
}*/
});
});
//监听导入按钮
$('#daoru').on('click', function () {
layer.open({
type: 2,
title: '数据导入',
area: ['60%', '50%'],
maxmin: true,
content: ctx + '/scenicInfo/daoru.do?',
success: function (index, layero) {
$(':focus').blur();//让按钮失去焦点
},
/*end: function(index, layero){
table.reload('tableId', {page : {curr : 1}});
}*/
});
});
//监听模板下载按钮
$('#mobanxiazai').on('click', function () {
window.location.href = ctx + "/doc/materialsmodel.xls";
});
//监听行工具事件
table.on('tool(tablefilter)', function (obj) {
var data = obj.data;
window.localStorage.setItem("bydata", JSON.stringify(data));
if (obj.event === 'del') {
layer.confirm('确定要删除【' + data['sname'] + '】吗?', function (index) {
var sid = data.guid;
deldevicelease(sid);
obj.del();
layer.close(index);
});
} else if (obj.event === 'edit') {
layer.open({
type: 2,
title: '编辑',
area: ['90%', '90%'],
maxmin: true,
content: '/html/back/scenicBasic/scenicBasicInfoAdd.html?guid=' + data['guid'],
success: function (layero, index) {
// 获取子页面的iframe
var iframe = window['layui-layer-iframe' + index];
// 向子页面的全局函数child传参
//iframe.showData(data);
}/*,
end: function(index, layero){
table.reload('tableId',{page:{curr:1}});
}*/
});
} else if (obj.event === 'xiangq') {
layer.open({
type: 2,
title: '绑定管理',
area: ['70%', '90%'],
maxmin: true,
content: "/html/back/scenicBasic/scenicBasicInfoBand.html?guid=" + data['guid'],
success: function (layero, index) {
// 获取子页面的iframe
var iframe = window['layui-layer-iframe' + index];
// 向子页面的全局函数child传参
iframe.showData(data);
}/*,
end: function(index, layero){
table.reload('tableId',{page:{curr:1}});
}*/
});
} else if (obj.event === 'scenicTicket') {
layer.open({
type: 2,
title: '门票管理',
area: ['90%', '90%'],
maxmin: true,
content: "/html/back/scenicTicket/list_scenicTicket.html?sid=" + data['guid'],
});
} else if (obj.event === 'bindUser') {
layer.open({
type: 2,
title: data['sname'] + "管理员",
area: ['60%', '90%'],
maxmin: true,
content: "/html/back/ybsjScenicBindUser/list_scenicBindUser.html?sid=" + data['guid'] + "&sname=" + data['sname'],
});
} else if (obj.event === 'appointLook') {
layer.open({
type: 2,
title: data['sname'] + "预约列表",
area: ['90%', '90%'],
maxmin: true,
content: "/html/back/ybsjReserve/list_reserve.html?sid=" + data['guid'] + "&sname=" + data['sname'],
});
}
});
function deldevicelease(sid) {
$.ajax({
url: ctx + "/scenicInfo/delScenicInfo.do",
data: {guid: sid},
type: "post",
dataType: "json",
xhrFields: {
withCredentials: true // 这里设置了withCredentials
},
async: false,
success: function (data) {
if (data) {
$(".layui-laypage-btn")[0].click(); //刷新
layer.msg("删除成功");
} else {
$(".layui-laypage-btn")[0].click(); //刷新
layer.msg("删除失败");
}
}
})
}
});
//格式化日期
function formatDate(date) {
var ru = "";
if (!isEmpty(date)) {
var time = new Date(date);
var mon = time.getMonth() + 1;//月
var day = time.getDate();//日
ru = time.getFullYear() + "-" + (mon < 10 ? "0" + mon : mon) + "-" + (day < 10 ? "0" + day : day);
}
return ru;
}
//修改排序
function updateSort(guid) {
var sortValue = $("#sort" + guid).val();
$.ajax({
url: ctx + '/scenicInfo/updateSort.do',
data: {guid: guid, ssort: sortValue},
type: 'post',
datatype: 'json',
xhrFields: {
withCredentials: true // 这里设置了withCredentials
},
async: false,
success: function (json) {
json = eval('(' + json + ')');
if (json.data) {
layer.msg("修改成功!");
}
}
});
}
//是否推荐
layui.form.on('switch(state)', function (data) {
console.log(data, '909090')
$.ajax({
url: ctx + '/appointmentSetting/stateSwitch',
type: 'post',
datatype: 'json',
xhrFields: {
withCredentials: true // 这里设置了withCredentials
},
async: false,
data: {guid: data.elem.value, scenicId: data.elem.value, state: data.elem.checked == true ? '1' : '0'},
success: function (json) {
json = eval('(' + json + ')');
if (json.data) {
if (data.elem.checked) {
layer.msg("启用成功!");
} else {
layer.msg("关闭成功!");
}
}
}
});
});
</script>
</html>

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

@ -1,4 +1,4 @@
document.title = "一部手机游管理平台";
document.title = "衡水老白干景区管理平台";
//本地接口访问地址
// var ctx = "http://127.0.0.1:8083/";
@ -7,9 +7,9 @@ document.title = "一部手机游管理平台";
//内网ip
var ctx = "http://192.168.110.158:8083/";
var frontctx = "http://192.168.110.158:8083/";
var filectx = "http://192.168.110.158:8083/";
var ctx = "http://192.168.130.109:8083/";
var frontctx = "http://192.168.130.109:8083/";
var filectx = "http://192.168.130.109:8083/";
//
@ -30,4 +30,4 @@ var filectx = "http://192.168.110.158:8083/";
// ctx="http://144.7.116.46:10001/";
// frontctx="http://144.7.116.46:10001/";
// filectx="http://144.7.116.46:10001/";
//}
//}

Loading…
Cancel
Save