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

application/models/Order_model.php

@@ -13,6 +13,13 @@ class Order_model extends CI_Model {
             where
                 COLI_ID = ?", $order_id);
         $order_array = $order_query->row_array();
+        if (empty($order_array)) {
+            $order_array = [
+                'COLI_Name' => '无法查到该订单',
+                'COLI_OrderDetailText' => '请检查订单号是否正确',
+                'COLI_OrderStartDate' => 'NULL'
+            ];
+        }
         return $order_array;
     }
 
@@ -26,8 +33,8 @@ class Order_model extends CI_Model {
         
         if (empty($order_array)) {
             $order_array = [
-                'COLI_Name' => 'NULL',
-                'COLI_OrderDetailText' => 'NULL',
+                'COLI_Name' => '无法查到该订单',
+                'COLI_OrderDetailText' => '订单可能没有同步回来',
                 'COLI_OrderStartDate' => 'NULL'
             ];
         }

application/views/order/detail.php

@@ -16,12 +16,11 @@
 </form>
 <br>
 <div class="panel panel-success">
-  <div class="panel-heading">网前</div>
+  <div class="panel-heading">网前订单情况</div>
   <div class="panel-body">
     <table class="table">
-      <caption>已经入库成功</caption>
       <thead>
-        <tr> <th>COLI_Name</th> <th>COLI_OrderDetailText</th>
+        <tr> <th style='width: 12%'>订单号</th> <th>订单信息</th>
         </tr>
       </thead>
       <tbody>
@@ -35,12 +34,11 @@
 </div>
 
 <div class="panel panel-info">
-  <div class="panel-heading">HT</div>
+  <div class="panel-heading">HT 订单情况</div>
   <div class="panel-body">
     <table class="table">
-      <caption>可以在HT查询</caption>
       <thead>
-        <tr> <th>COLI_Name</th> <th>COLI_OrderDetailText</th>
+        <tr> <th style='width: 12%'>订单号</th> <th>订单信息</th>
         </tr>
       </thead>
       <tbody>