@@ -20,15 +20,5 @@ class AdminController extends BaseController
util::success($auth);
}
- //退出登陆 shish 2019.11.26
- public function actionLogout()
- {
- $adminId = $this->adminId;
- $r = jwt::delToken($adminId);
- if ($r) {
- util::ok();
- }
- util::fail();
@@ -21,9 +21,7 @@ use common\components\configDict;
class OrderController extends BaseController
{
-
+
public function actionList()
$get = Yii::$app->request->get();
@@ -50,7 +48,8 @@ class OrderController extends BaseController
return [
'orderId' => '201911232278449',
'price' => '390',
- 'progress' => [
+ 'progress' => 4,
+ 'list' => [
[
'name' => '下单',
'reach' => 1,
@@ -22,7 +22,7 @@ class GoodsCategoryService extends BaseService
return $data;
$ids = array_column($list, 'gId');
- $list = GoodsService::getAllByCondition(['id' => ['in', $ids]], 'inTurn DESC', 'goodsName,shopImg,price,sold');
+ $list = GoodsService::getAllByCondition(['id' => ['in', $ids]], 'inTurn DESC', 'goodsName,shopImg,price,sold,id');
$data['list'] = GoodsClass::groupGoodsBaseInfo($list);