From d1bf4718eaf5d20448e9c93c2f11e4c448691918 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 2 Jun 2021 14:53:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A4=E7=89=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 2 +-
 application/views/mobile_first/ch.php    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 40b2cbf8..44213b61 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -152,7 +152,7 @@
                 <input type="hidden" value="FORID:9" name="cof">
                 <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
                 <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
-                <input type="hidden" name="__ftoken__" value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+            </form>
         </div>
 
         <div class="topnavitailor">
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index f27b8343..98482f57 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -49,8 +49,7 @@
             <input type="hidden" value="FORID:9" name="cof">
             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
             <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png">
-            <input type="hidden" name="__ftoken__"
-                   value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+        </form>
     </div>
 
 

From 3deafac79ea407fc8e63b463f3fc7b868d38470f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 2 Jun 2021 15:29:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B8=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E9=99=A4=E9=87=8D=E5=A4=8D=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=EF=BC=88=E7=BF=B0=E7=89=B9=E8=AF=BB=E5=8F=96=E7=9A=84=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=8E=92=E9=99=A4=E5=B7=B2=E7=BB=8F=E6=90=AC=E8=BF=81?=
 =?UTF-8?q?=E5=88=B0=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0=E7=9A=84=E3=80=82?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctmobilefirst/models/api_model.php           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php
index 90ce19ad..11285278 100644
--- a/application/third_party/ctmobilefirst/models/api_model.php
+++ b/application/third_party/ctmobilefirst/models/api_model.php
@@ -172,6 +172,18 @@ class Api_model extends CI_Model {
                 WHERE (p2.PAG2_LGC = 104) 
                     AND (p1.pag_dei_sn = 17) 
                     AND (p2.PAG2_Check = 2) 
+                    AND (PAG_Code not in(
+                        SELECT  convert(varchar(100),(
+                            SELECT TOP 1 im_value
+                            FROM infoMetas
+                            WHERE im_key = 'meta_product_code'
+                                AND im_ic_id = ic_id
+                            )) AS code			
+                            FROM dbo.infoContents
+                            INNER JOIN infoStructures ON ic_id = is_ic_id
+                            WHERE is_sitecode = 'chinatravel'".$whereInfo."
+                                AND ic_status = 1
+                    ))
                     AND (isnull(P1.DeleteFlag,0) <>1) ".$whereHT."
              ) Tmp 		 
             
@@ -186,13 +198,13 @@ class Api_model extends CI_Model {
                 FROM dbo.infoContents
                 inner join infoStructures on ic_id=is_ic_id
                  WHERE   is_sitecode='chinatravel' ".$whereInfo."
-                --and ic_status=1            
+                and ic_status=1            
              ) as t
           )  tball
           where 1=1
           ORDER BY tball.sortBy ASC
           ";
-
+     
           $query = $this->HT->query($sql);
           return $query->result();
     }