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

Skip to content

L
liquidnet-bus-v1
Commit b588b8eb authored by zhengfuxin's avatar zhengfuxin
Browse files
Options

Merge branch 'dev-smile' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev-smile

parents 1f26aa34 ba4631ea
Show whitespace changes
Inline Side-by-side
Showing with 295 additions and 272 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml
View file @ b588b8eb
...@@ -10,9 +10,9 @@ spring: ...@@ -10,9 +10,9 @@ spring:
cloud: cloud:
config: config:
# uri: http://127.0.0.1:7002/support-config # uri: http://127.0.0.1:7002/support-config
uri: http://39.107.71.112:7002/support-config # uri: http://39.107.71.112:7002/support-config
name: ${spring.application.name},${spring.application.name}-druid #默认为spring.application.name name: ${spring.application.name},${spring.application.name}-druid #默认为spring.application.name
profile: ${liquidnet.cloudConfig.profile} profile: ${liquidnet.cloudConfig.profile}
# discovery: discovery:
# enabled: true enabled: true
# service-id: liquidnet-support-config service-id: liquidnet-support-config
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/organization/list.html
View file @ b588b8eb
...@@ -258,16 +258,16 @@ ...@@ -258,16 +258,16 @@
title: '地区' title: '地区'
}, },
{ {
field: 'activityType', field: 'agentName',
title: '组长' title: '组长'
}, },
{ // {
field: 'smileUserVoOrgListOrdinary', // field: 'smileUserVoOrgListOrdinary',
title: '组员', // title: '组员',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
//
} // }
}, // },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/list.html
View file @ b588b8eb
...@@ -8,31 +8,38 @@ ...@@ -8,31 +8,38 @@
width: 800px; width: 800px;
padding-top: 20px; padding-top: 20px;
} }
#addClassify .selectClassify { #addClassify .selectClassify {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 20px; padding: 0 20px;
} }
#addClassify .selectClassify label { #addClassify .selectClassify label {
display: flex; display: flex;
margin-right: 20px; margin-right: 20px;
align-items: center; align-items: center;
} }
#addClassify .selectClassify label input { #addClassify .selectClassify label input {
margin: 0; margin: 0;
margin-right: 2px; margin-right: 2px;
} }
#detailPro .detail_inner { #detailPro .detail_inner {
margin-bottom: 20px; margin-bottom: 20px;
} }
#detailPro .detail_title { #detailPro .detail_title {
margin-top: 50px; margin-top: 50px;
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
} }
.form-group span { .form-group span {
padding-right: 20px; padding-right: 20px;
} }
.bottomBtn { .bottomBtn {
text-align: left; text-align: left;
padding: 10px 15px 12px; padding: 10px 15px 12px;
...@@ -42,24 +49,24 @@ ...@@ -42,24 +49,24 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<!-- <div class="col-sm-12 search-collapse">--> <!-- <div class="col-sm-12 search-collapse">-->
<!-- <form id="formId">--> <!-- <form id="formId">-->
<!-- <div class="select-list">--> <!-- <div class="select-list">-->
<!-- <ul>--> <!-- <ul>-->
<!-- <li>--> <!-- <li>-->
<!-- <label>手机号：</label>--> <!-- <label>手机号：</label>-->
<!-- <input type="text" name="activityTitle"/>--> <!-- <input type="text" name="activityTitle"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <!-- <li>-->
<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i--> <!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
<!-- class="fa fa-search"></i>&nbsp;搜索</a>--> <!-- class="fa fa-search"></i>&nbsp;搜索</a>-->
<!--&lt;!&ndash; <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i&ndash;&gt;--> <!--&lt;!&ndash; <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i&ndash;&gt;-->
<!--&lt;!&ndash; class="fa fa-refresh"></i>&nbsp;重置</a>&ndash;&gt;--> <!--&lt;!&ndash; class="fa fa-refresh"></i>&nbsp;重置</a>&ndash;&gt;-->
<!-- </li>--> <!-- </li>-->
<!-- </ul>--> <!-- </ul>-->
<!-- </div>--> <!-- </div>-->
<!-- </form>--> <!-- </form>-->
<!-- </div>--> <!-- </div>-->
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
...@@ -89,7 +96,7 @@ ...@@ -89,7 +96,7 @@
// // exportUrl: prefix + "/export", // // exportUrl: prefix + "/export",
// // modalName: "订单", // // modalName: "订单",
var subOArr = []; var subOArr = [];
$(function() { $(function () {
var options = { var options = {
url: smilePrefix + "/list", url: smilePrefix + "/list",
columns: [{ columns: [{
...@@ -126,7 +133,7 @@ ...@@ -126,7 +133,7 @@
{ {
field: 'status', field: 'status',
title: '打款状态', title: '打款状态',
formatter: function(value, row, index) { formatter: function (value, row, index) {
if (value == 1) { if (value == 1) {
return '已打款'; return '已打款';
} else { } else {
...@@ -137,7 +144,7 @@ ...@@ -137,7 +144,7 @@
{ {
field: 'comment', field: 'comment',
title: '序列', title: '序列',
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="topBtn(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>置顶</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="topBtn(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>置顶</a> ');
return actions.join(''); return actions.join('');
...@@ -146,7 +153,7 @@ ...@@ -146,7 +153,7 @@
{ {
title: '操作', title: '操作',
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="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> ');
...@@ -166,10 +173,11 @@ ...@@ -166,10 +173,11 @@
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ctx + 'smile/show/sort', url: ctx + 'smile/show/sort',
headers:{"Content-Type":"application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
data: JSON.stringify(postData), data: JSON.stringify(postData),
success:function(e) { success: function (e) {
// alert(e.msg)
location.reload();
} }
}); });
} }
...@@ -196,9 +204,9 @@ ...@@ -196,9 +204,9 @@
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ctx + 'smile/agent/create', url: ctx + 'smile/agent/create',
headers:{"Content-Type":"application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
data: JSON.stringify(postData), data: JSON.stringify(postData),
success:function(e) { success: function (e) {
$(".layui-layer-close1").click(); $(".layui-layer-close1").click();
} }
}); });
...@@ -218,8 +226,8 @@ ...@@ -218,8 +226,8 @@
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ctx + 'smile/agent/list?performancesId=' + id, url: ctx + 'smile/agent/list?performancesId=' + id,
headers:{"Content-Type":"application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
success:function(e) { success: function (e) {
subOArr = e.data; subOArr = e.data;
for (var i in e.data) { for (var i in e.data) {
$('#addClassify .form-group').append( $('#addClassify .form-group').append(
...@@ -234,7 +242,7 @@ ...@@ -234,7 +242,7 @@
} }
}); });
}, },
cancel: function(res){ cancel: function (res) {
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6}); // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
} }
}); });
...@@ -254,8 +262,8 @@ ...@@ -254,8 +262,8 @@
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ctx + 'smile/agent/list?performancesId=' + id, url: ctx + 'smile/agent/list?performancesId=' + id,
headers:{"Content-Type":"application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
success:function(e) { success: function (e) {
subOArr = e.data; subOArr = e.data;
for (var i in e.data) { for (var i in e.data) {
$('#addClassify .form-group').append( $('#addClassify .form-group').append(
...@@ -271,7 +279,7 @@ ...@@ -271,7 +279,7 @@
} }
}); });
}, },
cancel: function(res){ cancel: function (res) {
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6}); // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
} }
}); });
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html
View file @ b588b8eb
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('待审核')"/> <th:block th:include="include :: header('待审核')"/>
<th:block th:include="include :: bootstrap-fileinput-css" /> <th:block th:include="include :: bootstrap-fileinput-css"/>
</head> </head>
<body class="white-bg">
<div class="detail_status">用户状态：<span></span></div>
<p class="detail_title">基础资料</p>
<p>照片</p>
<div class="detail_inner detail_img"><img src=""></div>
<p>真实姓名</p>
<div class="detail_inner detail_name"></div>
<p>出生日期</p>
<div class="detail_inner detail_time"></div>
<p>性别</p>
<div class="detail_inner detail_sex"></div>
<p>所在城市</p>
<div class="detail_inner detail_city"></div>
<p>你的身份</p>
<div class="detail_inner detail_id"></div>
<p>学校全称/单位名称</p>
<div class="detail_inner detail_school"></div>
<p>所学专业/所在部门</p>
<div class="detail_inner detail_acc"></div>
<p>微信号</p>
<div class="detail_inner detail_wx"></div>
<p class="detail_title">认证信息</p>
<p>姓名：</p>
<div class="detail_inner detail_name"></div>
<p>身份证号：</p>
<div class="detail_inner detail_idcode"></div>
<p class="detail_title">自我介绍</p>
<div class="detail_inner detail_desc"></div>
<p>手机号：</p>
<div class="detail_inner detail_mobail"></div>
<p>提交时间：</p>
<div class="detail_inner detail_created"></div>
<div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="yes(1)">通过</a>
<a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal(0)">驳回</a>
</div>
<body class="white-bg">
<div class="detail_status">用户状态：<span></span></div>
<p class="detail_title">基础资料</p>
<p>照片</p>
<div class="detail_inner detail_img"><img src=""></div>
<p>真实姓名</p>
<div class="detail_inner detail_name"></div>
<p>出生日期</p>
<div class="detail_inner detail_time"></div>
<p>性别</p>
<div class="detail_inner detail_sex"></div>
<p>所在城市</p>
<div class="detail_inner detail_city"></div>
<p>你的身份</p>
<div class="detail_inner detail_id"></div>
<p>学校全称/单位名称</p>
<div class="detail_inner detail_school"></div>
<p>所学专业/所在部门</p>
<div class="detail_inner detail_acc"></div>
<p>微信号</p>
<div class="detail_inner detail_wx"></div>
<p class="detail_title">认证信息</p>
<p>姓名：</p>
<div class="detail_inner detail_name"></div>
<p>身份证号：</p>
<div class="detail_inner detail_idcode"></div>
<p class="detail_title">自我介绍</p>
<div class="detail_inner detail_desc"></div>
<p>手机号：</p>
<div class="detail_inner detail_mobail"></div>
<p>提交时间：</p>
<div class="detail_inner detail_created"></div>
<div class="bottomBtn" id = "btn-commit">
<a href="javascript:" class="a-success layui-layer-btn0" onclick="yes(1)">通过</a>
<a class="layui-layer-btn1 layui-layer-btn1 a-fail" onclick="closeModal(0)">驳回</a>
</div>
<div id="addClassify">
<div id="addClassify">
<div class="selectClassify"> <div class="selectClassify">
<div class="ibox-content"> <div class="ibox-content">
<div class="form-group"> <div class="form-group">
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
<div class="bottomBtn"> <div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(1)">确认通过</a> <a href="javascript:;" class="layui-layer-btn0" onclick="confirm(1)">确认通过</a>
</div> </div>
</div> </div>
<div id="addClassify_false"> <div id="addClassify_false">
<div class="selectClassify"> <div class="selectClassify">
<div class="ibox-content"> <div class="ibox-content">
<div class="form-group"> <div class="form-group">
...@@ -75,14 +75,14 @@ ...@@ -75,14 +75,14 @@
<div class="bottomBtn"> <div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(0)">驳回</a> <a href="javascript:;" class="layui-layer-btn0" onclick="confirm(0)">驳回</a>
</div> </div>
</div> </div>
</body> </body>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:src="@{/js/jquery.tmpl.js}"></script> <script th:src="@{/js/jquery.tmpl.js}"></script>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js"/>
<script type="text/javascript"> <script type="text/javascript">
var smilePrefix = ctx + "smile/user"; var smilePrefix = ctx + "smile/user";
var orifix = ctx + "smile/organization"; var orifix = ctx + "smile/organization";
var penddingId = window.localStorage.getItem('penddingId'); var penddingId = window.localStorage.getItem('penddingId');
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
data: { data: {
uid: penddingId uid: penddingId
}, },
success:function(e) { success: function (e) {
var detailData = e.data; var detailData = e.data;
detailObj = detailData; detailObj = detailData;
if (detailData.type == 0) { if (detailData.type == 0) {
...@@ -122,10 +122,13 @@ ...@@ -122,10 +122,13 @@
$('.detail_desc').text(detailData.introduce); $('.detail_desc').text(detailData.introduce);
$('.detail_mobail').text(detailData.phone); $('.detail_mobail').text(detailData.phone);
$('.detail_created').text(detailData.createdDate); $('.detail_created').text(detailData.createdDate);
if (detailData.type != 0) {
document.getElementById("btn-commit").style.visibility="hidden";
}
} }
}) })
function closeModal () { function closeModal() {
layer.open({ layer.open({
type: 1, type: 1,
shade: true, shade: true,
...@@ -154,10 +157,13 @@ ...@@ -154,10 +157,13 @@
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: smilePrefix + "/check/updateById", url: smilePrefix + "/check/updateById",
headers:{"Content-Type":"application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
data: JSON.stringify(postData), data: JSON.stringify(postData),
success:function(e) { success: function (e) {
$(".layui-layer-close1").click(); $(".layui-layer-close1").click();
alert(e.msg)
location.reload();
} }
}) })
} }
...@@ -169,7 +175,7 @@ ...@@ -169,7 +175,7 @@
title: '通过', //不显示标题 title: '通过', //不显示标题
content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响 content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
success: function () { success: function () {
$("input[name=idst]").change(function(e){ $("input[name=idst]").change(function (e) {
detailObj.type = e.target.value; detailObj.type = e.target.value;
var postData = { var postData = {
pageNum: 40, pageNum: 40,
...@@ -179,68 +185,77 @@ ...@@ -179,68 +185,77 @@
type: 'post', type: 'post',
url: orifix + '/list', url: orifix + '/list',
data: JSON.stringify(postData), data: JSON.stringify(postData),
success:function(res) { success: function (res) {
$('#selectTwo').html(''); $('#selectTwo').html('');
for (var i in res.rows) { for (var i in res.rows) {
$('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>'); $('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>');
} }
$('#selectTwo').change(function(){ $('#selectTwo').change(function () {
detailObj.orgId = $('#selectTwo option:selected').val(); detailObj.orgId = $('#selectTwo option:selected').val();
}) })
} }
}) })
}); });
}, },
cancel: function(res){ cancel: function (res) {
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6}); // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
} }
}); });
} }
</script> </script>
<style> <style>
.white-bg { .white-bg {
padding: 50px; padding: 50px;
} }
.white-bg .detail_inner { .white-bg .detail_inner {
margin-bottom: 20px; margin-bottom: 20px;
} }
.white-bg .detail_title { .white-bg .detail_title {
margin-top: 50px; margin-top: 50px;
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
} }
.bottomBtn { .bottomBtn {
text-align: left; text-align: left;
padding: 10px 15px 12px; padding: 10px 15px 12px;
} }
#addClassify, #addClassify_false { #addClassify, #addClassify_false {
display: none; display: none;
width: 540px; width: 540px;
padding-top: 20px; padding-top: 20px;
} }
#addClassify .selectClassify { #addClassify .selectClassify {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 20px; padding: 0 20px;
} }
#addClassify .selectClassify label { #addClassify .selectClassify label {
display: flex; display: flex;
margin-right: 20px; margin-right: 20px;
align-items: center; align-items: center;
} }
#addClassify .selectClassify label input { #addClassify .selectClassify label input {
margin: 0; margin: 0;
margin-right: 2px; margin-right: 2px;
} }
#detailPro .detail_inner { #detailPro .detail_inner {
margin-bottom: 20px; margin-bottom: 20px;
} }
#detailPro .detail_title { #detailPro .detail_title {
margin-top: 50px; margin-top: 50px;
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
} }
</style> </style>
</html> </html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java
View file @ b588b8eb
...@@ -166,7 +166,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -166,7 +166,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
//根据uid查询redis中的用户缓存信息 //根据uid查询redis中的用户缓存信息
SmileUserVO smileUserVO = getSmileUserVOFromRedis(smileUserCheckVo.getUid()); SmileUserVO smileUserVO = getSmileUserVOFromRedis(smileUserCheckVo.getUid());
if (!smileUserVO.getType().equals(0)) { if (!smileUserVO.getType().equals(0)) {
return AjaxResult.warn("已经审核过"); return AjaxResult.warn("已审核");
} }
//判断是否通过 //判断是否通过
if (smileUserCheckVo.getType().equals(4)) { if (smileUserCheckVo.getType().equals(4)) {
......
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