From 1adfe16118f59254ba2cba9c9d713b34d4a37010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 9 Apr 2021 15:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=88=86=E4=BA=BA=E7=AD=89=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctmobilefirst/controllers/api.php         | 66 +++++++++++--------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/application/third_party/ctmobilefirst/controllers/api.php b/application/third_party/ctmobilefirst/controllers/api.php
index 865b59e2..25579e75 100644
--- a/application/third_party/ctmobilefirst/controllers/api.php
+++ b/application/third_party/ctmobilefirst/controllers/api.php
@@ -250,37 +250,49 @@ class Api extends CI_Controller {
         if (isset($_GET["param"])){
             $param = str_replace("'","''",$_GET["param"]);
             $list = $this->api_model->getDaytripPriceList($param);
-            if (count($list)==1){
-                echo "1";
-            }else{
-                //echo "2";
-                $str_th="";
-                $str_td="";
-                foreach ($list as $row) {
-                    $PKP_AdultPrice = $row->PKP_AdultPrice;
-                    $PKP_AdultSpecialPrice = $row->PKP_AdultSpecialPrice;
-                    if ($PKP_AdultPrice!=$PKP_AdultSpecialPrice && $PKP_AdultSpecialPrice>0){
-                        $PKP_AdultPrice=$PKP_AdultSpecialPrice;
-                    }
-                    $PKP_AdultPrice =  $this->currency->convert_moneny_by_char($PKP_AdultPrice,"USD");
-                    $PKP_PersonStart = $row->PKP_PersonStart;
-                    $PKP_PersonStop = $row->PKP_PersonStop;
-                    //'根据数据生成显示内容
-                    if ($PKP_PersonStart == $PKP_PersonStop){
-                        $str_th .= "<th> ".$PKP_PersonStart." Person</th>";
+            if (!empty($list)){
+                if (count($list)==1){
+                    //echo "1";
+                    foreach ($list as $row) {
+                        $PKP_AdultPrice = $row->PKP_AdultPrice;
+                        $PKP_AdultSpecialPrice = $row->PKP_AdultSpecialPrice;
+                        if ($PKP_AdultPrice!=$PKP_AdultSpecialPrice && $PKP_AdultSpecialPrice>0){
+                            $PKP_AdultPrice=$PKP_AdultSpecialPrice;
+                        }
+                        $PKP_AdultPrice =  $this->currency->convert_moneny_by_char($PKP_AdultPrice,"USD");
+                        echo '<table border="0" align="center" cellpadding="10" cellspacing="1" class="pricetable"><tr><th>>1 Person</th></tr><tr><td><strong class="orange"> $'.$PKP_AdultPrice.'</strong></td></tr></table>';
                     }
-                    else if ($PKP_PersonStop=="1000") {
-                        $str_th .= "<th> >".$PKP_PersonStart." Person</th>";
-                    }
-                    else{
-                        $str_th .= "<th> ".$PKP_PersonStart." - ".$PKP_PersonStop." Person</th>";
+                }else{
+                    //echo "2";
+                    $str_th="";
+                    $str_td="";
+                    foreach ($list as $row) {
+                        $PKP_AdultPrice = $row->PKP_AdultPrice;
+                        $PKP_AdultSpecialPrice = $row->PKP_AdultSpecialPrice;
+                        if ($PKP_AdultPrice!=$PKP_AdultSpecialPrice && $PKP_AdultSpecialPrice>0){
+                            $PKP_AdultPrice=$PKP_AdultSpecialPrice;
+                        }
+                        $PKP_AdultPrice =  $this->currency->convert_moneny_by_char($PKP_AdultPrice,"USD");
+                        $PKP_PersonStart = $row->PKP_PersonStart;
+                        $PKP_PersonStop = $row->PKP_PersonStop;
+                        //'根据数据生成显示内容
+                        if ($PKP_PersonStart == $PKP_PersonStop){
+                            $str_th .= "<th> ".$PKP_PersonStart." Person</th>";
+                        }
+                        else if ($PKP_PersonStop=="1000") {
+                            $str_th .= "<th> >".$PKP_PersonStart." Person</th>";
+                        }
+                        else{
+                            $str_th .= "<th> ".$PKP_PersonStart." - ".$PKP_PersonStop." Person</th>";
+                        }
+                    
+                        $str_td .="<td><strong class='orange'> $ ".$PKP_AdultPrice."</strong></td>";
                     }
-                
-                    $str_td .="<td><strong class='orange'> $ ".$PKP_AdultPrice."</strong></td>";
+    
+                    echo '<table border="0" align="center" cellpadding="10" cellspacing="1" class="pricetable"><tr>'.$str_th.'</tr><tr>'.$str_td.'</tr></table>';
                 }
-
-                echo '<table border="0" align="center" cellpadding="10" cellspacing="1" class="pricetable"><tr>'.$str_th.'</tr><tr>'.$str_td.'</tr></table>';
             }
+            
         }else{
             echo "";
         }