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

master
candice 1 year ago
commit fc6410b256

@ -2176,19 +2176,6 @@ class Information extends CI_Controller
$template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
//
$feedback_newest_10 = $this->Feedback_model->get_feedback_newest(10);
$feedback_newest_10_content = $this->load->view(
'mobile_first/ah-feedback-newest-10',
array('feedback_list' => $feedback_newest_10),
true
);
$template = str_replace(
'<!--@NEWEST_FEEDBACK_10@-->',
$feedback_newest_10_content,
$template
);
//文中的信息推荐
if (strpos($information->ic_content, '<!--@Content-Recommends-Article@-->') !== false) {
$information->ic_content = str_replace('<!--@Content-Recommends-Article@-->', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content);
@ -2296,10 +2283,12 @@ class Information extends CI_Controller
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);
$feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
// 防止触发 Google 网络垃圾政策只返回前三条
$top3_feedback_list = array_slice($feedback_list, 0, 3);
$feedback_content = $this->load->view(
$template_path . '-feedback-list',
array('feedback_list' => $feedback_list),
array('feedback_list' => $top3_feedback_list),
true
);
$information->ic_content = str_replace(
@ -2359,19 +2348,6 @@ class Information extends CI_Controller
}
}
//
$feedback_newest = $this->Feedback_model->get_feedback_newest();
$feedback_newest_content = $this->load->view(
'mobile_first/ah-feedback-newest',
array('feedback_list' => $feedback_newest),
true
);
$information->ic_content = str_replace(
'<!--@NEWEST_FEEDBACK@-->',
$feedback_newest_content,
$information->ic_content
);
//主样式表,内联模式
if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) { //主样式表,内联模式,优先读取本地,没有在从网络读取,为了加速
$main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css'));

Loading…
Cancel
Save