Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
李洋
/
消息系统
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ffbff372
authored
Dec 07, 2017
by
李洋
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
1、为大小写敏感的Linux做修改。fuck
parent
d624e727
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
8 deletions
app/Http/Controllers/MessageController.php
resources/views/common.blade.php
resources/views/message/AddTemplate.blade.php → resources/views/message/addtemplate.blade.php
resources/views/message/AllHistoryList.blade.php → resources/views/message/allhistorylist.blade.php
resources/views/message/ManualHistoryList.blade.php → resources/views/message/manualhistorylist.blade.php
resources/views/message/SendManualMessage.blade.php → resources/views/message/sendmanualmessage.blade.php
resources/views/message/TemplateList.blade.php → resources/views/message/templatelist.blade.php
app/Http/Controllers/MessageController.php
View file @
ffbff372
...
@@ -173,7 +173,7 @@ class MessageController extends Controller
...
@@ -173,7 +173,7 @@ class MessageController extends Controller
//-------------------------------模块-------------------------------
//-------------------------------模块-------------------------------
// 消息模板列表
// 消息模板列表
private
function
template
L
ist
(
Request
$request
,
$id
,
$viewid
)
private
function
template
l
ist
(
Request
$request
,
$id
,
$viewid
)
{
{
Csrf
(
$request
);
Csrf
(
$request
);
$search_desc
=
$request
->
input
(
'search_desc'
);
$search_desc
=
$request
->
input
(
'search_desc'
);
...
@@ -234,12 +234,11 @@ class MessageController extends Controller
...
@@ -234,12 +234,11 @@ class MessageController extends Controller
'search_desc'
=>
$search_desc
,
'search_desc'
=>
$search_desc
,
'search_channel'
=>
$search_channel
,
'search_channel'
=>
$search_channel
,
];
];
return
view
(
$viewid
,
$data
);
return
view
(
$viewid
,
$data
);
}
}
// 人工发送历史消息列表
// 人工发送历史消息列表
private
function
manual
HistoryL
ist
(
Request
$request
,
$id
,
$viewid
)
private
function
manual
historyl
ist
(
Request
$request
,
$id
,
$viewid
)
{
{
Csrf
(
$request
);
Csrf
(
$request
);
//搜索条件
//搜索条件
...
@@ -319,7 +318,7 @@ class MessageController extends Controller
...
@@ -319,7 +318,7 @@ class MessageController extends Controller
}
}
// 所有历史消息
// 所有历史消息
private
function
all
HistoryL
ist
(
Request
$request
,
$id
,
$viewid
)
private
function
all
historyl
ist
(
Request
$request
,
$id
,
$viewid
)
{
{
Csrf
(
$request
);
Csrf
(
$request
);
//搜索条件
//搜索条件
...
@@ -391,7 +390,7 @@ class MessageController extends Controller
...
@@ -391,7 +390,7 @@ class MessageController extends Controller
}
}
// 新增编辑消息模板
// 新增编辑消息模板
private
function
add
T
emplate
(
Request
$request
,
$id
,
$viewid
)
private
function
add
t
emplate
(
Request
$request
,
$id
,
$viewid
)
{
{
Csrf
(
$request
);
Csrf
(
$request
);
$rq_tpl_id
=
$request
->
input
(
'tpl_id'
);
$rq_tpl_id
=
$request
->
input
(
'tpl_id'
);
...
@@ -457,7 +456,7 @@ class MessageController extends Controller
...
@@ -457,7 +456,7 @@ class MessageController extends Controller
}
}
// 添加手动发送消息(会创建模板)
// 添加手动发送消息(会创建模板)
private
function
send
ManualM
essage
(
Request
$request
,
$id
,
$viewid
)
private
function
send
manualm
essage
(
Request
$request
,
$id
,
$viewid
)
{
{
Csrf
(
$request
);
Csrf
(
$request
);
$rq_log_id
=
$request
->
input
(
'log_id'
);
$rq_log_id
=
$request
->
input
(
'log_id'
);
...
...
resources/views/common.blade.php
View file @
ffbff372
...
@@ -16,11 +16,11 @@
...
@@ -16,11 +16,11 @@
}
}
</style>
</style>
</head>
</head>
@include('
M
essage.js')
@include('
m
essage.js')
<body
style=
"background-color: #f3f3f4;padding-left:15px"
>
<body
style=
"background-color: #f3f3f4;padding-left:15px"
>
@include("
M
essage.$id")
@include("
m
essage.$id")
...
...
resources/views/message/
AddT
emplate.blade.php
→
resources/views/message/
addt
emplate.blade.php
View file @
ffbff372
File moved
resources/views/message/
AllHistoryL
ist.blade.php
→
resources/views/message/
allhistoryl
ist.blade.php
View file @
ffbff372
File moved
resources/views/message/
ManualHistoryL
ist.blade.php
→
resources/views/message/
manualhistoryl
ist.blade.php
View file @
ffbff372
File moved
resources/views/message/
SendManualM
essage.blade.php
→
resources/views/message/
sendmanualm
essage.blade.php
View file @
ffbff372
File moved
resources/views/message/
TemplateL
ist.blade.php
→
resources/views/message/
templatel
ist.blade.php
View file @
ffbff372
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment