From 1319b140bc87b5fea9c503cb189b7ab6797646c1 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Mon, 25 Jan 2021 16:47:53 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BDgoogl?=
 =?UTF-8?q?e=E5=B9=BF=E5=91=8A=E5=92=8Cadd=20this=E7=A4=BE=E5=AA=92?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 857b55a1..d34f8347 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -666,7 +666,8 @@ class Information extends CI_Controller
             //信息推荐
             $template_NEXT = $this->call_mobile_template_NEXT($template_path, $information->is_id);
             $template = str_replace('<!--@ARTICLENEXT@-->', $template_NEXT, $template);
-            $template = str_replace('<!--@ADDTHIS-WIDGET@-->', '<script async src="https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-52170b0a4a301edc"></script>', $template);
+            $addthis_widget=$this->load->view($template_path.'-add-this', false,true);
+            $template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
         } else {
             $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
         }
@@ -708,7 +709,8 @@ class Information extends CI_Controller
             $template = str_replace('<!--@Match-Content-GOOGLE@-->', '<script  async  src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block" data-ad-format="autorelaxed" data-ad-client="ca-pub-4231674166786366" data-ad-slot="1447610161"></ins><script>(adsbygoogle =  window.adsbygoogle || []).push({});</script>', $template);
         }
         if (!empty(get_meta($information->ic_id, 'meta_google_ad_article'))) {
-            $template = str_replace('<!--@IN-ARTICLE-GOOGLE@-->', '<script  async  src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block;  text-align:center;" data-ad-layout="in-article" data-ad-format="fluid" data-ad-client="ca-pub-4231674166786366" data-ad-slot="5442695494"></ins><script>(adsbygoogle =  window.adsbygoogle || []).push({});</script>', $template);
+            $in_article_google=$this->load->view($template_path.'-google-ad', false,true);
+            $template = str_replace('<!--@IN-ARTICLE-GOOGLE@-->', $in_article_google, $template);
         }
         //社媒分享图片
         if (!empty($information->ic_photo)) {
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 6de2a045..edf961f2 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -284,6 +284,7 @@
 </div>
 <!--@PRODUCT-JS@-->
 <!--@ADDON-JS@-->
+<script>function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}</script>
 <!--@IN-ARTICLE-GOOGLE@-->
 <!--@ADDTHIS-WIDGET@-->
 </body>
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 5f5f9e5a..60b2386d 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -255,6 +255,8 @@
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];
         _._cssomPrefixes=b;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i){return t}if(!n){return !1}if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i){return"@"+n}for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i){return"@-"+a.toLowerCase()+"-"+n}}return !1};_.atRule=E;var N=_._config.usePrefixes?S.toLowerCase().split(" "):[];_._domPrefixes=N;var P={elem:f("modernizr")};Modernizr._q.push(function(){delete P.elem});var z={style:P.elem.style};Modernizr._q.unshift(function(){delete z.style}),_.testAllProps=h;_.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.indexOf("-")&&(e=s(e)),n?h(e,n,t):h(e,"pfx"))};_.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),o(),i(g),delete _.addTest,delete _.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++){Modernizr._q[T]()}e.Modernizr=Modernizr}(window,document);(function(window){var support={animations:Modernizr.cssanimations},animEndEventNames={"WebkitAnimation":"webkitAnimationEnd","OAnimation":"oAnimationEnd","msAnimation":"MSAnimationEnd","animation":"animationend"},animEndEventName=animEndEventNames[Modernizr.prefixed("animation")],onEndAnimation=function(el,callback){var onEndCallbackFn=function(ev){if(support.animations){if(ev.target!=this){return}this.removeEventListener(animEndEventName,onEndCallbackFn)}if(callback&&typeof callback==="function"){callback.call()}};if(support.animations){el.addEventListener(animEndEventName,onEndCallbackFn)}else{onEndCallbackFn()}};function extend(a,b){for(var key in b){if(b.hasOwnProperty(key)){a[key]=b[key]}}return a}function MLMenu(el,options){this.el=el;this.options=extend({},this.options);extend(this.options,options);this.menus=[].slice.call(this.el.querySelectorAll(".menu__level"));this.current_menu=0;var current_menu;this.menus.forEach(function(menuEl,pos){var items=menuEl.querySelectorAll(".menu__item");items.forEach(function(itemEl,iPos){var currentLink=itemEl.querySelector(".menu__link--current");if(currentLink){current_menu=pos}})});if(current_menu){this.current_menu=current_menu}this._init()}MLMenu.prototype.options={breadcrumbsCtrl:true,initialBreadcrumb:"all",backCtrl:true,itemsDelayInterval:60,direction:"r2l",onItemClick:function(ev,itemName){return false}};MLMenu.prototype._init=function(){this.menusArr=[];this.breadCrumbs=false;var self=this;var submenus=[];this.menus.forEach(function(menuEl,pos){var menu={menuEl:menuEl,menuItems:[].slice.call(menuEl.querySelectorAll(".menu__item"))};self.menusArr.push(menu);if(pos===self.current_menu){classie.add(menuEl,"menu__level--current")}var menu_x=menuEl.getAttribute("data-menu");var links=menuEl.querySelectorAll(".menu__link");links.forEach(function(linkEl,lPos){var submenu=linkEl.getAttribute("data-submenu");if(submenu){var pushMe={"menu":submenu,"name":linkEl.innerHTML};if(submenus[pos]){submenus[pos].push(pushMe)}else{submenus[pos]=[];submenus[pos].push(pushMe)}}})});this.menus.forEach(function(menuEl,pos){var menu_x=menuEl.getAttribute("data-menu");submenus.forEach(function(subMenuEl,menu_root){subMenuEl.forEach(function(subMenuItem,subPos){if(subMenuItem.menu==menu_x){self.menusArr[pos].backIdx=menu_root;self.menusArr[pos].name=subMenuItem.name}})})});if(self.options.breadcrumbsCtrl){this.breadcrumbsCtrl=document.createElement("nav");this.breadcrumbsCtrl.className="menu__breadcrumbs";this.breadcrumbsCtrl.setAttribute("aria-label","You are here");this.el.insertBefore(this.breadcrumbsCtrl,this.el.firstChild);this._addBreadcrumb(0);if(self.menusArr[self.current_menu].backIdx!=0&&self.current_menu!=0){this._crawlCrumbs(self.menusArr[self.current_menu].backIdx,self.menusArr);this.breadCrumbs=true}if(self.current_menu!=0){this._addBreadcrumb(self.current_menu);this.breadCrumbs=true}}if(this.options.backCtrl){this.backCtrl=document.createElement("button");if(this.breadCrumbs){this.backCtrl.className="menu__back"}else{this.backCtrl.className="menu__back menu__back--hidden"}this.backCtrl.setAttribute("aria-label","Go back");this.backCtrl.innerHTML='<span class="icon icon--arrow-left"></span>';this.el.insertBefore(this.backCtrl,this.el.firstChild)}this._initEvents()};MLMenu.prototype._initEvents=function(){var self=this;for(var i=0,len=this.menusArr.length;i<len;++i){this.menusArr[i].menuItems.forEach(function(item,pos){item.querySelector("a").addEventListener("click",function(ev){var submenu=ev.target.getAttribute("data-submenu"),itemName=ev.target.innerHTML,subMenuEl=self.el.querySelector('ul[data-menu="'+submenu+'"]');if(submenu&&subMenuEl){ev.preventDefault();self._openSubMenu(subMenuEl,pos,itemName)}else{var currentlink=self.el.querySelector(".menu__link--current");if(currentlink){classie.remove(self.el.querySelector(".menu__link--current"),"menu__link--current")}classie.add(ev.target,"menu__link--current");self.options.onItemClick(ev,itemName)}})})}if(this.options.backCtrl){this.backCtrl.addEventListener("click",function(){self._back()})}};MLMenu.prototype._openSubMenu=function(subMenuEl,clickPosition,subMenuName){if(this.isAnimating){return false
     }this.isAnimating=true;this.menusArr[this.menus.indexOf(subMenuEl)].backIdx=this.current_menu;this.menusArr[this.menus.indexOf(subMenuEl)].name=subMenuName;this._menuOut(clickPosition);this._menuIn(subMenuEl,clickPosition)};MLMenu.prototype._back=function(){if(this.isAnimating){return false}this.isAnimating=true;this._menuOut();var backMenu=this.menusArr[this.menusArr[this.current_menu].backIdx].menuEl;this._menuIn(backMenu);if(this.options.breadcrumbsCtrl){this.breadcrumbsCtrl.removeChild(this.breadcrumbsCtrl.lastElementChild)}};MLMenu.prototype._menuOut=function(clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false;this.menusArr[this.current_menu].menuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms"});if(this.options.direction==="r2l"){classie.add(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight")}else{classie.add(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight")}};MLMenu.prototype._menuIn=function(nextMenuEl,clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false,nextMenuIdx=this.menus.indexOf(nextMenuEl),nextMenu=this.menusArr[nextMenuIdx],nextMenuEl=nextMenu.menuEl,nextMenuItems=nextMenu.menuItems,nextMenuItemsTotal=nextMenuItems.length;nextMenuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms";var farthestIdx=clickPosition<=nextMenuItemsTotal/2||isBackNavigation?nextMenuItemsTotal-1:0;if(pos===farthestIdx){onEndAnimation(item,function(){if(self.options.direction==="r2l"){classie.remove(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.remove(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}classie.remove(currentMenu,"menu__level--current");classie.add(nextMenuEl,"menu__level--current");self.current_menu=nextMenuIdx;if(!isBackNavigation){if(self.options.backCtrl){classie.remove(self.backCtrl,"menu__back--hidden")}self._addBreadcrumb(nextMenuIdx)}else{if(self.current_menu===0&&self.options.backCtrl){classie.add(self.backCtrl,"menu__back--hidden")}}self.isAnimating=false;nextMenuEl.focus()})}});if(this.options.direction==="r2l"){classie.add(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.add(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}};MLMenu.prototype._addBreadcrumb=function(idx){if(!this.options.breadcrumbsCtrl){return false}var bc=document.createElement("a");bc.href="#";bc.innerHTML=idx?this.menusArr[idx].name:this.options.initialBreadcrumb;this.breadcrumbsCtrl.appendChild(bc);var self=this;bc.addEventListener("click",function(ev){ev.preventDefault();if(!bc.nextSibling||self.isAnimating){return false}self.isAnimating=true;self._menuOut();var nextMenu=self.menusArr[idx].menuEl;self._menuIn(nextMenu);var siblingNode;while(siblingNode=bc.nextSibling){self.breadcrumbsCtrl.removeChild(siblingNode)}})};MLMenu.prototype._crawlCrumbs=function(currentMenu,menuArray){if(menuArray[currentMenu].backIdx!=0){this._crawlCrumbs(menuArray[currentMenu].backIdx,menuArray)}this._addBreadcrumb(currentMenu)};window.MLMenu=MLMenu})(window);(function(){var menuEl=document.getElementById("ml-menu"),mlmenu=new MLMenu(menuEl,{backCtrl:true,});var openMenuCtrl=document.querySelector(".action--open"),closeMenuCtrl=document.querySelector(".action--close");openMenuCtrl.addEventListener("click",openMenu);closeMenuCtrl.addEventListener("click",closeMenu);function openMenu(){classie.add(menuEl,"menu--open");closeMenuCtrl.focus()}function closeMenu(){classie.remove(menuEl,"menu--open");openMenuCtrl.focus()}})();
+    /* async load js */
+    function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}
 </script>
 
 <!--@PRODUCT-JS@-->

From c9d460f069f0e246e8fbc190c3385d26719940a9 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Mon, 25 Jan 2021 16:48:12 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BDgoogl?=
 =?UTF-8?q?e=E5=B9=BF=E5=91=8A=E5=92=8Cadd=20this=E7=A4=BE=E5=AA=92?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-add-this.php  | 1 +
 application/views/mobile_first/ch-google-ad.php | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 application/views/mobile_first/ch-add-this.php
 create mode 100644 application/views/mobile_first/ch-google-ad.php

diff --git a/application/views/mobile_first/ch-add-this.php b/application/views/mobile_first/ch-add-this.php
new file mode 100644
index 00000000..e5a9df04
--- /dev/null
+++ b/application/views/mobile_first/ch-add-this.php
@@ -0,0 +1 @@
+<script>document.addEventListener("DOMContentLoaded",()=>{setTimeout(function(){loadScriptByAsync("https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-52170b0a4a301edc")},5e3)});</script>
diff --git a/application/views/mobile_first/ch-google-ad.php b/application/views/mobile_first/ch-google-ad.php
new file mode 100644
index 00000000..6b9e6b56
--- /dev/null
+++ b/application/views/mobile_first/ch-google-ad.php
@@ -0,0 +1,6 @@
+<script>
+    function throttle(e,o,t){var n=null,c=new Date;return function(){var a=new Date;clearTimeout(n),a-c>=t?(e(),c=a):n=setTimeout(e,o)}}function createLazyloader(){return function(){var e=window.innerHeight;(document.documentElement&&document.documentElement.scrollTop||document.body&&document.body.scrollTop)>=e+100&&loadScriptByAsync("https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js")}}
+    var lazyloader = createLazyloader();window.addEventListener('scroll', throttle(lazyloader, 500, 500), false);
+</script>
+<ins class="adsbygoogle" style="display:block;  text-align:center;" data-ad-layout="in-article" data-ad-format="fluid" data-ad-client="ca-pub-4231674166786366" data-ad-slot="5442695494"></ins>
+<script>  (adsbygoogle =  window.adsbygoogle || []).push({});</script>
\ No newline at end of file

From 0aeb14c369defbc9b9115109304703edbc0e5fb2 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 09:44:50 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 60b2386d..80003daa 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -32,7 +32,7 @@
         <a href="/"> <img src="https://www.chinahighlights.com/pic/guide/info-template-top-logo.png" width="98px"
                           height="53px" alt="chinahighlights logo" class="chinahighlightslogo"></a>
         <div class="topnavitailor">
-            <a href="/tour/create-my-trip.htm" class="infocustomize">CREATE MY TRIP <i aria-hidden="true"
+            <a href="/tour/create-my-trip.htm" class="infocustomize">Create My Trip <i aria-hidden="true"
                                                                                        class="fa fa-caret-right toptailorarrow"></i></a>
             <i class="fa fa-bars navimenu topnaviarrowdown action--open"></i>
         </div>
@@ -255,8 +255,6 @@
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];
         _._cssomPrefixes=b;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i){return t}if(!n){return !1}if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i){return"@"+n}for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i){return"@-"+a.toLowerCase()+"-"+n}}return !1};_.atRule=E;var N=_._config.usePrefixes?S.toLowerCase().split(" "):[];_._domPrefixes=N;var P={elem:f("modernizr")};Modernizr._q.push(function(){delete P.elem});var z={style:P.elem.style};Modernizr._q.unshift(function(){delete z.style}),_.testAllProps=h;_.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.indexOf("-")&&(e=s(e)),n?h(e,n,t):h(e,"pfx"))};_.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),o(),i(g),delete _.addTest,delete _.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++){Modernizr._q[T]()}e.Modernizr=Modernizr}(window,document);(function(window){var support={animations:Modernizr.cssanimations},animEndEventNames={"WebkitAnimation":"webkitAnimationEnd","OAnimation":"oAnimationEnd","msAnimation":"MSAnimationEnd","animation":"animationend"},animEndEventName=animEndEventNames[Modernizr.prefixed("animation")],onEndAnimation=function(el,callback){var onEndCallbackFn=function(ev){if(support.animations){if(ev.target!=this){return}this.removeEventListener(animEndEventName,onEndCallbackFn)}if(callback&&typeof callback==="function"){callback.call()}};if(support.animations){el.addEventListener(animEndEventName,onEndCallbackFn)}else{onEndCallbackFn()}};function extend(a,b){for(var key in b){if(b.hasOwnProperty(key)){a[key]=b[key]}}return a}function MLMenu(el,options){this.el=el;this.options=extend({},this.options);extend(this.options,options);this.menus=[].slice.call(this.el.querySelectorAll(".menu__level"));this.current_menu=0;var current_menu;this.menus.forEach(function(menuEl,pos){var items=menuEl.querySelectorAll(".menu__item");items.forEach(function(itemEl,iPos){var currentLink=itemEl.querySelector(".menu__link--current");if(currentLink){current_menu=pos}})});if(current_menu){this.current_menu=current_menu}this._init()}MLMenu.prototype.options={breadcrumbsCtrl:true,initialBreadcrumb:"all",backCtrl:true,itemsDelayInterval:60,direction:"r2l",onItemClick:function(ev,itemName){return false}};MLMenu.prototype._init=function(){this.menusArr=[];this.breadCrumbs=false;var self=this;var submenus=[];this.menus.forEach(function(menuEl,pos){var menu={menuEl:menuEl,menuItems:[].slice.call(menuEl.querySelectorAll(".menu__item"))};self.menusArr.push(menu);if(pos===self.current_menu){classie.add(menuEl,"menu__level--current")}var menu_x=menuEl.getAttribute("data-menu");var links=menuEl.querySelectorAll(".menu__link");links.forEach(function(linkEl,lPos){var submenu=linkEl.getAttribute("data-submenu");if(submenu){var pushMe={"menu":submenu,"name":linkEl.innerHTML};if(submenus[pos]){submenus[pos].push(pushMe)}else{submenus[pos]=[];submenus[pos].push(pushMe)}}})});this.menus.forEach(function(menuEl,pos){var menu_x=menuEl.getAttribute("data-menu");submenus.forEach(function(subMenuEl,menu_root){subMenuEl.forEach(function(subMenuItem,subPos){if(subMenuItem.menu==menu_x){self.menusArr[pos].backIdx=menu_root;self.menusArr[pos].name=subMenuItem.name}})})});if(self.options.breadcrumbsCtrl){this.breadcrumbsCtrl=document.createElement("nav");this.breadcrumbsCtrl.className="menu__breadcrumbs";this.breadcrumbsCtrl.setAttribute("aria-label","You are here");this.el.insertBefore(this.breadcrumbsCtrl,this.el.firstChild);this._addBreadcrumb(0);if(self.menusArr[self.current_menu].backIdx!=0&&self.current_menu!=0){this._crawlCrumbs(self.menusArr[self.current_menu].backIdx,self.menusArr);this.breadCrumbs=true}if(self.current_menu!=0){this._addBreadcrumb(self.current_menu);this.breadCrumbs=true}}if(this.options.backCtrl){this.backCtrl=document.createElement("button");if(this.breadCrumbs){this.backCtrl.className="menu__back"}else{this.backCtrl.className="menu__back menu__back--hidden"}this.backCtrl.setAttribute("aria-label","Go back");this.backCtrl.innerHTML='<span class="icon icon--arrow-left"></span>';this.el.insertBefore(this.backCtrl,this.el.firstChild)}this._initEvents()};MLMenu.prototype._initEvents=function(){var self=this;for(var i=0,len=this.menusArr.length;i<len;++i){this.menusArr[i].menuItems.forEach(function(item,pos){item.querySelector("a").addEventListener("click",function(ev){var submenu=ev.target.getAttribute("data-submenu"),itemName=ev.target.innerHTML,subMenuEl=self.el.querySelector('ul[data-menu="'+submenu+'"]');if(submenu&&subMenuEl){ev.preventDefault();self._openSubMenu(subMenuEl,pos,itemName)}else{var currentlink=self.el.querySelector(".menu__link--current");if(currentlink){classie.remove(self.el.querySelector(".menu__link--current"),"menu__link--current")}classie.add(ev.target,"menu__link--current");self.options.onItemClick(ev,itemName)}})})}if(this.options.backCtrl){this.backCtrl.addEventListener("click",function(){self._back()})}};MLMenu.prototype._openSubMenu=function(subMenuEl,clickPosition,subMenuName){if(this.isAnimating){return false
     }this.isAnimating=true;this.menusArr[this.menus.indexOf(subMenuEl)].backIdx=this.current_menu;this.menusArr[this.menus.indexOf(subMenuEl)].name=subMenuName;this._menuOut(clickPosition);this._menuIn(subMenuEl,clickPosition)};MLMenu.prototype._back=function(){if(this.isAnimating){return false}this.isAnimating=true;this._menuOut();var backMenu=this.menusArr[this.menusArr[this.current_menu].backIdx].menuEl;this._menuIn(backMenu);if(this.options.breadcrumbsCtrl){this.breadcrumbsCtrl.removeChild(this.breadcrumbsCtrl.lastElementChild)}};MLMenu.prototype._menuOut=function(clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false;this.menusArr[this.current_menu].menuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms"});if(this.options.direction==="r2l"){classie.add(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight")}else{classie.add(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight")}};MLMenu.prototype._menuIn=function(nextMenuEl,clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false,nextMenuIdx=this.menus.indexOf(nextMenuEl),nextMenu=this.menusArr[nextMenuIdx],nextMenuEl=nextMenu.menuEl,nextMenuItems=nextMenu.menuItems,nextMenuItemsTotal=nextMenuItems.length;nextMenuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms";var farthestIdx=clickPosition<=nextMenuItemsTotal/2||isBackNavigation?nextMenuItemsTotal-1:0;if(pos===farthestIdx){onEndAnimation(item,function(){if(self.options.direction==="r2l"){classie.remove(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.remove(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}classie.remove(currentMenu,"menu__level--current");classie.add(nextMenuEl,"menu__level--current");self.current_menu=nextMenuIdx;if(!isBackNavigation){if(self.options.backCtrl){classie.remove(self.backCtrl,"menu__back--hidden")}self._addBreadcrumb(nextMenuIdx)}else{if(self.current_menu===0&&self.options.backCtrl){classie.add(self.backCtrl,"menu__back--hidden")}}self.isAnimating=false;nextMenuEl.focus()})}});if(this.options.direction==="r2l"){classie.add(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.add(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}};MLMenu.prototype._addBreadcrumb=function(idx){if(!this.options.breadcrumbsCtrl){return false}var bc=document.createElement("a");bc.href="#";bc.innerHTML=idx?this.menusArr[idx].name:this.options.initialBreadcrumb;this.breadcrumbsCtrl.appendChild(bc);var self=this;bc.addEventListener("click",function(ev){ev.preventDefault();if(!bc.nextSibling||self.isAnimating){return false}self.isAnimating=true;self._menuOut();var nextMenu=self.menusArr[idx].menuEl;self._menuIn(nextMenu);var siblingNode;while(siblingNode=bc.nextSibling){self.breadcrumbsCtrl.removeChild(siblingNode)}})};MLMenu.prototype._crawlCrumbs=function(currentMenu,menuArray){if(menuArray[currentMenu].backIdx!=0){this._crawlCrumbs(menuArray[currentMenu].backIdx,menuArray)}this._addBreadcrumb(currentMenu)};window.MLMenu=MLMenu})(window);(function(){var menuEl=document.getElementById("ml-menu"),mlmenu=new MLMenu(menuEl,{backCtrl:true,});var openMenuCtrl=document.querySelector(".action--open"),closeMenuCtrl=document.querySelector(".action--close");openMenuCtrl.addEventListener("click",openMenu);closeMenuCtrl.addEventListener("click",closeMenu);function openMenu(){classie.add(menuEl,"menu--open");closeMenuCtrl.focus()}function closeMenu(){classie.remove(menuEl,"menu--open");openMenuCtrl.focus()}})();
-    /* async load js */
-    function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}
 </script>
 
 <!--@PRODUCT-JS@-->

From 87417d320cdd960f0a630af9dbfb040da694a477 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 11:17:20 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 80003daa..6c91d18d 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -255,6 +255,7 @@
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];
         _._cssomPrefixes=b;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i){return t}if(!n){return !1}if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i){return"@"+n}for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i){return"@-"+a.toLowerCase()+"-"+n}}return !1};_.atRule=E;var N=_._config.usePrefixes?S.toLowerCase().split(" "):[];_._domPrefixes=N;var P={elem:f("modernizr")};Modernizr._q.push(function(){delete P.elem});var z={style:P.elem.style};Modernizr._q.unshift(function(){delete z.style}),_.testAllProps=h;_.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.indexOf("-")&&(e=s(e)),n?h(e,n,t):h(e,"pfx"))};_.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),o(),i(g),delete _.addTest,delete _.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++){Modernizr._q[T]()}e.Modernizr=Modernizr}(window,document);(function(window){var support={animations:Modernizr.cssanimations},animEndEventNames={"WebkitAnimation":"webkitAnimationEnd","OAnimation":"oAnimationEnd","msAnimation":"MSAnimationEnd","animation":"animationend"},animEndEventName=animEndEventNames[Modernizr.prefixed("animation")],onEndAnimation=function(el,callback){var onEndCallbackFn=function(ev){if(support.animations){if(ev.target!=this){return}this.removeEventListener(animEndEventName,onEndCallbackFn)}if(callback&&typeof callback==="function"){callback.call()}};if(support.animations){el.addEventListener(animEndEventName,onEndCallbackFn)}else{onEndCallbackFn()}};function extend(a,b){for(var key in b){if(b.hasOwnProperty(key)){a[key]=b[key]}}return a}function MLMenu(el,options){this.el=el;this.options=extend({},this.options);extend(this.options,options);this.menus=[].slice.call(this.el.querySelectorAll(".menu__level"));this.current_menu=0;var current_menu;this.menus.forEach(function(menuEl,pos){var items=menuEl.querySelectorAll(".menu__item");items.forEach(function(itemEl,iPos){var currentLink=itemEl.querySelector(".menu__link--current");if(currentLink){current_menu=pos}})});if(current_menu){this.current_menu=current_menu}this._init()}MLMenu.prototype.options={breadcrumbsCtrl:true,initialBreadcrumb:"all",backCtrl:true,itemsDelayInterval:60,direction:"r2l",onItemClick:function(ev,itemName){return false}};MLMenu.prototype._init=function(){this.menusArr=[];this.breadCrumbs=false;var self=this;var submenus=[];this.menus.forEach(function(menuEl,pos){var menu={menuEl:menuEl,menuItems:[].slice.call(menuEl.querySelectorAll(".menu__item"))};self.menusArr.push(menu);if(pos===self.current_menu){classie.add(menuEl,"menu__level--current")}var menu_x=menuEl.getAttribute("data-menu");var links=menuEl.querySelectorAll(".menu__link");links.forEach(function(linkEl,lPos){var submenu=linkEl.getAttribute("data-submenu");if(submenu){var pushMe={"menu":submenu,"name":linkEl.innerHTML};if(submenus[pos]){submenus[pos].push(pushMe)}else{submenus[pos]=[];submenus[pos].push(pushMe)}}})});this.menus.forEach(function(menuEl,pos){var menu_x=menuEl.getAttribute("data-menu");submenus.forEach(function(subMenuEl,menu_root){subMenuEl.forEach(function(subMenuItem,subPos){if(subMenuItem.menu==menu_x){self.menusArr[pos].backIdx=menu_root;self.menusArr[pos].name=subMenuItem.name}})})});if(self.options.breadcrumbsCtrl){this.breadcrumbsCtrl=document.createElement("nav");this.breadcrumbsCtrl.className="menu__breadcrumbs";this.breadcrumbsCtrl.setAttribute("aria-label","You are here");this.el.insertBefore(this.breadcrumbsCtrl,this.el.firstChild);this._addBreadcrumb(0);if(self.menusArr[self.current_menu].backIdx!=0&&self.current_menu!=0){this._crawlCrumbs(self.menusArr[self.current_menu].backIdx,self.menusArr);this.breadCrumbs=true}if(self.current_menu!=0){this._addBreadcrumb(self.current_menu);this.breadCrumbs=true}}if(this.options.backCtrl){this.backCtrl=document.createElement("button");if(this.breadCrumbs){this.backCtrl.className="menu__back"}else{this.backCtrl.className="menu__back menu__back--hidden"}this.backCtrl.setAttribute("aria-label","Go back");this.backCtrl.innerHTML='<span class="icon icon--arrow-left"></span>';this.el.insertBefore(this.backCtrl,this.el.firstChild)}this._initEvents()};MLMenu.prototype._initEvents=function(){var self=this;for(var i=0,len=this.menusArr.length;i<len;++i){this.menusArr[i].menuItems.forEach(function(item,pos){item.querySelector("a").addEventListener("click",function(ev){var submenu=ev.target.getAttribute("data-submenu"),itemName=ev.target.innerHTML,subMenuEl=self.el.querySelector('ul[data-menu="'+submenu+'"]');if(submenu&&subMenuEl){ev.preventDefault();self._openSubMenu(subMenuEl,pos,itemName)}else{var currentlink=self.el.querySelector(".menu__link--current");if(currentlink){classie.remove(self.el.querySelector(".menu__link--current"),"menu__link--current")}classie.add(ev.target,"menu__link--current");self.options.onItemClick(ev,itemName)}})})}if(this.options.backCtrl){this.backCtrl.addEventListener("click",function(){self._back()})}};MLMenu.prototype._openSubMenu=function(subMenuEl,clickPosition,subMenuName){if(this.isAnimating){return false
     }this.isAnimating=true;this.menusArr[this.menus.indexOf(subMenuEl)].backIdx=this.current_menu;this.menusArr[this.menus.indexOf(subMenuEl)].name=subMenuName;this._menuOut(clickPosition);this._menuIn(subMenuEl,clickPosition)};MLMenu.prototype._back=function(){if(this.isAnimating){return false}this.isAnimating=true;this._menuOut();var backMenu=this.menusArr[this.menusArr[this.current_menu].backIdx].menuEl;this._menuIn(backMenu);if(this.options.breadcrumbsCtrl){this.breadcrumbsCtrl.removeChild(this.breadcrumbsCtrl.lastElementChild)}};MLMenu.prototype._menuOut=function(clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false;this.menusArr[this.current_menu].menuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms"});if(this.options.direction==="r2l"){classie.add(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight")}else{classie.add(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight")}};MLMenu.prototype._menuIn=function(nextMenuEl,clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false,nextMenuIdx=this.menus.indexOf(nextMenuEl),nextMenu=this.menusArr[nextMenuIdx],nextMenuEl=nextMenu.menuEl,nextMenuItems=nextMenu.menuItems,nextMenuItemsTotal=nextMenuItems.length;nextMenuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms";var farthestIdx=clickPosition<=nextMenuItemsTotal/2||isBackNavigation?nextMenuItemsTotal-1:0;if(pos===farthestIdx){onEndAnimation(item,function(){if(self.options.direction==="r2l"){classie.remove(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.remove(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}classie.remove(currentMenu,"menu__level--current");classie.add(nextMenuEl,"menu__level--current");self.current_menu=nextMenuIdx;if(!isBackNavigation){if(self.options.backCtrl){classie.remove(self.backCtrl,"menu__back--hidden")}self._addBreadcrumb(nextMenuIdx)}else{if(self.current_menu===0&&self.options.backCtrl){classie.add(self.backCtrl,"menu__back--hidden")}}self.isAnimating=false;nextMenuEl.focus()})}});if(this.options.direction==="r2l"){classie.add(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.add(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}};MLMenu.prototype._addBreadcrumb=function(idx){if(!this.options.breadcrumbsCtrl){return false}var bc=document.createElement("a");bc.href="#";bc.innerHTML=idx?this.menusArr[idx].name:this.options.initialBreadcrumb;this.breadcrumbsCtrl.appendChild(bc);var self=this;bc.addEventListener("click",function(ev){ev.preventDefault();if(!bc.nextSibling||self.isAnimating){return false}self.isAnimating=true;self._menuOut();var nextMenu=self.menusArr[idx].menuEl;self._menuIn(nextMenu);var siblingNode;while(siblingNode=bc.nextSibling){self.breadcrumbsCtrl.removeChild(siblingNode)}})};MLMenu.prototype._crawlCrumbs=function(currentMenu,menuArray){if(menuArray[currentMenu].backIdx!=0){this._crawlCrumbs(menuArray[currentMenu].backIdx,menuArray)}this._addBreadcrumb(currentMenu)};window.MLMenu=MLMenu})(window);(function(){var menuEl=document.getElementById("ml-menu"),mlmenu=new MLMenu(menuEl,{backCtrl:true,});var openMenuCtrl=document.querySelector(".action--open"),closeMenuCtrl=document.querySelector(".action--close");openMenuCtrl.addEventListener("click",openMenu);closeMenuCtrl.addEventListener("click",closeMenu);function openMenu(){classie.add(menuEl,"menu--open");closeMenuCtrl.focus()}function closeMenu(){classie.remove(menuEl,"menu--open");openMenuCtrl.focus()}})();
+    function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}
 </script>
 
 <!--@PRODUCT-JS@-->

From daf492cc2bdc5679fbb09076b2847cf8ab815a64 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 11:57:35 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-next.php | 12 ++++++++----
 application/views/mobile_first/ch-pc.php   | 13 ++++++++-----
 application/views/mobile_first/ch.php      | 11 ++++++-----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/application/views/mobile_first/ch-next.php b/application/views/mobile_first/ch-next.php
index 0ad7bd01..50e22639 100644
--- a/application/views/mobile_first/ch-next.php
+++ b/application/views/mobile_first/ch-next.php
@@ -5,7 +5,8 @@
     <?php if (!empty($info_howtoplan)) { ?>
         <div class="articlenext">
             <a href="<?php echo $info_howtoplan->ic_url; ?>" rel="nofollow"><img
-                        src="<?php echo $info_howtoplan->ic_photo; ?>"
+                        src="https://data.chinahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $info_howtoplan->ic_photo; ?>"
                         alt="<?php echo $info_howtoplan->ic_title; ?>" class="img-responsive"></a>
             <span class="categorycenter"><?php echo $info_howtoplan_root->ic_title; ?></span>
             <span class="articlenexttitle"><a
@@ -16,7 +17,8 @@
     <?php if (!empty($info_besttime)) { ?>
         <div class="articlenext">
             <a href="<?php echo $info_besttime->ic_url; ?>" rel="nofollow"><img
-                        src="<?php echo $info_besttime->ic_photo; ?>"
+                        src="https://data.chinahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $info_besttime->ic_photo; ?>"
                         alt="<?php echo $info_besttime->ic_title; ?>" class="img-responsive"></a>
             <span class="categorycenter"><?php echo $info_besttime_root->ic_title; ?></span>
             <span class="articlenexttitle"><a
@@ -27,7 +29,8 @@
     <?php if (!empty($info_topthings)) { ?>
         <div class="articlenext">
             <a href="<?php echo $info_topthings->ic_url; ?>" rel="nofollow"><img
-                        src="<?php echo $info_topthings->ic_photo; ?>"
+                        src="https://data.chinahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $info_topthings->ic_photo; ?>"
                         alt="<?php echo $info_topthings->ic_title; ?>" class="img-responsive"></a>
             <span class="categorycenter"><?php echo $info_topthings_root->ic_title; ?></span>
             <span class="articlenexttitle"><a
@@ -38,7 +41,8 @@
     <?php if (!empty($info_hotel)) { ?>
         <div class="articlenext">
             <a href="<?php echo $info_hotel->ic_url; ?>" rel="nofollow"><img
-                        src="<?php echo $info_hotel->ic_photo; ?>"
+                        src="https://data.chinahighlights.com/grey.gif" loader="lazy"
+                        originalsrc="<?php echo $info_hotel->ic_photo; ?>"
                         alt="<?php echo $info_hotel->ic_title; ?>" class="img-responsive"></a>
             <span class="categorycenter"><?php echo $info_hotel_root->ic_title; ?></span>
             <span class="articlenexttitle"><a
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index edf961f2..353d12f1 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -41,7 +41,7 @@
 <!--PC头部导航-->
 <header class="headerbar" id="header">
 
-    <a href="/" class="p_toplogo"> <img src="https://www.chinahighlights.com/pic/logo/pc-top-navi-logo-2020.png"
+    <a href="/" class="p_toplogo"> <img src="https://www.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png"
                                         width="154px" height="83px" alt="chinahighlights logo"
                                         class="chinahighlightslogo"></a>
     <div class="p_topnavigation">
@@ -231,7 +231,7 @@
             <div class="aboutusright">
 
                 <div class="bottompctitle">Featured on</div>
-                <img src="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="xxx"
+                <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on"
                      class="img-responsive bottomfeature">
 
 
@@ -264,7 +264,7 @@
             </div>
             <div class="bottommembers">
                 <div class="memberIcons">
-                    <img src="https://data.chinahighlights.com/css/images/global/member-icons.png">
+                    <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/css/images/global/member-icons.png">
                 </div>
             </div>
         </div>
@@ -274,7 +274,9 @@
 <div class="bottomlogo">
     <div class="footerbox">
         <div class="row">
-            <img src="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
+            <img src="https://data.chinahighlights.com/grey.gif"
+                 originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
+                  loader="lazy"
                  class="img-responsive bottomlogopc">
             <span class="bottomcopyright">© 1998-2020 China Highlights — Discovery Your Way!  </span>
             <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
@@ -284,7 +286,8 @@
 </div>
 <!--@PRODUCT-JS@-->
 <!--@ADDON-JS@-->
-<script>function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}</script>
+<script>eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('8.R=10;(4(){3 h=b 26();4 11(X){8.R=X&&X.1I===\'1b\'?h.1V==1:10;1c()}h.1T=11;h.1Z=11;h.S=\'1M:1R/1x;1F,1Q/1P=\'})();5(!c.g){c.g=(4(){3 1u=y.M.1S;3 P=4(l){6 I l==="4"||1u.Q(l)==="[19 1L]"};3 1j=4(D){3 f=1O(D);5(1N(f)){6 0}5(f===0||!1Y(f)){6 f}6(f>0?1:-1)*o.1X(o.20(f))};3 1y=o.1U(2,1W)-1;3 1a=4(D){3 9=1j(D);6 o.1G(o.1H(9,0),1y)};6 4 g(J){3 C=E;3 U=y(J);5(J==p){F b H("c.g 1K 1J 1E-1D 19 - V p 1k B")}3 n=j.m>1?j[1]:2o B;3 T;5(I n!=="B"){5(!P(n)){F b H("c.g: 2q 2j, 2i 2k 2l 2m 2n a 4")}5(j.m>2){T=j[2]}}3 9=1a(U.m);3 A=P(C)?y(b C(9)):b c(9);3 k=0;3 d;1l(k<9){d=U[k];5(n){A[k]=I T==="B"?n(d,k):n.Q(T,d,k)}z{A[k]=d}k+=1}A.m=9;6 A}}())}5(!c.M.v){c.M.v=4(u){3 T,k;5(E==p){F b H("E 1i p 1k V 2p")}3 O=y(E);3 9=O.m>>>0;5(I u!=="4"){F b H(u+" 1i V a 4")}5(j.m>1){T=j[1]}k=0;1l(k<9){3 d;5(k 13 O){d=O[k];u.Q(T,d,k,O)}k++}}}4 1c(2h){3 14=4(i){i.W("1b",4(){i.r.q=1});5(8.R){i.1z("S",i.1B("1A").25(\'.28\',\'.1x\'))}z{i.1z("S",i.1B("1A"))}};3 1p=c.g(e.1q("h[1C=27]"));1p.v(4(7,Y){7.r.q=0;7.r.1w="q 0.18 1e-13-1m";14(7)});3 w=1o();w();4 12(l,1s,1v){3 N=p,L=b 1r();6 4(){3 K=b 1r();22(N);5(K-L>=1v){l();L=K}z{N=21(l,1s)}}}4 1h(1n){3 16=1n.24();6{15:16.15+8.23-e.t.2e,1t:16.1t+8.2d-e.t.2g}}4 1o(){3 G=c.g(e.1q("h[1C=2f]"));G.v(4(7,Y){7.r.q=0;7.r.1w="q 0.18 1e-13-1m"});6 4(){3 1g=8.2a;3 x=(e.t&&e.t.x)||(e.1d&&e.1d.x);G=G.29(4(7,Y){3 1f=1h(7).15;3 Z=1f<1g+x;5(Z){14(7)}6!Z})}}5(8.W){8.W("2c",12(w,s,s),10)}z{5(8.17){8.17("2b",12(w,s,s))}}};',62,151,'|||var|function|if|return|element|window|len||new|Array|kValue|document|number|from|img|target|arguments||fn|length|mapFn|Math|null|opacity|style|500|documentElement|callback|forEach|lazyloader|scrollTop|Object|else||undefined||value|this|throw|lazyImageList|TypeError|typeof|arrayLike|curTime|startTime|prototype|timeout||isCallable|call|isSupportWebp|src||items|not|addEventListener|event|index|hasVisible|false|getResult|throttle|in|loadImageByUrl|top|box|attachEvent|5s|object|toLength|load|createImageLoader|body|ease|offsetTop|seeHeight|getOffset|is|toInteger|or|while|out|el|createLazyloader|imageList|querySelectorAll|Date|delay|left|toStr|atleast|transition|webp|maxSafeInteger|setAttribute|originalsrc|getAttribute|loader|like|array|base64|min|max|type|an|requires|Function|data|isNaN|Number|vuUAAA|UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoBAAEAAwA0JaQAA3AA|image|toString|onerror|pow|width|53|floor|isFinite|onload|abs|setTimeout|clearTimeout|pageYOffset|getBoundingClientRect|replace|Image|ready|jpg|filter|innerHeight|onscroll|scroll|pageXOffset|clientTop|lazy|clientLeft|settings|the|provided|second|argument|must|be|void|defined|when'.split('|'),0,{}))
+    function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}</script>
 <!--@IN-ARTICLE-GOOGLE@-->
 <!--@ADDTHIS-WIDGET@-->
 </body>
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 6c91d18d..22ef8a52 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -29,7 +29,7 @@
 <!--头部导航-->
 <header class="headerbar  flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
     <div role=button tabindex=0>
-        <a href="/"> <img src="https://www.chinahighlights.com/pic/guide/info-template-top-logo.png" width="98px"
+        <a href="/"> <img src="https://www.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png" width="98px"
                           height="53px" alt="chinahighlights logo" class="chinahighlightslogo"></a>
         <div class="topnavitailor">
             <a href="/tour/create-my-trip.htm" class="infocustomize">Create My Trip <i aria-hidden="true"
@@ -198,8 +198,8 @@
 
     <div class="infobottom">
         <div class="bottomwechat">
-            <p><img src="https://data.chinahighlights.com/pic/guide/info-template-qr-code.jpg" alt=xxx width=100px
-                    height=100px></p>
+            <p><img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-qr-code.jpg" alt="info template qr code" width="100px"
+                    height="100px"></p>
             <span class="wechattitle">Contact us via WeChat</span>
         </div>
 
@@ -239,8 +239,8 @@
 
         <div class="featureon">
             <span class="followtitle">Featured on</span>
-            <img src=https://data.chinahighlights.com/pic/guide/info-template-feature-on.png alt=xxx
-                 class="img-responsive" width=436px height=250px>
+            <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on"
+                 class="img-responsive" width="436px" height="250px">
         </div>
     </div>
     <div class="bottomlogo">
@@ -255,6 +255,7 @@
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];
         _._cssomPrefixes=b;var E=function(n){var r,o=prefixes.length,i=e.CSSRule;if("undefined"==typeof i){return t}if(!n){return !1}if(n=n.replace(/^@/,""),r=n.replace(/-/g,"_").toUpperCase()+"_RULE",r in i){return"@"+n}for(var s=0;o>s;s++){var a=prefixes[s],f=a.toUpperCase()+"_"+r;if(f in i){return"@-"+a.toLowerCase()+"-"+n}}return !1};_.atRule=E;var N=_._config.usePrefixes?S.toLowerCase().split(" "):[];_._domPrefixes=N;var P={elem:f("modernizr")};Modernizr._q.push(function(){delete P.elem});var z={style:P.elem.style};Modernizr._q.unshift(function(){delete z.style}),_.testAllProps=h;_.prefixed=function(e,n,t){return 0===e.indexOf("@")?E(e):(-1!=e.indexOf("-")&&(e=s(e)),n?h(e,n,t):h(e,"pfx"))};_.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),o(),i(g),delete _.addTest,delete _.addAsyncTest;for(var T=0;T<Modernizr._q.length;T++){Modernizr._q[T]()}e.Modernizr=Modernizr}(window,document);(function(window){var support={animations:Modernizr.cssanimations},animEndEventNames={"WebkitAnimation":"webkitAnimationEnd","OAnimation":"oAnimationEnd","msAnimation":"MSAnimationEnd","animation":"animationend"},animEndEventName=animEndEventNames[Modernizr.prefixed("animation")],onEndAnimation=function(el,callback){var onEndCallbackFn=function(ev){if(support.animations){if(ev.target!=this){return}this.removeEventListener(animEndEventName,onEndCallbackFn)}if(callback&&typeof callback==="function"){callback.call()}};if(support.animations){el.addEventListener(animEndEventName,onEndCallbackFn)}else{onEndCallbackFn()}};function extend(a,b){for(var key in b){if(b.hasOwnProperty(key)){a[key]=b[key]}}return a}function MLMenu(el,options){this.el=el;this.options=extend({},this.options);extend(this.options,options);this.menus=[].slice.call(this.el.querySelectorAll(".menu__level"));this.current_menu=0;var current_menu;this.menus.forEach(function(menuEl,pos){var items=menuEl.querySelectorAll(".menu__item");items.forEach(function(itemEl,iPos){var currentLink=itemEl.querySelector(".menu__link--current");if(currentLink){current_menu=pos}})});if(current_menu){this.current_menu=current_menu}this._init()}MLMenu.prototype.options={breadcrumbsCtrl:true,initialBreadcrumb:"all",backCtrl:true,itemsDelayInterval:60,direction:"r2l",onItemClick:function(ev,itemName){return false}};MLMenu.prototype._init=function(){this.menusArr=[];this.breadCrumbs=false;var self=this;var submenus=[];this.menus.forEach(function(menuEl,pos){var menu={menuEl:menuEl,menuItems:[].slice.call(menuEl.querySelectorAll(".menu__item"))};self.menusArr.push(menu);if(pos===self.current_menu){classie.add(menuEl,"menu__level--current")}var menu_x=menuEl.getAttribute("data-menu");var links=menuEl.querySelectorAll(".menu__link");links.forEach(function(linkEl,lPos){var submenu=linkEl.getAttribute("data-submenu");if(submenu){var pushMe={"menu":submenu,"name":linkEl.innerHTML};if(submenus[pos]){submenus[pos].push(pushMe)}else{submenus[pos]=[];submenus[pos].push(pushMe)}}})});this.menus.forEach(function(menuEl,pos){var menu_x=menuEl.getAttribute("data-menu");submenus.forEach(function(subMenuEl,menu_root){subMenuEl.forEach(function(subMenuItem,subPos){if(subMenuItem.menu==menu_x){self.menusArr[pos].backIdx=menu_root;self.menusArr[pos].name=subMenuItem.name}})})});if(self.options.breadcrumbsCtrl){this.breadcrumbsCtrl=document.createElement("nav");this.breadcrumbsCtrl.className="menu__breadcrumbs";this.breadcrumbsCtrl.setAttribute("aria-label","You are here");this.el.insertBefore(this.breadcrumbsCtrl,this.el.firstChild);this._addBreadcrumb(0);if(self.menusArr[self.current_menu].backIdx!=0&&self.current_menu!=0){this._crawlCrumbs(self.menusArr[self.current_menu].backIdx,self.menusArr);this.breadCrumbs=true}if(self.current_menu!=0){this._addBreadcrumb(self.current_menu);this.breadCrumbs=true}}if(this.options.backCtrl){this.backCtrl=document.createElement("button");if(this.breadCrumbs){this.backCtrl.className="menu__back"}else{this.backCtrl.className="menu__back menu__back--hidden"}this.backCtrl.setAttribute("aria-label","Go back");this.backCtrl.innerHTML='<span class="icon icon--arrow-left"></span>';this.el.insertBefore(this.backCtrl,this.el.firstChild)}this._initEvents()};MLMenu.prototype._initEvents=function(){var self=this;for(var i=0,len=this.menusArr.length;i<len;++i){this.menusArr[i].menuItems.forEach(function(item,pos){item.querySelector("a").addEventListener("click",function(ev){var submenu=ev.target.getAttribute("data-submenu"),itemName=ev.target.innerHTML,subMenuEl=self.el.querySelector('ul[data-menu="'+submenu+'"]');if(submenu&&subMenuEl){ev.preventDefault();self._openSubMenu(subMenuEl,pos,itemName)}else{var currentlink=self.el.querySelector(".menu__link--current");if(currentlink){classie.remove(self.el.querySelector(".menu__link--current"),"menu__link--current")}classie.add(ev.target,"menu__link--current");self.options.onItemClick(ev,itemName)}})})}if(this.options.backCtrl){this.backCtrl.addEventListener("click",function(){self._back()})}};MLMenu.prototype._openSubMenu=function(subMenuEl,clickPosition,subMenuName){if(this.isAnimating){return false
     }this.isAnimating=true;this.menusArr[this.menus.indexOf(subMenuEl)].backIdx=this.current_menu;this.menusArr[this.menus.indexOf(subMenuEl)].name=subMenuName;this._menuOut(clickPosition);this._menuIn(subMenuEl,clickPosition)};MLMenu.prototype._back=function(){if(this.isAnimating){return false}this.isAnimating=true;this._menuOut();var backMenu=this.menusArr[this.menusArr[this.current_menu].backIdx].menuEl;this._menuIn(backMenu);if(this.options.breadcrumbsCtrl){this.breadcrumbsCtrl.removeChild(this.breadcrumbsCtrl.lastElementChild)}};MLMenu.prototype._menuOut=function(clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false;this.menusArr[this.current_menu].menuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms"});if(this.options.direction==="r2l"){classie.add(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight")}else{classie.add(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight")}};MLMenu.prototype._menuIn=function(nextMenuEl,clickPosition){var self=this,currentMenu=this.menusArr[this.current_menu].menuEl,isBackNavigation=typeof clickPosition=="undefined"?true:false,nextMenuIdx=this.menus.indexOf(nextMenuEl),nextMenu=this.menusArr[nextMenuIdx],nextMenuEl=nextMenu.menuEl,nextMenuItems=nextMenu.menuItems,nextMenuItemsTotal=nextMenuItems.length;nextMenuItems.forEach(function(item,pos){item.style.WebkitAnimationDelay=item.style.animationDelay=isBackNavigation?parseInt(pos*self.options.itemsDelayInterval)+"ms":parseInt(Math.abs(clickPosition-pos)*self.options.itemsDelayInterval)+"ms";var farthestIdx=clickPosition<=nextMenuItemsTotal/2||isBackNavigation?nextMenuItemsTotal-1:0;if(pos===farthestIdx){onEndAnimation(item,function(){if(self.options.direction==="r2l"){classie.remove(currentMenu,!isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.remove(currentMenu,isBackNavigation?"animate-outToLeft":"animate-outToRight");classie.remove(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}classie.remove(currentMenu,"menu__level--current");classie.add(nextMenuEl,"menu__level--current");self.current_menu=nextMenuIdx;if(!isBackNavigation){if(self.options.backCtrl){classie.remove(self.backCtrl,"menu__back--hidden")}self._addBreadcrumb(nextMenuIdx)}else{if(self.current_menu===0&&self.options.backCtrl){classie.add(self.backCtrl,"menu__back--hidden")}}self.isAnimating=false;nextMenuEl.focus()})}});if(this.options.direction==="r2l"){classie.add(nextMenuEl,!isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}else{classie.add(nextMenuEl,isBackNavigation?"animate-inFromRight":"animate-inFromLeft")}};MLMenu.prototype._addBreadcrumb=function(idx){if(!this.options.breadcrumbsCtrl){return false}var bc=document.createElement("a");bc.href="#";bc.innerHTML=idx?this.menusArr[idx].name:this.options.initialBreadcrumb;this.breadcrumbsCtrl.appendChild(bc);var self=this;bc.addEventListener("click",function(ev){ev.preventDefault();if(!bc.nextSibling||self.isAnimating){return false}self.isAnimating=true;self._menuOut();var nextMenu=self.menusArr[idx].menuEl;self._menuIn(nextMenu);var siblingNode;while(siblingNode=bc.nextSibling){self.breadcrumbsCtrl.removeChild(siblingNode)}})};MLMenu.prototype._crawlCrumbs=function(currentMenu,menuArray){if(menuArray[currentMenu].backIdx!=0){this._crawlCrumbs(menuArray[currentMenu].backIdx,menuArray)}this._addBreadcrumb(currentMenu)};window.MLMenu=MLMenu})(window);(function(){var menuEl=document.getElementById("ml-menu"),mlmenu=new MLMenu(menuEl,{backCtrl:true,});var openMenuCtrl=document.querySelector(".action--open"),closeMenuCtrl=document.querySelector(".action--close");openMenuCtrl.addEventListener("click",openMenu);closeMenuCtrl.addEventListener("click",closeMenu);function openMenu(){classie.add(menuEl,"menu--open");closeMenuCtrl.focus()}function closeMenu(){classie.remove(menuEl,"menu--open");openMenuCtrl.focus()}})();
+    eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('8.R=10;(4(){3 h=b 26();4 11(X){8.R=X&&X.1I===\'1b\'?h.1V==1:10;1c()}h.1T=11;h.1Z=11;h.S=\'1M:1R/1x;1F,1Q/1P=\'})();5(!c.g){c.g=(4(){3 1u=y.M.1S;3 P=4(l){6 I l==="4"||1u.Q(l)==="[19 1L]"};3 1j=4(D){3 f=1O(D);5(1N(f)){6 0}5(f===0||!1Y(f)){6 f}6(f>0?1:-1)*o.1X(o.20(f))};3 1y=o.1U(2,1W)-1;3 1a=4(D){3 9=1j(D);6 o.1G(o.1H(9,0),1y)};6 4 g(J){3 C=E;3 U=y(J);5(J==p){F b H("c.g 1K 1J 1E-1D 19 - V p 1k B")}3 n=j.m>1?j[1]:2o B;3 T;5(I n!=="B"){5(!P(n)){F b H("c.g: 2q 2j, 2i 2k 2l 2m 2n a 4")}5(j.m>2){T=j[2]}}3 9=1a(U.m);3 A=P(C)?y(b C(9)):b c(9);3 k=0;3 d;1l(k<9){d=U[k];5(n){A[k]=I T==="B"?n(d,k):n.Q(T,d,k)}z{A[k]=d}k+=1}A.m=9;6 A}}())}5(!c.M.v){c.M.v=4(u){3 T,k;5(E==p){F b H("E 1i p 1k V 2p")}3 O=y(E);3 9=O.m>>>0;5(I u!=="4"){F b H(u+" 1i V a 4")}5(j.m>1){T=j[1]}k=0;1l(k<9){3 d;5(k 13 O){d=O[k];u.Q(T,d,k,O)}k++}}}4 1c(2h){3 14=4(i){i.W("1b",4(){i.r.q=1});5(8.R){i.1z("S",i.1B("1A").25(\'.28\',\'.1x\'))}z{i.1z("S",i.1B("1A"))}};3 1p=c.g(e.1q("h[1C=27]"));1p.v(4(7,Y){7.r.q=0;7.r.1w="q 0.18 1e-13-1m";14(7)});3 w=1o();w();4 12(l,1s,1v){3 N=p,L=b 1r();6 4(){3 K=b 1r();22(N);5(K-L>=1v){l();L=K}z{N=21(l,1s)}}}4 1h(1n){3 16=1n.24();6{15:16.15+8.23-e.t.2e,1t:16.1t+8.2d-e.t.2g}}4 1o(){3 G=c.g(e.1q("h[1C=2f]"));G.v(4(7,Y){7.r.q=0;7.r.1w="q 0.18 1e-13-1m"});6 4(){3 1g=8.2a;3 x=(e.t&&e.t.x)||(e.1d&&e.1d.x);G=G.29(4(7,Y){3 1f=1h(7).15;3 Z=1f<1g+x;5(Z){14(7)}6!Z})}}5(8.W){8.W("2c",12(w,s,s),10)}z{5(8.17){8.17("2b",12(w,s,s))}}};',62,151,'|||var|function|if|return|element|window|len||new|Array|kValue|document|number|from|img|target|arguments||fn|length|mapFn|Math|null|opacity|style|500|documentElement|callback|forEach|lazyloader|scrollTop|Object|else||undefined||value|this|throw|lazyImageList|TypeError|typeof|arrayLike|curTime|startTime|prototype|timeout||isCallable|call|isSupportWebp|src||items|not|addEventListener|event|index|hasVisible|false|getResult|throttle|in|loadImageByUrl|top|box|attachEvent|5s|object|toLength|load|createImageLoader|body|ease|offsetTop|seeHeight|getOffset|is|toInteger|or|while|out|el|createLazyloader|imageList|querySelectorAll|Date|delay|left|toStr|atleast|transition|webp|maxSafeInteger|setAttribute|originalsrc|getAttribute|loader|like|array|base64|min|max|type|an|requires|Function|data|isNaN|Number|vuUAAA|UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoBAAEAAwA0JaQAA3AA|image|toString|onerror|pow|width|53|floor|isFinite|onload|abs|setTimeout|clearTimeout|pageYOffset|getBoundingClientRect|replace|Image|ready|jpg|filter|innerHeight|onscroll|scroll|pageXOffset|clientTop|lazy|clientLeft|settings|the|provided|second|argument|must|be|void|defined|when'.split('|'),0,{}))
     function loadScriptByAsync(src) {var asyncScript = document.createElement("script");asyncScript.async = true;asyncScript.crossorigin = "anonymous";asyncScript.src = src;firstScript=document.getElementsByTagName("script")[0];firstScript.parentNode.insertBefore(asyncScript, firstScript);}
 </script>
 

From f053dba7f83647eddc97d03a57ba053b95516720 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 13:49:22 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 353d12f1..6b514e5b 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -41,9 +41,9 @@
 <!--PC头部导航-->
 <header class="headerbar" id="header">
 
-    <a href="/" class="p_toplogo"> <img src="https://www.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png"
-                                        width="154px" height="83px" alt="chinahighlights logo"
-                                        class="chinahighlightslogo"></a>
+    <a href="/" class="p_toplogo"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png"
+                                        alt="chinahighlights logo"
+                                        class="chinahighlightslogo img-responsive"></a>
     <div class="p_topnavigation">
         <ul class="pctopnavi">
             <li class="dropdown"><a href="/tour/" class="p_topnavilink">China Tours</a>
@@ -276,7 +276,7 @@
         <div class="row">
             <img src="https://data.chinahighlights.com/grey.gif"
                  originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
-                  loader="lazy"
+                 loader="lazy"
                  class="img-responsive bottomlogopc">
             <span class="bottomcopyright">© 1998-2020 China Highlights — Discovery Your Way!  </span>
             <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 22ef8a52..766ba495 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -29,8 +29,7 @@
 <!--头部导航-->
 <header class="headerbar  flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
     <div role=button tabindex=0>
-        <a href="/"> <img src="https://www.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png" width="98px"
-                          height="53px" alt="chinahighlights logo" class="chinahighlightslogo"></a>
+        <a href="/"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a>
         <div class="topnavitailor">
             <a href="/tour/create-my-trip.htm" class="infocustomize">Create My Trip <i aria-hidden="true"
                                                                                        class="fa fa-caret-right toptailorarrow"></i></a>

From 3732b6a9436ef694940db7c5511bb8b62063079f Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 16:31:09 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 6b514e5b..94b9262b 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -41,7 +41,7 @@
 <!--PC头部导航-->
 <header class="headerbar" id="header">
 
-    <a href="/" class="p_toplogo"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png"
+    <a href="/" class="p_toplogo"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navigation-logo.png"
                                         alt="chinahighlights logo"
                                         class="chinahighlightslogo img-responsive"></a>
     <div class="p_topnavigation">
@@ -185,8 +185,11 @@
 
 <span class="infotailormade"><a href="/tour/create-my-trip.htm">Create Your Trip <i aria-hidden="true"
                                                                                     class="fa fa-caret-right"></i></a></span>
-</span>
 
+</span>
+        <div class="chbottomlogo">
+            <img src="https://data.chinahighlights.com/pic/logo/china-highlights-bottom-logo.png" alt="China Highlights Logo">
+        </div>
     </div>
 
     <div class="footerbox">
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 766ba495..dfee25cd 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -29,7 +29,7 @@
 <!--头部导航-->
 <header class="headerbar  flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
     <div role=button tabindex=0>
-        <a href="/"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navi-logo-2021.png" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a>
+        <a href="/"> <img src="https://data.chinahighlights.com/pic/logo/china-highlights-top-navigation-logo.png" alt="chinahighlights logo" class="chinahighlightslogo img-responsive"></a>
         <div class="topnavitailor">
             <a href="/tour/create-my-trip.htm" class="infocustomize">Create My Trip <i aria-hidden="true"
                                                                                        class="fa fa-caret-right toptailorarrow"></i></a>
@@ -193,6 +193,9 @@
 <span class="infotailormade"><a href="https://www.chinahighlights.com/tour/create-my-trip.htm">Create Your Trip <i
                 aria-hidden="true" class="fa fa-caret-right"></i></a></span>
 </span>
+        <div class="chbottomlogo">
+            <img src="https://data.chinahighlights.com/pic/logo/china-highlights-bottom-logo.png" alt="China Highlights Logo" >
+        </div>
     </div>
 
     <div class="infobottom">

From 053f9752d9df3197d9dfaf3c9aef3f4e29c0d3ce Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Tue, 26 Jan 2021 16:33:54 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E6=8F=90=E9=86=92=E7=88=AC=E8=99=AB?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=A7=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 94b9262b..ed07906f 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -9,6 +9,7 @@
     <meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
+    <meta name="robots" content="max-image-preview:large">
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <link rel="shortcut icon" href="/favicon.ico">
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index dfee25cd..09af96ae 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -7,6 +7,7 @@
     <meta name="description" content="<!--@DESCRIPTION@-->">
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
+    <meta name="robots" content="max-image-preview:large">
     <!--@OG:IMAGE@-->
     <link rel="shortcut icon" href="//data.chinahighlights.com/favicon.ico">
     <!--@MAIN-CSS@-->

From 5081097a6c94f14f0bae767fcb5f6c09ba92d9d8 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 11:00:57 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BC=98=E9=80=89=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=A4=A7=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       |   6 +-
 .../views/bootstrap3/information_edit.php     | 141 ++++++++++--------
 2 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index d34f8347..f77733c7 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -672,7 +672,11 @@ class Information extends CI_Controller
             $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
         }
         //顶部全屏大图
-        $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
+        if($device=='mobile'){//移动端读取移动大图
+            $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
+        }else{
+            $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
+        }
         $meta_addon_picture_url = get_meta($information->ic_id, 'meta_addon_picture_url');
         if (!empty($meta_addon_picture)) {
             if(!empty($meta_addon_picture_url)){
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 72cb1de4..d5785f89 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -746,11 +746,16 @@
 
                     <textarea name="ic_summary" id="ic_summary" class="col-xs-24" rows="5" placeholder="信息简介"
                               style="border:none;border-bottom:1px solid #bbb;"><?php echo  str_replace('textarea', 't-e-x-t-a-r-e-a', $information->ic_summary);  ?></textarea>
-                    <div class="col-xs-24">
+                    <div class="col-xs-16">
                         <label>SEO标题<em class="pull-right muted" id="ic_seo_title_count"></em></label>
                         <input class="form-control" type="text" onkeyup="change_seo_count(this.id);" id="ic_seo_title"
                                name="ic_seo_title" value="<?php echo $information->ic_seo_title; ?>">
                     </div>
+                    <div class="col-xs-8">
+                        <label>SEO关键词</label>
+                        <input class="form-control" type="text" id="ic_seo_keywords" name="ic_seo_keywords"
+                               value="<?php echo $information->ic_seo_keywords; ?>">
+                    </div>
 
                     <div class="col-xs-24">
                         <label>SEO描述<em class="pull-right muted" id="ic_seo_description_count"></em></label>
@@ -758,40 +763,11 @@
                                   name="ic_seo_description"><?php echo $information->ic_seo_description; ?></textarea>
                     </div>
 
-                    <div class="col-xs-24">
-                        <label>SEO关键词</label>
-                        <input class="form-control" type="text" id="ic_seo_keywords" name="ic_seo_keywords"
-                               value="<?php echo $information->ic_seo_keywords; ?>">
-                    </div>
 
-                    <div class="col-xs-24 nopadding">
-                        <div class="col-sm-4">
-                            <label>所属导航
-                                <a href="javascript:void(0);"
-                                   onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_website_nav', $('#meta_website_nav').val())"><i
-                                            class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
-                                <a href="javascript:void(0);"
-                                   onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_website_nav', $('#meta_website_nav').val())"><i
-                                            class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
-                            </label>
 
-                            <select name="meta_website_nav" id="meta_website_nav" class="form-control">
-                                <option value="">不选择</option>
-                                <?php
-                                if (!empty($setting_website_nav)) {
-                                    $setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
-                                    foreach ($setting_website_nav as $item) {
-                                        $strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value); ?>
-                                        <option <?php echo $strcasecmp_nav == 0 ? 'selected' : false; ?>
-                                                value="<?php echo $item->im_value ?>"><?php echo $item->im_value ?></option>
-                                        <?php
-                                    }
-                                }
-                                ?>
-                            </select>
+                    <div class="col-xs-24 nopadding">
 
-                        </div>
-                        <div class="col-sm-7">
+                        <div class="col-sm-8">
                             <label>附加样式
                                 <a href="javascript:void(0);"
                                    onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_css', $('#meta_addon_css').val())"><i
@@ -823,15 +799,84 @@
                                    placeholder="cht-1,cht12,gm-1,"
                                    value="<?php echo $information->ic_recommend_tours; ?>">
                         </div>
-
                         <div class="col-sm-3">
                             <label>小包价</label>
                             <input class="form-control" type="text" id="ic_recommend_packages"
                                    name="ic_recommend_packages"
                                    value="<?php echo $information->ic_recommend_packages; ?>">
                         </div>
+                        <div class="col-sm-3">
+                            <label>所属导航
+                                <a href="javascript:void(0);"
+                                   onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_website_nav', $('#meta_website_nav').val())"><i
+                                            class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                                <a href="javascript:void(0);"
+                                   onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_website_nav', $('#meta_website_nav').val())"><i
+                                            class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                            </label>
+
+                            <select name="meta_website_nav" id="meta_website_nav" class="form-control">
+                                <option value="">不选择</option>
+                                <?php
+                                if (!empty($setting_website_nav)) {
+                                    $setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
+                                    foreach ($setting_website_nav as $item) {
+                                        $strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value); ?>
+                                        <option <?php echo $strcasecmp_nav == 0 ? 'selected' : false; ?>
+                                                value="<?php echo $item->im_value ?>"><?php echo $item->im_value ?></option>
+                                        <?php
+                                    }
+                                }
+                                ?>
+                            </select>
+
+                        </div>
+                    </div>
+
+<div >
+                    <div class="col-sm-8">
+                        <label>附加图片
+                            <a href="javascript:void(0);"
+                               onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                            <a href="javascript:void(0);"
+                               onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                        </label>
+                        <input name="meta_addon_picture" id="meta_addon_picture" type="text"
+                               class="form-control"
+                               value="<?php echo get_meta($information->ic_id, 'meta_addon_picture'); ?>"/>
                     </div>
 
+                    <div class="col-sm-8">
+                        <label>附加图片Mobile
+                            <a href="javascript:void(0);"
+                               onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                            <a href="javascript:void(0);"
+                               onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                        </label>
+                        <input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text"
+                               class="form-control"
+                               value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>"/>
+                    </div>
+
+                    <div class="col-sm-8">
+                        <label>附加图片链接
+                            <a href="javascript:void(0);"
+                               onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                            <a href="javascript:void(0);"
+                               onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i
+                                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                        </label>
+                        <input name="meta_addon_picture_url" id="meta_addon_picture_url" type="text"
+                               class="form-control"
+                               value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_url'); ?>"/>
+                    </div>
+</div>
+
                     <input type="hidden" name="ic_photo_width" id="ic_photo_width"
                            value="<?php echo $information->ic_photo_width; ?>"/>
                     <input type="hidden" name="ic_photo_height" id="ic_photo_height"
@@ -896,37 +941,7 @@
                                 </select>
                             </div>
 
-                            <div class="col-sm-5">
-                                <label>附加图片地址
-                                    <a href="javascript:void(0);"
-                                       onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
-                                    <a href="javascript:void(0);"
-                                       onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
-                                    <a href="javascript:void(0);" title="为信息绑定更多图片."><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
-                                </label>
-                                <input name="meta_addon_picture" id="meta_addon_picture" type="text"
-                                       class="form-control"
-                                       value="<?php echo get_meta($information->ic_id, 'meta_addon_picture'); ?>"/>
-                            </div>
 
-                            <div class="col-sm-4">
-                                <label>附加图片链接
-                                    <a href="javascript:void(0);"
-                                       onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
-                                    <a href="javascript:void(0);"
-                                       onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
-                                    <a href="javascript:void(0);" title="图片的链接."><i
-                                                class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
-                                </label>
-                                <input name="meta_addon_picture_url" id="meta_addon_picture_url" type="text"
-                                       class="form-control"
-                                       value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_url'); ?>"/>
-                            </div>
 
                             <div class="col-sm-4 meta_recommend_info_box">
                                 <label>推荐信息

From 65344c9168242ecf5b013b3055db2b8a1897882d Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 11:12:44 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B4=E4=BB=BD?=
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    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index ed07906f..58c6a0bb 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -282,7 +282,7 @@
                  originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
                  loader="lazy"
                  class="img-responsive bottomlogopc">
-            <span class="bottomcopyright">© 1998-2020 China Highlights — Discovery Your Way!  </span>
+            <span class="bottomcopyright">© 1998-2021 China Highlights — Discovery Your Way!  </span>
             <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
                         href="/aboutus/terms.htm">Terms</a></span>
         </div>
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 09af96ae..73e21de9 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -247,7 +247,7 @@
         </div>
     </div>
     <div class="bottomlogo">
-        © 1998-2020 China Highlights <br>— Discovery Your Way!
+        © 1998-2021 China Highlights <br>— Discovery Your Way!
     </div>
 
 </footer>

From 181e2401f76abd07b534e8b3b1253885dd13cf57 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 12:50:38 +0800
Subject: [PATCH 11/17] =?UTF-8?q?url=E5=88=97=E8=A1=A8=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/welcome.php      | 2 +-
 application/models/information_model.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index d17f485c..172bfafc 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -105,7 +105,7 @@ class Welcome extends CI_Controller {
             show_404();
             return false;
         }
-        $data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path);
+        $data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path,false,false,'is_id,ic_url,ic_id,ic_status');
         $this->load->view('bootstrap3/header', $data);
         switch ($view){
             case 'amp':
diff --git a/application/models/information_model.php b/application/models/information_model.php
index ebafb5ca..70e0a4b4 100644
--- a/application/models/information_model.php
+++ b/application/models/information_model.php
@@ -97,14 +97,14 @@ class Information_model extends CI_Model {
     }
 
     //根据根节点路径获取子节点列表
-    function get_list_by_path($path, $level = false, $site_code = false) {
+    function get_list_by_path($path, $level = false, $site_code = false,$filed=false) {
         $this->init();
         if ($level !== false) {
             $this->level = " AND is1.is_level= '$level' ";
         }
         $this->path = " AND is1.is_path LIKE '$path%' ";
         $this->orderBy = ' ORDER BY is1.is_level ASC, is1.is_sort ASC,is1.is_path ASC ';
-        return $this->GetList('', $site_code);
+        return $this->GetList($filed, $site_code);
     }
 
     //根据路径获取某一级别节点详细页

From b956bf7452ed99db41566f7b4d39d78932acf478 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 13:44:00 +0800
Subject: [PATCH 12/17] ok

---
 application/controllers/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 0705a6b2..60f266fb 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -26,7 +26,7 @@ class Cache extends CI_Controller
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');
-        $this->site_code = $this->config->item('site_code');
+        $this->site_code = $this->input->get('site_code') || $this->config->item('site_code');
     }
 
     /**

From 302de2e1d7692f506f3bb1b920568eecba068cc5 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 13:56:30 +0800
Subject: [PATCH 13/17] test cache

---
 application/config/config.php     |  9 ++++++++-
 application/controllers/cache.php | 11 ++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/config/config.php b/application/config/config.php
index f452e73d..d2ccda34 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -415,7 +415,6 @@ $config['site'] = array(
 );
 
 //静态文件生成路径
-
 $config['cache']['jp']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\arachina.com';
 $config['cache']['gm']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\chinarundreisen.com';
 $config['cache']['vc']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\voyageschine.com';
@@ -423,6 +422,14 @@ $config['cache']['vac']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaje-a-china.c
 $config['cache']['ru']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\chinahighlights.ru';
 $config['cache']['it']['cache_path'] = 'C:\VHD\Dropbox\wwwcache\viaggio-in-cina.it';
 
+//静态文件站点域名
+$config['cache']['jp']['site_url'] = 'https://www.arachina.com';
+$config['cache']['gm']['site_url'] = 'https://www.chinarundreisen.com';
+$config['cache']['vc']['site_url'] = 'https://www.voyageschine.com';
+$config['cache']['vac']['site_url'] = 'https://www.viaje-a-china.com';
+$config['cache']['ru']['site_url'] = 'https://www.chinahighlights.ru';
+$config['cache']['it']['site_url'] = 'https://www.viaggio-in-cina.it';
+
 //静态文件更新接口
 $config['cache']['jp']['cache_api'] = '/info.php/information/update_cache/';
 $config['cache']['gm']['cache_api'] = '/info.php/information/update_cache/';
diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 60f266fb..0f81dbae 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -39,13 +39,14 @@ class Cache extends CI_Controller
      */
     public function update()
     {
+        $returnType = $this->input->get('type');
         //设置缓存文件文件夹
         $cache_config = $this->config->item('cache');
         $current_cache_config = $cache_config[$this->site_code];
         $this->dir = $current_cache_config['cache_path'];
 
         //设置当前站点
-        $this->current_domain = $this->config->item('site_url');
+        $this->current_domain = $current_cache_config['site_url']; //$this->config->item('site_url');
         //echo $this->config->item('site_url');
         //设置缓存更新接口及POST参数
         $this->cache_api = $current_cache_config['cache_api'];
@@ -66,8 +67,12 @@ class Cache extends CI_Controller
         $data['cache_api'] = $this->cache_api;
         $data['post_para'] = $this->post_para;
 
-        //视图
-        $this->load->view('cache/update', $data);
+        if ($returnType === 'json') {
+            echo (json_encode($this->file));
+        } else {
+            //视图
+            $this->load->view('cache/update', $data);
+        }
     }
 
     /**

From d2c59e12e1b55e2957b4d4ff2a02bb09800f7bf7 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 14:51:37 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=95=E9=83=A8logo?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bootstrap3/refresh_mobile_first_urls.php  |  2 +-
 application/views/mobile_first/ch-pc.php      | 87 +++++++++----------
 application/views/mobile_first/ch.php         | 28 +++---
 3 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/application/views/bootstrap3/refresh_mobile_first_urls.php b/application/views/bootstrap3/refresh_mobile_first_urls.php
index 32762bf4..eaa0f2de 100644
--- a/application/views/bootstrap3/refresh_mobile_first_urls.php
+++ b/application/views/bootstrap3/refresh_mobile_first_urls.php
@@ -35,7 +35,7 @@
 
     function create_amp_data(index) {
         if ($('#cache_url' + index).length > 0) {
-            setTimeout("batch_update_amp(" + index + ")", 500);
+            setTimeout("batch_update_amp(" + index + ")", 100);
         }
     }
 
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 58c6a0bb..c5e8d898 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -9,7 +9,6 @@
     <meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
-    <meta name="robots" content="max-image-preview:large">
     <!--@OG:IMAGE@-->
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <link rel="shortcut icon" href="/favicon.ico">
@@ -56,7 +55,7 @@
                         <ul class="list-reset sidebar">
                             <li class="start-nav-item"><a href="/tour/top-china-tours/">Top 10 Tours</a></li>
                             <li class="start-nav-item"><a href="/tour/family-tours/">Family Tours</a></li>
-                            <li class="start-nav-item"><a href="/tour/year.htm">China Tours 2020</a></li>
+                            <li class="start-nav-item"><a href="/tour/year.htm">China Tours 2021</a></li>
                             <li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li>
                             <li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li>
                             <li class="start-nav-item"><a href="/tour/china-nature-tours/">Nature Tours</a></li>
@@ -188,61 +187,59 @@
                                                                                     class="fa fa-caret-right"></i></a></span>
 
 </span>
-        <div class="chbottomlogo">
-            <img src="https://data.chinahighlights.com/pic/logo/china-highlights-bottom-logo.png" alt="China Highlights Logo">
-        </div>
     </div>
 
     <div class="footerbox">
-        <div class="row">
-            <div class="aboutusleft">
 
-                <div class="bottomaboutus">
-                    <div class="bottompctitle">About Us</div>
-                    <div class="aboutusinfo">China Highlights tailor-makes China tours to help travelers discover China
-                        their way. We're a passionate team of one hundred avid travelers who love to share our knowledge
-                        of China with those looking for a more authentic travel experience, <a href="/aboutus/">more
-                            ...</a></div>
+        <div class="aboutusleft">
 
+            <div class="bottomaboutus">
+                <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/logo/bottom-logo-b.png" width="180px" style="float: left;
+                   margin-right: 30px;">
+                <div class="aboutusinfo">China Highlights tailor-makes China tours to help travelers discover China
+                    their way. We're a passionate team of one hundred avid travelers who love to share our knowledge
+                    of China with those looking for a more authentic travel experience, <a href="/aboutus/">more
+                        ...</a></div>
 
-                </div>
 
+            </div>
 
-                <div class="bottomfollowus">
-                    <div class="bottompctitle">Follow Us</div>
 
+            <div class="bottomfollowus">
+                <div class="bottompctitle">Follow Us</div>
 
-                    <ul>
-                        <li><a href="https://www.facebook.com/Chinahighlights" rel="nofollow"
-                               title="Follow us on Facebook" class="fb" target="_blank">
-                                <i class="fa fa-facebook"></i>Facebook
 
-                            </a></li>
-                        <li><a href="https://twitter.com/Chinahighlights" rel="nofollow" title="Share us on Twitter"
-                               class="tw" target="_blank"> <i class="fa fa-twitter"></i>Twitter </a></li>
-                        <li><a href="https://www.instagram.com/chinahighlights/" rel="nofollow"
-                               title="Follow us on Instagram" class="linkin" target="_blank">
-                                <i class="fa fa-instagram" aria-hidden="true"></i>
-                                Instagram </a></li>
-                        <li><i class="fab fa-weixin" aria-hidden="true"></i></li>
+                <ul>
+                    <li><a href="https://www.facebook.com/Chinahighlights" rel="nofollow"
+                           title="Follow us on Facebook" class="fb" target="_blank">
+                            <i class="fa fa-facebook"></i>Facebook
 
-                    </ul>
-                </div>
+                        </a></li>
+                    <li><a href="https://twitter.com/Chinahighlights" rel="nofollow" title="Share us on Twitter"
+                           class="tw" target="_blank"> <i class="fa fa-twitter"></i>Twitter </a></li>
+                    <li><a href="https://www.instagram.com/chinahighlights/" rel="nofollow"
+                           title="Follow us on Instagram" class="linkin" target="_blank">
+                            <i class="fa fa-instagram" aria-hidden="true"></i>
+                            Instagram </a></li>
+                    <li><i class="fab fa-weixin" aria-hidden="true"></i></li>
 
+                </ul>
             </div>
 
+        </div>
 
-            <div class="aboutusright">
 
-                <div class="bottompctitle">Featured on</div>
-                <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on"
-                     class="img-responsive bottomfeature">
+        <div class="aboutusright">
+
+            <div class="bottompctitle">Featured on</div>
+            <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on"
+                 class="img-responsive bottomfeature">
 
 
-            </div>
         </div>
+
         <div class="clear"></div>
-        <div class="row bottomaboutuslinks">
+        <div class="bottomaboutuslinks">
             <div class="bottomlinksleft">
                 <ul class="withBorder">
                     <li><a href="https://www.chinahighlights.com/aboutus/" rel="nofollow">About us</a></li>
@@ -277,15 +274,15 @@
 
 <div class="bottomlogo">
     <div class="footerbox">
-        <div class="row">
-            <img src="https://data.chinahighlights.com/grey.gif"
-                 originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
-                 loader="lazy"
-                 class="img-responsive bottomlogopc">
-            <span class="bottomcopyright">© 1998-2021 China Highlights — Discovery Your Way!  </span>
-            <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
-                        href="/aboutus/terms.htm">Terms</a></span>
-        </div>
+
+        <img src="https://data.chinahighlights.com/grey.gif"
+             originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
+             loader="lazy"
+             class="img-responsive bottomlogopc">
+        <span class="bottomcopyright">© 1998-2021 China Highlights — Discovery Your Way!  </span>
+        <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
+                    href="/aboutus/terms.htm">Terms</a></span>
+
     </div>
 </div>
 <!--@PRODUCT-JS@-->
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 73e21de9..3c04ad77 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -7,7 +7,6 @@
     <meta name="description" content="<!--@DESCRIPTION@-->">
     <link rel="canonical" href="<!--@CANONICAL@-->">
     <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
-    <meta name="robots" content="max-image-preview:large">
     <!--@OG:IMAGE@-->
     <link rel="shortcut icon" href="//data.chinahighlights.com/favicon.ico">
     <!--@MAIN-CSS@-->
@@ -191,33 +190,31 @@
 <footer>
     <div class="infotailor">
 <span class="infotailorword">We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
-<span class="infotailormade"><a href="https://www.chinahighlights.com/tour/create-my-trip.htm">Create Your Trip <i
-                aria-hidden="true" class="fa fa-caret-right"></i></a></span>
+<span class="infotailormade"><a href="https://www.chinahighlights.com/tour/create-my-trip.htm">Create Your Trip <i aria-hidden="true" class="fa fa-caret-right"></i></a></span>
 </span>
-        <div class="chbottomlogo">
-            <img src="https://data.chinahighlights.com/pic/logo/china-highlights-bottom-logo.png" alt="China Highlights Logo" >
-        </div>
+
     </div>
 
     <div class="infobottom">
+
+        <img src="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/logo/bottom-logo-b.png" alt="China Highlights Logo" width="150px" class="bottomlogocenter"> <div class="bottomlogoinfo">China Highlights tailor-makes China tours to help travelers discover China
+            their way. <a href="/aboutus/">more
+                ...</a></div>
+
         <div class="bottomwechat">
-            <p><img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-qr-code.jpg" alt="info template qr code" width="100px"
-                    height="100px"></p>
+            <p><img src="https://data.chinahighlights.com/pic/guide/info-template-qr-code.webp" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-qr-code.jpg" alt="info template qr code" width="100px" height="100px" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></p>
             <span class="wechattitle">Contact us via WeChat</span>
         </div>
 
         <div class="bottommedia">
             <span class="followtitle">Follow Us</span>
             <ul>
-                <li><a href="https://www.facebook.com/Chinahighlights" rel="nofollow" title="Follow us on Facebook"
-                       class="fb" target="_blank">
+                <li><a href="https://www.facebook.com/Chinahighlights" rel="nofollow" title="Follow us on Facebook" class="fb" target="_blank">
                         <i class="fa fa-facebook"></i>Facebook
 
                     </a></li>
-                <li><a href="https://twitter.com/Chinahighlights" rel="nofollow" title="Share us on Twitter" class="tw"
-                       target="_blank"> <i class="fa fa-twitter"></i>Twitter </a></li>
-                <li><a href="https://www.instagram.com/chinahighlights/" rel="nofollow" title="Follow us on Instagram"
-                       class="linkin" target="_blank">
+                <li><a href="https://twitter.com/Chinahighlights" rel="nofollow" title="Share us on Twitter" class="tw" target="_blank"> <i class="fa fa-twitter"></i>Twitter </a></li>
+                <li><a href="https://www.instagram.com/chinahighlights/" rel="nofollow" title="Follow us on Instagram" class="linkin" target="_blank">
                         <i class="fa fa-instagram" aria-hidden="true"></i>
                         Instagram </a></li>
                 <li><i class="fab fa-weixin" aria-hidden="true"></i></li>
@@ -242,8 +239,7 @@
 
         <div class="featureon">
             <span class="followtitle">Featured on</span>
-            <img src="https://data.chinahighlights.com/grey.gif" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on"
-                 class="img-responsive" width="436px" height="250px">
+            <img src="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" loader="lazy" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="info template feature on" class="img-responsive" width="436px" height="250px" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;">
         </div>
     </div>
     <div class="bottomlogo">

From fb77707d607dddeb8990864d78c02a8d701841c6 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 18:10:16 +0800
Subject: [PATCH 15/17] ok

---
 application/controllers/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 0f81dbae..101a8e3a 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -26,7 +26,7 @@ class Cache extends CI_Controller
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');
-        $this->site_code = $this->input->get('site_code') || $this->config->item('site_code');
+        $this->site_code = $this->input->get('site_code') or $this->config->item('site_code');
     }
 
     /**

From 008d0607bb92c3a91a95565fbbcce49c53ec9b3e Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 18:38:09 +0800
Subject: [PATCH 16/17] yes

---
 application/controllers/cache.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 101a8e3a..e627198d 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -26,7 +26,7 @@ class Cache extends CI_Controller
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');
-        $this->site_code = $this->input->get('site_code') or $this->config->item('site_code');
+        $this->site_code = $this->input->get('site_code') ? $this->input->get('site_code') : $this->config->item('site_code');
     }
 
     /**
@@ -68,7 +68,10 @@ class Cache extends CI_Controller
         $data['post_para'] = $this->post_para;
 
         if ($returnType === 'json') {
-            echo (json_encode($this->file));
+            //print_r($cache_config[$this->site_code]);
+            //echo('json');
+            //print_r($data['file']);
+            echo (json_encode($data['file']));
         } else {
             //视图
             $this->load->view('cache/update', $data);
@@ -155,7 +158,11 @@ class Cache extends CI_Controller
                     $url_temp = $this->current_domain . $path_temp . '/' . $file_temp;
                     $url_temp = str_replace('index.htm', '', $url_temp);
                     $file_time[$url_temp] = date("F d Y H:i:s", filemtime("$dir/$f"));
-                    $file[] = $url_temp;
+
+                    $encode = mb_detect_encoding($url_temp, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8'));
+                    $_url_temp = mb_convert_encoding($url_temp, 'UTF8', $encode);
+
+                    $file[] = $_url_temp;
                 }
             }
         }

From dd8ff037ad60a382450757412c0ec744972789dc Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 21:24:51 +0800
Subject: [PATCH 17/17] check siteCode

---
 application/controllers/cache.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index e627198d..f6316f10 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -22,7 +22,9 @@ class Cache extends CI_Controller
     function __construct()
     {
         parent::__construct();
-        $this->permission->is_admin();
+        if (!$this->input->get('site_code')) {
+            $this->permission->is_admin();
+        }
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');