diff --git a/application/plugins/homemiddleadv/Hook.php b/application/plugins/homemiddleadv/Hook.php index c3a52cb88..6c71d0acb 100755 --- a/application/plugins/homemiddleadv/Hook.php +++ b/application/plugins/homemiddleadv/Hook.php @@ -12,6 +12,7 @@ namespace app\plugins\homemiddleadv; use think\Controller; use app\plugins\homemiddleadv\Service; +use app\service\PluginsService; /** * 首页中间广告插件 - 钩子入口 * @author Devil @@ -37,7 +38,7 @@ class Hook extends Controller { // style css case 'plugins_common_header' : - $ret = $this->Css($params); + $ret = $this->StyleCss($params); break; // 楼层数据上面 @@ -61,6 +62,30 @@ class Hook extends Controller */ public function HomeFloorTopAdv($params = []) { + // 获取应用数据 + $ret = PluginsService::PluginsData('homemiddleadv'); + if($ret['code'] == 0) + { + // 有效时间 + if(!empty($ret['data']['time_start'])) + { + // 是否已开始 + if(strtotime($ret['data']['time_start']) > time()) + { + return ''; + } + } + if(!empty($ret['data']['time_end'])) + { + // 是否已结束 + if(strtotime($ret['data']['time_end']) < time()) + { + return ''; + } + } + } + + // 获取图片列表 $ret = Service::DataList(); if($ret['code'] == 0 && !empty($ret['data'])) { @@ -78,7 +103,7 @@ class Hook extends Controller * @datetime 2019-02-06T16:16:34+0800 * @param [array] $params [输入参数] */ - public function Css($params = []) + public function StyleCss($params = []) { return ''; } diff --git a/application/plugins/homemiddleadv/Service.php b/application/plugins/homemiddleadv/Service.php index 42d25fbb2..8da873342 100644 --- a/application/plugins/homemiddleadv/Service.php +++ b/application/plugins/homemiddleadv/Service.php @@ -34,7 +34,7 @@ class Service */ public static function DataList($params = []) { - $ret = PluginsService::PluginsData('homemiddleadv', null, false); + $ret = PluginsService::PluginsData('homemiddleadv'); $data = (empty($ret['data']) || empty($ret['data']['data_list'])) ? [] : $ret['data']['data_list']; if(!empty($data)) diff --git a/application/plugins/view/homemiddleadv/admin/index.html b/application/plugins/view/homemiddleadv/admin/index.html index ade85988f..f6f8e5115 100755 --- a/application/plugins/view/homemiddleadv/admin/index.html +++ b/application/plugins/view/homemiddleadv/admin/index.html @@ -13,42 +13,23 @@
基础数据 - 编辑 + 编辑
- +
- {{if empty($data['application_name'])}} - 未设置应用导航名称 + {{if !empty($data['time_start']) and !empty($data['time_end'])}} + {{$data.time_start}} ~ {{$data.time_end}} + {{elseif !empty($data['time_start']) and empty($data['time_end'])}} + {{$data.time_start}} ~ 长期有效 + {{elseif empty($data['time_start']) and !empty($data['time_end'])}} + 立即生效 ~ {{$data.time_end}} {{else /}} - {{$data.application_name}} + 无限制 {{/if}}
- -
- -
- {{if empty($data['right_top_rec_name'])}} - 推荐问答 - {{else /}} - {{$data.right_top_rec_name}} - {{/if}} -
-
- -
- -
- {{if empty($data['middle_new_name'])}} - 最新问答 - {{else /}} - {{$data.middle_new_name}} - {{/if}} -
-
-
@@ -65,7 +46,7 @@
  • - {{$v.name}} + {{$v.name}}
    • diff --git a/application/plugins/view/homemiddleadv/admin/saveinfo.html b/application/plugins/view/homemiddleadv/admin/saveinfo.html index fbaf34b2d..b5deb3527 100755 --- a/application/plugins/view/homemiddleadv/admin/saveinfo.html +++ b/application/plugins/view/homemiddleadv/admin/saveinfo.html @@ -9,86 +9,7 @@ 首页中间广告 返回 - -
    -
    - - -
    +上传图片
    -
    -
    - - -
    -
    - -
    -
    - - -
    +上传图片
    -
    -
    - - -
    -
    - -
    -
    - - -
    +上传图片
    -
    -
    - - -
    -
    - -
    -
    - - -
    +上传图片
    -
    -
    - - -
    -
    - -
    - -
    - {{foreach $is_whether_list as $v}} - - {{/foreach}} -
    -
    - +
    diff --git a/application/plugins/view/homemiddleadv/index/content.html b/application/plugins/view/homemiddleadv/index/content.html index 8b102f09b..27811048c 100755 --- a/application/plugins/view/homemiddleadv/index/content.html +++ b/application/plugins/view/homemiddleadv/index/content.html @@ -5,7 +5,7 @@
  • - {{$v.name}} + {{$v.name}}
    • diff --git a/public/static/plugins/css/homemiddleadv/admin.css b/public/static/plugins/css/homemiddleadv/admin.css index 432d189b1..80e67a02b 100755 --- a/public/static/plugins/css/homemiddleadv/admin.css +++ b/public/static/plugins/css/homemiddleadv/admin.css @@ -30,10 +30,22 @@ } } +/** + * 编辑页面 + */ +.form-date input { + width: 30% !important; + display: -webkit-inline-box !important; +} + +.form-date span { + vertical-align: middle; +} /** * 幻灯片编辑 */ ul.plug-file-upload-view li { - width: 300px; + width: 160px; + height: auto; } \ No newline at end of file diff --git a/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400237551.jpg b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400237551.jpg new file mode 100644 index 000000000..a56708af9 Binary files /dev/null and b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400237551.jpg differ diff --git a/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400479636.jpg b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400479636.jpg new file mode 100644 index 000000000..73a9e41d5 Binary files /dev/null and b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400479636.jpg differ diff --git a/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400647560.jpg b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400647560.jpg new file mode 100644 index 000000000..ead80371f Binary files /dev/null and b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400647560.jpg differ diff --git a/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400780646.jpg b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400780646.jpg new file mode 100644 index 000000000..51fcff596 Binary files /dev/null and b/public/static/upload/images/plugins_homemiddleadv/2019/04/22/1555929400780646.jpg differ