diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index d44f13fd..ee2416a4 100644
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -120,6 +120,14 @@ class Goods extends Controller
         return $this->renderSuccess($goodsList);
     }
 
+    public function getCommonConfig(): Json
+    {
+        $service = new GoodsService;
+        $goodsList = $service->getCommonConfig();
+        return $this->renderSuccess($goodsList);
+    }
+
+
     public function charts(): Json
     {
         $service = new GoodsService;
diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php
index bbc2ecad..4f9086b7 100644
--- a/app/api/controller/Order.php
+++ b/app/api/controller/Order.php
@@ -36,12 +36,21 @@ class Order extends Controller
      */
     public function list(string $dataType): Json
     {
-        echo 12113;die;
         $model = new OrderModel;
         $list = $model->getList($dataType);
         return $this->renderSuccess(compact('list'));
     }
 
+    public function del()
+    {
+        $model = new OrderModel;
+        $res = $model->del();
+        if ($res) {
+            return $this->renderSuccess('删除成功');
+        }
+        return $this->renderSuccess('删除失败');
+    }
+
     /**
      * 订单详情信息
      * @param int $orderId 订单ID
@@ -55,6 +64,8 @@ class Order extends Controller
     {
         // 订单详情
         $model = OrderModel::getUserOrderDetail($orderId);
+        //todo wmc 自提时间
+        $model->ziti_time = '2024-03-02 22:22:22';
         return $this->renderSuccess([
             'order' => $model,  // 订单详情
             'setting' => [
diff --git a/app/api/model/Order.php b/app/api/model/Order.php
index 2fd1d774..cd8ede07 100644
--- a/app/api/model/Order.php
+++ b/app/api/model/Order.php
@@ -109,17 +109,42 @@ class Order extends OrderModel
      */
     public function getList(string $dataType = 'all'): \think\Paginator
     {
+
         // 设置订单类型条件
         $dataTypeFilter = $this->getFilterDataType($dataType);
         // 当前用户ID
         $userId = UserService::getCurrentLoginUserId();
-        // 查询列表数据
-        return $this->with(['goods.image'])
+        $query = $this->with(['goods.image'])
             ->where($dataTypeFilter)
             ->where('user_id', '=', $userId)
             ->where('is_delete', '=', 0)
-            ->order(['create_time' => 'desc'])
-            ->paginate(15);
+            ->order(['create_time' => 'desc']);
+        if (!empty($_GET['keyword'])) {
+            $query = $this->with(['goods.image'])
+                ->alias('a')
+                ->join('order_goods b', 'b.order_id = a.order_id')
+                ->where($dataTypeFilter)
+                ->where('a.user_id', '=', $userId)
+                ->where('b.goods_name', '=', $_GET['keyword'])
+                ->where('a.is_delete', '=', 0)
+                ->order(['a.create_time' => 'desc']);
+        }
+        $list = $query->paginate(15);
+        return $list;
+    }
+
+    /**
+     * 删除订单
+     * @return bool|mixed
+     */
+    public function del()
+    {
+        $userId = UserService::getCurrentLoginUserId();
+        $res = Order::where([
+            'user_id' => $userId,
+            'order_id' => $_GET['order_id'],
+        ])->update(['is_delete' => 1]);
+        return $res;
     }
 
     /**
diff --git a/app/api/service/Goods.php b/app/api/service/Goods.php
index c89060af..0a040e81 100644
--- a/app/api/service/Goods.php
+++ b/app/api/service/Goods.php
@@ -46,6 +46,12 @@ class Goods extends GoodsService
         return $detail;
     }
 
+    public function getCommonConfig()
+    {
+        //todo wmc1新品首发背景图 2限时秒杀背景图 3排行榜背景图
+        return [];
+    }
+
     /**
      * 推荐的商品列表
      * @return array