Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
candice 4 years ago
parent 4213d7027e 60e7adbc59
commit a2fe663a3c
8 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
application/config/config.php
Unescape Escape View File

@ -691,7 +691,7 @@ $config['project_state'] = array(
//是否开启权限控制
$config['check_access'] = TRUE;
//权限管理超级管理
$config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'cyc', 'zp');
$config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'rz', 'zp');
//编辑器预览样式路径
$config['css_source_cht'] = 'https://data.chinahighlights.com/css/min.php?f=/public/css/global.min.css,/css/festival-detail.css';

4
application/libraries/html_optimize_lib.php
Unescape Escape View File

@ -125,8 +125,8 @@ class html_optimize_lib
$file_path = $imagesPath . $img_src_urls['path'];
}
if (is_file($file_path)) {
$properties = getimagesize($file_path);//获取图片属性
if (!empty($properties[0]) && !empty($properties[1])) {
$properties = getimagesize($file_path);//获取图片属性，读取失败返回false
if ($properties && !empty($properties[0]) && !empty($properties[1])) {
$image->width = $properties[0];
$image->height = $properties[1];
}

12
application/views/bootstrap/header.php
Unescape Escape View File

@ -53,7 +53,17 @@
window.location.href = window.location.href;
});
}
</script>
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

9
application/views/bootstrap/login.php
Unescape Escape View File

@ -22,6 +22,15 @@
-->
<link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

10
application/views/bootstrap3/header.php
Unescape Escape View File

@ -103,6 +103,16 @@
}
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

13
application/views/header.php
Unescape Escape View File

@ -35,8 +35,17 @@
}
}
</script>
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>
<div id="wrap">

9
application/views/login.php
Unescape Escape View File

@ -13,6 +13,15 @@
<script type="text/javascript" src="/js/modaldialog/jquery.modaldialog.js"></script>
<script type="text/javascript" src="/js/basic.js"></script>
<link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

2
application/views/mobile_first/chinatravel-flight-index.php
Unescape Escape View File

@ -45,7 +45,7 @@
</div>
<link href="https://data.chinatravel.com/css/newcss3/flatpickr.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.flex-col-3, .flex-col-4, .flex-col-2{ margin-right: 20px; margin-bottom: 20px; display: block; flex-flow: column; position: static;} #searchbox .hidden{ display: none} .traintype li{ cursor: pointer} @media (max-width: 680px){ .hidden-xs{ display: none !important;}} .autocomplete{ position: relative;} #searchbox .autocomplete-items{ position: absolute; border: 1px solid #d4d4d4; border-bottom: none; border-top: none; z-index: 999;} #searchbox .autocomplete-items div{ padding: 5px; cursor: pointer; background-color: #f1f0f0; border-bottom: 1px solid #d4d4d4; font-size: 14px;} #searchbox .autocomplete-items div:hover{ background-color: #e9e9e9;} #searchbox .autocomplete-active{ background-color: DodgerBlue !important; color: #ffffff;} #loader{ position: fixed; display: none; width: 100%; height: 100%; top: 0; left: 0; right: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.5); z-index: 2;} #loading{ position: absolute; top: 50%; left: 50%; font-size: 50px; color: white; transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);} #loading:after{ content: " "; display: block; width: 64px; height: 64px; margin: 8px; border-radius: 50%; border: 6px solid #fff; border-color: #fff transparent #fff transparent; animation: lds-dual-ring 1.2s linear infinite} @keyframes lds-dual-ring{ 0%{ transform: rotate(0deg)} 100%{ transform: rotate(360deg)}}
.flex-col-3, .flex-col-4, .flex-col-2{ margin-bottom: 20px; display: block; flex-flow: column; position: static;} #searchbox .hidden{ display: none} .traintype li{ cursor: pointer} @media (max-width: 680px){ .hidden-xs{ display: none !important;}} .autocomplete{ position: relative;} #searchbox .autocomplete-items{ position: absolute; border: 1px solid #d4d4d4; border-bottom: none; border-top: none; z-index: 999;} #searchbox .autocomplete-items div{ padding: 5px; cursor: pointer; background-color: #f1f0f0; border-bottom: 1px solid #d4d4d4; font-size: 14px;} #searchbox .autocomplete-items div:hover{ background-color: #e9e9e9;} #searchbox .autocomplete-active{ background-color: DodgerBlue !important; color: #ffffff;} #loader{ position: fixed; display: none; width: 100%; height: 100%; top: 0; left: 0; right: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.5); z-index: 2;} #loading{ position: absolute; top: 50%; left: 50%; font-size: 50px; color: white; transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);} #loading:after{ content: " "; display: block; width: 64px; height: 64px; margin: 8px; border-radius: 50%; border: 6px solid #fff; border-color: #fff transparent #fff transparent; animation: lds-dual-ring 1.2s linear infinite} @keyframes lds-dual-ring{ 0%{ transform: rotate(0deg)} 100%{ transform: rotate(360deg)}}
</style>
<script src="https://data.chinatravel.com/js/mobile-first/zepto.min.js"></script>
<script src="https://data.chinatravel.com/js/mobile-first/flight-index.js"></script>
Write Preview
Loading…
Cancel
Save