李忠强 / temporaryfood · 提交

转到一个项目

作者 何书鹏
提交 2bc1dc8ac4fa52869f0ff651776d66dbab1f4764 1 个父辈 4de8b277

待评价订单数量

内嵌 并排对比
正在显示 3 个修改的文件 包含 6 行增加 和 1 行删除
@@ -24,6 +24,10 @@ return [ @@ -24,6 +24,10 @@ return [
24 'Order_status 10' => '进行中', 24 'Order_status 10' => '进行中',
25 'Order_status 20' => '取消', 25 'Order_status 20' => '取消',
26 'Order_status 30' => '已完成', 26 'Order_status 30' => '已完成',
  27 + 'Comment_status' => '评论状态',
  28 + 'Comment_status 10' => '未评论',
  29 + 'Comment_status 20' => '已评论',
  30 + 'Comment_time' => '评论时间',
27 'Transaction_id' => '微信支付ID', 31 'Transaction_id' => '微信支付ID',
28 'User_id' => '用户ID', 32 'User_id' => '用户ID',
29 'Createtime' => '生成时间', 33 'Createtime' => '生成时间',
@@ -914,7 +914,7 @@ class Order extends Api @@ -914,7 +914,7 @@ class Order extends Api
914 'pay_status' => '20', 914 'pay_status' => '20',
915 'freight_status' => '20', 915 'freight_status' => '20',
916 'receipt_status' => '20', 916 'receipt_status' => '20',
917 - 'order_status' => '10' 917 + 'comment_status' => '10'
918 ])->count(); 918 ])->count();
919 $coupon = UserCoupon::where([ 919 $coupon = UserCoupon::where([
920 'user_id' => $this->auth->id, 920 'user_id' => $this->auth->id,
@@ -35,6 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -35,6 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
35 {field: 'pay_time', title: __('Pay_time'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 35 {field: 'pay_time', title: __('Pay_time'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
36 {field: 'freight_time', title: __('Freight_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 36 {field: 'freight_time', title: __('Freight_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
37 {field: 'receipt_time', title: __('Receipt_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 37 {field: 'receipt_time', title: __('Receipt_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  38 + {field: 'comment_time', title: __('Comment_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
38 {field: 'order_status', title: __('Order_status'), searchList: {"10":__('Order_status 10'),"20":__('Order_status 20'),"30":__('Order_status 30')}, 39 {field: 'order_status', title: __('Order_status'), searchList: {"10":__('Order_status 10'),"20":__('Order_status 20'),"30":__('Order_status 30')},
39 formatter: Controller.api.status_formatter}, 40 formatter: Controller.api.status_formatter},
40 {field: 'updatetime', title: __('Updatetime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 41 {field: 'updatetime', title: __('Updatetime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},