From 3f2018cb60321b493492334c5337e6429df570ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 25 May 2023 16:25:13 +0800
Subject: [PATCH] fix

---
 application/third_party/trainsystem/config/config.php |  8 ++++----
 .../third_party/trainsystem/controllers/pages.php     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application/third_party/trainsystem/config/config.php b/application/third_party/trainsystem/config/config.php
index 0b596a4c..06b421e2 100644
--- a/application/third_party/trainsystem/config/config.php
+++ b/application/third_party/trainsystem/config/config.php
@@ -71,13 +71,13 @@ $config["train_order_status_msg"]=array(
                                 "5"=>"出票失败",
                                 "6"=>"线上退票处理中",
                                 "7"=>"(改签)退票成功",
-                                "8"=>"乘客退票失败",
                                 "e"=>"数据错误，提交失败",
+                                "8"=>"乘客退票失败",                             
 								"9"=>"改签成功",
                                 "10"=>"退款(差价)",
-                                "12"=>"订单取消",
-                                "11"=>"订单退款"
-                                    );
+                                "11"=>"订单退款",
+                                "12"=>"订单取消"                                                                
+                                );
 
 //座次配对
 $config["train_zw"]=array(
diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php
index ae485027..a27c4bb0 100644
--- a/application/third_party/trainsystem/controllers/pages.php
+++ b/application/third_party/trainsystem/controllers/pages.php
@@ -57,9 +57,9 @@ class pages extends CI_Controller{
 	
 	//系统列表页面
 	public function order_list(){
-		if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
-			redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
-		}
+		// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
+		// 	redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
+		// }
 
 		$page_size = 10;
         $page = $this->input->get("page");
@@ -102,9 +102,10 @@ class pages extends CI_Controller{
 
         $list["page_link"]=$this->pagination->create_links();
 
+
         foreach ($list["data"] as $key => $value) {
-			$vstatus = $value->ts_status=="r"?11:$value->ts_status;
-            $value->info = $this->order_status_msg[$vstatus];//自定义说明信息;
+			$status = trim($value->ts_status);
+            $value->info = $this->order_status_msg[$status];//自定义说明信息;
         }