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
hotfix/paypal-note
candice 2 years ago
parent ba7c4d239d af8ce2ee6d
commit aa5acdeff7
3 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -985,14 +985,8 @@ class Information extends CI_Controller
public function test_feedback()
{
$feedback_newest = $this->Feedback_model->get_feedback_newest();
$feedback_newest = $this->Feedback_model->test_feedback_newest();
var_dump($feedback_newest);
$feedback_newest_content = $this->load->view(
'ch-feedback-newest',
array('feedback_list' => $feedback_newest),
true);
var_dump($feedback_newest_content);
}
public function test_price()
@ -1673,30 +1667,6 @@ class Information extends CI_Controller
file_put_contents($html_path, $template, LOCK_EX);
}
public function test_ah_feedback()
{
$feedback_array = [];
preg_match_all('^<!--@FEEDBACK_(.*)@-->^', '<div><!--@FEEDBACK_Siem Reap,Bangkok@--></div>', $feedback_array);
if (!empty($feedback_array)) {
foreach ($feedback_array[0] as $index => $tag_name) {
$city_name_string = $feedback_array[1][$index];
$city_name_list = explode(',', $city_name_string);
$feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
var_dump($feedback_list);
$feedback_content = $this->load->view(
'mobile_first/ah' . '-feedback-list',
array('feedback_list' => $feedback_list),
true
);
echo $feedback_content;
// $information->ic_content = str_replace(
// $tag_name,
// $feedback_content,
// $information->ic_content);
}
}
}
/**
* @description: CT用的生成静态文件方法.有些内容的替换，CT这边不一样，需要单独处理 zp
* @param {type} $device='mobile' or 'pc'

35
application/models/feedback_model.php
Unescape Escape View File

@ -41,6 +41,41 @@ class Feedback_model extends CI_Model {
return $feedback_list;
}
function test_feedback_newest() {
$feedback_query =
$this->HT->query("
select top 40
tad_content, tai_customerid, tai_title, tai_getdate, tai_url
from Eva_TAInfo
left join Eva_TADetail on TAD_TAI_SN=TAI_SN
where TAD_Content is not null
order by tai_getdate desc");
$feedback_result = $feedback_query->result();
$feedback_list = [];
$customer_id_list = [];
foreach ($feedback_result as $feedback_row) {
$createdOn = new DateTime($feedback_row->tai_getdate);
$createdOnString = $createdOn->format('M Y');
$feedback_count = COUNT($feedback_list);
if (!array_key_exists($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {
$feedback = [
// 'title' => $feedback_row->tai_title,
'customer' => $feedback_row->tai_customerid,
// 'content' => $feedback_row->tad_content,
// 'url' => $feedback_row->tai_url,
// 'createdOn' => $createdOnString
];
$feedback_list[] = $feedback;
$customer_id_list[] = $feedback_row->tai_customerid;
}
}
return $feedback_list;
}
/**
* 根据城市英文名查找最新八条反馈信息
*/

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

@ -784,6 +784,32 @@ if (!empty($setting_website_nav)) {
</div>
<?php if ($information->ic_sitecode == 'chinatravel') {
?>
<div>
<div class="col-sm-8">
<label>附加图片PC
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture" id="meta_addon_picture" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture'); ?>" />
</div>
<div class="col-sm-8" >
<label>附加图片Mobile
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_mobile', $('#meta_addon_picture_mobile').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>" />
</div>
<div class="col-sm-8">
<label>附加图片链接
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
<a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label>
<input name="meta_addon_picture_url" id="meta_addon_picture_url" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_url'); ?>" />
</div>
</div>
<div>
<div class="col-sm-8">
<label>附加图片说明文字

Write Preview
Loading…
Cancel
Save