Skip to content

李洋 / 消息系统

Go to a project
Commit c5ef9078 by 李洋
Options

1...

parent ec3a2067
Inline Side-by-side
Showing with 11 additions and 10 deletions
app/Http/Controllers/MessageApiController.php
...@@ -310,7 +310,7 @@ class MessageApiController extends Controller ...@@ -310,7 +310,7 @@ class MessageApiController extends Controller
$params['msg_type'] = $data['msg_type']; $params['msg_type'] = $data['msg_type'];
// $params['creater'] = $data['creater']; // $params['creater'] = $data['creater'];
$params['description'] = $data['description']; $params['description'] = $data['description'];
$params['ex_str'] = $data['tpl_key']; $params['ex_str'] = $data['true_description'];
$params['title_1'] = $data['title_1']; $params['title_1'] = $data['title_1'];
$params['title_3'] = $data['title_3']; $params['title_3'] = $data['title_3'];
$params['content_1'] = $data['content_1']; $params['content_1'] = $data['content_1'];
......
app/Http/Controllers/MessageController.php
...@@ -268,9 +268,11 @@ class MessageController extends Controller ...@@ -268,9 +268,11 @@ class MessageController extends Controller
$db = DB::connection('message'); $db = DB::connection('message');
//1.首次进页面无搜索条件 //1.首次进页面无搜索条件
if(null==$search_desc && null==$search_channel && null==$search_sendtime_start && null==$search_sendtime_end) if(null==$search_desc && 0==$search_channel && null==$search_sendtime_start && null==$search_sendtime_end)
{ {
$info = $db->table('lie_msg_log')->groupBy('tpl_id')->having('source_type','=',2)->orderBy('log_id','desc')->get(); $info = $db->table('lie_msg_log')->groupBy('lie_msg_log.tpl_id')->having('lie_msg_log.source_type','=',2)
->join('lie_msg_tpl','lie_msg_log.tpl_id','=','lie_msg_tpl.tpl_id')
->orderBy('lie_msg_log.log_id','desc')->get();
$search_channel = 0; $search_channel = 0;
$search_desc = ''; $search_desc = '';
$search_sendtime_start = ''; $search_sendtime_start = '';
...@@ -284,7 +286,7 @@ class MessageController extends Controller ...@@ -284,7 +286,7 @@ class MessageController extends Controller
$end_time = strtotime($search_sendtime_end); $end_time = strtotime($search_sendtime_end);
}else//否则为极限时间 }else//否则为极限时间
{ {
$start_time = 31507200; $start_time = 0;
$end_time = 2524579200; $end_time = 2524579200;
} }
...@@ -304,7 +306,6 @@ class MessageController extends Controller ...@@ -304,7 +306,6 @@ class MessageController extends Controller
->where('lie_msg_tpl.ex_str','like',"%$search_desc%")->orderBy('log_id','desc')->get(); ->where('lie_msg_tpl.ex_str','like',"%$search_desc%")->orderBy('log_id','desc')->get();
} }
} }
//构建model //构建model
foreach ($info as $log) foreach ($info as $log)
{ {
...@@ -389,7 +390,7 @@ class MessageController extends Controller ...@@ -389,7 +390,7 @@ class MessageController extends Controller
$end_time = strtotime($search_sendtime_end); $end_time = strtotime($search_sendtime_end);
}else//否则为极限时间 }else//否则为极限时间
{ {
$start_time = 31507200; $start_time = 0;
$end_time = 2524579200; $end_time = 2524579200;
} }
......
public/js/Message/sendmanualmessage.js
...@@ -141,7 +141,7 @@ function sendManualMessage() ...@@ -141,7 +141,7 @@ function sendManualMessage()
msg_type:$('#inner-tpl-type option:selected').val()?$('#inner-tpl-type option:selected').val():'', msg_type:$('#inner-tpl-type option:selected').val()?$('#inner-tpl-type option:selected').val():'',
// creater:$('#creater').val()?$('#creater').val():'', // creater:$('#creater').val()?$('#creater').val():'',
description:$('#msg-tpl-desc').val()?$('#msg-tpl-desc').val():'', description:$('#msg-tpl-desc').val()?$('#msg-tpl-desc').val():'',
tpl_key:$('#msg-tpl-desc1').val()?$('#msg-tpl-desc1').val():'', true_description:$('#msg-tpl-desc1').val()?$('#msg-tpl-desc1').val():'',
title_1:$('#inner-tpl-title').val()?$('#inner-tpl-title').val():'', title_1:$('#inner-tpl-title').val()?$('#inner-tpl-title').val():'',
content_1:ue_inner.getContent()?ue_inner.getContent():'', content_1:ue_inner.getContent()?ue_inner.getContent():'',
op_type:$("input[name='inner-tpl-op']:checked").val()?$("input[name='inner-tpl-op']:checked").val():'', op_type:$("input[name='inner-tpl-op']:checked").val()?$("input[name='inner-tpl-op']:checked").val():'',
......
resources/views/message/manualhistorylist.blade.php
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<tr role="row" style="text-align: center"> <tr role="row" style="text-align: center">
<td>{{ $info[$i]->log_id }}</td> <td>{{ $info[$i]->log_id }}</td>
<td>{{ $info[$i]->title }}</td> <td>{{ $info[$i]->title }}</td>
<td>{{ $info[$i]->description }}</td> <td>{{ $info[$i]->ex_str }}</td>
<td>{{ $info[$i]->channels_str }}</td> <td>{{ $info[$i]->channels_str }}</td>
@if($info[$i]->obj_user=='is_to_all') @if($info[$i]->obj_user=='is_to_all')
<td>全部用户</td> <td>全部用户</td>
......
resources/views/message/sendmanualmessage.blade.php
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</div> </div>
<div class="col-sm-10 form-inline" style="margin-top: 20px"> <div class="col-sm-10 form-inline" style="margin-top: 20px">
<label class="col-sm-2 control-label"><span style="color: red">*</span> 模板key:</label> <label class="col-sm-2 control-label"><span style="color: red">*</span> 模板描述:</label>
<div class="col-sm-3"> <div class="col-sm-3">
<input type="text" id="msg-tpl-desc1" class="form-control" placeholder="请输入key" value="{{ $info->ex_str }}"/> <input type="text" id="msg-tpl-desc1" class="form-control" placeholder="请输入key" value="{{ $info->ex_str }}"/>
<label id="msg-tpl-desc1-length"></label> <label id="msg-tpl-desc1-length"></label>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</div> </div>
<div class="col-sm-10 form-inline" style="margin-top: 20px"> <div class="col-sm-10 form-inline" style="margin-top: 20px">
<label class="col-sm-2 control-label"><span style="color: red">*</span> 模板描述:</label> <label class="col-sm-2 control-label"><span style="color: red">*</span> 模板key:</label>
<div class="col-sm-3"> <div class="col-sm-3">
<input type="text" id="msg-tpl-desc" class="form-control" placeholder="请输入描述" value="{{ $info->desc }}"/> <input type="text" id="msg-tpl-desc" class="form-control" placeholder="请输入描述" value="{{ $info->desc }}"/>
<label id="msg-tpl-desc-length"></label> <label id="msg-tpl-desc-length"></label>
......
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