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

hotfix/paypal-note
赵鹏 4 years ago
commit b7eedd11b1

@ -46,9 +46,7 @@
<ul class="pctopnavi">
<li class="dropdown"><a href="/tour/" class="p_topnavilink">China Tours</a>
<div class="chinatourspc dropdown-content">
<img src="https://data.chinahighlights.com/pic/guide/ch-pc-top-navigation-china-tour-forbidden-city.jpg"
width="1275" height="224"
class="img-responsive topnavipic">
<div class="menulinkbox">
<ul class="list-reset sidebar">
@ -76,9 +74,7 @@
<li class="dropdown"><a href="/citytour/" class="p_topnavilink">Destinations</a>
<div class="destinationspc dropdown-content">
<img src="https://data.chinahighlights.com/pic/guide/ch-pc-top-navigation-destination-shanghai.jpg"
width="1275" height="224"
class="img-responsive topnavipic">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/beijing/tours.htm">Beijing</a></li>
<li class="start-nav-item"><a href="/shanghai/tours.htm">Shanghai</a></li>
@ -95,9 +91,7 @@
</li>
<li class="dropdown"><a href="/travelguide/" class="p_topnavilink">Travel Guide</a>
<div class="travelguidepc dropdown-content">
<img src="https://data.chinahighlights.com/pic/guide/ch-pc-top-navigation-travel-guide-panda.jpg"
width="1275" height="224"
class="img-responsive topnavipic">
<ul class="list-reset sidebar">
@ -118,9 +112,7 @@
</li>
<li class="dropdown"><a href="/travelguide/culture/" class="p_topnavilink">Culture</a>
<div class="culturepc dropdown-content">
<img src="https://data.chinahighlights.com/pic/guide/ch-pc-top-navigation-culture-great-wall.jpg"
width="1275" height="224"
class="img-responsive topnavipic">
<div class="container">
<ul class="list-reset sidebar">

@ -232,25 +232,6 @@
</footer>
<div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm" >privacy policy</a>.</p>
<button class="cookie_button" id='gotItBtn'>Got It</button>
</div>
<script>
var GOT_IT_KEY = '__china_highlights_you_agree_to_use_of_cookies__';
if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
console.info('If you continue browsing, you agree to the use of cookies.');
} else {
document.getElementById('gotIdArea').style.display = '';
var gotItBtn = document.getElementById('gotItBtn');
gotItBtn.addEventListener('click', function(evt) {
if (window.localStorage) {
localStorage.setItem(GOT_IT_KEY, '1');
}
document.getElementById('gotIdArea').style.display = 'none';
});
}
</script>
<script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
(function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);
!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(" "):[];

Loading…
Cancel
Save