From 9df5e4341a95c35b00e651d49ff789576f28e897 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 09 六月 2023 21:21:59 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.2api' into develop
---
application/api/controller/Activity.php | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/application/api/controller/Activity.php b/application/api/controller/Activity.php
index 62a2a12..1121d87 100644
--- a/application/api/controller/Activity.php
+++ b/application/api/controller/Activity.php
@@ -26,4 +26,35 @@
$this->success('鑾峰彇鎴愬姛',$list);
}
+ /**
+ *
+ * 浠婃棩鎶樹笂鎶�
+ */
+ public function zsz_goods_list()
+ {
+ $cid = request()->param('cid','');
+
+ $appkey = request()->param('app_key','');
+
+ $LogicDataoke = new LogicDataoke();
+ $list=$LogicDataoke->zszGoodsList($cid, $appkey);
+ $this->success('鑾峰彇鎴愬姛',$list);
+ }
+
+ /**
+ *
+ * 灏忔牱
+ */
+ public function xy_goods_list()
+ {
+ $keyword = request()->param('keyword','');
+ $apikey=request()->param('apikey','');
+ $back=request()->param('back',10);
+ $min_id = request()->param('min_id',1);
+
+ $LogicDataoke = new LogicDataoke();
+ $list=$LogicDataoke->xyGoodsList($apikey, $keyword,$min_id,$back);
+ $this->success('鑾峰彇鎴愬姛',$list);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3