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

application/views/mobile_first/chinatravel-pc.php

@@ -254,35 +254,14 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a
 <!--@PRODUCT-JS@--> <?php echo $PRODUCTJS ?>
 <!--@ADDON-JS@-->  <?php echo $ADDONJS ?>
 <!-- Google -->
-<script defer="defer">
+<!-- Global site tag (gtag.js) - Google Analytics -->
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-4273670-1"></script>
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-4273670-1',{'siteSpeedSampleRate': 100});
-  ga('require', 'linkid', 'linkid.js');
-  ga('require', 'displayfeatures');
-  ga('send', 'pageview');
-//google trace
-  (function() {
-  	var reg = new RegExp('(^|&)q=([^&]*)(&|$)');
-    var r = document.referrer.match(reg);
-    if (r != null) {
-        var ref = document.referrer;
-        var _date = new Date();
-        _date.setDate(_date.getDate()+30);
-        var exp = _date.toGMTString();
-        document.cookie='inquireTrackGoogle='+ref+';path=/;expires='+exp;
-    }
-  })();
-</script>
-<!-- Global site tag (gtag.js) - Google Ads: 823612164 -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=AW-823612164"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-  gtag('config', 'AW-823612164');
+
+  gtag('config', 'UA-4273670-1');
 </script>
 <?php if ($ISPRODUCT=="no") { ?>
 <!-- Google AD-->

application/views/mobile_first/chinatravel.php

@@ -249,35 +249,14 @@
 <!--@PRODUCT-JS@--> <?php echo $PRODUCTJS ?>
 <!--@ADDON-JS@-->  <?php echo $ADDONJS ?>
 <!-- Google -->
-<script defer="defer">
+<!-- Global site tag (gtag.js) - Google Analytics -->
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-4273670-1"></script>
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-4273670-1',{'siteSpeedSampleRate': 100});
-  ga('require', 'linkid', 'linkid.js');
-  ga('require', 'displayfeatures');
-  ga('send', 'pageview');
-//google trace
-  (function() {
-  	var reg = new RegExp('(^|&)q=([^&]*)(&|$)');
-    var r = document.referrer.match(reg);
-    if (r != null) {
-        var ref = document.referrer;
-        var _date = new Date();
-        _date.setDate(_date.getDate()+30);
-        var exp = _date.toGMTString();
-        document.cookie='inquireTrackGoogle='+ref+';path=/;expires='+exp;
-    }
-  })();
-</script>
-<!-- Global site tag (gtag.js) - Google Ads: 823612164 -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=AW-823612164"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-  gtag('config', 'AW-823612164');
+
+  gtag('config', 'UA-4273670-1');
 </script>
 <?php if ($ISPRODUCT=="no") { ?>
 <!-- Google AD-->