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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	application/controllers/information.php
hotfix/paypal-note
ycc 4 years ago
parent a2e84142b7 e9e442c4b0
commit f5099d8ff2
6 changed files with 103 additions and 26 deletions
Show Stats Download Patch File Download Diff File

22
application/controllers/information.php
Unescape Escape View File

@ -825,6 +825,13 @@ class Information extends CI_Controller
if ($device == 'mobile') {//移动端读取移动大图
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
$bannerImg = '<img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '">';
$meta_addon_picture_text = get_meta($information->ic_id,'meta_addon_picture_text');
if(!empty($meta_addon_picture_url)){
$ImgText = '<div class="carousel-caption"><p class="ads-title"><a href="'.$meta_addon_picture_url.'">'.$meta_addon_picture_text.'</a></p></div>';
}else{
$ImgText = '<div class="carousel-caption"><p class="ads-title">'.$meta_addon_picture_text.'</p></div>';
}
} else {
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
$bannerImg = '<img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '">';
@ -903,7 +910,7 @@ class Information extends CI_Controller
}
//列表js
if ($meta_ct_page_type == "daytripindex" || $meta_ct_page_type == "tourindex") {
if (in_array($meta_ct_page_type ,array('daytripindex','tourindex','attractionindex'))) {
$addonJs .= '<script src="/js/mobile-first/getlist.js"></script>';
}
@ -924,14 +931,23 @@ class Information extends CI_Controller
//页面传递参数
$passParam = "";
if ($meta_ct_page_type == "daytripindex" || $meta_ct_page_type == "tourindex") {
if (in_array($meta_ct_page_type ,array( "daytripindex" , "tourindex","attractionindex")) ){ //一日游和线路列表
//产品首页
$meta_ct_page_value = get_meta($information->ic_id, 'meta_ct_page_value');
$passParam .= '<input type="hidden" name="param_city" id="param_city" value="' . $meta_ct_page_value . '"/>';
if (in_array($meta_ct_page_type,array("attractionindex") )){
//旧信息id,景点等信息类
$passParam .= '<input type="hidden" name="param_old_pid" id="param_old_pid" value="'.$meta_ct_page_value.'"/>';
}else{
//城市名称，产品类用
$passParam .= '<input type="hidden" name="param_city" id="param_city" value="' . $meta_ct_page_value . '"/>';
}
//加信息平台的is_id
$passParam .= '<input type="hidden" name="param_parentId" id="param_parentId" value="' . $information->is_id . '"/>';
}
$data["passParam"] = $passParam;

50
application/third_party/ctmobilefirst/controllers/api.php vendored
Unescape Escape View File

@ -104,7 +104,7 @@ class Api extends CI_Controller {
$whereInfo = " and is_parent_id = '".$parentid."'";
}else{
$whereHT = " and (CII2_Name ='".$param."') ";
$whereInfo = "";
$whereInfo = " and is_parent_id = -1 ";
}
}
@ -160,6 +160,54 @@ class Api extends CI_Controller {
echo json_encode($list);
}
/**
* @description: 获取新旧网站的子类列表
* @param {*} $old_pid
* @param {*} $new_pid
* @return {*}
* @Date Changed:
*/
public function getGuideList($old_pid = null,$new_pid=null)
{
//处理参数
if (isset($_GET["param"])){
$param = str_replace("'","''",$_GET["param"]);
if (strpos($param,",")!== false){
$new_pid = explode(",",$param)[0];
$old_pid = explode(",",$param)[1];
}else{
$old_pid = -1;
$new_pid = $param;
}
}
if (empty($old_pid) || !is_numeric($old_pid)){
$old_pid = -1 ;
}
if (empty($new_pid)|| !is_numeric($new_pid)){
$new_pid = -1;
}
$list = $this->api_model->getGuideList($old_pid,$new_pid);
foreach ($list as $row) {
//图片
if (!empty($row->ic_photo)){
$picurl = $row->ic_photo;
}else if (!empty($row->pic1)){
$picurl = $row->pic1;
}else{
$picurl="//data.chinatravel.com/images/loading2.gif";
}
$row->pic = $picurl; //显示图片地址
}
echo json_encode($list);
}
}
/* End of file Api.php */

34
application/third_party/ctmobilefirst/models/api_model.php vendored
Unescape Escape View File

@ -246,28 +246,38 @@ class Api_model extends CI_Model {
/**
* @description: 获取子类信息列表
* @param {type} $parentid，父类的Id
* @param {type} $old_pid，$new_pid 父类的Id,分为旧网站的和新网站的
* @return:
* @Date Changed:
*/
function getGuideList($parentid){
if ($parentid < 0 ) {
return null;
}
function getGuideList($old_pid,$new_pid){
$sql = "
SELECT is_sort,ic_url,ic_url_title,ic_title, substring(convert(nvarchar(2000),ic_content),0,1000) as ic_summary,ic_photo
,(select top 1 im_value from infoMetas where im_key='meta_addon_picture' and im_ic_id=ic_id) as pic2
select * from (
SELECT ic_url,ic_url_title,ic_photo
,(select top 1 im_value from infoMetas where im_key='meta_addon_picture_mobile' and im_ic_id=ic_id) as pic2
,'2' as sortby
FROM dbo.infoContents
inner join infoStructures on ic_id=is_ic_id
WHERE is_sitecode='ct'
and ic_status=1
and is_parent_id = ?
UNION ALL
SELECT ic_url,ic_url_title,ic_photo
,(select top 1 im_value from infoMetas where im_key='meta_addon_picture_mobile' and im_ic_id=ic_id) as pic2
,'1' as sortby
FROM dbo.infoContents
inner join infoStructures on ic_id=is_ic_id
WHERE is_sitecode='chinatravel'
and is_parent_id = ?
and ic_status=1
and is_parent_id = ?
) allbt
order by sortby
";
//and ic_status=1
$qurey = $this->HT->query($sql,array($parentid));
$qurey = $this->HT->query($sql,array($old_pid,$new_pid));
return $qurey->result();
}

7
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -689,7 +689,7 @@
<input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url"
value="<?php echo $information->ic_url; ?>">
</div>
<?php if ($information->ic_sitecode == 'ct') { ?>
<?php if ($information->ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel' ) { ?>
<div class="col-sm-24 col-xs-24 nopadding">
<label>CT信息旧URL
<a href="javascript:void(0);"
@ -894,6 +894,9 @@
<option value="tourdetail" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'tourdetail' ? 'selected' : false; ?>>
线路详细
</option>
<option value="attractionindex" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'attractionindex' ? 'selected' : false; ?>>
城市景点首页
</option>
</select>
</div>
<div class="col-sm-6">
@ -904,7 +907,7 @@
<a href="javascript:void(0);"
onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_ct_page_value', $('#meta_ct_page_value').val())"><i
class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
<a href="javascript:void(0);" title="此属性用于对应上面那个页面类型的值，比如选择一日游首页，那么这里录入shanghai，就可以动态读取上海的一日游列表."><i
<a href="javascript:void(0);" title="此属性用于对应上面那个页面类型的值。&#10 1.一日游首页，录城市名称，如：shanghai &#10 2.景点首页，需要读取原子类，录原信息ID"><i
class="text-muted glyphicon glyphicon-question-sign"></i></a>
</label>
<input name="meta_ct_page_value" id="meta_ct_page_value" type="text"

10
application/views/mobile_first/chinatravel-pc.php
Unescape Escape View File

@ -2,13 +2,13 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>China Travel: China Travel Agency Featured in Multiple-Destination Tour Design</title>
<title><?php echo $TITLE ?></title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="yes" name="apple-mobile-web-app-capable">
<meta name="apple-mobile-web-app-title" content="China Travel: China Travel Agency Featured in Multiple-Destination Tour Design">
<meta name="keywords" content="China Travel, China Tours, China city day trips, China Trains">
<meta name="description" content="China Travel organizes China trips with multiple destinations. Single city day tours, Yangtze River cruises and China train bookings are also available.">
<meta name="apple-mobile-web-app-title" content="<?php echo $TITLE ?>">
<meta name="keywords" content="<?php echo $KEYWORDS ?>">
<meta name="description" content="<?php echo $DESCRIPTION ?>">
<!--@OG:IMAGE@--><?php echo $OGIMAGE ?>
<link rel="canonical" href="https://www.chinatravel.com/">
<link rel="shortcut icon" href="/favicon.ico">
@ -176,7 +176,7 @@
<div class="footer-right vw-width">
<span class="color8 m-left20"> FEATURE ON:</span>
<div class="brands-logo">
<a href="#" rel="nofollow" target="_blank" class="bbc-logo" title="BBC Logo"></a><a href="https://listverse.com/2014/09/14/10-spectacular-lakes-with-sinister-pasts/" rel="nofollow" target="_blank" class="listverse-logo" title="Listverse"></a><a href="https://elpais.com/elpais/2012/11/13/viajero_astuto/1352821786_135282.html" rel="nofollow" target="_blank" class="elpais-logo" title="Elpais"></a>
<a href="javascript:;" rel="nofollow" class="bbc-logo" title="BBC Logo"></a><a href="javascript:;" rel="nofollow" class="listverse-logo" title="Listverse"></a><a href="javascript:;" rel="nofollow" class="elpais-logo" title="Elpais"></a>
</div></div>
</div>
</div>

6
application/views/mobile_first/chinatravel.php
Unescape Escape View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>China Travel: China Travel Agency Featured in Multiple-Destination Tour Design</title>
<title><?php echo $TITLE ?></title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="yes" name="apple-mobile-web-app-capable">
@ -175,7 +175,7 @@
</div>
<div class="footer-list"> <img src="/images/icon/partner-logo.png" alt="partner logo" class="img-responsive" /> </div>
<div class="brands-logo">
<a href="#" rel="nofollow" target="_blank" class="bbc-logo" title="BBC Logo"></a><a href="https://listverse.com/2014/09/14/10-spectacular-lakes-with-sinister-pasts/" rel="nofollow" target="_blank" class="listverse-logo" title="Listverse"></a><a href="https://elpais.com/elpais/2012/11/13/viajero_astuto/1352821786_135282.html" rel="nofollow" target="_blank" class="elpais-logo" title="Elpais"></a>
<a href="javascript:;" rel="nofollow" class="bbc-logo" title="BBC Logo"></a><a href="javascript:;" rel="nofollow" class="listverse-logo" title="Listverse"></a><a href="javascript:;" rel="nofollow" class="elpais-logo" title="Elpais"></a>
</div>
</div>
<div class="footer-bottom">
@ -184,7 +184,7 @@
<div class="footerbottom-text">
<p>call us at:<strong> 86-773-286-5632</strong> (Intl rates apply) </p>
<p>© All Rights Reserved,Chinatravel.com®</p>
</div>
</div>
</div>
</div>
</footer>

Write Preview
Loading…
Cancel
Save