浏览代码

试课订单,补充字段

lizhen_gitee 6 月之前
父节点
当前提交
0dcd48ba1e

+ 1 - 0
application/admin/controller/Trylessonorder.php

@@ -27,6 +27,7 @@ class Trylessonorder extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Trylessonorder;
         $this->view->assign("orderStatusList", $this->model->getOrderStatusList());
+        $this->view->assign("payTypeList", $this->model->getPayTypeList());
     }
 
 

+ 5 - 2
application/admin/lang/zh-cn/trylessonorder.php

@@ -17,12 +17,15 @@ return [
     'Createtime'        => '创建时间',
     'Updatetime'        => '更新时间',
     'Lesson_order_id'   => '下单订单id',
+    'Remark'            => '下单备注',
+    'Seller'            => '销售前台',
+    'Pay_type'          => '支付方式',
+    'Pay_type 1'        => '线上',
+    'Pay_type 2'        => '线下',
     'User.firstname'    => '名',
     'User.lastname'     => '姓',
     'Trylesson.name'    => '试课标题',
     'Trylesson.name_en' => '试课标题(en)',
     'select user'       => '选择用户',
     'select trylesson'  => '选择试课',
-    'Remark'            => '备注',
-    'Seller'            => '销售前台',
 ];

+ 15 - 1
application/admin/model/Trylessonorder.php

@@ -28,7 +28,8 @@ class Trylessonorder extends Model
         'order_status_text',
         'paytime_text',
         'starttime_text',
-        'endtime_text'
+        'endtime_text',
+        'pay_type_text'
     ];
     
 
@@ -38,6 +39,11 @@ class Trylessonorder extends Model
         return ['0' => __('Order_status 0'), '10' => __('Order_status 10'), '20' => __('Order_status 20')];
     }
 
+    public function getPayTypeList()
+    {
+        return ['1' => __('Pay_type 1'), '2' => __('Pay_type 2')];
+    }
+
 
     public function getOrderStatusTextAttr($value, $data)
     {
@@ -67,6 +73,14 @@ class Trylessonorder extends Model
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
 
+
+    public function getPayTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['pay_type']) ? $data['pay_type'] : '');
+        $list = $this->getPayTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     protected function setPaytimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

+ 3 - 0
public/assets/js/backend/trylessonorder.js

@@ -44,6 +44,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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: 'lesson_order_id', title: __('Lesson_order_id')},
+                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {field: 'seller', title: __('Seller'), operate: 'LIKE'},
+                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Pay_type 1'),"2":__('Pay_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]