diff --git a/application/config/config.php b/application/config/config.php index 41035b47..d04ee784 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -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,'), ); //静态文件生成路径 diff --git a/application/controllers/information.php b/application/controllers/information.php index 17a2c40b..eac6dcff 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -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; } diff --git a/application/third_party/ctmobilefirst/controllers/apits.php b/application/third_party/ctmobilefirst/controllers/apits.php index 87b2257a..2bf1bf58 100644 --- a/application/third_party/ctmobilefirst/controllers/apits.php +++ b/application/third_party/ctmobilefirst/controllers/apits.php @@ -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); diff --git a/application/views/mobile_first/trainspread-daydetail-form.php b/application/views/mobile_first/trainspread-daydetail-form.php index 14ce8d80..1294fecd 100644 --- a/application/views/mobile_first/trainspread-daydetail-form.php +++ b/application/views/mobile_first/trainspread-daydetail-form.php @@ -7,7 +7,7 @@
diff --git a/application/views/mobile_first/trainspread-pc.php b/application/views/mobile_first/trainspread-pc.php index dc77af0d..a1c35065 100644 --- a/application/views/mobile_first/trainspread-pc.php +++ b/application/views/mobile_first/trainspread-pc.php @@ -11,8 +11,7 @@ - - + @@ -40,7 +39,7 @@