From 7e8874dc62a429c26bd08dc3e0d738cb7cae99a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Wed, 2 Jun 2021 14:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=92=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E4=BE=BF=E6=8D=B7=E5=8C=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/recommend/controllers/tips.php      |  2 +-
 application/third_party/recommend/views/welcome.php | 13 ++++---------
 application/views/bootstrap3/header.php             |  4 ++--
 wysiwyg/config.js                                   |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/application/third_party/recommend/controllers/tips.php b/application/third_party/recommend/controllers/tips.php
index 42ca9e1c..304cad97 100644
--- a/application/third_party/recommend/controllers/tips.php
+++ b/application/third_party/recommend/controllers/tips.php
@@ -26,7 +26,7 @@ class Tips extends CI_Controller
         $infoTip = new StdClass;
         $infoTip->it_title = '新广告';
         $infoTip->it_expires = time();
-        $infoTip->it_content = '';
+        $infoTip->it_content = $this->load->view('templates', false,true);;
         $infoTip->it_code = '<!--@TIPS--@-->';
         $infoTip->it_datetime = time();
         $infoTip->it_sitecode = $this->config->item('site_code');
diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php
index 4c8efefa..eb10a2b1 100644
--- a/application/third_party/recommend/views/welcome.php
+++ b/application/third_party/recommend/views/welcome.php
@@ -4,7 +4,7 @@
 
         </div>
         <div class="col-md-9">
-            <h4>广告管理</h4>
+            <h4>广告管理   <small><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></small></h4>
             <table class="table table-striped">
 
                 <thead>
@@ -16,8 +16,9 @@
                 </tr>
                 </thead>
                 <tbody>
+
                 <?php foreach ($tipsList as $key=>$item){ ?>
-                <tr>
+                <tr class="<?php if($item->it_expires<time()){echo 'warning';} ?>">
                     <td><?php echo ++$key; ?></td>
                     <td>
                         <a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a>
@@ -26,13 +27,7 @@
                     <td><?php echo date('m/d/Y', $item->it_expires); ?></td>
                 </tr>
             <?php } ?>
-                <tr>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></td>
-                </tr>
-                <tr>
+
 
 
                 </tbody>
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 5b9075e0..86d3f99b 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -89,8 +89,8 @@
             var use_pictures = $("#use_pictures").val();
             if (result != null) {
                 for (var key in result.Pinfo) {
-                    if ('<?php echo $this->config->item('site_code') ?>' == 'cht') {
-                        editor.insertHtml('<div class="photoBlock300 autowidht" id="yonglaidingweitupian"> <img class="img-responsive" src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />' + result.Pinfo[key].Sinfo + '</div>');
+                    if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
+                        editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" loader="lazy" originalsrc="' + site_image_url + result.Pinfo[key].PUrl + '" src="https://data.asiahighlights.com/image/grey.gif" /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
                         editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else {
diff --git a/wysiwyg/config.js b/wysiwyg/config.js
index bb7b49d7..1c29a191 100644
--- a/wysiwyg/config.js
+++ b/wysiwyg/config.js
@@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'others', groups: [ 'others' ] },
 		{ name: 'about', groups: [ 'about' ] }
 	];
-//,NumberedList,BulletedList,SpecialChar
-	config.removeButtons = 'Print,Preview,NewPage,Save,Templates,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';
+//,NumberedList,BulletedList,SpecialChar ,Templates
+	config.removeButtons = 'Print,Preview,NewPage,Save,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';