重建轮播

application/admin/controller/Banner.php

@@ -22,6 +22,8 @@ class Banner extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Banner;
+        $this->view->assign("opentypeList", $this->model->getOpentypeList());
+        $this->view->assign("placeList", $this->model->getPlaceList());
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 

application/admin/lang/zh-cn/banner.php

@@ -1,12 +1,22 @@
 <?php
 
 return [
-    'Id'       => '主键ID',
-    'Title'    => '标题',
-    'Image'    => '图片',
-    'Url'      => '链接地址',
-    'Weigh'    => '权重排序',
-    'Status'   => '状态',
-    'Status 1' => '上架',
-    'Status 0' => '下架'
+    'Id'         => '主键ID',
+    'Title'      => '标题',
+    'Image'      => '图片',
+    'Url'        => '链接地址',
+    'Weigh'      => '排序',
+    'Opentype'   => '打开方式',
+    'Opentype 1' => '内部',
+    'Opentype 2' => '外部',
+    'Place'      => '位置',
+    'Place 1'    => '动态最新',
+    'Place 2'    => '首页附近',
+    'Place 3'    => '消息顶部',
+    'Place 4'    => '我的底部',
+    'Place 5'    => '发现顶部',
+    'Place 6'    => '发现页',
+    'Status'     => '状态',
+    'Status 1'   => '上架',
+    'Status 0'   => '下架'
 ];

application/admin/model/Banner.php

@@ -25,6 +25,8 @@ class Banner extends Model
 
     // 追加属性
     protected $append = [
+        'opentype_text',
+        'place_text',
         'status_text'
     ];
     
@@ -38,12 +40,38 @@ class Banner extends Model
     }
 
     
+    public function getOpentypeList()
+    {
+        return ['1' => __('Opentype 1'), '2' => __('Opentype 2')];
+    }
+
+    public function getPlaceList()
+    {
+        return ['1' => __('Place 1'), '2' => __('Place 2'), '3' => __('Place 3'), '4' => __('Place 4'), '5' => __('Place 5'), '6' => __('Place 6')];
+    }
+
     public function getStatusList()
     {
         return ['1' => __('Status 1'), '0' => __('Status 0')];
     }
 
 
+    public function getOpentypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['opentype']) ? $data['opentype'] : '');
+        $list = $this->getOpentypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getPlaceTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['place']) ? $data['place'] : '');
+        $list = $this->getPlaceList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
     public function getStatusTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');

application/admin/view/banner/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
+            <input id="c-title" class="form-control" name="row[title]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -29,7 +29,31 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Opentype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-opentype" data-rule="required" class="form-control selectpicker" name="row[opentype]">
+                {foreach name="opentypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Place')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-place" data-rule="required" class="form-control selectpicker" name="row[place]">
+                {foreach name="placeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">

application/admin/view/banner/edit.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+            <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -29,7 +29,31 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Opentype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-opentype" data-rule="required" class="form-control selectpicker" name="row[opentype]">
+                {foreach name="opentypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.opentype"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Place')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-place" data-rule="required" class="form-control selectpicker" name="row[place]">
+                {foreach name="placeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.place"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">

application/admin/view/banner/index.html

@@ -18,7 +18,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('banner/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('banner/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('banner/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('banner/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('banner/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
@@ -28,7 +28,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>-->
+                        </div>
 
                         
                     </div>

application/api/controller/Baseconfig.php

@@ -21,6 +21,7 @@ class Baseconfig extends Api
             'index_pipei_switch'    => config('site.index_pipei_switch'), //首页匹配功能开关
             'kefu_url'    => config('site.kefu_url'), //客服超链接
             'sixin_oneday_user_times'    => config('site.sixin_oneday_user_times'), //每人每天私信免费次数
+            'app_find_show'    => config('site.app_find_show'), //发现页是否展示
 
             //问答
             'question_icon' => localpath_to_netpath(config('site.question_icon')),               //问号图标

application/extra/site.php

@@ -91,4 +91,5 @@ return array (
   'enumtag_max' => '18',
   'kefu_url' => 'https://www.baidu.com',
   'sixin_oneday_user_times' => '2',
+  'app_find_show' => '1',
 );

public/assets/js/backend/banner.js

@@ -30,6 +30,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'url', title: __('Url'), operate: 'LIKE', formatter: Table.api.formatter.url},
                         {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'opentype', title: __('Opentype'), searchList: {"1":__('Opentype 1'),"2":__('Opentype 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'place', title: __('Place'), searchList: {"1":__('Place 1'),"2":__('Place 2'),"3":__('Place 3'),"4":__('Place 4'),"5":__('Place 5'),"6":__('Place 6')}, formatter: Table.api.formatter.normal},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]