正在显示
4 个修改的文件
包含
6 行增加
和
14 行删除
@@ -25,7 +25,7 @@ class Order extends Backend | @@ -25,7 +25,7 @@ class Order extends Backend | ||
25 | $this->model = new \app\admin\model\Order; | 25 | $this->model = new \app\admin\model\Order; |
26 | $this->view->assign("orderStatusList", $this->model->getOrderStatusList()); | 26 | $this->view->assign("orderStatusList", $this->model->getOrderStatusList()); |
27 | $this->view->assign("invoiceStatusList", $this->model->getInvoiceStatusList()); | 27 | $this->view->assign("invoiceStatusList", $this->model->getInvoiceStatusList()); |
28 | - $this->view->assign("ispayList", $this->model->getIspay()); | 28 | + $this->view->assign("isPayList", $this->model->getIsPay()); |
29 | } | 29 | } |
30 | 30 | ||
31 | /** | 31 | /** |
@@ -23,7 +23,7 @@ return [ | @@ -23,7 +23,7 @@ return [ | ||
23 | 'Invoice_status 1' => '待开票', | 23 | 'Invoice_status 1' => '待开票', |
24 | 'Invoice_status 2' => '开票中', | 24 | 'Invoice_status 2' => '开票中', |
25 | 'Invoice_status 3' => '已开票', | 25 | 'Invoice_status 3' => '已开票', |
26 | - 'Ispay 0' => '未支付', | ||
27 | - 'Ispay 1' => '已支付', | 26 | + 'Is_pay 0' => '未支付', |
27 | + 'Is_pay 1' => '已支付', | ||
28 | 'User.username' => '下单用户' | 28 | 'User.username' => '下单用户' |
29 | ]; | 29 | ]; |
@@ -37,17 +37,9 @@ class Order extends Model | @@ -37,17 +37,9 @@ class Order extends Model | ||
37 | return ['0' => __('Invoice_status 0'), '1' => __('Invoice_status 1'), '2' => __('Invoice_status 2'), '3' => __('Invoice_status 3')]; | 37 | return ['0' => __('Invoice_status 0'), '1' => __('Invoice_status 1'), '2' => __('Invoice_status 2'), '3' => __('Invoice_status 3')]; |
38 | } | 38 | } |
39 | 39 | ||
40 | - public function getIspay() | 40 | + public function getIsPay() |
41 | { | 41 | { |
42 | - return ['0' => __('Ispay 0'), '1' => __('Ispay 1')]; | ||
43 | - } | ||
44 | - | ||
45 | - | ||
46 | - public function getIspayTextAttr($value, $data) | ||
47 | - { | ||
48 | - $value = $value ? $value : (isset($data['ispay']) ? $data['ispay'] : ''); | ||
49 | - $list = $this->getIspay(); | ||
50 | - return isset($list[$value]) ? $list[$value] : ''; | 42 | + return ['0' => __('Is_pay 0'), '1' => __('Is_pay 1')]; |
51 | } | 43 | } |
52 | 44 | ||
53 | public function getOrderStatusTextAttr($value, $data) | 45 | public function getOrderStatusTextAttr($value, $data) |
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | @@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | ||
37 | {field: 'address', title: __('Address')}, | 37 | {field: 'address', title: __('Address')}, |
38 | {field: 'address_con', title: __('Address_con')}, | 38 | {field: 'address_con', title: __('Address_con')}, |
39 | {field: 'invoice_status', title: __('Invoice_status'), searchList: {"0":__('Invoice_status 0'),"1":__('Invoice_status 1'),"2":__('Invoice_status 2'),"3":__('Invoice_status 3')}, formatter: Table.api.formatter.status}, | 39 | {field: 'invoice_status', title: __('Invoice_status'), searchList: {"0":__('Invoice_status 0'),"1":__('Invoice_status 1'),"2":__('Invoice_status 2'),"3":__('Invoice_status 3')}, formatter: Table.api.formatter.status}, |
40 | - {field: 'ispay', title: __('Ispay'), searchList: {"0":__('Ispay 0'),"1":__('Ispay 1'),}, formatter: Table.api.formatter.status}, | 40 | + {field: 'is_pay', title: __('Is_pay'), searchList: {"0":__('Is_pay 0'),"1":__('Is_pay 1'),}, formatter: Table.api.formatter.status}, |
41 | {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, | 41 | {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, |
42 | {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, | 42 | {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, |
43 | {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} | 43 | {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} |
-
请 注册 或 登录 后发表评论