注销订单

application/admin/controller/Cannelorder.php

@@ -24,6 +24,7 @@ class Cannelorder extends Backend
         $this->model = new \app\admin\model\Cannelorder;
         $this->view->assign("statusList", $this->model->getStatusList());
         $this->view->assign("isOffsetList", $this->model->getIsOffsetList());
+        $this->view->assign("timeoutList", $this->model->getTimeoutList());
     }
 
 
@@ -59,7 +60,7 @@ class Cannelorder extends Backend
 
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['username']);
+                $row->getRelation('user')->visible(['username','nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -23,5 +23,9 @@ return [
     'Createtime'    => '创建时间',
     'Updatetime'    => '更新时间',
     'Deletetime'    => '删除时间',
-    'User.username' => '用户名'
+    'Timeout'       => '回收超时',
+    'Timeout 0'     => '未超时',
+    'Timeout 1'     => '超时已提醒',
+    'User.username' => '用户名',
+    'User.nickname' => '昵称'
 ];

application/admin/model/Cannelorder.php

@@ -10,10 +10,11 @@ class Cannelorder extends Model
 
     use SoftDelete;
 
+    
 
     // 表名
     protected $name = 'user_cancel_order';
-
+    
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'integer';
 
@@ -25,10 +26,12 @@ class Cannelorder extends Model
     // 追加属性
     protected $append = [
         'status_text',
-        'is_offset_text'
+        'is_offset_text',
+        'timeout_text'
     ];
+    
 
-
+    
     public function getStatusList()
     {
         return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3'), '4' => __('Status 4'), '5' => __('Status 5')];
@@ -39,6 +42,11 @@ class Cannelorder extends Model
         return ['0' => __('Is_offset 0'), '1' => __('Is_offset 1')];
     }
 
+    public function getTimeoutList()
+    {
+        return ['0' => __('Timeout 0'), '1' => __('Timeout 1')];
+    }
+
 
     public function getStatusTextAttr($value, $data)
     {
@@ -56,6 +64,16 @@ class Cannelorder extends Model
     }
 
 
+    public function getTimeoutTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['timeout']) ? $data['timeout'] : '');
+        $list = $this->getTimeoutList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+
+
     public function user()
     {
         return $this->belongsTo('User', 'c_user_id', 'id', [], 'LEFT')->setEagerlyType(0);

application/admin/view/cannelorder/add.html

@@ -92,6 +92,18 @@
             <input id="c-remarks" data-rule="required" class="form-control" name="row[remarks]" type="text" value="">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Timeout')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-timeout" data-rule="required" class="form-control selectpicker" name="row[timeout]">
+                {foreach name="timeoutList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/cannelorder/edit.html

@@ -92,6 +92,18 @@
             <input id="c-remarks" data-rule="required" class="form-control" name="row[remarks]" type="text" value="{$row.remarks|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Timeout')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-timeout" data-rule="required" class="form-control selectpicker" name="row[timeout]">
+                {foreach name="timeoutList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.timeout"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/cannelorder.js

@@ -42,7 +42,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'remarks', title: __('Remarks'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'timeout', title: __('Timeout'), searchList: {"0":__('Timeout 0'),"1":__('Timeout 1')}, formatter: Table.api.formatter.normal},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]