diff --git a/application/api/controller/Classification.php b/application/api/controller/Classification.php index 3ca0371..6a324c7 100644 --- a/application/api/controller/Classification.php +++ b/application/api/controller/Classification.php @@ -91,7 +91,7 @@ class Classification extends Api $page = $this->request->post('page',1); $model = new Goods(); if ($sort_id > 0){ - $list = $model->where('is_index','1') + $list = $model ->where('is_delete','0') ->where('category_id',$sort_id) ->where('goods_status','10') @@ -114,6 +114,8 @@ class Classification extends Api }); }else{ $list = $model + ->where('is_delete','0') + ->where('goods_status','10') ->field('goods_id,goods_name,image') ->paginate(10,false,['page'=>$page]) ->each(function ($item,$key){ diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php index 868f756..3a06a65 100644 --- a/application/api/controller/Order.php +++ b/application/api/controller/Order.php @@ -107,7 +107,7 @@ class Order extends Api 'fa_litestore_order.pay_status' => '20', 'fa_litestore_order.freight_status' => '20', 'fa_litestore_order.receipt_status' => '20', - 'fa_litestore_order.order_status' => '10', + 'fa_litestore_order.comment_status' => '10', ]; break; } @@ -623,6 +623,7 @@ class Order extends Api $order->rider_status = '20'; //送达状态:已送达 $order->receipt_status = '20'; //收货状态:已收货 $order->receipt_time = time(); //收货时间 + $order->order_status = '30'; //订单状态变为已完成 $order->save(); // 修改配送单信息 $rider_order->status = '2'; //已送达 @@ -817,7 +818,7 @@ class Order extends Api } $ordermodel = new \app\api\model\Order(); - $ordermodel->whereIn('id',$orderids)->update(['order_status'=>'30']); + $ordermodel->whereIn('id',$orderids)->update(['comment_status'=>'20']); $commentmodel = new GoodsComment(); $commentmodel->isUpdate(false)->saveAll($params); $this->success('评价成功'); diff --git a/application/api/controller/Rider.php b/application/api/controller/Rider.php index e0855b4..2aa49fe 100644 --- a/application/api/controller/Rider.php +++ b/application/api/controller/Rider.php @@ -332,6 +332,7 @@ class Rider extends Api $order->rider_status = '20'; //送达状态:已送达 $order->receipt_status = '20'; //收货状态:已收货 $order->receipt_time = time(); //收货时间 + $order->order_status = '30'; //订单状态变为已完成 $order->save(); // 修改配送单信息 $rider_order->status = '2'; //已送达 diff --git a/public/assets/js/backend/litestore/litestoregoods.js b/public/assets/js/backend/litestore/litestoregoods.js index 14748bb..ed2c41d 100644 --- a/public/assets/js/backend/litestore/litestoregoods.js +++ b/public/assets/js/backend/litestore/litestoregoods.js @@ -45,6 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','template','litestoreg // {field: 'delivery_id', title: __('Delivery_id')}, {field: 'goods_status', title: __('Goods_status'), searchList: {"10":__('Goods_status 10'),"20":__('Goods_status 20')}, formatter: Table.api.formatter.status}, {field: 'is_delete', title: __('Is_delete'), searchList: {"0":__('Is_delete 0'),"1":__('Is_delete 1')}, formatter: Table.api.formatter.normal}, + {field: 'is_index', title: __('Is_index'), searchList: {"0":__('Is_index 0'),"1":__('Is_index 1')}, formatter: Table.api.formatter.normal}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}