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

Skip to content

L
liquidnet-bus-v1
Commit b775809c authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 审核相关文案提示

parent 73d36bd9
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 235 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml
View file @ b775809c
...@@ -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 @ b775809c
...@@ -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/userPendingList/detail.html
View file @ b775809c
<!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"> <body class="white-bg">
<div class="detail_status">用户状态：<span></span></div> <div class="detail_status">用户状态：<span></span></div>
<p class="detail_title">基础资料</p> <p class="detail_title">基础资料</p>
<p>照片</p> <p>照片</p>
<div class="detail_inner detail_img"><img src=""></div> <div class="detail_inner detail_img"><img src=""></div>
<p>真实姓名</p> <p>真实姓名</p>
<div class="detail_inner detail_name"></div> <div class="detail_inner detail_name"></div>
<p>出生日期</p> <p>出生日期</p>
<div class="detail_inner detail_time"></div> <div class="detail_inner detail_time"></div>
<p>性别</p> <p>性别</p>
<div class="detail_inner detail_sex"></div> <div class="detail_inner detail_sex"></div>
<p>所在城市</p> <p>所在城市</p>
<div class="detail_inner detail_city"></div> <div class="detail_inner detail_city"></div>
<p>你的身份</p> <p>你的身份</p>
<div class="detail_inner detail_id"></div> <div class="detail_inner detail_id"></div>
<p>学校全称/单位名称</p> <p>学校全称/单位名称</p>
<div class="detail_inner detail_school"></div> <div class="detail_inner detail_school"></div>
<p>所学专业/所在部门</p> <p>所学专业/所在部门</p>
<div class="detail_inner detail_acc"></div> <div class="detail_inner detail_acc"></div>
<p>微信号</p> <p>微信号</p>
<div class="detail_inner detail_wx"></div> <div class="detail_inner detail_wx"></div>
<p class="detail_title">认证信息</p> <p class="detail_title">认证信息</p>
<p>姓名：</p> <p>姓名：</p>
<div class="detail_inner detail_name"></div> <div class="detail_inner detail_name"></div>
<p>身份证号：</p> <p>身份证号：</p>
<div class="detail_inner detail_idcode"></div> <div class="detail_inner detail_idcode"></div>
<p class="detail_title">自我介绍</p> <p class="detail_title">自我介绍</p>
<div class="detail_inner detail_desc"></div> <div class="detail_inner detail_desc"></div>
<p>手机号：</p> <p>手机号：</p>
<div class="detail_inner detail_mobail"></div> <div class="detail_inner detail_mobail"></div>
<p>提交时间：</p> <p>提交时间：</p>
<div class="detail_inner detail_created"></div> <div class="detail_inner detail_created"></div>
<div class="bottomBtn"> <div class="bottomBtn" id = "btn-commit">
<a href="javascript:;" class="layui-layer-btn0" onclick="yes(1)">通过</a> <a href="javascript:" class="a-success layui-layer-btn0" onclick="yes(1)">通过</a>
<a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal(0)">驳回</a> <a class="layui-layer-btn1 layui-layer-btn1 a-fail" onclick="closeModal(0)">驳回</a>
</div> </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">
<p>选择身份</p> <p>选择身份</p>
<input class="idst_radio" name="idst" type="radio" value="1">总代 <input class="idst_radio" name="idst" type="radio" value="1">总代
<input class="idst_radio" name="idst" type="radio" value="2">普代 <input class="idst_radio" name="idst" type="radio" value="2">普代
</div>
<div class="form-group">
<select name="bindType" id="selectTwo" placeholder="请选择分组"></select>
</div>
</div>
</div> </div>
<input type="hidden" class="editCon"> <div class="form-group">
<div class="bottomBtn"> <select name="bindType" id="selectTwo" placeholder="请选择分组"></select>
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(1)">确认通过</a>
</div> </div>
</div> </div>
</div>
<input type="hidden" class="editCon">
<div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(1)">确认通过</a>
</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">
<input class="reason_text" type="textarea" placeholder="请输入驳回原因"> <input class="reason_text" type="textarea" placeholder="请输入驳回原因">
</div>
</div>
</div>
<input type="hidden" class="editCon">
<div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(0)">驳回</a>
</div> </div>
</div> </div>
</body> </div>
<input type="hidden" class="editCon">
<div class="bottomBtn">
<a href="javascript:;" class="layui-layer-btn0" onclick="confirm(0)">驳回</a>
</div>
</div>
</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');
var detailObj = {} var detailObj = {}
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: smilePrefix + "/getUserById", url: smilePrefix + "/getUserById",
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) {
$('.detail_status span').text('未认证'); $('.detail_status span').text('未认证');
} }
$('.detail_img img').attr('src', detailData.img); $('.detail_img img').attr('src', detailData.img);
$('.detail_name').text(detailData.name); $('.detail_name').text(detailData.name);
$('.detail_time').text(detailData.birthday); $('.detail_time').text(detailData.birthday);
if (detailData.sex == 1) { if (detailData.sex == 1) {
$('.detail_sex').text('男'); $('.detail_sex').text('男');
} else { } else {
$('.detail_sex').text('女'); $('.detail_sex').text('女');
} }
$('.detail_city').text(detailData.province + detailData.city + detailData.area); $('.detail_city').text(detailData.province + detailData.city + detailData.area);
if (detailData.identity == 1) { if (detailData.identity == 1) {
$('.detail_id').text('在校学生'); $('.detail_id').text('在校学生');
} else { } else {
$('.detail_id').text('已毕业'); $('.detail_id').text('已毕业');
} }
$('.detail_school').text(detailData.schoolName); $('.detail_school').text(detailData.schoolName);
$('.detail_acc').text(detailData.schoolMajor); $('.detail_acc').text(detailData.schoolMajor);
$('.detail_wx').text(detailData.wechat); $('.detail_wx').text(detailData.wechat);
$('.detail_name').text(detailData.name); $('.detail_name').text(detailData.name);
$('.detail_idcode').text(detailData.idCard); $('.detail_idcode').text(detailData.idCard);
$('.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 () {
layer.open({
type: 1,
shade: true,
title: '驳回', //不显示标题
content: $('#addClassify_false') //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
});
} }
})
function confirm(num) { function closeModal() {
if (num == 1) { layer.open({
var postData = { type: 1,
id: Number(detailObj.id), shade: true,
orgId: Number(detailObj.orgId), title: '驳回', //不显示标题
type: Number(detailObj.type), content: $('#addClassify_false') //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
uid: detailObj.uid, });
} }
} else {
var postData = { function confirm(num) {
id: Number(detailObj.id), if (num == 1) {
orgId: '', var postData = {
type: 4, id: Number(detailObj.id),
uid: detailObj.uid, orgId: Number(detailObj.orgId),
reason: $('.reason_text').val() type: Number(detailObj.type),
} uid: detailObj.uid,
}
} else {
var postData = {
id: Number(detailObj.id),
orgId: '',
type: 4,
uid: detailObj.uid,
reason: $('.reason_text').val()
} }
$.ajax({
type: 'post',
url: smilePrefix + "/check/updateById",
headers:{"Content-Type":"application/json;charset=UTF-8"},
data: JSON.stringify(postData),
success:function(e) {
$(".layui-layer-close1").click();
}
})
} }
$.ajax({
type: 'post',
url: smilePrefix + "/check/updateById",
headers: {"Content-Type": "application/json;charset=UTF-8"},
data: JSON.stringify(postData),
success: function (e) {
$(".layui-layer-close1").click();
alert(e.msg)
function yes() { location.reload();
layer.open({ }
type: 1, })
shade: true, }
title: '通过', //不显示标题
content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响 function yes() {
success: function () { layer.open({
$("input[name=idst]").change(function(e){ type: 1,
detailObj.type = e.target.value; shade: true,
var postData = { title: '通过', //不显示标题
pageNum: 40, content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
pageSize: 1 success: function () {
} $("input[name=idst]").change(function (e) {
$.ajax({ detailObj.type = e.target.value;
type: 'post', var postData = {
url: orifix + '/list', pageNum: 40,
data: JSON.stringify(postData), pageSize: 1
success:function(res) { }
$('#selectTwo').html(''); $.ajax({
for (var i in res.rows) { type: 'post',
$('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>'); url: orifix + '/list',
} data: JSON.stringify(postData),
$('#selectTwo').change(function(){ success: function (res) {
detailObj.orgId = $('#selectTwo option:selected').val(); $('#selectTwo').html('');
}) for (var i in res.rows) {
$('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>');
} }
}) $('#selectTwo').change(function () {
}); detailObj.orgId = $('#selectTwo option:selected').val();
}, })
cancel: function(res){ alert(e.msg)
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6}); location.reload();
} }
}); })
} });
</script> },
cancel: function (res) {
// layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
}
});
}
</script>
<style> <style>
.white-bg { .white-bg {
padding: 50px; padding: 50px;
} }
.white-bg .detail_inner {
margin-bottom: 20px; .white-bg .detail_inner {
} margin-bottom: 20px;
.white-bg .detail_title { }
margin-top: 50px;
font-weight: bold; .white-bg .detail_title {
font-size: 16px; margin-top: 50px;
} font-weight: bold;
.bottomBtn { font-size: 16px;
text-align: left; }
padding: 10px 15px 12px;
} .bottomBtn {
#addClassify, #addClassify_false { text-align: left;
display: none; padding: 10px 15px 12px;
width: 540px; }
padding-top: 20px;
} #addClassify, #addClassify_false {
#addClassify .selectClassify { display: none;
display: flex; width: 540px;
align-items: center; padding-top: 20px;
padding: 0 20px; }
}
#addClassify .selectClassify label { #addClassify .selectClassify {
display: flex; display: flex;
margin-right: 20px; align-items: center;
align-items: center; padding: 0 20px;
} }
#addClassify .selectClassify label input {
margin: 0; #addClassify .selectClassify label {
margin-right: 2px; display: flex;
} margin-right: 20px;
#detailPro .detail_inner { align-items: center;
margin-bottom: 20px; }
}
#detailPro .detail_title { #addClassify .selectClassify label input {
margin-top: 50px; margin: 0;
font-weight: bold; margin-right: 2px;
font-size: 16px; }
}
</style> #detailPro .detail_inner {
margin-bottom: 20px;
}
#detailPro .detail_title {
margin-top: 50px;
font-weight: bold;
font-size: 16px;
}
</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 @ b775809c
...@@ -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