From ecf74466b68d6ef154ca9d5fd054c4e4ecc48952 Mon Sep 17 00:00:00 2001
From: liyukun <1099438829@qq.com>
Date: Fri, 13 Aug 2021 00:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/controller/Poster.php | 4 ++--
app/admin/view/poster/index.html | 21 +++++++++++++++++----
app/common/taglib/Zz.php | 4 +---
app/index/common.php | 13 +++++++------
public/template/default/pc/index/index.html | 17 +++++------------
5 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/app/admin/controller/Poster.php b/app/admin/controller/Poster.php
index 304a738..7bd1866 100644
--- a/app/admin/controller/Poster.php
+++ b/app/admin/controller/Poster.php
@@ -77,7 +77,7 @@ class Poster extends AuthController
$form[] = Elm::input('sort','排序')->col(10);
$form[] = Elm::select('position', '位置')->options(function(){
$options = [];
- foreach(['首页', '首页右侧','文章页面'] as $k=>$v){
+ foreach(['顶部页签', '右侧广告位','文章页面'] as $k=>$v){
$options[] = Elm::option($k, $v);
}
return $options;
@@ -105,7 +105,7 @@ class Poster extends AuthController
$form[] = Elm::input('sort','排序',$ainfo['sort'])->col(10);
$form[] = Elm::select('position', '位置',$ainfo['position'])->options(function(){
$options = [];
- foreach(['首页', '首页右侧','文章页面'] as $k=>$v){
+ foreach(['顶部页签', '右侧广告位','文章页面'] as $k=>$v){
$options[] = Elm::option($k, $v);
}
return $options;
diff --git a/app/admin/view/poster/index.html b/app/admin/view/poster/index.html
index f61c10d..9f2d13f 100644
--- a/app/admin/view/poster/index.html
+++ b/app/admin/view/poster/index.html
@@ -87,16 +87,29 @@
},{
field: 'title',
title: '广告名称'
- },
- {
+ },{
field: 'image',
title: '广告图片',
formatter:function (value,row,index) {
let html ='';
return html;
}
- },
- {
+ },{
+ field: 'position',
+ title: '广告图片',
+ formatter:function (value,row,index) {
+ switch (value) {
+ case 1:
+ return '顶部页签';
+ case 2:
+ return '右侧广告位';
+ case 3:
+ return '文章页面';
+ default:
+ return '顶部页签';
+ }
+ }
+ },{
field: 'url',
title: '链接地址',
}, {
diff --git a/app/common/taglib/Zz.php b/app/common/taglib/Zz.php
index c60def6..02a62f2 100644
--- a/app/common/taglib/Zz.php
+++ b/app/common/taglib/Zz.php
@@ -208,11 +208,9 @@ class Zz extends TagLib{
*/
public function tagAdvert($tag,$content)
{
- $type=isset($tag['type'])?$tag['type']:'text';
- $type=$type=='text'?0:1;
+ $type=isset($tag['type'])?$tag['type']:1;
$row=isset($tag['row'])?$tag['row']:100;
$void=isset($tag['void'])?$tag['void']:'field';
-
$parse = '';
diff --git a/app/index/common.php b/app/index/common.php
index c1e16c8..99a28ee 100644
--- a/app/index/common.php
+++ b/app/index/common.php
@@ -566,13 +566,14 @@ function tpl_get_banner($type, $row)
*/
function tpl_get_advert($type, $row)
{
- $advertList = cache('DATA_BANNER');
+ $advertList = cache('DATA_ADVERT'.'_'.$type);
if ($advertList === null) {
- $advertList = Db::name('advert')->where('status', 1)->order('sort asc')->limit($row)->select();
- cache('DATA_ADVERT', $advertList);
- }
- if ($type === 0) {
- return $advertList;
+ if ($type > 0) {
+ $advertList = Db::name('advert')->where('position',$type)->where('status', 1)->order('sort desc')->limit($row)->select();
+ }else{
+ $advertList = Db::name('advert')->where('status', 1)->order('sort desc')->limit($row)->select();
+ }
+ cache('DATA_ADVERT'.'_'.$type, $advertList);
}
$advertListTemp = [];
foreach ($advertList as $key => $item) {
diff --git a/public/template/default/pc/index/index.html b/public/template/default/pc/index/index.html
index 70f3882..93c4f46 100644
--- a/public/template/default/pc/index/index.html
+++ b/public/template/default/pc/index/index.html
@@ -442,23 +442,16 @@
+ {zz:advert row="3" type="2"}
-
-