Skip to content

李洋 / 消息系统

Go to a project
Commit a69af574 by 肖康
Options

log

parent 80c850e6
Inline Side-by-side
Showing with 23 additions and 14 deletions
public/js/Message/MessageList.js
...@@ -223,13 +223,15 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () { ...@@ -223,13 +223,15 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () {
success: function (layero, dIndex) { success: function (layero, dIndex) {
table.render({ table.render({
elem: '#logList', elem: '#logList',
url: '/api/log/getCustomerUserLogs', url: '/sync/getLogs',
method: 'GET', method: 'GET',
size: 'sm', size: 'sm',
page: false, page: false,
where: { where: {
obj_type: 1613, obj_type: 100,
obj_id: data.id obj_id: data.business_notice_id,
page:1,
limit:1000000,
}, },
cols: [[ cols: [[
{ type: 'numbers', title: '序号' }, { type: 'numbers', title: '序号' },
...@@ -238,14 +240,14 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () { ...@@ -238,14 +240,14 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () {
{ field: 'content', title: '内容' } { field: 'content', title: '内容' }
]], ]],
limit: 1000000, limit: 1000000,
parseData: function (res) { // parseData: function (res) {
return { // return {
code: res.code, // code: res.code,
msg: res.msg, // msg: res.msg,
count: res.data ? res.data.length : 0, // count: res.data ? res.data.length : 0,
data: res.data // data: res.data
} // }
}, // },
done: function (res, curr, count) { done: function (res, curr, count) {
} }
......
public/js/public_notice.js
...@@ -20,7 +20,7 @@ layui.use([], function () { ...@@ -20,7 +20,7 @@ layui.use([], function () {
const css = ` const css = `
.nrtx{line-height:38px;} .nrtx{line-height:38px;}
.noticeitemxo{margin-right:30px;cursor: pointer;} .noticeitemxo{margin-right:30px;cursor: pointer;}
#ann_box{position:fixed;top:0;left:${left}px;right:400px;height:50px;line-height:50px;background:rgba(255,255,255,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;} #ann_box{position:fixed;top:0;left:${left}px;right:400px;height:50px;line-height:50px;background:rgba(0,0,0,0.1);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
#ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 300s linear infinite;} #ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 300s linear infinite;}
@keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`; @keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`;
const html = `<div id="ann_box"><div id="ann_txt"></div></div>`; const html = `<div id="ann_box"><div id="ann_txt"></div></div>`;
...@@ -80,6 +80,13 @@ layui.use([], function () { ...@@ -80,6 +80,13 @@ layui.use([], function () {
node.style.animation = ''; node.style.animation = '';
}, },
handle: function () { handle: function () {
$('.layui-header .layui-icon-shrink-right').closest('.layui-nav-item').on('click', function () {
setTimeout(function(){
$("#ann_box").css({"left":`${$(".layui-layout.layui-layout-admin").hasClass("admin-nav-mini")?'240px':'400px'}`})
},500)
});
document.getElementById('ann_box').addEventListener('mouseenter', () => { document.getElementById('ann_box').addEventListener('mouseenter', () => {
document.getElementById('ann_txt').style.animationPlayState = 'paused'; document.getElementById('ann_txt').style.animationPlayState = 'paused';
}); });
...@@ -110,14 +117,14 @@ layui.use([], function () { ...@@ -110,14 +117,14 @@ layui.use([], function () {
</div> </div>
</div> </div>
<div style="padding-left:39px;">公告详情</div> <div style="padding-left:39px;">公告详情</div>
<div class="noticedetailcs" style="padding-left:39px;padding-top:15px;width:1060px;overflow-x: auto;"></div> <div class="noticedetailcs" style="padding-left:39px;padding-top:15px;max-width:1060px;overflow-x: auto;"></div>
</div> </div>
` `
layer.open({ layer.open({
type: 1, type: 1,
title: '公告详情', title: '公告详情',
offset: '50px', offset: '50px',
area: ['1100px', '450'], area: ['1100px', '450px'],
shadeClose: false, shadeClose: false,
resize: false, resize: false,
move: false, move: false,
......
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 sign in to comment