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
master
candice 1 year ago
parent ff2a254b66 15595794de
commit 9e8a05adbc
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -390,6 +390,7 @@ $config['rewrite_short_tags'] = false;
*/
$config['proxy_ips'] = '';
//各站信息组和人员权限分配
$config['site'] = array(
'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,si'),
@ -424,9 +425,9 @@ $config['site'] = array(
'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.beijinghighlights.com', 'site_authors' => array('cj')),
'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj'), 'site_user' => array(',ycc,zp,')),
'shanghai' => array('site_code' => 'shanghai', 'site_id' => 96, 'site_lgc' => '107', 'site_url' => 'http://www.shanghaihighlights.com/', 'site_image_url' => 'https://images.shanghaihighlights.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
'beijing' => array('site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'http://www.mybeijingchina.com/', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
'trainspread' => array('site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'http://www.trainspread.com/', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
'shanghai' => array('site_code' => 'shanghai', 'site_id' => 96, 'site_lgc' => '107', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => 'https://images.shanghaihighlights.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
'beijing' => array('site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'https://www.mybeijingchina.com', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
'trainspread' => array('site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'https://www.trainspread.com', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
);
//静态文件生成路径

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

@ -4091,11 +4091,11 @@ class Information extends CI_Controller
$TourData = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripDetail/?param=" . $paramCode));
$DayTripData["TourData"] = $TourData;
$TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $paramCode));
$TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $productCode));
if ($TourPrice->status == "ok"){
$DayTripData["DaytripPrice"] = $TourPrice->price;
}else{
$TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $paramCode.",3"));
$TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $productCode.",3"));
$DayTripData["DaytripPrice"] = $TourPrice->price;
}

2
application/third_party/ctmobilefirst/controllers/apits.php vendored
Unescape Escape View File

@ -312,7 +312,7 @@ class Apits extends CI_Controller {
$i = 0 ;
$ProductList = array();
foreach ($arrCode as $value) {
$value = trim($value);
//循环读取每条产品的价格列表
$ProductList[$i] = new stdClass();
$ProductList[$i] ->productdetail = $this->apits_model->get_pagdetail($value);

2
application/views/mobile_first/trainspread-daydetail-form.php
Unescape Escape View File

@ -7,7 +7,7 @@
<?php } ?>
<div class="tourspic-text">
<ul>
<li><span class="duration"></span><?php echo $TourData->PAG_NeedTime ==""?"":"Duration:".$TourData->PAG_NeedTime." hours" ?></li>
<li><span class="duration"></span><?php if (isset($TourData->PAG_NeedTime) && $TourData->PAG_NeedTime!="") { echo "Duration:".$TourData->PAG_NeedTime." hours";} ?></li>
<li><span class="departure"></span>Departure:Daily</li>
<li><span class="travelers"></span><?php echo $InfoData->MinTravelers>0?"Min Travelers:".$InfoData->MinTravelers." Pax" : "Min Travelers:NO Limit" ?></li>
</ul>

7
application/views/mobile_first/trainspread-pc.php
Unescape Escape View File

@ -11,8 +11,7 @@
<?php if (in_array($productType, array("customize", "contactus", "cruiseform", "daytripform"))) { // 预订表单不显示
?>
<meta name="robots" content="noindex,nofollow">
<?php } else { ?>
<meta name="keywords" content="<?php echo $KEYWORDS ?>">
<?php } else { ?>
<meta name="description" content="<?php echo $DESCRIPTION ?>">
<!--@OG:IMAGE@--><?php echo $OGIMAGE ?>
<?php } ?>
@ -40,7 +39,7 @@
<div class="top-box">
<div class="topsearch">
<form id="cse-search-box" name="googlesreach" action="/search">
<input type="hidden" name="cx" value="016808570474272112209:2xv5z3olaus">
<input type="hidden" name="cx" value="e2d891a2076ac43b7">
<input type="hidden" name="cof" value="FORID:11">
<div class="relative">
<input type="text" class="siteser" placeholder="Site Search..." name="q">
@ -90,7 +89,7 @@
</main>
<!---mian end---->
<?php if (!in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
<?php echo $FloatIcon ?>
<!---tailor made star---->
<div class="content-tm">
<div class="">

5
application/views/mobile_first/trainspread.php
Unescape Escape View File

@ -11,7 +11,6 @@
<?php if (in_array($productType,array("customize","contactus","cruiseform","daytripform"))) { // 预订表单不显示 ?>
<meta name="robots" content="noindex,nofollow">
<?php } else { ?>
<meta name="keywords" content="<?php echo $KEYWORDS ?>">
<meta name="description" content="<?php echo $DESCRIPTION ?>">
<!--@OG:IMAGE@--><?php echo $OGIMAGE ?>
<?php } ?>
@ -96,7 +95,7 @@
<button class="action search--close" aria-label="Close Menu"><span class="icon icon--cross"></span></button>
<div class="siteSearch">
<form id="cse-search-box" name="googlesreach" action="/search">
<input type="hidden" value="016808570474272112209:2xv5z3olaus" name="cx">
<input type="hidden" value="e2d891a2076ac43b7" name="cx">
<input type="hidden" value="FORID:11" name="cof">
<input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
<button type="submit" class="submits" name="searchbtn" aria-label="Search"><i class="fa fa-search" aria-hidden="true"></i></button>
@ -121,7 +120,7 @@
</main>
<!--main end-->
<?php if (!in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
<?php echo $FloatIcon ?>
<!---tailor made star---->
<div class="content-tm">
<div class="content-tm-info">

Write Preview
Loading…
Cancel
Save