diff --git a/webht/third_party/partners/controllers/index.php b/webht/third_party/partners/controllers/index.php index abf5a129..2e1b1d00 100644 --- a/webht/third_party/partners/controllers/index.php +++ b/webht/third_party/partners/controllers/index.php @@ -53,7 +53,11 @@ class Index extends CI_Controller $data['status']=$status; $data['list']=$this->Partners_model->get_orders($user,$status,$date1,$date2,$COLI_ID); //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; //} @@ -62,6 +66,7 @@ class Index extends CI_Controller $this->load->view('index/group'); $this->load->view('footer'); } + //地接与导游信息 public function guideinfo($GRI_SN='') { @@ -93,7 +98,11 @@ class Index extends CI_Controller $data=array(); $this->load->model('Mailinfo_model'); $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) @@ -102,7 +111,11 @@ class Index extends CI_Controller $this->load->model('Mailinfo_model'); $data['maildetail']=$this->Mailinfo_model->mail_detail($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); } } diff --git a/webht/third_party/partners/models/mailinfo_model.php b/webht/third_party/partners/models/mailinfo_model.php index ca8596c2..9dab7897 100644 --- a/webht/third_party/partners/models/mailinfo_model.php +++ b/webht/third_party/partners/models/mailinfo_model.php @@ -17,6 +17,7 @@ class Mailinfo_model extends CI_Model { { $sql="SELECT MAI_SN, MAI_SendDate, + MOI_ReadState, MAI_COLI_SN, MAI_From, MAI_To, diff --git a/webht/third_party/partners/models/partners_model.php b/webht/third_party/partners/models/partners_model.php index 3cad3b63..7ac8a80f 100644 --- a/webht/third_party/partners/models/partners_model.php +++ b/webht/third_party/partners/models/partners_model.php @@ -90,7 +90,8 @@ class Partners_model extends CI_Model { } $ApplyDate_sql=''; 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) { $default_date=date("Y-m-d",strtotime("-15 day")); $ApplyDate_sql=" AND COLI_OrderStartDate>'$default_date' ORDER BY COLI_OrderStartDate ASC"; diff --git a/webht/third_party/partners/views/index/group_app.php b/webht/third_party/partners/views/index/group_app.php new file mode 100644 index 00000000..f0346a7e --- /dev/null +++ b/webht/third_party/partners/views/index/group_app.php @@ -0,0 +1,42 @@ + $g) { ?> +
订单类型:COLI_OrderType;?>
+报价名称:PTI_Name;?>
+订单人数:COLI_PersonNum;?>
+预订天数:COLI_Days;?>,出发日期是COLI_OrderStartDate;?>
+订单来源于COLI_OrderSource;?>,提交日期是COLI_ApplyDate;?>
+发送时间: MAI_SendDate; ?>
+ MAI_BlobContent; ?> +MAI_Subject; ?>
diff --git a/webht/third_party/partners/views/index/mailinfo_app.php b/webht/third_party/partners/views/index/mailinfo_app.php new file mode 100644 index 00000000..50f316fe --- /dev/null +++ b/webht/third_party/partners/views/index/mailinfo_app.php @@ -0,0 +1,27 @@ + + + + + + +