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

hotfix/远程访问多媒体中心
cyc 7 years ago
commit dbcac59ec6

@ -615,6 +615,7 @@ $config['area_type'] = array(
'大使馆' => 'y', '大使馆' => 'y',
'公民游' => 'z', '公民游' => 'z',
'交换链接' => 'k', '交换链接' => 'k',
'首页' => 'h',
'FAQ' => 'q' 'FAQ' => 'q'
); );

@ -0,0 +1,42 @@
<?php
if (!defined('BASEPATH'))
exit('No direct script access allowed');
class Home extends CI_Controller
{
function __construct()
{
parent::__construct();
$this->permission->is_admin();
//$this->output->enable_profiler(TRUE);
$this->load->model('Area_model');
$this->load->model('Information_model');
$this->load->model('InfoContents_model');
$this->load->model('InfoStructures_model');
}
//站点首页
public function index()
{
$home_id=1;
//查询结构根节点,当为空则建立
$rootStructure = $this->Information_model->GetRoot('h', $home_id);
if ($rootStructure == FALSE)
{
$this->InfoContents_model->Add('', 'HomePage', 'root', '', '', '', '', '', '', 0, 0, '', '', 0, 0, '', '', $home_id, 'h', 0,
'','');
$this->InfoStructures_model->Add(0, $this->InfoContents_model->insert_id);
$is_id = $this->InfoStructures_model->insert_id;
}
else
{
$is_id = $rootStructure->is_id;
}
redirect(site_url('information/edit/' . $is_id));
}
}

@ -242,12 +242,24 @@ class Info_amp extends CI_Controller
if (!empty($rs)) { if (!empty($rs)) {
$newrs = array(); $newrs = array();
foreach ($rs as $info) { foreach ($rs as $info) {
if (!empty($info->ic_content) && !empty($info->ic_url)) { $show_photo_meta = $this->InfoMetas_model->get($info->ic_id, 'meta_use_list_picture');
if ($show_photo_meta == 'no') {
$use_photo = '';
} else {
$use_photo = $this->config->item('site_image_url').$info->ic_photo;
}
if ($info->ic_type === 'c_attraction' || $info->ic_template === 'city_info_attractions_list' || $info->ic_template === 'r_tpl_empty_navi1p') {
$list_info = true;
} else {
$list_info = false;
}
if ($list_info || !empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
array_push($newrs, array( array_push($newrs, array(
'is_path' => $info->is_path,
'ic_url' => $info->ic_url, 'ic_url' => $info->ic_url,
'ic_id' => $info->ic_id, 'ic_id' => $info->ic_id,
'title' => $info->ic_title, 'title' => $info->ic_title,
'photo' => $this->config->item('site_image_url').$info->ic_photo, 'photo' => $use_photo,
'im_id' => $info->im_id 'im_id' => $info->im_id
)); ));
} }
@ -267,11 +279,17 @@ class Info_amp extends CI_Controller
if ($icid) { if ($icid) {
$ic = $this->InfoContents_model->get_ic_contents2($icid); $ic = $this->InfoContents_model->get_ic_contents2($icid);
if ($ic) { if ($ic) {
$show_photo_meta = $this->InfoMetas_model->get($icid, 'meta_use_list_picture');
if ($show_photo_meta == 'no') {
$use_photo = '';
} else {
$use_photo = $this->config->item('site_image_url').$ic->ic_photo;
}
echo json_encode(array( echo json_encode(array(
"succ" => true, "succ" => true,
"info" => $ic->ic_content, "info" => $ic->ic_content ? $ic->ic_content : "<p>".$ic->ic_seo_description."</p>",
"title" => $ic->ic_title, "title" => $ic->ic_title,
"photo" => $this->config->item('site_image_url').$ic->ic_photo, "photo" => $use_photo,
"url" => $ic->ic_url, "url" => $ic->ic_url,
"site" => $this->config->item('site_url') "site" => $this->config->item('site_url')
)); ));

@ -126,7 +126,7 @@ class InfoContents_model extends CI_Model
public function get_ic_contents2($ic_id) public function get_ic_contents2($ic_id)
{ {
$sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo, ic_sitecode from infoContents where ic_id=?"; $sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo, ic_sitecode, ic_seo_description from infoContents where ic_id=?";
$query=$this->HT->query($sql,array($ic_id)); $query=$this->HT->query($sql,array($ic_id));
if ($query->result()) if ($query->result())
{ {

@ -58,6 +58,7 @@ class InfoMetas_model extends CI_Model {
//按节点列表信息含meta数据 //按节点列表信息含meta数据
function list_info_by_path_with_meta($is_path, $site_code) { function list_info_by_path_with_meta($is_path, $site_code) {
$sql = "SELECT is1.is_id, \n" $sql = "SELECT is1.is_id, \n"
. " is1.is_path, \n"
. " ic.ic_id, \n" . " ic.ic_id, \n"
. " ic.ic_url, \n" . " ic.ic_url, \n"
. " ic.ic_status, \n" . " ic.ic_status, \n"
@ -66,12 +67,14 @@ class InfoMetas_model extends CI_Model {
. " ic.ic_content, \n" . " ic.ic_content, \n"
. " ic.ic_photo, \n" . " ic.ic_photo, \n"
. " ic.ic_title, \n" . " ic.ic_title, \n"
. " ic.ic_type, \n"
. " im.im_id \n" . " im.im_id \n"
. " FROM infoStructures is1 \n" . " FROM infoStructures is1 \n"
. " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n" . " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n"
. " AND ic.ic_sitecode = is1.is_sitecode \n" . " AND ic.ic_sitecode = is1.is_sitecode \n"
. " LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?" . " LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?"
. " WHERE is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1"; . " WHERE is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1"
. " ORDER BY is1.is_level, is1.is_sort, is1.is_path";
$query = $this->HT->query($sql, array('AMP_JSON', $site_code)); $query = $this->HT->query($sql, array('AMP_JSON', $site_code));
//print_r($this->HT->queries); //print_r($this->HT->queries);
return $query->result(); return $query->result();

@ -12,7 +12,6 @@
} }
</style> </style>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="preview_box" id="iframe_box" ></div> <div class="preview_box" id="iframe_box" ></div>
@ -20,7 +19,7 @@
</div> </div>
<hr/> <hr/>
<form name="form_amp_code" id="form_amp_code" method="post" action="<?php echo site_url('amp/edit_save') ?>"> <form name="form_amp_code" id="form_amp_code" method="post" action="<?php echo site_url('amp/edit_save') ?>">
<textarea id="textarea_htmlcode" name="textarea_htmlcode" style="display: none;"><?php echo get_meta($information->ic_id, 'AMP'); ?></textarea> <textarea id="textarea_htmlcode" name="textarea_htmlcode" style="display: none;"></textarea>
<input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" /> <input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" />
<div class="row"> <div class="row">
@ -40,7 +39,7 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button> <button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button>
<a href="http://192.155.224.195:8080/guide-use.php/amp_loader/load/?info_url=<?php echo $information->ic_url ?>" target="_blank">看看</a> <a href="http://192.155.224.195:8080/guide-use.php/amp_loader/test/?info_url=<?php echo $information->ic_url ?>" target="_blank">看看</a>
</div> </div>
<div class="col-sm-4"> <button type="button" class="btn btn-default" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">删除</button> </div> <div class="col-sm-4"> <button type="button" class="btn btn-default" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">删除</button> </div>
</div> </div>
@ -48,45 +47,47 @@
<hr/> <hr/>
</div> </div>
<script type="text/x-template" id="amp_html">
<?php echo htmlentities(get_meta($information->ic_id, 'AMP')); ?>
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script>
<script> <script>
var editor = ace.edit("editor"); var editor = ace.edit("editor");
editor.setTheme("ace/theme/eclipse"); editor.setTheme("ace/theme/eclipse");
editor.session.setMode("ace/mode/html"); editor.session.setMode("ace/mode/html");
editor.setOptions({ editor.setOptions({
autoScrollEditorIntoView: true, autoScrollEditorIntoView: true,
wrap: true wrap: true
}); });
editor.getSession().on('change', function (e) {
update_preview();
});
editor.getSession().on('change', function (e) { var temp_div = document.createElement("div");
update_preview(); temp_div.innerHTML = $('#amp_html').html();
}); editor.session.setValue(temp_div.textContent);
editor.session.setValue($('#textarea_htmlcode').html($('#textarea_htmlcode').html()).text());
function update_preview() { function update_preview() {
//考虑做成异步操作,降低页面卡顿 //考虑做成异步操作,降低页面卡顿
var iframe = document.createElement('iframe'); var iframe = document.createElement('iframe');
iframe.setAttribute('frameBorder', '0'); iframe.setAttribute('frameBorder', '0');
iframe.setAttribute('id', 'previewIframe'); iframe.setAttribute('id', 'previewIframe');
iframe.setAttribute('height', '100%'); iframe.setAttribute('height', '100%');
iframe.setAttribute('width', '100%'); iframe.setAttribute('width', '100%');
iframe.setAttribute('name', 'AMP Playground Output'); iframe.setAttribute('name', 'AMP Playground Output');
$('#iframe_box').html(''); $('#iframe_box').html('');
$('#iframe_box').append(iframe); $('#iframe_box').append(iframe);
var doc = iframe.contentDocument || iframe.document; var doc = iframe.contentDocument || iframe.document;
doc.open(); doc.open();
doc.write(editor.getValue()); doc.write(editor.getValue());
doc.close(); doc.close();
} }
function submit_amp_editor() { function submit_amp_editor() {
$('#textarea_htmlcode').text(editor.getValue()).html(); $('#textarea_htmlcode').text(editor.getValue()).html();
submitForm('form_amp_code'); submitForm('form_amp_code');
} }
</script> </script>

@ -10,6 +10,7 @@
<li class="divider"></li> <li class="divider"></li>
<li class="nav-header">信息模块</li> <li class="nav-header">信息模块</li>
<li><a href="<?php echo site_url('home') ?>">首页</a></li>
<li><a href="<?php echo site_url('special') ?>">专题管理</a></li> <li><a href="<?php echo site_url('special') ?>">专题管理</a></li>
<li><a href="<?php echo site_url('link') ?>">交换链接</a></li> <li><a href="<?php echo site_url('link') ?>">交换链接</a></li>
<li><a href="<?php echo site_url('airport') ?>">机场信息</a></li> <li><a href="<?php echo site_url('airport') ?>">机场信息</a></li>

@ -550,12 +550,13 @@
<div class="col-xs-17 text-right"> <div class="col-xs-17 text-right">
<?php <?php
$amp_user = $this->session->userdata('session_admin'); $amp_user = $this->session->userdata('session_admin');
$show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture');
$amp_photo = ''; $amp_photo = '';
if ($information->ic_photo) { if ($information->ic_photo && $show_photo_meta !== 'no') {
$amp_photo = $this->config->item('site_image_url').$information->ic_photo; $amp_photo = $this->config->item('site_image_url').$information->ic_photo;
} }
?> ?>
<label title="AMP页面编辑"><a href="/amp_app/?icid=<?php echo($information->ic_id); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&url=<?php echo(urlencode($information->ic_url)); ?>&photo=<?php echo(urlencode($amp_photo)); ?>&site=<?php echo(urlencode($this->config->item('site_url'))); ?>&imgurl=<?php echo(urlencode($this->config->item('site_image_url'))); ?>" target="_blank">AMP构建工具</a></label> | <label title="AMP页面编辑"><a href="/amp_app/?icid=<?php echo($information->ic_id); ?>&is_path=<?php echo($information->is_path); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&url=<?php echo(urlencode($information->ic_url)); ?>&photo=<?php echo(urlencode($amp_photo)); ?>&site=<?php echo(urlencode($this->config->item('site_url'))); ?>&imgurl=<?php echo(urlencode($this->config->item('site_image_url'))); ?>" target="_blank">AMP构建工具</a></label> |
<?php if (get_meta($information->ic_id, 'AMP_STATUS') === '1') {?> <?php if (get_meta($information->ic_id, 'AMP_STATUS') === '1') {?>
<label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label> <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
<?php } else {?> <?php } else {?>

@ -5,7 +5,9 @@
<dl> <dl>
<dt>系统模块</dt> <dt>系统模块</dt>
<dd>
<a href="<?php echo site_url('home') ?>">站点首页</a>
</dd>
<dd> <dd>
<a href="<?php echo site_url('special') ?>">专题管理</a> <a href="<?php echo site_url('special') ?>">专题管理</a>
</dd> </dd>

Loading…
Cancel
Save