记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit c1330a00 authored by dongchun's avatar dongchun
Browse files
Options

修改后台bug

parent ec38528f
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 55 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/organization/list.html
View file @ c1330a00
...@@ -40,6 +40,12 @@ ...@@ -40,6 +40,12 @@
.layui-layer-shade{ .layui-layer-shade{
opacity: 30%; opacity: 30%;
} }
.item div {
display: flex;
}
.item div a{
margin-left: 12px;
}
</style> </style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
...@@ -86,12 +92,31 @@ ...@@ -86,12 +92,31 @@
<p>地区</p> <p>地区</p>
<div class="detail_inner detail_address"></div> <div class="detail_inner detail_address"></div>
<p class="detail_title">总代</p> <p class="detail_title">总代</p>
<p>姓名</p> <div id="smileUserVoOrgListTotal">
<div class="detail_inner detail_z_name"></div> <!-- <div class="item">
<p>手机号</p> <div>
<div class="detail_inner detail_z_mobile"></div> <p>姓名：</p>
<div class="detail_inner detail_z_name">范德萨发</div>
<a href="javascript:;">查看详情</a>
</div>
<div>
手机号：<span>123456</span>
</div>
</div> -->
</div>
<p class="detail_title">普代</p> <p class="detail_title">普代</p>
<div id="smileUserVoOrgListOrdinary">
<!-- <div class="item">
<div>
<p>姓名: </p>
<div class="detail_inner detail_z_mobile">范德萨发</div>
<a href="javascript:;">查看详情</a>
</div>
<div>
手机号： <span>215545</span>
</div>
</div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -217,7 +242,10 @@ ...@@ -217,7 +242,10 @@
} }
}); });
} }
function goDetail (uid) {
var url = ctx+'local/smileDetail?id=' + uid;
$.modal.openTab("用户详情", url);
}
function todetail(id) { function todetail(id) {
layer.open({ layer.open({
type: 1, type: 1,
...@@ -230,20 +258,39 @@ ...@@ -230,20 +258,39 @@
url: orifix + '/getOrgById', url: orifix + '/getOrgById',
data: {id: id}, data: {id: id},
success:function(e) { success:function(e) {
$('.detail_name').text(e.data.name); let { data } = e;
$('.detail_address').text(e.data.province + ' ' + e.data.city + ' ' + e.data.area); console.log(data)
if (e.data.smileUserVoOrgListTotal) { $('.detail_name').text(data.name);
$('.detail_z_name').text(e.data.smileUserVoOrgListTotal[0].name); $('.detail_address').text(data.province||'' + ' ' + data.city||'' + ' ' + data.area||'');
$('.detail_z_mobile').text(e.data.smileUserVoOrgListTotal[0].phone); if (data.smileUserVoOrgListTotal) {
let str = '';
str += `<div class="item">
<div>
<p>姓名：</p>
<div class="detail_inner detail_z_name">${data.smileUserVoOrgListTotal.name}</div>
<a href="javascript:;" onclick="goDetail('${data.smileUserVoOrgListTotal.uid}')">查看详情</a>
</div>
<div>
手机号：<span>${data.smileUserVoOrgListTotal.phone}</span>
</div>
</div>`
$("#smileUserVoOrgListTotal").html(str);
} }
if (e.data.smileUserVoOrgListOrdinary) { if (data.smileUserVoOrgListOrdinary && data.smileUserVoOrgListOrdinary.length > 0) {
for (var i in e.data.smileUserVoOrgListOrdinary) { let str = '';
console.log(e.data.smileUserVoOrgListOrdinary[i]) data.smileUserVoOrgListOrdinary.forEach(item => {
$('#detailPro .file-loading').append( str += `<div class="item">
'<p>姓名</p><div className="detail_inner detail_p_name">' + e.data.smileUserVoOrgListOrdinary[i].name + '</div>' + <div>
'<p>手机号</p><div className="detail_inner detail_p_mobile">' + e.data.smileUserVoOrgListOrdinary[i].phone + '</div>' <p>姓名：</p>
) <div class="detail_inner detail_z_name">${item.name}</div>
} <a href="javascript:;" onclick="goDetail('${item.uid}')">查看详情</a>
</div>
<div>
手机号：<span>${item.phone}</span>
</div>
</div>`
})
$("#smileUserVoOrgListOrdinary").html(str);
} }
} }
}) })
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/detail.html
View file @ c1330a00
...@@ -13,9 +13,17 @@ ...@@ -13,9 +13,17 @@
<p>演出地点</p> <p>演出地点</p>
<div class="detail_inner detail_place"></div> <div class="detail_inner detail_place"></div>
<p>票提设置</p> <p>票提设置</p>
<div class="detail_inner detail_option"></div> <div class="detail_inner detail_option">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<p>代理票种</p> <p>代理票种</p>
<div class="detail_inner detail_pur"></div> <div class="detail_inner detail_pur">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table2"></table>
</div>
</div>
<p>演出详情</p> <p>演出详情</p>
<div class="detail_inner detail_main"></div> <div class="detail_inner detail_main"></div>
</body> </body>
...@@ -34,11 +42,90 @@ ...@@ -34,11 +42,90 @@
performancesId: perId performancesId: perId
}, },
success:function(e) { success:function(e) {
$('.detail_title span').text(e.data.title); let { data } = e;
$('.detail_img img').attr('src', e.data.imgPoster); console.log(data, 'data')
$('.detail_time').text(e.data.timeStart + '-' + e.data.timeEnd); $('.detail_title span').text(data.title);
$('.detail_place').text(e.data.fieldName); $('.detail_img img').attr('src', data.imgPoster);
$('.detail_option').text(e.data.detail_option); $('.detail_time').text(data.timeStart + '-' + data.timeEnd);
$('.detail_place').text(data.fieldName);
$('.detail_option').text(data.detail_option);
$('.detail_main').html(data.detail_option);
// 新增表格数据
var options = {
data: data.showAgentVoList,
id: 'bootstrap-table',
pagination: false,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
sidePagination: "client",
columns: [
{
field: 'totalCarry',
title: '总代票提',
formatter: function (value, row, index) {
return value*100 + '%'
}
},
{
field: 'ordCarry',
title: '普代票提',
formatter: function (value, row, index) {
return value*100 + '%'
}
},
{
field: 'content',
title: '特殊代理票提'
}
]
};
$.table.init(options);
var options2 = {
data: data.showTicketVoList,
id: 'bootstrap-table2',
pagination: false,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
sidePagination: "client",
columns: [
{
field: 'title',
title: '票种名'
},
{
field: 'price',
title: '单价'
},
{
field: 'type',
title: '类型'
},
{
field: 'type',
title: '使用时间',
formatter: function (value, row, index) {
return $.common.dateFormat(new Date(row.useStart), 'yyyy-MM-dd HH:mm:ss') + ' - ' + $.common.dateFormat(new Date(row.useEnd), 'yyyy-MM-dd HH:mm:ss')
}
},
{
field: 'totalGeneral',
title: '库存'
},
{
field: 'agentSaleNum',
title: '代理销售数量'
},
{
field: 'totalPrice',
title: '销售金额'
}
]
};
$.table.init(options2);
} }
}) })
</script> </script>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/detail.html
View file @ c1330a00
...@@ -91,12 +91,12 @@ ...@@ -91,12 +91,12 @@
<div class="user_item"> <div class="user_item">
<div class="name_box"> <div class="name_box">
<h3>用户身份:</h3> <h3>用户身份:</h3>
<span>代理/总代/特邀代理/志愿者</span> <span id="type">代理/总代/特邀代理/志愿者</span>
</div> </div>
<div class="name_box"> <!-- <div class="name_box">
<h3>状态:</h3> <h3>状态:</h3>
<span>正常/黑名单</span> <span>正常/黑名单</span>
</div> </div> -->
</div> </div>
<div class="user_item_box"> <div class="user_item_box">
<div class="title"> <div class="title">
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<div class="user_items_box"> <div class="user_items_box">
<div class="items2" style="display: flex;"> <div class="items2" style="display: flex;">
<p style="font-weight: 500">照片:</p> <p style="font-weight: 500">照片:</p>
<img style="height: 120px;" src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt=""> <img id="photo" style="height: 120px;" src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt="">
</div> </div>
<div class="items"> <div class="items">
<p>真实姓名:</p> <p>真实姓名:</p>
...@@ -113,38 +113,38 @@ ...@@ -113,38 +113,38 @@
</div> </div>
<div class="items"> <div class="items">
<p>出生日期:</p> <p>出生日期:</p>
<input type="text" disabled id="name" autocomplete="off" value="2022.04.20" class="layui-input"> <input type="text" disabled id="bornTime" autocomplete="off" value="2022.04.20" class="layui-input">
</div> </div>
<div class="items"> <div class="items">
<p>性别:</p> <p>性别:</p>
<span class="selectedSp">男</span> <span id="sex1" class="selectedSp">男</span>
<span>女</span> <span id="sex2">女</span>
</div> </div>
<div class="items"> <div class="items">
<p>所在城市:</p> <p>所在城市:</p>
<input type="text" disabled id="name" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input"> <input type="text" disabled id="citys" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div> </div>
<div class="items"> <div class="items">
<p>详细地址:</p> <p>详细地址:</p>
<input type="text" disabled id="name" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input"> <input type="text" disabled id="address" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div> </div>
<div class="items"> <div class="items">
<p>类型:</p> <p>类型:</p>
<span class="selectedSp">在校学生</span> <span id="identity1" class="selectedSp">在校学生</span>
<span>已毕业</span> <span id="identity2">已毕业</span>
</div> </div>
<div class="items"> <div class="items">
<p>学校全称/单位名称:</p> <p>学校全称/单位名称:</p>
<input type="text" disabled id="name" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input"> <input type="text" disabled id="schoolName" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div> </div>
<div class="items"> <div class="items">
<p>所学专业/所在部门:</p> <p>所学专业/所在部门:</p>
<input type="text" disabled id="name" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input"> <input type="text" disabled id="schoolMajor" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div> </div>
<div class="items"> <!-- <div class="items">
<p>微信号:</p> <p>微信号:</p>
<input type="text" disabled id="name" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input"> <input type="text" disabled id="wechat" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div> </div> -->
</div> </div>
</div> </div>
<div class="user_item_box"> <div class="user_item_box">
...@@ -154,10 +154,10 @@ ...@@ -154,10 +154,10 @@
<div class="user_items_box"> <div class="user_items_box">
<div class="items2"> <div class="items2">
<p>姓名：<span>张三</span></p> <p>姓名：<span>张三</span></p>
<p>身份证号：<span>211481199302641564</span></p> <p>身份证号：<span id="idCard">211481199302641564</span></p>
<p>有效期：<span>长期/2021年12月27日到期</span></p> <!-- <p>有效期：<span>长期/2021年12月27日到期</span></p> -->
</div> </div>
<div class="items"> <!-- <div class="items">
<div class="showImg"> <div class="showImg">
<p>身份证正面:</p> <p>身份证正面:</p>
<img src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt=""> <img src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt="">
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<p>手持身份证:</p> <p>手持身份证:</p>
<img src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt=""> <img src="https://img.zhengzai.tv/banner/2022/02/28/6735ab4d9baf467998e80dcd70fee527.jpeg?x-oss-process=image/resize,s_400" alt="">
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="user_item_box"> <div class="user_item_box">
...@@ -179,12 +179,12 @@ ...@@ -179,12 +179,12 @@
</div> </div>
<div class="user_items_box"> <div class="user_items_box">
<div class="items2"> <div class="items2">
<textarea id="remark" name="remark" class="form-control" style="height: 200px;width: 50%">先随便写点啥</textarea> <textarea disabled id="specialty" name="remark" class="form-control" style="height: 200px;width: 50%">先随便写点啥</textarea>
</div> </div>
<div class="items"> <!-- <div class="items">
<p>作品链接:</p> <p>作品链接:</p>
<input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input"> <input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input">
</div> </div> -->
</div> </div>
</div> </div>
<div class="user_item_box"> <div class="user_item_box">
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
</div> </div>
<div class="user_items_box"> <div class="user_items_box">
<div class="items2"> <div class="items2">
<textarea id="remark" name="remark" class="form-control" style="height: 200px;width: 50%">先随便写点啥</textarea> <textarea disabled id="introduce" name="remark" class="form-control" style="height: 200px;width: 50%">先随便写点啥</textarea>
</div> </div>
</div> </div>
</div> </div>
...@@ -202,17 +202,17 @@ ...@@ -202,17 +202,17 @@
<span></span><h3>社交主页</h3> <span></span><h3>社交主页</h3>
</div> </div>
<div class="user_items_box"> <div class="user_items_box">
<div class="items"> <!-- <div class="items">
<p>抖音:</p> <p>抖音:</p>
<input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input"> <input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input">
</div> </div>
<div class="items"> <div class="items">
<p>微博:</p> <p>微博:</p>
<input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input"> <input type="text" disabled id="name" autocomplete="off" value="https://weibo.com/u/53454874" class="layui-input">
</div> </div> -->
<div class="items"> <div class="items">
<p>提交时间:</p> <p>提交时间:</p>
<p>2022年02月24日 16:43:15</p> <p id="createTime">2022年02月24日 16:43:15</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -220,6 +220,59 @@ ...@@ -220,6 +220,59 @@
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script type="text/javascript"> <script type="text/javascript">
$(function() {
let uid = getUrlParms('id');
console.log(uid, 'uid')
let data = {
uid
}
$.ajax({
url: '/smile/user/getUserById',
type: 'post',
data,
success: function(res) {
let { data } = res;
$("#photo").attr('src', data.img);
$("#name").val(data.name);
$("#bornTime").val(data.birthday);
$("#citys").val(`${data.province + ' ' + data.city + ' ' + data.area}`);
$("#schoolName").val(data.schoolName);
$("#createTime").text($.common.dateFormat(new Date(data.createdDate), 'yyyy-MM-dd HH:mm:ss'));
if (data.sex == 1) {
$('#sex1').addClass('selectedSp');
$('#sex2').removeClass('selectedSp');
} else {
$('#sex2').addClass('selectedSp');
$('#sex1').removeClass('selectedSp');
}
$("#address").val(data.address);
$("#wechat").val(data.wechat);
if (data.type == 1) {
$("#type").text('总代')
} else {
$("#type").text('普代')
}
$("#schoolMajor").val(data.schoolMajor);
if (data.identity == 1) {
$("#identity1").addClass('selectedSp');
$("#identity2").removeClass('selectedSp');
} else {
$("#identity2").addClass('selectedSp');
$("#identity1").removeClass('selectedSp');
}
$("#introduce").text(data.introduce);
$("#idCard").text(data.idCard);
$("#specialty").val(`${data.specialty1}\n${data.specialty2}\n${data.specialty3}\n`);
console.log(res, 'res')
}
})
})
function getUrlParms(name){
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)
return unescape(r[2]);
return null;
}
</script> </script>
</html> </html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html
View file @ c1330a00
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="goDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="goDetail(\'' + row.uid + '\')"><i class="fa fa-edit"></i>查看</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment