mycht搜索修复

hotfix/远程访问多媒体中心
尹诚诚 6 years ago
parent e065c87dcb
commit 046634e0aa

@ -53,7 +53,11 @@ class Index extends CI_Controller
$data['status']=$status; $data['status']=$status;
$data['list']=$this->Partners_model->get_orders($user,$status,$date1,$date2,$COLI_ID); $data['list']=$this->Partners_model->get_orders($user,$status,$date1,$date2,$COLI_ID);
//if ($COLI_ID!==false) { //if ($COLI_ID!==false) {
$this->load->view('index/order_search',$data); $grouptpl='index/order_search';
if ($this->session->userdata('isapp')) {
$grouptpl='index/group_app';
}
$this->load->view($grouptpl,$data);
return; return;
//} //}
@ -62,6 +66,7 @@ class Index extends CI_Controller
$this->load->view('index/group'); $this->load->view('index/group');
$this->load->view('footer'); $this->load->view('footer');
} }
//地接与导游信息 //地接与导游信息
public function guideinfo($GRI_SN='') public function guideinfo($GRI_SN='')
{ {
@ -93,7 +98,11 @@ class Index extends CI_Controller
$data=array(); $data=array();
$this->load->model('Mailinfo_model'); $this->load->model('Mailinfo_model');
$data['mailinfo']=$this->Mailinfo_model->get_mail_info($COLI_ID); $data['mailinfo']=$this->Mailinfo_model->get_mail_info($COLI_ID);
$this->load->view('index/mailinfo', $data); $tpl='index/mailinfo';
if ($this->session->userdata('isapp')) {
$tpl='index/mailinfo_app';
}
$this->load->view($tpl, $data);
} }
//来往邮件正文内容 //来往邮件正文内容
public function mail_detail($MAI_SN) public function mail_detail($MAI_SN)
@ -102,7 +111,11 @@ class Index extends CI_Controller
$this->load->model('Mailinfo_model'); $this->load->model('Mailinfo_model');
$data['maildetail']=$this->Mailinfo_model->mail_detail($MAI_SN); $data['maildetail']=$this->Mailinfo_model->mail_detail($MAI_SN);
$data['mailattach']=$this->Mailinfo_model->mail_attach($MAI_SN); $data['mailattach']=$this->Mailinfo_model->mail_attach($MAI_SN);
$this->load->view('index/maildetail', $data); $tpl='index/maildetail';
if ($this->session->userdata('isapp')) {
$tpl='index/maildetail_app';
}
$this->load->view($tpl, $data);
} }
} }

@ -17,6 +17,7 @@ class Mailinfo_model extends CI_Model {
{ {
$sql="SELECT MAI_SN, $sql="SELECT MAI_SN,
MAI_SendDate, MAI_SendDate,
MOI_ReadState,
MAI_COLI_SN, MAI_COLI_SN,
MAI_From, MAI_From,
MAI_To, MAI_To,

@ -90,7 +90,8 @@ class Partners_model extends CI_Model {
} }
$ApplyDate_sql=''; $ApplyDate_sql='';
if ($date1) { if ($date1) {
$ApplyDate_sql=" AND COLI_ApplyDate Between '$date1' AND '$date2' "; //$ApplyDate_sql=" AND COLI_ApplyDate Between '$date1' AND '$date2' ";
$ApplyDate_sql=" AND COLI_OrderStartDate Between '$date1' AND '$date2' ORDER BY COLI_OrderStartDate ASC";
}elseif(!$date1 && $status==5) { }elseif(!$date1 && $status==5) {
$default_date=date("Y-m-d",strtotime("-15 day")); $default_date=date("Y-m-d",strtotime("-15 day"));
$ApplyDate_sql=" AND COLI_OrderStartDate>'$default_date' ORDER BY COLI_OrderStartDate ASC"; $ApplyDate_sql=" AND COLI_OrderStartDate>'$default_date' ORDER BY COLI_OrderStartDate ASC";

@ -0,0 +1,42 @@
<?php foreach ($list as $key => $g) { ?>
<div class="panel-body feed_box nopadding">
<div class="media">
<div class="media-body">
<h4 class=" result-title">订单号: <?php echo $g->COLI_ID; ?></h4>
<p>订单类型:<?php echo $g->COLI_OrderType;?></p>
<p>报价名称:<?php echo $g->PTI_Name;?></p>
<p>订单人数:<?php echo $g->COLI_PersonNum;?></p>
<p>预订天数:<?php echo $g->COLI_Days;?>,出发日期是<?php echo $g->COLI_OrderStartDate;?></p>
<p>订单来源于<?php echo $g->COLI_OrderSource;?>,提交日期是<?php echo $g->COLI_ApplyDate;?></p>
</div>
</div>
<div class="col-xs-24 nopadding">
<a href="javascript:void(0);" class="guideinfomodal" data-url="<?php echo site_url('apps/partners/index/customerinfo/'.$g->Vkey);?>" style="border-right:1px solid #ddd;padding-right:10px;text-decoration: underline;">客人信息</a>
<a href="javascript:void(0);" class="guideinfomodal" data-url="<?php echo site_url('apps/partners/index/groupinfo/'.$g->COLI_GRI_SN);?>" style="border-right:1px solid #ddd;padding:0 10px;text-decoration: underline;">团信息</a>
<a href="javascript:void(0);" class="guideinfomodal" data-url="<?php echo site_url('apps/partners/index/guideinfo/'.$g->COLI_GRI_SN);?>" style="padding-left:10px;text-decoration: underline;">地接导游</a>
<a href="<?php echo site_url('apps/partners/index/mail_info/'.$g->COLI_ID); ?>" style="padding-left:10px;text-decoration: underline;">来往邮件</a>
<?php if(!empty($g->SFI_FileName)){ ?>
<a target="_blank" href="http://www.chinahighlights.com/community/tourManager/letter<?php echo $g->SFI_Location.$g->SFI_FileName;?>.html" style="padding-left:10px;text-decoration: underline;">确认信</a>
<?php } ?>
</div>
<div class="col-xs-24 btn-lg"></div>
</div>
<?php } ?>
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content guidemodalcontent">
</div>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$(".guideinfomodal").click(function(){
$(".guidemodalcontent").html('');
var url=$(this).attr('data-url');
$(".guidemodalcontent").load(url);
$('#myModal').modal('show');
});
});
</script>

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>邮件正文</title>
<link href="/css/webht/bootstrap.min.css" rel="stylesheet">
<link href="/css/nav/nav.css?v=20150723" rel="stylesheet">
<script src="/min?f=/js/jquery.min.js,/js/bootstrap.min.js,/js/navigation.js"></script>
<!--[if lt IE 9]>
<script src="/js/respond.min.js" type="text/javascript"></script>
<![endif]-->
<style type="text/css">
.mailtext-box img{max-width: 100%;}
.mailtext-box span{font-size: 13pt !important;color: #555 !important;font-family: "Verdana","sans-serif" !important;}
</style>
</head>
<body>
<div class="list-group mailtext-box text-left" style="padding:10px;">
<h4><?php echo $maildetail->MAI_Subject; ?></h4>
<p class="small text-muted">发送时间: <?php echo $maildetail->MAI_SendDate; ?></p>
<?php echo $maildetail->MAI_BlobContent; ?>
</div>
</body>
</html>

@ -12,7 +12,7 @@
<div class="list-group"> <div class="list-group">
<?php foreach ($mailinfo as $v) { ?> <?php foreach ($mailinfo as $v) { ?>
<a data-action="<?php echo site_url('apps/partners/index/mail_detail/'.$v->MAI_SN); ?>" href="javascript:void(0);" class="list-group-item mail-detail-link" style="min-height:82px;"> <a data-action="<?php echo site_url('apps/partners/index/mail_detail/'.$v->MAI_SN); ?>" href="javascript:void(0);" class="list-group-item mail-detail-link" style="min-height:82px;">
<h4 class="list-group-item-heading text-muted"><span class="text-primary" style="font-size:17px;"><?php echo str_replace('"', '', $v->MAI_From); ?></span> <span class="small pull-right"><small><?php echo $v->MAI_SendDate; ?></small></span></h4> <h4 class="list-group-item-heading text-muted"><?php if($v->MAI_Direction==2 && $v->MOI_ReadState==0)echo '<span class="text-danger">•</span>'; ?><span class="text-primary" style="font-size:17px;"><?php echo str_replace('"', '', $v->MAI_From); ?></span> <span class="small pull-right"><small><?php echo $v->MAI_SendDate; ?></small></span></h4>
<p class="list-group-item-text"><?php echo $v->MAI_Subject; ?></p> <p class="list-group-item-text"><?php echo $v->MAI_Subject; ?></p>
</a> </a>
<?php } ?> <?php } ?>

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>来往邮件</title>
<link href="/css/webht/bootstrap.min.css" rel="stylesheet">
<link href="/css/nav/nav.css?v=20150723" rel="stylesheet">
<script src="/min?f=/js/jquery.min.js,/js/bootstrap.min.js,/js/navigation.js"></script>
<!--[if lt IE 9]>
<script src="/js/respond.min.js" type="text/javascript"></script>
<![endif]-->
</head>
<body>
<div class="list-group">
<?php foreach ($mailinfo as $v) { ?>
<a href="<?php echo site_url('apps/partners/index/mail_detail/'.$v->MAI_SN); ?>" class="list-group-item" style="min-height:82px;">
<h4 class="list-group-item-heading text-muted"><?php if($v->MAI_Direction==2 && $v->MOI_ReadState==0)echo '<span class="text-danger">•</span>'; ?><span class="text-primary" style="font-size:17px;"><?php echo str_replace('"', '', $v->MAI_From); ?></span> <span class="small pull-right"><small><?php echo $v->MAI_SendDate; ?></small></span></h4>
<p class="list-group-item-text"><?php echo $v->MAI_Subject; ?></p>
</a>
<?php } ?>
</div>
</body>
</html>
Loading…
Cancel
Save