From fd0200cbfc45bf83377aa08b9fc8c461ab0dd82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 9 Jul 2020 14:36:10 +0800
Subject: [PATCH] =?UTF-8?q?bokun=E6=8A=93=E5=8F=96=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/tpmanage/controllers/webgetbokun.php     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/third_party/tpmanage/controllers/webgetbokun.php b/application/third_party/tpmanage/controllers/webgetbokun.php
index abf65efa..3e061c63 100644
--- a/application/third_party/tpmanage/controllers/webgetbokun.php
+++ b/application/third_party/tpmanage/controllers/webgetbokun.php
@@ -127,7 +127,7 @@ class webgetbokun extends CI_Controller
             <h2>Description<i class="fa fa-angle-down" aria-hidden="true"></i></h2>
             <div class="details-content">
                 <div class="details-list">
-                <h3><i class="fa fa-circle" aria-hidden="true"></i>Trip Overview</h3>'.$temp_summary.'
+                <h3><i class="fa fa-circle" aria-hidden="true"></i>Overview</h3>'.$temp_summary.'
                 </div>
             </div>
             </div>';
@@ -136,21 +136,22 @@ class webgetbokun extends CI_Controller
             <h2>Itinerary<i class="fa fa-angle-down" aria-hidden="true"></i></h2>
             <div class="details-content">'.$strContent.'</div></div>';
             //FAQ
-            $tempFaq = $strFaq = '';
+            $tempFaq = $strFaq = $strIncluded = $strExcluded = '';
             if (isset($activityDeatil->included)){
                 if ($activityDeatil->included!="" && $activityDeatil->included!=null){
                     $strFaq = '<div class="details-list">
                     <h3><i class="fa fa-circle" aria-hidden="true"></i>What\'s included?</h3>'.$activityDeatil->included.'</div>';
-                    $tempFaq.=$strFaq;
+                    $strIncluded.=$strFaq;
                 }
             }
             if (isset($activityDeatil->excluded)){
                 if ($activityDeatil->excluded!="" && $activityDeatil->excluded!=null){
                     $strFaq = '<div class="details-list">
                     <h3><i class="fa fa-circle" aria-hidden="true"></i>What\'s excluded？</h3>'.$activityDeatil->excluded.'</div>';
-                    $tempFaq.=$strFaq;
+                    $strExcluded.=$strFaq;
                 }
             }
+            $tempFaq = '<div class="row"><div class="col-xs-24 col-sm-12">'.$strIncluded.'</div><div class="col-xs-24 col-sm-12">'.$strExcluded.'</div><div class="clearfix"></div></div>';
 
             if (isset($activityDeatil->requirements)){
                 if ($activityDeatil->requirements!="" && $activityDeatil->requirements!=null){