From 47a9ce1e3f825fd62759af0ef17f08264afa630e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Fri, 15 Oct 2021 14:27:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=B8=AD=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       | 22 ++++++++++---------
 .../third_party/recommend/views/bind.php      | 19 ----------------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index fe71420b..cd934257 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -784,12 +784,6 @@ class Information extends CI_Controller
         if (!empty($template_recommand['Tips Right'])) {
             $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'>" . $template_recommand['Tips Right']->it_content . "</div>", $template);
         }
-
-        //文中广告
-        if (!empty($template_recommand['Tips Content']) && strpos($information->ic_content, '<!--@TIPS-CONTENT@-->') !== false) {
-            $information->ic_content = str_replace('<!--@TIPS-CONTENT@-->',  $template_recommand['Tips Content']->it_content, $information->ic_content);
-        }
-
         //文中的信息推荐
         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);
@@ -799,6 +793,18 @@ class Information extends CI_Controller
             $information->ic_content = str_replace('<!--@Content-Recommends-Tour@-->', $this->load->view($template_path . '-recommends-tour', array('recommands' => $template_recommand), TRUE), $information->ic_content);
         }
 
+        //替换内容中广告
+        $temp_array = array();
+        preg_match_all('^<!--@TIPS-[A-Z]+-([0-9]+)@-->^', $template, $temp_array);
+        if (!empty($temp_array[1])) {
+            foreach ($temp_array[1] as $key => $item) {
+                $tips_detail = $this->recommends_and_tips_model->tips_detail($item);
+                if ($tips_detail) {
+                    $template = str_replace($temp_array[0][$key], $tips_detail->it_content, $template);
+                }
+            }
+        }
+
         //顶部全屏大图
         if ($device == 'mobile') { //移动端读取移动大图
             $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
@@ -997,10 +1003,6 @@ class Information extends CI_Controller
         if (!empty($template_recommand['Tips Right'])) {
             $template = str_replace('<!--@TIPS-RIGHT@-->', "<div class='right_tour'><div class='ah_inforight'>" . $template_recommand['Tips Right']->it_content . "</div></div>", $template);
         }
-        //文中广告
-        if (!empty($template_recommand['Tips Content']) && strpos($information->ic_content, '<!--@TIPS-CONTENT@-->') !== false) {
-            $information->ic_content = str_replace('<!--@TIPS-CONTENT@-->',  $template_recommand['Tips Content']->it_content, $information->ic_content);
-        }
         //文中的信息推荐
         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);
diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php
index 08228b45..f17378dd 100644
--- a/application/third_party/recommend/views/bind.php
+++ b/application/third_party/recommend/views/bind.php
@@ -112,25 +112,6 @@
                             </div>
                             <!-- 文中信息推荐 end -->
 
-                            <hr/>
-                            <p class="text-primary text-center">&lt;!--@TIPS-CONTENT@--&gt;</p>
-                            <div class="row">
-                                <div class="col-md-8"></div>
-                                <div class="col-md-8">
-                                    <div class="panel panel-default">
-                                        <div class="panel-heading">文中广告<a
-                                                    href="javascript:void(0);"
-                                                    onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tips Content')"
-                                            > <span
-                                                        class="pull-right glyphicon glyphicon-cog"></span></a></div>
-                                        <div class="panel-body">
-                                            <?php echo empty($recommends['Tips Content']) ? '继承上级' : $recommends['Tips Content']->ir_rule . '<br/>' . $recommends['Tips Content']->ir_keyword; ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-8"></div>
-
-                            </div>
                             <hr/>
                             <!-- 文中线路推荐 begin -->
                             <p class="text-primary text-center">&lt;!--@Content-Recommends-Tour@--&gt;</p>