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

Browse Source
hotfix/paypal-note
赵鹏 4 years ago
parent f539578e6c a04b362555
commit dc615cb331
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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

@ -610,19 +610,19 @@ class Information extends CI_Controller
// HTLM: <div><!--@FEEDBACK_Shanghai@--></div> // HTLM: <div><!--@FEEDBACK_Shanghai@--></div>
// 解析结果：<!--@FEEDBACK_Shanghai@-->, Shanghai // 解析结果：<!--@FEEDBACK_Shanghai@-->, Shanghai
$feedback_array = []; $feedback_array = [];
preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $template, $feedback_array); preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array);
if (!empty($feedback_array)) { if (!empty($feedback_array)) {
foreach ($feedback_array[0] as $index => $tag_name) { foreach ($feedback_array[0] as $index => $tag_name) {
$city_name = $feedback_array[1][$index]; $city_name = $feedback_array[1][$index];
$feedback_data = $this->feedback_model->get_feedback_by_city($city_name); $feedback_data = $this->Feedback_model->get_feedback_by_city($city_name);
$feedback_content = $this->load->view( $feedback_content = $this->load->view(
$template_path . '-feedback', $template_path . '-feedback',
array('feedback_data' => $feedback_data), array('feedback_data' => $feedback_data),
true); true);
$template = str_replace( $information->ic_content = str_replace(
$tag_name, $tag_name,
$feedback_content, $feedback_content,
$template); $information->ic_content);
} }
} }

13
application/controllers/test.php
Unescape Escape View File

@ -14,22 +14,23 @@ class Test extends CI_Controller
} }
// https://cht.mycht.cn/info.php/test/feedback/?tag=%3Chtml%3E%3Cdiv%3E%3C!--%40FEEDBACK_Shanghai%40--%3E%3C%2Fdiv%3E%3C%2Fhtml%3E
public function feedback() public function feedback()
{ {
$is_id = $this->input->get_post('is_id'); $tag = $this->input->get_post('tag');
$template_path = 'mobile_first/ch'; $template_path = 'mobile_first/ch';
$information = $this->Information_model->Detail($is_id);
$feedback_array = array(); $feedback_array = array();
preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array); preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $tag, $feedback_array);
if (!empty($feedback_array)) { if (!empty($feedback_array)) {
foreach ($feedback_array[0] as $index => $tag_name) { foreach ($feedback_array[0] as $index => $tag_name) {
$city_name = $feedback_array[1][$index]; $city_name = $feedback_array[1][$index];
echo $information->ic_title.'<br>'; echo 'city_name: '.$city_name.'<br>';
echo $city_name.'<br>'; echo 'tag_name: '.htmlentities($tag_name).'<br>';
echo htmlentities($tag_name).'<br>'; echo 'feedback_data: <br>';
$feedback_data = $this->feedback_model->get_feedback_by_city($city_name); $feedback_data = $this->feedback_model->get_feedback_by_city($city_name);
var_dump($feedback_data);
$feedback_content = $this->load->view( $feedback_content = $this->load->view(
$template_path . '-feedback', $template_path . '-feedback',
array('feedback_data' => $feedback_data), array('feedback_data' => $feedback_data),

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

@ -7,6 +7,9 @@ class Feedback_model extends CI_Model {
$this->HT = $this->load->database('HT', TRUE); $this->HT = $this->load->database('HT', TRUE);
} }
/**
* 根据城市英文名查找最新一条反馈信息
*/
function get_feedback_by_city($city_name) { function get_feedback_by_city($city_name) {
$feedback_query = $feedback_query =

24
application/views/mobile_first/ch-feedback.php
Unescape Escape View File

@ -1,14 +1,14 @@
<div class="about_ta">
<h3>About China Highlights</h3> <div class="about_ta" style="width: 100%; margin-bottom: 0;">
<p>Since 1959 we've guided everyone ranging from US presidents, Australian Geographic and retired backpackers. Our goal is to create unique trips that take you off-the-beaten path, helping you discover China in a more authentic way. Our motto: "Discovery Your Way!"</p> <h2 style="text-align:center;">About China Highlights</h2>
<div class="infoimage"><img alt="travelers' choice 2020" src="https://data.chinahighlights.com/image/aboutus/feedback/Travelers_Choice_2020.png" loader="lazy"> <div class="photoBlock300" style="
</div> margin-bottom: 0;
margin-top: -10px;"><img alt="travelers' choice 2021" src="https://data.chinahighlights.com/image/aboutus/ta-travelers-choice-2021-150.jpg" loader="lazy" width="128" height="150" class="img-responsive" ></div>
<p>Since 1959 we've guided everyone ranging from US presidents, Australian Geographic and retired backpackers. Our goal is to create unique trips that take you off-the-beaten path, helping you discover China in a more authentic way. Our motto: "Discovery Your Way!"</p></div>
<div class="feedback_content_right" style="width: 100%;">
<div class="feedback_content" style="box-shadow: 0px 0px 8px 2px #d1d1d1;">
<p><strong><?php echo $feedback_data['title'] ?></strong></p>
<img alt="" class="feedback-rate" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><div class="review_date">reviewed <?php echo $feedback_data['createdOn'] ?>, <?php echo $feedback_data['customer'] ?></div>
<p><?php echo $feedback_data['content'] ?>&nbsp;<a href="<?php echo $feedback_data['url'] ?>" target="_blank">more</a></p>
</div> </div>
<div class="feedback_content_right">
<div class="feedback_content">
<div class="content_name"><?php echo $feedback_data['customer'] ?> reviewed in <?php echo $feedback_data['createdOn'] ?></div>
<img alt="" class="feedback-rate" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20">
<p><strong><?php echo $feedback_data['title'] ?></strong></p>
<p><?php echo $feedback_data['content'] ?>&nbsp;<a href="<?php echo $feedback_data['url'] ?>" target="_blank">more</a></p>
</div>
</div> </div>
Write Preview
Loading…
Cancel
Save