lizhen_gitee 1 year ago
parent
commit
36af0ac84a

+ 1 - 35
application/admin/controller/Gift.php

@@ -22,7 +22,7 @@ class Gift extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Gift;
-
+        $this->view->assign("isShowList", $this->model->getIsShowList());
     }
 
     public function import()
@@ -37,38 +37,4 @@ class Gift extends Backend
      */
     
 
-    /**
-     * 查看
-     */
-    public function index()
-    {
-        //当前是否为关联查询
-        $this->relationSearch = true;
-        //设置过滤方法
-        $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage,则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                    ->with(['gifttype'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->paginate($limit);
-
-            foreach ($list as $row) {
-                
-                $row->getRelation('gifttype')->visible(['name']);
-            }
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
-        }
-        return $this->view->fetch();
-    }
-
 }

+ 9 - 12
application/admin/lang/zh-cn/gift.php

@@ -1,16 +1,13 @@
 <?php
 
 return [
-    'Id'            => 'ID',
-    'No'            => '编号',
-    'Name'          => '名称',
-    'Type'          => '类别',
-    'Value'         => '价值',
-    'Price'         => '价格',
-    'Image'         => '图片',
-    'Special'       => '特效',
-    'Sort'          => '排序',
-    'Updatetime'    => '更新时间',
-    'Createtime'    => '创建时间',
-    'Gifttype.name' => '礼物类型'
+    'Id'        => '主键ID',
+    'Name'      => '名称',
+    'Price'     => '价格',
+    'Image'     => '图片',
+    'Special'   => '特效',
+    'Weigh'     => '排序',
+    'Is_show'   => '是否上架',
+    'Is_show 1' => '是',
+    'Is_show 0' => '否'
 ];

+ 18 - 27
application/admin/model/Gift.php

@@ -16,51 +16,42 @@ class Gift extends Model
     protected $name = 'gift';
     
     // 自动写入时间戳字段
-    protected $autoWriteTimestamp = 'int';
+    protected $autoWriteTimestamp = false;
 
     // 定义时间戳字段名
-    protected $createTime = 'createtime';
-    protected $updateTime = 'updatetime';
+    protected $createTime = false;
+    protected $updateTime = false;
     protected $deleteTime = false;
 
     // 追加属性
     protected $append = [
-
+        'is_show_text'
     ];
+    
 
     protected static function init()
     {
-        //两个毫无用处的字段,没有还不行
-        self::afterInsert(function ($row){
-            $data = [
-                'no' => $row['id'],
-                'price' => $row['value'],
-            ];
-
-            db('gift')->where('id',$row['id'])->update($data);
-        });
-
-        self::beforeUpdate(function ($row) {
-            $changed = $row->getChangedData();
-            //如果有修改密码
-            if (isset($changed['value'])) {
-                $row->price = $changed['value'];
-            }
-
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
         });
     }
-    
 
     
+    public function getIsShowList()
+    {
+        return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
+    }
 
 
+    public function getIsShowTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_show']) ? $data['is_show'] : '');
+        $list = $this->getIsShowList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
 
 
 
-
-    public function gifttype()
-    {
-        return $this->belongsTo('Gifttype', 'type', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

+ 16 - 14
application/admin/view/gift/add.html

@@ -1,28 +1,18 @@
 <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">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
         </div>
     </div>
-
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" data-source="gifttype/index" data-field="name" class="form-control selectpage" name="row[type]" type="text" value="0">
+            <input id="c-price" class="form-control" name="row[price]" type="number">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="">
-        </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">
@@ -51,9 +41,21 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <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">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sort" class="form-control" name="row[sort]" type="number" value="0">
+                        
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
+                {foreach name="isShowList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group layer-footer">

+ 16 - 12
application/admin/view/gift/edit.html

@@ -1,6 +1,5 @@
 <form id="edit-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">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -8,18 +7,11 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" data-source="gifttype/index" class="form-control selectpage" name="row[type]" type="text" value="{$row.type|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="{$row.value|htmlentities}">
+            <input id="c-price" class="form-control" name="row[price]" type="number" value="{$row.price|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">
@@ -49,9 +41,21 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</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-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">{:__('Is_show')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
+                {foreach name="isShowList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_show"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group layer-footer">

+ 6 - 10
public/assets/js/backend/gift.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'gift/index' + location.search,
                     add_url: 'gift/add',
                     edit_url: 'gift/edit',
-//                    del_url: 'gift/del',
+                    del_url: 'gift/del',
                     multi_url: 'gift/multi',
                     import_url: 'gift/import',
                     table: 'gift',
@@ -21,21 +21,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
-                sortName: 'id',
+                sortName: 'weigh',
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'no', title: __('No')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-//                        {field: 'type', title: __('Type')},
-                        {field: 'gifttype.name', title: __('Gifttype.name'), operate: 'LIKE'},
-                        {field: 'value', title: __('Value')},
+                        {field: 'price', title: __('Price')},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-//                        {field: 'special', title: __('Special'), operate: 'LIKE'},
-                        {field: 'sort', title: __('Sort')},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'special', title: __('Special'), operate: 'LIKE'},
+                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]