chenhao 4 years ago
parent
commit
87332a5c82

+ 16 - 16
fastadmin/application/admin/controller/Introduce.php

@@ -14,7 +14,7 @@ use think\exception\ValidateException;
  */
 class Introduce extends Backend
 {
-    
+
     /**
      * Introduce模型对象
      * @var \app\admin\model\Introduce
@@ -27,13 +27,13 @@ class Introduce extends Backend
         $this->model = new \app\admin\model\Introduce;
 
     }
-    
+
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
+
 
     /**
      * 查看
@@ -53,22 +53,22 @@ class Introduce extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
-                    ->with(['type'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->count();
+                ->with(['type'])
+                ->where($where)
+                ->order($sort, $order)
+                ->count();
 
             $list = $this->model
-                    ->with(['type'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->limit($offset, $limit)
-                    ->select();
+                ->with(['type'])
+                ->where($where)
+                ->order($sort, $order)
+                ->limit($offset, $limit)
+                ->select();
 
             foreach ($list as $row) {
-                $row->visible(['id','title','zhu_image','pei_image','introduce','sort']);
+                $row->visible(['id','title','zhu_images','pei_image','introduce','sort']);
                 $row->visible(['type']);
-				$row->getRelation('type')->visible(['name']);
+                $row->getRelation('type')->visible(['name']);
             }
             $list = collection($list)->toArray();
             $result = array("total" => $total, "rows" => $list);
@@ -123,7 +123,7 @@ class Introduce extends Backend
         if ($type) {
             return $this->view->fetch('add',['type' => $type]);
         } else {
-             return '<center><div style="font-size: 30px;color: red">暂无栏目,请去添加栏目 </div></center>';
+            return '<center><div style="font-size: 30px;color: red">暂无栏目,请去添加栏目 </div></center>';
         }
 
     }
@@ -181,4 +181,4 @@ class Introduce extends Backend
         $this->view->assign("row", $row);
         return $this->view->fetch();
     }
-}
+}

+ 10 - 8
fastadmin/application/admin/lang/zh-cn/introduce.php

@@ -1,12 +1,14 @@
 <?php
 
 return [
-    'Id'         => 'id',
-    'Tid'        => '栏目分类',
-    'Title'      => '标题',
-    'Zhu_image'  => '文案主图',
-    'Pei_images' => '文案配图',
-    'Introduce'  => '文案简介',
-    'Sort'       => '排序',
-    'Type.name'  => '栏目名称'
+    'Id'              => 'id',
+    'Tid'             => '栏目分类',
+    'Title'           => '主标题',
+    'Small_title'     => '小标题',
+    'Zhu_images'      => '文案主图',
+    'Small_introduce' => '文字介绍',
+    'Introduce'       => '图文简介',
+    'Create'          => '发布时间',
+    'Sort'            => '排序',
+    'Type.name'       => '栏目名称'
 ];

+ 4 - 3
fastadmin/application/admin/lang/zh-cn/type.php

@@ -1,7 +1,8 @@
 <?php
 
 return [
-    'Name'  => '栏目名称',
-    'Image' => '栏目主图',
-    'Sort'  => '排序'
+    'Name'    => '栏目名称',
+    'English' => '英文',
+    'Image'   => '栏目主图',
+    'Sort'    => '排序'
 ];

+ 9 - 0
fastadmin/application/admin/model/Type.php

@@ -27,5 +27,14 @@ class Type extends Model
     protected $append = [
 
     ];
+    
+
+    
+
+
+
+
+
+
 
 }

+ 23 - 20
fastadmin/application/admin/view/introduce/add.html

@@ -1,15 +1,15 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
     <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" class="form-control" name="row[title]" type="text">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tid')}:</label>
         <div class="col-xs-12 col-sm-8">
-<!--            <input id="c-tid" data-rule="required" class="form-control" name="row[tid]" type="number">-->
+            <!--            <input id="c-tid" data-rule="required" class="form-control" name="row[tid]" type="number">-->
             <select class="form-control" id="c-tid" data-rule="required" name="row[tid]">
                 {volist id="t" name="type"}
                 <option value="{$t.id}"> {$t.name}</option>
@@ -17,39 +17,42 @@
             </select>
         </div>
     </div>
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Zhu_image')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Small_title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-zhu_image" class="form-control" size="50" name="row[zhu_image]" type="text">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-zhu_image" class="btn btn-danger plupload" data-input-id="c-zhu_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-zhu_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-zhu_image" class="btn btn-primary fachoose" data-input-id="c-zhu_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-zhu_image"></span>
-            </div>
-            <ul class="row list-inline plupload-preview" id="p-zhu_image"></ul>
+            <input id="c-small_title" class="form-control" name="row[small_title]" type="text">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pei_images')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Zhu_images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-pei_images" class="form-control" size="50" name="row[pei_images]" type="text">
+                <input id="c-zhu_images" class="form-control" size="50" name="row[zhu_images]" type="text">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-pei_images" class="btn btn-danger plupload" data-input-id="c-pei_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-pei_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-pei_images" class="btn btn-primary fachoose" data-input-id="c-pei_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="plupload-zhu_images" class="btn btn-danger plupload" data-input-id="c-zhu_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-zhu_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-zhu_images" class="btn btn-primary fachoose" data-input-id="c-zhu_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-pei_images"></span>
+                <span class="msg-box n-right" for="c-zhu_images"></span>
             </div>
-            <ul class="row list-inline plupload-preview" id="p-pei_images"></ul>
+            <ul class="row list-inline plupload-preview" id="p-zhu_images"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Small_introduce')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-small_introduce" class="form-control" name="row[small_introduce]" type="text"></textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Introduce')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-introduce" class="form-control" name="row[introduce]" type="text"></textarea>
+            <textarea id="c-introduce" class="form-control editor" name="row[introduce]" type="text"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" class="form-control" name="row[create]" type="text">
         </div>
     </div>
     <div class="form-group">

+ 23 - 19
fastadmin/application/admin/view/introduce/edit.html

@@ -9,7 +9,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tid')}:</label>
         <div class="col-xs-12 col-sm-8">
-<!--            <input id="c-tid" data-rule="required" class="form-control" name="row[tid]" type="number" value="{$row.tid|htmlentities}">-->
+            <!--            <input id="c-tid" data-rule="required" class="form-control" name="row[tid]" type="number" value="{$row.tid|htmlentities}">-->
             <select class="form-control" id="c-tid" data-rule="required" name="row[tid]">
                 {volist id="t" name="type"}
                 <option value="{$t.id}" {if $t.id==$row.tid} selected {/if}> {$t.name}</option>
@@ -18,43 +18,47 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Zhu_image')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Small_title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-zhu_image" class="form-control" size="50" name="row[zhu_image]" type="text" value="{$row.zhu_image|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-zhu_image" class="btn btn-danger plupload" data-input-id="c-zhu_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-zhu_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-zhu_image" class="btn btn-primary fachoose" data-input-id="c-zhu_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-zhu_image"></span>
-            </div>
-            <ul class="row list-inline plupload-preview" id="p-zhu_image"></ul>
+            <input id="c-small_title" class="form-control" name="row[small_title]" type="text" value="{$row.small_title|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pei_images')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Zhu_images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-pei_images" class="form-control" size="50" name="row[pei_images]" type="text" value="{$row.pei_images|htmlentities}">
+                <input id="c-zhu_images" class="form-control" size="50" name="row[zhu_images]" type="text" value="{$row.zhu_images|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-pei_images" class="btn btn-danger plupload" data-input-id="c-pei_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-pei_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-pei_images" class="btn btn-primary fachoose" data-input-id="c-pei_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="plupload-zhu_images" class="btn btn-danger plupload" data-input-id="c-zhu_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-zhu_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-zhu_images" class="btn btn-primary fachoose" data-input-id="c-zhu_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-pei_images"></span>
+                <span class="msg-box n-right" for="c-zhu_images"></span>
             </div>
-            <ul class="row list-inline plupload-preview" id="p-pei_images"></ul>
+            <ul class="row list-inline plupload-preview" id="p-zhu_images"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Small_introduce')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-small_introduce" class="form-control" name="row[small_introduce]" type="text">{$row.small_introduce|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Introduce')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-introduce" class="form-control" name="row[introduce]" type="text">{$row.introduce|htmlentities}</textarea>
+            <textarea id="c-introduce" class="form-control editor" name="row[introduce]" type="text">{$row.introduce|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" class="form-control" name="row[create]" type="text" value="{$row.create|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sort" class="form-control " name="row[sort]" type="number" value="{$row.sort|htmlentities}">
+            <input id="c-sort" class="form-control" name="row[sort]" type="number" value="{$row.sort|htmlentities}">
         </div>
     </div>
     <div class="form-group layer-footer">

+ 6 - 0
fastadmin/application/admin/view/type/add.html

@@ -7,6 +7,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('English')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-english" class="form-control" name="row[english]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

+ 6 - 0
fastadmin/application/admin/view/type/edit.html

@@ -7,6 +7,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('English')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-english" class="form-control" name="row[english]" type="text" value="{$row.english|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">

+ 1 - 1
fastadmin/application/admin/view/type/index.html

@@ -8,7 +8,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('type/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('type/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('type/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('type/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
 <!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('type/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>-->
 

+ 7 - 7
fastadmin/application/api/model/IntroduceModel.php

@@ -26,7 +26,7 @@ class IntroduceModel extends Model
     {
         $data = $this->alias('i')
             ->join('type t', 'i.tid=t.id','left')
-            ->field('t.name name,title,zhu_image,pei_images,introduce')
+            ->field('t.name name,title,small_title,zhu_images,small_introduce,introduce,create')
             ->where('i.tid',$id)
             ->order('i.sort','asc')
             ->select();
@@ -41,7 +41,7 @@ class IntroduceModel extends Model
     {
         $data = $this->alias('i')
             ->join('type t', 'i.tid=t.id','left')
-            ->field('t.name name,title,zhu_image,pei_images,introduce')
+            ->field('t.name name,title,small_title,zhu_images,small_introduce,introduce,create')
             ->where('i.id',$id)
             ->order('i.sort','asc')
             ->select();
@@ -56,12 +56,12 @@ class IntroduceModel extends Model
         $this->belongsTo('type','tid', 'id');
     }
 
-    public function getZhuImageAttr($value)
-    {
-        return config('site.url').$value;
-    }
+//    public function getZhuImageAttr($value)
+//    {
+//        return config('site.url').$value;
+//    }
 
-    public function getPeiImagesAttr($value)
+    public function getZhuImagesAttr($value)
     {
        $value = explode(',', $value);
        foreach ($value as &$v) {

+ 6 - 5
fastadmin/public/assets/js/backend/introduce.js

@@ -22,15 +22,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 pk: 'id',
                 sortName: 'id',
                 search:false,
+                commonSearch:false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'title', title: __('Title'),operate:'like'},
-                        {field: 'zhu_image', title: __('Zhu_image'), events: Table.api.events.image, formatter: Table.api.formatter.image,operate:false},
-                        {field: 'introduce', title: __('Introduce'),operate:false},
-                        {field: 'sort', title: __('Sort'),operate:false},
-                        {field: 'type.name', title: __('Type.name'),operate:'like'},
+                        {field: 'title', title: __('Title')},
+                        {field: 'zhu_images', title: __('Zhu_images'), operate: false, events: Table.api.events.image,formatter:Table.api.formatter.images},
+                        {field: 'introduce', title: __('Introduce')},
+                        {field: 'sort', title: __('Sort')},
+                        {field: 'type.name', title: __('Type.name')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 1 - 0
fastadmin/public/assets/js/backend/type.js

@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name')},
+                        {field: 'english', title: __('English')},
                         {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
                         // {field: 'sort', title: __('Sort')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

BIN
fastadmin/public/uploads/20200610/fbf835654a142267dd43a036e24e2fa1.jpg