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

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(

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') == ''){
+		// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
-			redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
+		// 	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;
+			$status = trim($value->ts_status);
-            $value->info = $this->order_status_msg[$vstatus];//自定义说明信息;
+            $value->info = $this->order_status_msg[$status];//自定义说明信息;
         }  
                    
         

application/views/mobile_first/ah-info-page-form.php

@@ -9,7 +9,7 @@
         <textarea id="form_additionalrequirements" name="additional_requirements" placeholder="E.g. This is a big trip for my birthday, anniversary, honeymoon, retirement, kid's graduation, bucket list…
 Our must-dos/must-sees are…" style="height:90px;"></textarea>
 
-		<div class="selectionBlock" style="margin-bottom: 10px;">
+		<div class="selectionBlock" style="margin-bottom: 0;">
 			<p style="
     margin-bottom: 0px;
 ">