浏览代码

重建活动

lizhen_gitee 1 年之前
父节点
当前提交
dd4203d285

+ 1 - 2
application/admin/lang/zh-cn/active.php

@@ -3,8 +3,7 @@
 return [
     'Id'              => 'ID',
     'Name'            => '活动标题',
-    'Joinstarttime'   => '报名开始时间',
-    'Joinendtime'     => '报名结束时间',
+    'Image'           => '图片',
     'Activestarttime' => '活动开始时间',
     'Activeendtime'   => '活动结束时间',
     'Content'         => '活动说明',

+ 0 - 26
application/admin/model/Active.php

@@ -25,8 +25,6 @@ class Active extends Model
 
     // 追加属性
     protected $append = [
-        'joinstarttime_text',
-        'joinendtime_text',
         'activestarttime_text',
         'activeendtime_text',
         'is_show_text'
@@ -48,20 +46,6 @@ class Active extends Model
     }
 
 
-    public function getJoinstarttimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['joinstarttime']) ? $data['joinstarttime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
-    public function getJoinendtimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['joinendtime']) ? $data['joinendtime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
     public function getActivestarttimeTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['activestarttime']) ? $data['activestarttime'] : '');
@@ -83,16 +67,6 @@ class Active extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-    protected function setJoinstarttimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
-
-    protected function setJoinendtimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
-
     protected function setActivestarttimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

+ 10 - 8
application/admin/view/active/add.html

@@ -7,15 +7,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Joinstarttime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-joinstarttime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[joinstarttime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Joinendtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-joinendtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[joinendtime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-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-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
     <div class="form-group">

+ 10 - 8
application/admin/view/active/edit.html

@@ -7,15 +7,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Joinstarttime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-joinstarttime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[joinstarttime]" type="text" value="{:$row.joinstarttime?datetime($row.joinstarttime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Joinendtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-joinendtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[joinendtime]" type="text" value="{:$row.joinendtime?datetime($row.joinendtime):''}">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-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-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
     <div class="form-group">

+ 1 - 4
public/assets/js/backend/active.js

@@ -22,15 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
-                fixedColumns: true,
-                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'joinstarttime', title: __('Joinstarttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'joinendtime', title: __('Joinendtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'activestarttime', title: __('Activestarttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'activeendtime', title: __('Activeendtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'content', title: __('Content')},