diff --git a/.gitignore b/.gitignore index 9429a9fb..6d4da9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.phpintel .svn/* */logs/log* /web.config diff --git a/application/config/config.php b/application/config/config.php index a6ad6f16..4ef67641 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -572,7 +572,8 @@ $config['templates_i'] = array( '[城市]C景点列表模板' => 'city_info_attractions_list', '[城市]C景点详细模板' => 'city_attractions', '[专题]T0空白' => 'r_tpl_empty', - '[专题]T0空白（带框架）' => 'r_empty2', + '[专题]T0空白（HTML构建工具）' => 'r_empty_container', + '[专题]T0空白（H1+面包屑）' => 'r_empty2', '----------二级目录----------' => '------2------', '[专题]T2首页' => 'r_t2_index', '[专题]T2详细' => 'r_t2_detail', @@ -871,7 +872,7 @@ $config['templates'] = array( '通用内容模板' => 'guide_info_detail', '城市-列表模板' => 'city_info_list', '城市-首页模板' => 'city_info_index', - '城市-首页模板(GM)' => 'city_info_index_new', + '城市-首页模板(GM)' => 'city_info_index_new', '城市-首页模板[简]' => 'city_info_s_index', '城市-景点列表模板' => 'city_info_attractions_list', '城市-景点列表模板[简]' => 'city_info_s_attractions_list', @@ -910,19 +911,11 @@ $config['templates'] = array( //德语信息模板 $config['templates_gm'] = array( '通用内容模板' => 'guide_info_detail', - '城市-列表模板' => 'city_info_list', - '城市-首页模板' => 'city_info_index', - '城市-首页模板(GM)' => 'city_info_index_new', - '城市-首页模板[简]' => 'city_info_s_index', - '城市-景点列表模板' => 'city_info_attractions_list', - '城市-景点列表模板[简]' => 'city_info_s_attractions_list', - '城市-特色产品模板' => 'city_info_diytour', - '城市-一线城市首页' => 'city_info_index_one', - '省份-首页' => "area_info_index", - '文化模板 [列表式]' => "culture_info_detail_just_list", + '城市-首页模板(GM)' => 'city_info_index', '文化模板 [单页式]' => 'culture_info_detail_one_page', '文化模板 [导航式]' => 'culture_info_detail_with_category', '信息专题模板' => 'guide_top_series', + '列表式' => 'guide_info_list', '空白模板'=>'none' ); @@ -963,6 +956,7 @@ $config['templates_product'] = array( //产品管理板块模板（国际站使用） $config['templates_product_i'] = array( + '空白模板（HTML构建工具）' => 'r_empty_container', '空白模板（新）' => 'r_tpl_empty_2017', '空白模板（旧）' => 'r_tpl_empty', ); diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 6abbcd44..c1fd3f2c 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,57 +24,72 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pc_html'); + $pc_css = $this->input->get_post('pc_css'); $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); $status = $this->input->get_post('status'); + + //如果源信息的内容为空，则插入内容。 + $info = $this->InfoContents_model->get_ic_contents2($icid); + if ($info && empty($info->ic_content)) { + $this->InfoContents_model->force_update($icid, ''.$pc_html); + } + if ($icid && $json && $html) { try { //html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY', $html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); } //pc_html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); } + //pc_css + $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS_PC'); + if ($meta === FALSE) { + $this->InfoMetas_model->add($icid, 'AMP_CSS_PC', $pc_css); + } else { + $this->InfoMetas_model->update($icid, 'AMP_CSS_PC', $pc_css); + } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_JSON', $json); } else { $this->InfoMetas_model->update($icid, 'AMP_JSON', $json); } //css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS', $css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS', $css); } //script $meta = $this->InfoMetas_model->get($icid, 'AMP_SCRIPT'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCRIPT', $script); } else { $this->InfoMetas_model->update($icid, 'AMP_SCRIPT', $script); } //schema $meta = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCHEMA', $schema); } else { $this->InfoMetas_model->update($icid, 'AMP_SCHEMA', $schema); } //status $meta = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_STATUS', $status); } else { $this->InfoMetas_model->update($icid, 'AMP_STATUS', $status); diff --git a/application/controllers/information.php b/application/controllers/information.php index 4e3fd961..cfead29f 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -127,8 +127,6 @@ class Information extends CI_Controller { } public function edit($is_id) { - header("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); set_time_limit(30); //$this->output->enable_profiler(true); //查询结构信息 @@ -528,7 +526,7 @@ class Information extends CI_Controller { break; case 'gm': - GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 + //GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 if ($delete_only) { $url = "http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url); } else { diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php index 5f99c142..676d76db 100644 --- a/application/models/infoContents_model.php +++ b/application/models/infoContents_model.php @@ -85,6 +85,14 @@ class InfoContents_model extends CI_Model return $query; } + //删除信息 + function force_update($ic_id, $ic_content) + { + $sql = "UPDATE infoContents SET ic_content = N? WHERE ic_id = ?"; + $query = $this->HT->query($sql, array($ic_content, $ic_id)); + return $query; + } + //删除信息 function Delete($ic_id) { diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php index 69cb2843..08264246 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -16,7 +16,7 @@ class InfoMetas_model extends CI_Model { . " ( \n" . " ?, ?, N? \n" . " )"; - return $this->HT->query($sql, array($im_ic_id, $im_key, $im_value)); + return $this->HT->query($sql, array($im_ic_id, $im_key, (string)$im_value)); } function get_list($im_ic_id, $im_key) { @@ -56,6 +56,7 @@ class InfoMetas_model extends CI_Model { ,im.im_ic_id ,c.ic_url ,c.ic_id + ,empty_tpl = case when c.ic_template in ('r_tpl_empty', 'r_empty_container', 'r_empty2', 'r_tpl_empty_2017', 'tpl_empty', 'tpl_empty_h1', 'tpl_empty_navi_h1') then 'yes' else 'no' end FROM infoMetas im INNER JOIN infoContents c ON c.ic_id = im.im_ic_id @@ -176,7 +177,7 @@ class InfoMetas_model extends CI_Model { . "SET im_value = N? \n" . "WHERE im_ic_id = ? \n" . " AND im_key = ?"; - return $this->HT->query($sql, array($im_value, $im_ic_id, $im_key)); + return $this->HT->query($sql, array((string)$im_value, $im_ic_id, $im_key)); } function delete($im_ic_id, $im_key) { diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php new file mode 100644 index 00000000..05983890 --- /dev/null +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -0,0 +1,264 @@ +load->helper('ctrip'); + $this->load->model("ctrip_model"); + date_default_timezone_set('PRC'); + + } + + public function index(){ + exit('hello ctrip'); + } + + //查询车次余票 + public function search(){ + //接收参数 + $date = $this->input->get_post('date'); + $from = $this->input->get_post('from'); + $to = $this->input->get_post('to'); + $TrainNo = $this->input->get_post('TrainNo'); + + if(!$date || !$from || !$to){ + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); + }else{ + $isCache = false; + $iseven = false; + $cachedata = false; + $now_time = time(); + $differ = (strtotime($date) - $now_time) / 86400; + if($differ > 29){ + $date = date('Y-m-d',strtotime('+7day')); + $iseven = true; + } + + //转换三字码为中文 + $FromCode = $this->ctrip_model->ReplaceCodeToName($from); + $ToCode = $this->ctrip_model->ReplaceCodeToName($to); + + + if(!$FromCode || !$ToCode){ + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); + }else{ + $from = $FromCode->station_name; + $to = $ToCode->station_name; + } + + //生成请求链接 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'SearchS2S/?From='.urlencode($from).'&To='.urlencode($to).'&DepartDate='.$date.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + + $api_start_time = microtime(true); + + //获取数据 + $ResponseJson = post_ctrip($url,'','GET'); + + $api_end_time = microtime(true); + + $ResponseData = json_decode($ResponseJson); + $api_responsive_time = $api_end_time - $api_start_time; + //print_r($ResponseData);die(); + + if(empty($ResponseData->Trains)){ + log_message('error','ctrip_trian|status:trains is empty |相应时间:'.$api_responsive_time); + }else{ + log_message('error','ctrip_trian|status:'.$ResponseData->ResponseStatus->Ack.'|相应时间:'.$api_responsive_time); + } + + //定义返回的json + $ReturnData = new stdClass(); + $ReturnData->httpstatus = 200; + $ReturnData->data = new stdClass(); + $ReturnData->data->seven = $iseven; + $ReturnData->data->cache = $isCache; + $ReturnData->data->result = array(); + $ReturnData->data->map = new stdClass(); + $obj = array(); + $i = 0; + $PriceStr = ''; + //数据解析 + if(!empty($ResponseData->Trains)){ + foreach ($ResponseData->Trains as $TrainInfo){ + $obj[$TrainInfo->FromTelcode] = $TrainInfo->FromStationName; + $obj[$TrainInfo->ToTelcode] = $TrainInfo->ToStationName; + $SeaType = ''; + $gjrwNum = $rwNum = $rzNum = $tdzNum = $wzNum = $yzNum = $edzNum = $ydzNum = $swzNum = $ywNum = $dwNum = null; + foreach($TrainInfo->Seats as $Seats){ + if($Seats->SeatName == '高级软卧下'){ + $gjrwXiaPrice = $Seats->Price * 10; + $SeaType .= '"6":"'.$gjrwXiaPrice.'","A6":"¥'.$Seats->Price.'",'; + $gjrwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '软卧下'){ + $rwPrice = $Seats->Price * 10; + $SeaType .= '"4":"'.$rwPrice.'","A4":"¥'.$Seats->Price.'",'; + $rwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '软座'){ + $rzPrice = $Seats->Price * 10; + $SeaType .= '"4":"'.$rzPrice.'","A4":"¥'.$Seats->Price.'",'; + $rzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '特等座'){ + $SeaType .= '"P":"¥'.$Seats->Price.'",'; + $tdzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '无座'){ + $SeaType .= '"WZ":"¥'.$Seats->Price.'",'; + $wzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '硬座'){ + $yzPrice = $Seats->Price * 10; + $SeaType .= '"1":"'.$yzPrice.'","A1":"¥'.$Seats->Price.'",'; + $yzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '二等座'){ + $SeaType .= '"O":"¥'.$Seats->Price.'",'; + $edzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '一等座'){ + $SeaType .= '"M":"¥'.$Seats->Price.'",'; + $ydzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '商务座'){ + $swzPrice = $Seats->Price * 10; + $SeaType .= '"9":"'.$swzPrice.'","A9":"¥'.$Seats->Price.'",'; + $swzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '硬卧下'){ + $ywPrice = $Seats->Price * 10; + $SeaType .= '"3":"'.$ywPrice.'","A3":"¥'.$Seats->Price.'",'; + $ywNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '动卧下'){ + $SeaType .= '"F":"¥'.$Seats->Price.'",'; + $dwNum = $Seats->TicketLeft; + } + + $PriceStr = $SeaType.'"train_no":'.'"'.$TrainInfo->TrainNo.'"'; + } + + //对返回的数据进行容错处理 + $gjrwNum = isset($gjrwNum) ? ticket_exchange($gjrwNum,$iseven) : ''; + $rwNum = isset($rwNum) ? ticket_exchange($rwNum,$iseven) : ''; + $rzNum = isset($rzNum) ? ticket_exchange($rzNum,$iseven) : ''; + $tdzNum = isset($tdzNum) ? ticket_exchange($tdzNum,$iseven) : ''; + $wzNum = isset($wzNum) ? ticket_exchange($wzNum,$iseven) : ''; + $ywNum = isset($ywNum) ? ticket_exchange($ywNum,$iseven) : ''; + $yzNum = isset($yzNum) ? ticket_exchange($yzNum,$iseven) : ''; + $edzNum = isset($edzNum) ? ticket_exchange($edzNum,$iseven) : ''; + $ydzNum = isset($ydzNum) ? ticket_exchange($ydzNum,$iseven) : ''; + $swzNum = isset($swzNum) ? ticket_exchange($swzNum,$iseven) : ''; + $dwNum = isset($dwNum) ? ticket_exchange($dwNum,$iseven) : ''; + $runMin = $TrainInfo->DurationMinutes % 60; + $runHour = ($TrainInfo->DurationMinutes - $runMin) / 60; + + $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$runHour.':'.$runMin.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'||'; + + $data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$PriceStr.'},"messages":[],"validateMessages":{}}'; + $ReturnData->data->price[$i] = $data; + $i++; + } + } + //print_r($ResponseData); + $ReturnData->data->map = (object)$obj; + print_r(json_encode($ReturnData)); + } + } + + //查询经停站 + public function GetStopStation(){ + //接收参数 + $DepartDate = $this->input->get_post('DepartDate'); + $TrainNo = $this->input->get_post('TrainNo'); + + if(!$DepartDate || !$TrainNo){ + exit('传参错误！'); + }else{ + //生成请求链接 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'GetStopStations/?DepartDate='.$DepartDate.'&TrainNo='.$TrainNo.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + echo $url; + + } + } + + //获取所有站点信息 + public function GetAllStation(){ + //生成请求参数 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'/GetAllStations/?&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + + $ResponseJson = post_ctrip($url,'','GET'); + + $ResponseData = json_decode($ResponseJson); + + $data = array(); + foreach ($ResponseData->Stations as $items){ + $data['StationName'] = isset($items->StationName) ? checkNull($items->StationName) : ''; + $data['PinYin'] = isset($items->PinYin) ? checkNull($items->PinYin) : ''; + $data['Telecode'] = isset($items->Telecode) ? checkNull($items->Telecode) : ''; + $data['Address'] = isset($items->Address) ? checkNull($items->Address) : ''; + $data['Geography'] = isset($items->Geography) ? checkNull($items->Geography) : ''; + $this->ctrip_model->AddOrUpdate($data); + } + } + + //获取回调信息 + public function receiveinfo(){ + echo ' + + + + hainatravel123 + + + + '; + $back_xml = file_get_contents('php://input'); + $xml = simplexml_load_string($back_xml); + $json = json_encode($xml); + log_message('error','携程回调信息：'.$json); + } +} \ No newline at end of file diff --git a/application/third_party/ctrip/helpers/ctrip_helper.php b/application/third_party/ctrip/helpers/ctrip_helper.php new file mode 100644 index 00000000..fe9c072d --- /dev/null +++ b/application/third_party/ctrip/helpers/ctrip_helper.php @@ -0,0 +1,77 @@ += 99){ + return '有'; + }else{ + return $num; + } + } + } + } + + //发送请求函数 + function post_ctrip($url, $data = '', $method = 'GET') { + $curl = curl_init(); // 启动一个CURL会话 + curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 + curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer + if ($method == 'POST' && !empty($data)) { + curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求 + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 + curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); + } + curl_setopt($curl, CURLOPT_TIMEOUT, 40); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT_MS, 40000); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 + $tmpInfo = curl_exec($curl); // 执行操作 + $errno = curl_errno($curl); + if ($errno !== 0) { + log_message('error', 'ctripost'.$errno.curl_error($curl)); + } + curl_close($curl); //关闭CURL会话 + return $tmpInfo; //返回数据 + } + +?> \ No newline at end of file diff --git a/application/third_party/ctrip/models/ctrip_model.php b/application/third_party/ctrip/models/ctrip_model.php new file mode 100644 index 00000000..fac981e4 --- /dev/null +++ b/application/third_party/ctrip/models/ctrip_model.php @@ -0,0 +1,68 @@ +INFO = $this->load->database('INFO', TRUE); + } + + //» + public function AddOrUpdate($data){ + $sql = "IF NOT EXISTS( + SELECT 1 + FROM train_stations + WHERE + station_telecode = '{$data['Telecode']}' + ) BEGIN + INSERT INTO train_stations + ( + station_name, + station_telecode, + station_geography, + station_pinyin, + station_address + ) + VALUES + ( + '{$data['StationName']}','{$data['Telecode']}','{$data['Geography']}','{$data['PinYin']}','{$data['Address']}' + ) + END + ELSE + BEGIN + UPDATE train_stations + SET station_name = '{$data['StationName']}', + station_geography = '{$data['Geography']}', + station_pinyin = '{$data['PinYin']}', + station_address = '{$data['Address']}' + WHERE + station_telecode = '{$data['Telecode']}' + END + "; + $query = $this->INFO->query($sql); + return $query; + } + + //ȡĻϢ + //ȡ7ǰݾͲκݣҽɾ + public function get_train_cache($tpc_from_station,$tpc_to_station){ + $sql = "SELECT + * + FROM + TrainPriceCache + WHERE + tpc_from_station = '$tpc_from_station' + AND + tpc_to_station = '$tpc_to_station'"; + $query = $this->INFO->query($sql); + return $query->row(); + } + + //ȡվ + public function ReplaceCodeToName($code){ + $sql = "SELECT station_name from train_stations where station_telecode = '{$code}'"; + $query = $this->INFO->query($sql); + return $query->row(); + } + +} +?> \ No newline at end of file diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php index f79a2025..bf0ee52f 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ah.php +++ b/application/third_party/htmlcompressor/views/amp-template/ah.php @@ -15,8 +15,9 @@ + @@ -18,6 +19,7 @@ .fa-google-plus::before{content:"\f0d5"}.ampstart-headerbar{background-color:#fff;color:#000;z-index:999;box-shadow:0 0 5px 2px rgba(0,0,0,.1)}.ampstart-headerbar+:not(amp-sidebar),.ampstart-headerbar-nav .ampstart-nav-item{padding:0 1rem;background:transparent;opacity:.8}.ampstart-headerbar-nav{line-height:3.5rem}.ampstart-nav-item:active,.ampstart-nav-item:focus,.ampstart-nav-item:hover{opacity:1}.ampstart-navbar-trigger:focus{outline:0}.ampstart-nav a,.ampstart-navbar-trigger,.ampstart-sidebar-faq a{cursor:pointer;text-decoration:none}.ampstart-nav .ampstart-label{color:inherit;padding-left:0}.ampstart-navbar-trigger{line-height:3.5rem;font-size:2.2rem}.ampstart-headerbar-nav{-webkit-box-flex:1;-ms-flex:1;flex:1}.ampstart-nav-search{-webkit-box-flex:.5;-ms-flex-positive:.5;flex-grow:.5}.ampstart-headerbar .ampstart-nav-search:active,.ampstart-headerbar .ampstart-nav-search:focus,.ampstart-headerbar .ampstart-nav-search:hover{box-shadow:none}.ampstart-nav-dropdown{min-width:200px}.ampstart-nav-dropdown amp-accordion header{background-color:#fff;border:0}.ampstart-nav-dropdown amp-accordion ul{background-color:#fff}.ampstart-nav-dropdown .ampstart-dropdown-item,.ampstart-nav-dropdown .ampstart-dropdown>section>header{background-color:#fff;color:#000}.ampstart-nav-dropdown .ampstart-dropdown-item{color:#f88}.ampstart-sidebar{background-color:#555;color:#000;min-width:300px;width:300px}.ampstart-sidebar .ampstart-icon{fill:#f88}.ampstart-sidebar-header{line-height:3.5rem;min-height:3.5rem}.ampstart-sidebar .ampstart-dropdown-item,.ampstart-sidebar .ampstart-dropdown header,.ampstart-sidebar .ampstart-faq-item,.ampstart-sidebar .ampstart-nav-item,.ampstart-sidebar .ampstart-social-follow{margin:0 0 2rem}.ampstart-sidebar .ampstart-nav-dropdown{margin:0}.ampstart-sidebar .ampstart-navbar-trigger{line-height:inherit;text-align:right;margin-right:15px;color:#999}.ampstart-navbar-trigger svg{pointer-events:none;margin:15px 0 0 15px;color:#fff}.ampstart-headerbar{color:#f88;padding-right:1rem;background-color:#fff;height:3.5rem;box-shadow:none;border-bottom:1px solid #f3f3f3}.ampstart-headerbar .ampstart-navbar-trigger{color:#222;font-size:1.38rem;padding-right:0}.ampstart-navbar-trigger:focus{outline:5px auto -webkit-focus-ring-color}.ampstart-sidebar-nav-image{width:120px}.ampstart-icon,.ampstart-sidebar .ampstart-icon{fill:#222}.ampstart-sidebar-header{position:relative;z-index:1}.ampstart-nav{margin-bottom:2rem}.ampstart-nav-item{color:#222;border-bottom:1px solid #777;list-style:none;padding-bottom:8px}.ampstart-sidebar .ampstart-nav-item{margin-bottom:1rem;padding-left:30px}.ampstart-nav-link{font-size:16px;font-weight:400;line-height:normal;display:inline-block;margin-bottom:5px;position:relative;color:#fff;padding-bottom:3px}.ampstart-nav-link .fa{position:absolute;right:20px;top:3px}.amp-mode-mouse .ampstart-nav-link:after{left:0;position:absolute;-webkit-transform:scaleX(0);transform:scaleX(0);-webkit-transform-origin:left center;transform-origin:left center;-webkit-transition:-webkit-transform .3s cubic-bezier(.19,1,.22,1);transition:-webkit-transform .3s cubic-bezier(.19,1,.22,1);transition:transform .3s cubic-bezier(.19,1,.22,1);transition:transform .3s cubic-bezier(.19,1,.22,1),-webkit-transform .3s cubic-bezier(.19,1,.22,1);width:100%;bottom:0;height:2px;content:"";display:block}.ampstart-dropdown-items{padding-left:0}.ampstart-dropdown-items li{font-size:14px;text-transform:capitalize;line-height:35px;border-bottom:1px solid #777;margin-right:30px;padding-left:20px;padding-bottom:5px;list-style:none}.ampstart-dropdown-items li a{color:#fff}.ampstart-dropdown-items li:last-child{border-bottom:0}.ampstart-social-follow{-webkit-box-pack:initial;-ms-flex-pack:initial;justify-content:initial;display:inline-block}.ampstart-social-follow li{display:inline-block;margin-right:0}.footerLink{display:block;padding:20px 0 0;text-align:center}.footerLink a{margin:0 10px}.copyright{display:block;padding:20px 0;text-align:center}.socialLink{text-align:center;display:block;margin-top:50px}.socialLink a{text-decoration:none}.socialLink .fa{font-size:150%;margin:0 20px;color:#fff}.logo{text-align:center}.amphtml-accordion-header{background:0;border:0;margin-bottom:0}.clearfix{clear:both}.amp-tailor { display: block; margin:50px 15px 10px; background:#f1f1f1; padding:15px 15px 20px; font-size:18px; border-radius:4px; text-align:center;}.amp-tailor span { display: block; margin:15px auto 0; width:70%; text-align:center; background:#a31022; border-radius:4px;}.amp-tailor span a { text-decoration: none; color:#fff; padding:5px 10px; display: block; font-size:18px;}.amp-tailor span .fa { font-size:130%; margin-left:10px;} /*@CUSTOM-CSS@*/ #contentHead{padding-top: 8px;} +.sharebar-sticker { display: block; position:fixed; bottom:0; left:0; width:100%;} @@ -60,13 +62,13 @@

Destinations

@@ -129,5 +131,6 @@ +
diff --git a/application/third_party/htmlcompressor/views/amp-template/gm.php b/application/third_party/htmlcompressor/views/amp-template/gm.php index 0ad306ef..4eb5c144 100644 --- a/application/third_party/htmlcompressor/views/amp-template/gm.php +++ b/application/third_party/htmlcompressor/views/amp-template/gm.php @@ -15,25 +15,29 @@ - - +
-
-
- - -
- - - -
-
- Anfragen
+
+
+
+ + +
+ + + +
+
+ Anfragen +
+
@@ -90,18 +94,16 @@ - -
- + - +
diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 1b9ae2fc..e8c3e11b 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -30,14 +30,14 @@ class Confirm extends CI_Controller { } } } else { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } $visitor_link_arr = $this->Order_model->get_visitor_link($COLI_SN); foreach ($visitor_link_arr as $l) { if ($visitor_link == $l->visitor_link) { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } } @@ -66,6 +66,7 @@ class Confirm extends CI_Controller { //已经确认过 $had_save = $this->Order_model->get_visitor_link($COLI_SN, $visitor_link); + if (!empty($had_save)) { echo json_encode(array('status' => 'ok')); return; @@ -79,7 +80,7 @@ class Confirm extends CI_Controller { } elseif ($this->input->post('address_street')) { $MEI_Street = $this->input->post('address_street') . ',' . $this->input->post('address_city') . ',' . $this->input->post('address_state') . ',' . $this->input->post('address_country'); } else { - $MEI_Street = ''; + $MEI_Street = $this->input->post('street').','.$this->input->post('city').','.$this->input->post('country'); } $data['MEI_Street'] = $MEI_Street; if (isset($given_name[$key]) && $given_name[$key] != 'None') { @@ -125,7 +126,7 @@ class Confirm extends CI_Controller { echo json_encode(array('status' => 'no')); } } - + //只有ch有review功能 function review() { $data = array(); diff --git a/application/third_party/order/views/gm/confirm_order.php b/application/third_party/order/views/gm/confirm_order.php index 1a973471..b3f26321 100644 --- a/application/third_party/order/views/gm/confirm_order.php +++ b/application/third_party/order/views/gm/confirm_order.php @@ -6,532 +6,404 @@ China Reisen und China Rundreisen individuell | Chinarundreisen.com - - - + + + + + - - - - - - -
- -
- -
-
-
- -
-

Vielen Dank für die Buchung bei Chinarundreisen!

-

Bitte füllen Sie das folgende Formular aus und schicken es zurück.

-
-
-
-
-
- -
-

Kunden informationen

-

Bitte prüfen Sie, ob Ihr Name richtig geschrieben ist (vollständiger Name wie im Reisepass) . Da wir die Folgekosten durch ein wegen falschem Namen stornierten Hotel oder Flugticket nicht tragen, ist die richtige Schreibweise Ihres Namens und Ihrer alle Daten unbedingt wichtig.

-
- -
-
- -
-
- -
-
- -
-
- -
- -
- -
-
- -
- -
-
-
- - -
-
-
-
-
- -
-
/
-
- -
-
-
-
-
-
- -
-
- -
-
- -
- -
- -
-
- -
-
- - - -
-
- - - - -
-
- -
- -
- - Mitreisende hinzufügen - -
-
- -
-
- - Kontakttelefon: - -
-
- -
-
- -
-
-
-
- COLI_CustomerType!=44003){ ?> -
-
- - Anschrift: - - - -
-
- - -
-
-
- -
-
-
- -
-

Fluginformationen

-
- -
-
- - -
- -
- -
- -
-
- -
- - -
- -
- -
- -
-
- -
- -
-
-
- -
-
-
- -
-

- Besondere Anforderungen -

-
- -
-
-
- -
-
-
-
- -
-
-
- COLI_CustomerType!=44003){ ?> -
-
-
- -
-

- Kontaktinformationen für Notfälle - (im Falle eines Notfalls während Ihrer Chinareise) -

-
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
-
-
- - -
- - - - - -
- -
-
Danke! Mit besten Grüßen, OPI_FirstName; ?>
-
- -
- -
-
- - - - + + //提交信息 + $("#form-confirm-info").submit(function(event){ + event.preventDefault(); + var $btn = $("#btn-add-userinfo").button('loading'); + + var url=$(this).attr('action'); + var data=$(this).serialize(); + $.ajax({ + type: "post", + url: url, + dataType: "json", + data: data, + success: function(json_data) { + if (json_data.status == 'ok') { + location.href='/secureinfoconfirm/confirm/index/0/0/0/gm'; + } else { + $btn.button('reset'); + $('#myModal').modal('show'); + } + }, + error: function(XMLHttpRequest, textStatus, errorThrown) { + $btn.button('reset'); + alert(errorThrown); + } + }); + }); +}) \ No newline at end of file diff --git a/application/third_party/order/views/gm/confirm_order_back.php b/application/third_party/order/views/gm/confirm_order_back.php new file mode 100644 index 00000000..31578924 --- /dev/null +++ b/application/third_party/order/views/gm/confirm_order_back.php @@ -0,0 +1,538 @@ + + + + + + + China Reisen und China Rundreisen individuell | Chinarundreisen.com + + + + + + + + + + + + + + +
+ +
+ +
+
+
+ +
+

Vielen Dank für die Buchung bei Chinarundreisen!

+

Bitte füllen Sie das folgende Formular aus und schicken es zurück.

+
+
+
+
+
+ +
+

Kunden informationen

+

Bitte prüfen Sie, ob Ihr Name richtig geschrieben ist (vollständiger Name wie im Reisepass) . Da wir die Folgekosten durch ein wegen falschem Namen stornierten Hotel oder Flugticket nicht tragen, ist die richtige Schreibweise Ihres Namens und Ihrer alle Daten unbedingt wichtig.

+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ + +
+
+
+
+
+ +
+
/
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + + +
+
+ + + + +
+
+ +
+ +
+ + Mitreisende hinzufügen + +
+
+ +
+
+ + Kontakttelefon: + +
+
+ +
+
+ +
+
+
+
+ COLI_CustomerType!=44003){ ?> +
+
+ + Anschrift: + + + +
+
+ + +
+
+
+ +
+
+
+ +
+

Fluginformationen

+
+ +
+
+ + +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+
+ +
+

+ Besondere Anforderungen +

+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ COLI_CustomerType!=44003){ ?> +
+
+
+ +
+

+ Kontaktinformationen für Notfälle + (im Falle eines Notfalls während Ihrer Chinareise) +

+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ + +
+ + + + + +
+ +
+
Danke! Mit besten Grüßen, OPI_FirstName; ?>
+
+ +
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/application/third_party/tour_map/controllers/index.php b/application/third_party/tour_map/controllers/index.php new file mode 100644 index 00000000..f3a5aeb3 --- /dev/null +++ b/application/third_party/tour_map/controllers/index.php @@ -0,0 +1,20 @@ +load->view('welcome'); + } + + +} \ No newline at end of file diff --git a/application/third_party/tour_map/views/welcome.php b/application/third_party/tour_map/views/welcome.php new file mode 100644 index 00000000..fa916d88 --- /dev/null +++ b/application/third_party/tour_map/views/welcome.php @@ -0,0 +1,383 @@ + + + + + + + Tour Map + + + + + + + + + + 'Beijing', 'start_lng' => '116.41667', 'start_lat' => '39.91667', 'end' => 'urumqi', 'end_lng' => '87.61792', 'end_lat' => '43.793308', 'traffic' => '2', 'memo' => 'G87'); + $tour[] = array('start' => 'Beijing', 'start_lng' => '116.41667', 'start_lat' => '39.91667', 'end' => 'Xian', 'end_lng' => '108.95000', 'end_lat' => '34.26667', 'traffic' => '2', 'memo' => 'G87'); + $tour[] = array('start' => 'Xian', 'start_lng' => '108.95000', 'start_lat' => '34.26667', 'end' => 'Guilin', 'end_lng' => '110.290247', 'end_lat' => '25.273915', 'traffic' => '3', 'memo' => 'CA1225'); + $tour[] = array('start' => 'Guilin', 'start_lng' => '110.290247', 'start_lat' => '25.273915', 'end' => 'Longsheng', 'end_lng' => '110.648739', 'end_lat' => '24.828426', 'traffic' => '5', 'memo' => ''); + $tour[] = array('start' => 'Longsheng', 'start_lng' => '110.648739', 'start_lat' => '24.828426', 'end' => 'Guilin', 'end_lng' => '110.290247', 'end_lat' => '25.273915', 'traffic' => '5', 'memo' => ''); + $tour[] = array('start' => 'Guilin', 'start_lng' => '110.290247', 'start_lat' => '25.273915', 'end' => 'Yangshuo', 'end_lng' => '110.496593', 'end_lat' => '24.778481', 'traffic' => '5', 'memo' => ''); + $tour[] = array('start' => 'Yangshuo', 'start_lng' => '110.496593', 'start_lat' => '24.778481', 'end' => 'Guilin', 'end_lng' => '110.290247', 'end_lat' => '25.273915', 'traffic' => '5', 'memo' => ''); + $tour[] = array('start' => 'Guilin', 'start_lng' => '110.290247', 'start_lat' => '25.273915', 'end' => 'Shanghai', 'end_lng' => '121.473658', 'end_lat' => '31.230378', 'traffic' => '3', 'memo' => 'FM9350'); + + + $map_data = $this->input->get('map_data'); +//echo $map_data; + $debug = $this->input->get('debug'); + if (!empty($debug)) { + print_r(base64_decode($map_data)); + } + ?> +
+ + + + + + \ No newline at end of file diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 0e217f82..1563caa7 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -438,7 +438,7 @@ class search extends CI_Controller{ function ticket_exchange($price,$num){ //echo $this->can_buy_now; if($this->cache == 'yes' || $this->seveth == 'yes'){ - if(isset($price)){ + if(isset($price) && is_numeric($num)){ if($price > 0){ return '有'; }else{ diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index 559fba16..5dcdecb0 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -43,6 +43,7 @@ class Tuniu_train extends CI_Controller{ //做超过预售期的处理查询 $isCache = false; $iseven = false; + $cachedata = false; $now_time = time(); $differ = (strtotime($date) - $now_time) / 86400; if($differ > 29){ @@ -59,27 +60,35 @@ class Tuniu_train extends CI_Controller{ "sign": "'.$sign.'", "timestamp": "'.$time.'", "data": { "trainDate": "'.$date.'", "fromStation": "'.$fromStation.'", "toStation": "'.$toStation.'", "trainCode": "" } - }'; + }'; + //设置请求接口时间 + $api_start_time = microtime(true); + $back_data = post_tuniu($url,$post_data,$method = 'POST'); + //$back_data = null; + //接口结束时间 + $api_end_time = microtime(true); - log_message('error','tuniutrain 原始数据:'.$back_data); - //print_r(json_decode($back_data));die(); - //$log_info = ''; + //计算响应时间 + $api_responsive_time = $api_end_time - $api_start_time; - $tn_info = json_decode($back_data); - $retrun_code = $tn_info->returnCode; - $return_msg = $tn_info->errorMsg; + if(!empty($back_data)){ + $tn_info = json_decode($back_data); + $retrun_code = $tn_info->returnCode; + $return_msg = $tn_info->errorMsg; + }else{ + $retrun_code = '404'; + $return_msg = '途牛接口未响应'; + } if(isset($tn_info->data)){ if(empty(json_decode($back_data)->data)){ $isCache = true; - //$log_info = 'tuniutrain data缺失|数据源:'.$fromStation.'|'.$toStation.'|'.$date.'|retrun_code:'.$retrun_code.'|return_msg:'.$return_msg; }else{ $this->tuniuprice_model->addOrUpdate($fromStation,$toStation,$back_data); } }else{ $isCache = true; - //$log_info = 'tuniutrain 接口未响应|数据源:'.$fromStation.'|'.$toStation.'|'.$date.'|retrun_code:'.$retrun_code.'|return_msg:'.$return_msg; } if($isCache){ @@ -89,17 +98,23 @@ class Tuniu_train extends CI_Controller{ $trainCache = $this->tuniuprice_model->get_train_cache($fromStation,$toStation); if(!empty($trainCache)){ $back_data = $trainCache->tpc_content; - $isCache = true; - //$log_info .= '|调用缓存'; - //log_message('error',$log_info); + $cachedata = true; }else{ $back_data = null; - //$log_info .= '|缓存为空'; - //log_message('error',$log_info); + $cachedata = false; } } } + if($cachedata){ + $cacheuse = '使用缓存'; + }else{ + $cacheuse = '缓存为空'; + } + + //记录数据格式 |出发站|到达站|发车时间|接口响应时间|接口返回代码|接口返回信息|是否调用缓存 + log_message('error','tuniutrain|'.$fromStation.'|'.$toStation.'|'.$date.'|'.$api_responsive_time.'|'.$retrun_code.'|'.$return_msg.'|'.$cacheuse); + //途牛数据格式转换 $return_data = new stdClass(); $return_data->httpstatus = 200; diff --git a/application/third_party/tuniu/helpers/tuniu_helper.php b/application/third_party/tuniu/helpers/tuniu_helper.php index eb76527d..55a44a9c 100644 --- a/application/third_party/tuniu/helpers/tuniu_helper.php +++ b/application/third_party/tuniu/helpers/tuniu_helper.php @@ -44,8 +44,8 @@ curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); } - curl_setopt($curl, CURLOPT_TIMEOUT, 25); // 设置超时限制防止死循环 - curl_setopt($curl, CURLOPT_TIMEOUT_MS, 25000); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT, 40); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT_MS, 40000); // 设置超时限制防止死循环 curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 $tmpInfo = curl_exec($curl); // 执行操作 diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 9f70c5c4..feb5f103 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -84,6 +84,7 @@
  • Html基础知识
  • AMP知识
  • AMP操作SOP
    • +
  • HTML构建工具V3
  • PS基础课件
  • 系统设置
    • diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index c9b57531..c5a0b78a 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -91,6 +91,7 @@
  • Html基础知识
  • AMP知识
  • AMP操作SOP
    • +
  • HTML构建工具V3
  • PS基础课件
  • 系统设置
    • diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 7b6b12c5..baff7735 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1,1334 +1,1354 @@ +
    +
    + - //选择内容图片 - function openKCFinder_Content() { - var site_url = 'config->item('site_url') ?>'; - var weburl = encodeURI(site_url + $("#ic_url").val()); - window.CallBack = openKCFinder_Content_callback; - window.open('/media/popselectpicture.php?site_code=config->item('site_code'); ?>&site_lgc=config->item('site_lgc'); ?>&WebUrl=' + weburl, 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600'); - } - function openKCFinder_Content_callback(result) { - var site_image_url = 'config->item('media_image_url') ?>'; - var use_pictures = $("#use_pictures").val(); - if (result != null) { - for (var key in result.Pinfo) { - if ('config->item('site_code') ?>' == 'cht') { - editor.insertHtml('
    ' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
    '); - insertoutP(); - } else { - editor.insertHtml('' + result.Pinfo[key].PName + ''); +
    + +
    + +
    + + + +
    +
    +
    +
    + +
    +
    + session->userdata('session_admin'); + $show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture'); + $amp_photo = ''; + if ($information->ic_photo && $show_photo_meta !== 'no') { + $amp_photo = $this->config->item('site_image_url') . $information->ic_photo; } - use_pictures = use_pictures + result.Pinfo[key].ID + ':' + result.Pinfo[key].PUrl + ':' + result.Pinfo[key].wh + ','; - } - $("#use_pictures").val(use_pictures); - } - } - - //搜索产品列表 - function select_product_list(product_type, product_name) { - $("#product_list_ul").html('waiting...'); - $.ajax({ - type: "post", - dataType: "json", - url: "", - data: {'product_type': product_type, 'product_name': product_name}, - success: function (data, textStatus) { - for (var key in data) { - if (data[key].name == 'ok') { - $("#product_list_ul").html(data[key].value); - return true; + $amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url')); + ?> + ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { + $PcAmpChecked = 'checked'; + } else { + $PcAmpChecked = ''; } + ?> + + | + | + + + amp_status === '1') { ?> + + + amp_status === '2') { ?> + + + amp_status === '0') { ?> + + +
    +
    + " name="ic_title" value="ic_title; ?>" > +
    +
    +
    +
    +
    +
    链接标题
    + +
    +
    +
    +
    链接地址 + + + ic_sitecode == 'cht') { ?> + + + ic_sitecode == 'gm') { ?> + + +
    + +
    +
    + + - +
    +
    + + + + + + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    +
    + + + - //跳转到前台页面 - function goto_page() { - var site_url = 'config->item('site_url') ?>'; - $('#goto_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } +
    +
    + + +
    +
    + + +
    +
    + + +
    - //跳转到测试页面 - function goto_test_page() { - var site_url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } - //德语站点跳转测试页面 - function goto_gmtest_page() { - var site_url = 'http://gm.test/gm.php/information/detail/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } - function goto_test_page_pgr() { - var site_url = 'http://192.155.250.125:8011/guide.php/travelguide/guide/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } +
    + + +
    +
    + + + + + + + + + + + + + + + + + +

    +
    + +
    + +
    diff --git a/css/images/arrow.png b/css/images/arrow.png new file mode 100644 index 00000000..b5208ca5 Binary files /dev/null and b/css/images/arrow.png differ diff --git a/css/images/car.png b/css/images/car.png new file mode 100644 index 00000000..2f3551b4 Binary files /dev/null and b/css/images/car.png differ diff --git a/css/images/plane.png b/css/images/plane.png new file mode 100644 index 00000000..bd3857f8 Binary files /dev/null and b/css/images/plane.png differ diff --git a/css/images/point.PNG b/css/images/point.PNG new file mode 100644 index 00000000..d9fd55ec Binary files /dev/null and b/css/images/point.PNG differ diff --git a/css/images/ship.png b/css/images/ship.png new file mode 100644 index 00000000..ab6e4712 Binary files /dev/null and b/css/images/ship.png differ diff --git a/css/images/ship32x32.png b/css/images/ship32x32.png new file mode 100644 index 00000000..0ffe94f0 Binary files /dev/null and b/css/images/ship32x32.png differ diff --git a/css/images/train.png b/css/images/train.png new file mode 100644 index 00000000..a597a1c1 Binary files /dev/null and b/css/images/train.png differ diff --git a/css/images/train32x32.png b/css/images/train32x32.png new file mode 100644 index 00000000..f871d0f0 Binary files /dev/null and b/css/images/train32x32.png differ diff --git a/css/images/trainxMAX.png b/css/images/trainxMAX.png new file mode 100644 index 00000000..0b9313d8 Binary files /dev/null and b/css/images/trainxMAX.png differ diff --git a/js/basic.js b/js/basic.js index 68fd61de..3deded8f 100644 --- a/js/basic.js +++ b/js/basic.js @@ -38,6 +38,15 @@ function information_check() { flag = false; } + //信息备注og:description长度 + var og_description = $("#meta_note").val(); + var og_description_length = get_string_length(og_description); + if (sitecode == 'jp' || sitecode == 'ru') og_description_length = parseInt(og_description_length / 2); + if (og_description_length < 80 || og_description_length > 160) { + $("#error-tops").append('
  • og:description信息备注长度必须在80~160个字符之间[' + og_description_length + '个]
    • '); + flag = false; + } + //文章字数 var content_num = content_length; if (content_num < 1500) { diff --git a/js/information-system3.min.js b/js/information-system3.min.js index c7353a87..ebfa2f5d 100644 --- a/js/information-system3.min.js +++ b/js/information-system3.min.js @@ -161,6 +161,13 @@ function information_check() { $("#error-tops").append("
  • SEO描述长度必须在80~160个字符之间[" + description_length + "个]
    • "); flag = false } + var og_description = $("#meta_note").val(); + var og_description_length = get_string_length(og_description); + if (sitecode == 'jp' || sitecode == 'ru') og_description_length = parseInt(og_description_length / 2); + if (og_description_length < 80 || og_description_length > 160) { + $("#error-tops").append('
  • og:description信息备注长度必须在80~160个字符之间[' + og_description_length + '个]
    • '); + flag = false; + } var content_num = content_length; if (content_num < 1500) { $("#error-tops").append("
  • 文章字数不能少于1500字[" + content_num + "字]
    • "); diff --git a/sureroute-test-object.html b/sureroute-test-object.html new file mode 100644 index 00000000..bb0fb2ad --- /dev/null +++ b/sureroute-test-object.html @@ -0,0 +1,105 @@ + + + + + + Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit + + + + + + +

    Lorem Ipsum

    + +

    Ipsum, Lorem

    + +
    +

    +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam massa enim, tincidunt non hendrerit eget, malesuada et nisi. In hac habitasse platea dictumst. Praesent nec laoreet ante. Aenean tempus nisi in erat tempus tempus. Vestibulum imperdiet lobortis sapien eu tempus. Vivamus volutpat quam sed eros molestie vitae dignissim nulla ultricies. Vivamus dictum elit velit. Pellentesque pellentesque ornare ornare. Mauris vel gravida sapien. Praesent eleifend tristique ipsum nec tempor. Vestibulum cursus eleifend tellus, a egestas lectus euismod sed. +

    +

    +Duis nec massa quam. Nulla porta, enim ut consequat tincidunt, quam tortor consequat enim, eu interdum eros lorem eu turpis. Cras vestibulum orci quis felis tristique quis semper sem imperdiet. Sed mattis tincidunt risus scelerisque scelerisque. Aliquam nisl quam, bibendum quis luctus eu, sodales ut felis. Integer id turpis nisi. Phasellus mattis nulla eu odio faucibus a auctor orci tristique. Nulla ullamcorper, risus nec semper accumsan, libero lacus aliquet elit, quis lacinia metus nunc vestibulum turpis. Suspendisse vel sapien vel magna auctor aliquam. Aenean fringilla fringilla metus non imperdiet. Aliquam nisl lacus, tempus vitae commodo non, accumsan ut lectus. Nam in urna eu neque pretium aliquam. Maecenas sit amet urna lectus. Donec vitae metus enim. +

    +

    +Sed lacus nulla, faucibus eget ullamcorper ut, mollis at metus. Vivamus tortor felis, tincidunt at tristique ut, tincidunt feugiat velit. Ut euismod felis non urna luctus luctus. Integer nec urna massa. Mauris vestibulum hendrerit auctor. Morbi at tellus nec arcu scelerisque rhoncus. Phasellus facilisis interdum lorem vulputate posuere. Nullam quis felis est. Aenean metus augue, tempus non ultricies et, dapibus vel felis. Pellentesque at augue velit. Nulla erat nisi, posuere eu pellentesque id, pretium ac libero. Phasellus tincidunt sollicitudin sapien at mollis. Nullam et libero velit, nec tincidunt eros. Aliquam et sem elit. Quisque suscipit orci enim, vel aliquam nisi. Suspendisse in enim a ligula blandit volutpat in id velit. +

    +

    +Nam tempor neque nec ligula sollicitudin rhoncus. Etiam et lorem vel odio pharetra interdum. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In imperdiet nisi sed diam rutrum gravida in vel massa. Nam ullamcorper ultrices diam, vitae consequat lacus consequat consequat. Curabitur laoreet leo sed tortor fringilla nec euismod libero lobortis. Donec non enim lectus. Suspendisse potenti. In hac habitasse platea dictumst. Fusce semper auctor neque nec lobortis. Praesent vitae mauris turpis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sed pharetra odio. Suspendisse potenti. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis eget odio purus, quis dapibus massa. +

    +

    +Curabitur ut dapibus eros. Donec tempor, felis ac facilisis bibendum, nisi purus pellentesque sem, sollicitudin tempor lectus nulla at mi. Maecenas quis urna ut ante pulvinar pellentesque. Duis auctor imperdiet suscipit. Pellentesque dui nulla, volutpat quis posuere a, gravida ornare augue. Proin nec felis pharetra magna pellentesque facilisis. Curabitur lacus libero, malesuada sed tincidunt ac, aliquet ut tortor. Etiam gravida lorem nulla, consectetur eleifend risus. Donec facilisis, turpis laoreet imperdiet laoreet, purus justo egestas nulla, et hendrerit leo eros at orci. Nunc vulputate mauris sit amet sapien accumsan nec euismod orci volutpat. Sed ultricies velit ut lorem venenatis in convallis tellus imperdiet. Aenean auctor ultrices est ultricies rhoncus. Phasellus non magna a leo luctus fermentum nec fermentum erat. +

    +

    + +Sed faucibus nisl quis diam mollis quis varius tortor tincidunt. Phasellus in turpis in tellus consectetur mollis. Donec a neque id metus condimentum dignissim. In hac habitasse platea dictumst. Pellentesque sem nisi, pulvinar nec sagittis vitae, lacinia non tellus. Aliquam dignissim dignissim volutpat. Pellentesque ut quam et mi tincidunt varius id vel quam. Duis consectetur elit ac ligula fringilla elementum. In elementum tellus viverra mi vehicula vitae tempus lectus laoreet. Nullam diam nibh, tincidunt vitae imperdiet a, luctus a felis. In posuere pulvinar volutpat. Pellentesque eget viverra justo. +

    +

    +Nullam nec sapien at felis molestie auctor. Sed dignissim erat eu nulla ullamcorper mattis. Curabitur felis sem, feugiat non semper ut, sollicitudin sed ipsum. Quisque cursus laoreet turpis, sit amet molestie neque consequat at. Vestibulum eu ligula quis nisl pulvinar rhoncus. Praesent faucibus, dolor in elementum ullamcorper, tellus ante mattis risus, ac imperdiet eros eros quis risus. Praesent luctus libero a diam pharetra eget placerat risus pulvinar. Donec sollicitudin pulvinar velit vel pellentesque. Quisque sagittis leo ac mauris congue adipiscing. In tempus facilisis facilisis. Aliquam erat volutpat. Suspendisse sagittis libero ipsum. +

    +

    +Aliquam at cursus ipsum. Vivamus purus mi, pretium at molestie id, dictum in quam. Proin egestas auctor iaculis. Maecenas sodales facilisis tellus eu bibendum. Vestibulum varius vehicula scelerisque. Praesent condimentum varius commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sem nisl, sagittis eu euismod non, tempor nec magna. Fusce sed auctor nisl. Phasellus porttitor sagittis est, sit amet eleifend elit dignissim et. Nam consectetur elementum elit non egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum a ultricies neque. Integer hendrerit nisi id dolor porta quis venenatis lacus dignissim. In vitae fringilla magna. +

    +

    +Fusce ultrices scelerisque felis, id semper quam posuere a. Sed nec erat eget velit euismod condimentum a in enim. Maecenas bibendum aliquam tincidunt. Mauris vestibulum neque at nulla sagittis id lacinia enim fermentum. Quisque adipiscing risus nec massa auctor condimentum. Mauris venenatis lacus justo, eu varius odio. Fusce commodo luctus felis, vitae lobortis lectus facilisis id. Nunc faucibus vestibulum urna et lacinia. Cras ornare quam neque, non gravida sapien. Cras porta, diam sit amet laoreet rutrum, massa erat commodo diam, eu rhoncus nisl massa ac metus. In sem mauris, venenatis nec euismod ac, suscipit condimentum neque. Quisque pretium blandit lectus, ut aliquet neque rhoncus eu. Vivamus ultrices porttitor tincidunt. Curabitur ut ipsum non ipsum ultrices tincidunt. Integer scelerisque augue nec nisl varius tristique. Morbi condimentum rutrum sodales. Pellentesque odio mauris, porttitor ac sollicitudin in, ultrices ut diam. +

    +

    +Sed congue adipiscing orci a pellentesque. Etiam quis neque eu nulla viverra egestas. Ut ultricies dui non enim rhoncus laoreet. Nulla molestie nibh non erat venenatis gravida. Pellentesque faucibus sem sit amet risus tincidunt non ultrices diam auctor. Praesent quis libero et tellus tempor molestie. Mauris ullamcorper feugiat libero sed elementum. Donec eget nunc eget diam hendrerit pulvinar. Ut ut imperdiet enim. Vestibulum sed quam lorem. Nunc ipsum massa, venenatis eget condimentum at, ornare id ante. Vestibulum ornare volutpat tincidunt. Etiam a eros erat. Curabitur lobortis, nisi a malesuada tincidunt, nisi enim congue eros, in dictum elit odio at nunc. Nam hendrerit porta velit a viverra. +

    +

    +Etiam vel velit urna. Donec commodo aliquet magna rhoncus pretium. Donec fermentum orci in diam dictum non pulvinar mi tristique. Morbi urna libero, sagittis vel facilisis nec, ornare vitae nunc. Pellentesque laoreet mi a mi condimentum sagittis. Donec eleifend, nisi sit amet tincidunt sollicitudin, leo magna accumsan elit, at adipiscing velit lacus id purus. Aenean nunc sapien, egestas vitae pretium viverra, bibendum vel tellus. Maecenas mattis dui ac justo facilisis sollicitudin. Proin in mi ac lacus hendrerit congue ac vitae elit. Aliquam erat volutpat. In hac habitasse platea dictumst. Phasellus dapibus diam vel velit consectetur tempor. Maecenas viverra suscipit bibendum. Sed non enim neque. +

    + +

    +Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus at odio et odio volutpat egestas. Fusce non pellentesque felis. Nunc fermentum posuere sem quis egestas. Integer nec orci vel eros fringilla bibendum. Praesent placerat molestie elit at mattis. Nunc rutrum faucibus arcu non bibendum. Vestibulum at sapien sit amet sem iaculis congue. Morbi tempus, libero vitae interdum suscipit, lacus ipsum suscipit quam, non pretium nulla orci eget dui. Praesent et nisl turpis, ultricies convallis quam. In tempor urna et eros aliquet accumsan. Phasellus lobortis bibendum libero sit amet viverra. Aenean consectetur, neque eu cursus posuere, est leo molestie dui, sit amet vulputate mi erat eu tortor. Suspendisse arcu velit, porta sit amet adipiscing sed, ultrices id urna. In hendrerit iaculis massa in pretium. Vivamus eros augue, venenatis non hendrerit a, bibendum in tortor. Fusce et mauris lorem, vitae semper ligula. Nam iaculis, eros eu varius varius, orci sapien rhoncus arcu, et luctus urna lectus non quam. Donec gravida convallis justo at bibendum. Quisque non est velit, sed laoreet augue. +

    +
    + + +