Merge branch 'master' of gitee.com:hainatravel/information-system

hotfix/远程访问多媒体中心
lyt 6 years ago
commit c6c3dcc23a

@ -13,9 +13,9 @@ class pages extends CI_Controller{
} }
public function index($coli_id = null){ public function index($coli_id = null){
if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){
dingLogin(); dingLogin();
} }*/
if($coli_id == null){ if($coli_id == null){
$cols_id = $this->input->post("ht_order"); $cols_id = $this->input->post("ht_order");
}else{ }else{
@ -54,9 +54,9 @@ class pages extends CI_Controller{
//系统列表页面 //系统列表页面
public function order_list(){ public function order_list(){
if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){
dingLogin(); dingLogin();
} }*/
$page_size = 10; $page_size = 10;
$page = $this->input->get("page"); $page = $this->input->get("page");
$order = $this->input->get("order"); $order = $this->input->get("order");
@ -110,9 +110,9 @@ class pages extends CI_Controller{
//订单详情页面 //订单详情页面
public function order(){ public function order(){
if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){
dingLogin(); dingLogin();
} }*/
$ordernumber = $order=$this->input->get("order"); $ordernumber = $order=$this->input->get("order");
if(empty($ordernumber)){ if(empty($ordernumber)){
@ -159,9 +159,9 @@ class pages extends CI_Controller{
//退票页面 //退票页面
public function refund(){ public function refund(){
if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){
dingLogin(); dingLogin();
} }*/
$ordernumber = $order=$this->input->get("order"); $ordernumber = $order=$this->input->get("order");
if(empty($ordernumber)){ if(empty($ordernumber)){
@ -198,9 +198,9 @@ class pages extends CI_Controller{
} }
public function export(){ public function export(){
if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){
dingLogin(); dingLogin();
} }*/
$this->load->view('header'); $this->load->view('header');
$this->load->view('export'); $this->load->view('export');
$this->load->view('footer'); $this->load->view('footer');

Loading…
Cancel
Save