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

application/models/information_model.php

@@ -67,7 +67,10 @@ class Information_model extends CI_Model
         $this->init();
         $this->topNum = $topnum;
         $sql_keyword = '%' . $this->HT->escape_like_str($keyword) . '%';
-        $this->search = " AND ic_content like N'$sql_keyword' ";
+        $this->search = " AND  (ic_content like N'$sql_keyword' 
+                                or ic.ic_photo like N'$sql_keyword'
+                                or map.im_value like N'$sql_keyword'
+                                or mapm.im_value like N'$sql_keyword')";
         return $this->GetList();
     }
 
@@ -371,6 +374,8 @@ class Information_model extends CI_Model
         $sql .= ",0 as amp_status ";
         $sql .= "FROM   infoStructures is1 \n"
             . "       INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n"
+            . "       left JOIN infoMetas map on ic.ic_id = map.im_ic_id AND map.im_key = 'meta_addon_picture' \n"
+            . "       left JOIN infoMetas mapm on ic.ic_id = mapm.im_ic_id AND mapm.im_key = 'meta_addon_picture_mobile' \n"
             . "            AND ic.ic_sitecode = is1.is_sitecode \n"
             . "WHERE  is1.is_sitecode = ? ";
         $this->search_title ? $sql .= $this->search_title : false;

application/third_party/recommend/views/templates.php

@@ -2,20 +2,20 @@
 
 <h3>文中tour广告代码：</h3>
 
-<div class="info_ad"><a href="/japan/tours/classic-japan" rel="nofollow" id=""><img alt="11-Day Classic Japan Tour" class="img-responsive" src="https://data.asiahighlights.com/image/travel-guide/japan/shirakawa-go-village.jpg" /> </a>
+<div class="info_ad"><a href="/japan/tours/classic-japan" rel="nofollow" id="infopage-"><img alt="11-Day Classic Japan Tour" class="img-responsive" src="https://data.asiahighlights.com/image/travel-guide/japan/shirakawa-go-village.jpg" /> </a>
 
 <div class="info_ad_content">
-<div class="info_ad_name"><a href="/japan/tours/classic-japan" id=""><strong>11-Day Classic Japan Tour</strong> Tokyo - Takayama - Shirakawa - Kanazawa - Kyoto </a></div>
+<div class="info_ad_name"><a href="/japan/tours/classic-japan" id="infopage-"><strong>11-Day Classic Japan Tour</strong> Tokyo - Takayama - Shirakawa - Kanazawa - Kyoto </a></div>
 
-<div class="info_ad_button"><a href="/japan/tours/classic-japan" rel="nofollow" id=""><i aria-hidden="true" class="fa fa-angle-right"></i></a></div>
+<div class="info_ad_button"><a href="/japan/tours/classic-japan" rel="nofollow" id="infopage-"><i aria-hidden="true" class="fa fa-angle-right"></i></a></div>
 </div>
 </div>
 
+
+
 <h3>CH 完整的右侧广告代码：</h3>
 
-<div class="expatstour" style="
-margin: 30px 0; width:auto;
-">
+<div class="expatstour" style="margin: 30px 0; width:auto;">
 <div class="tour_img_title"><a href="/tour/zhangjiajietour/hun-3/" rel="nofollow"><img alt="most classic china tour" class="img-responsive" height="415" src="https://images.chinahighlights.com/allpicture/2015/03/e47d1ba34f204510962a6c89_cut_600x550_251.jpg" width="600" /><span class="citytourname">Classic Wonders</span></a></div>
 
 <div class="tourdetailinfo"><span class="expatstourname"><a href="/tour/zhangjiajietour/hun-3/">11-Day Beijing – Xi'an – Guilin/Yangshuo – Shanghai Tour</a></span>

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

@@ -472,8 +472,8 @@
     function setNovember28thTicketLeft() {
       standardOption.disabled = false;
       vipOption.disabled = false;
-      premiumOption.disabled = false;
-      premiumTicketLeft.innerText = '20 left';
+      premiumOption.disabled = true;
+      premiumTicketLeft.innerText = 'sold out';
       vipTicketLeft.innerText = '30 left';
       standardTicketLeft.innerText = '60 left';
     }

application/views/mobile_first/ah-lantern-form.php

@@ -469,8 +469,8 @@
     function setNovember28thTicketLeft() {
       standardOption.disabled = false;
       vipOption.disabled = false;
-      premiumOption.disabled = false;
-      premiumTicketLeft.innerText = '20 left';
+      premiumOption.disabled = true;
+      premiumTicketLeft.innerText = 'sold out';
       vipTicketLeft.innerText = '30 left';
       standardTicketLeft.innerText = '60 left';
     }