From d01dbe195c5dc2886ce4bf62d66d7459cefda667 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 13 七月 2023 11:36:39 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发
---
application/api/logic/taoke/device/Pdd.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/application/api/logic/taoke/device/Pdd.php b/application/api/logic/taoke/device/Pdd.php
index b7439e8..2db5a56 100644
--- a/application/api/logic/taoke/device/Pdd.php
+++ b/application/api/logic/taoke/device/Pdd.php
@@ -330,7 +330,7 @@
* @param mixed $sort_type 鎺掑簭鏂瑰紡:0-缁煎悎鎺掑簭;1-鎸変剑閲戞瘮鐜囧崌搴�;2-鎸変剑閲戞瘮渚嬮檷搴�;3-鎸変环鏍煎崌搴�;4-鎸変环鏍奸檷搴�;5-鎸夐攢閲忓崌搴�;6-鎸夐攢閲忛檷搴�;7-浼樻儬鍒搁噾棰濇帓搴忓崌搴�;8-浼樻儬鍒搁噾棰濇帓搴忛檷搴�;9-鍒稿悗浠峰崌搴忔帓搴�;10-鍒稿悗浠烽檷搴忔帓搴�;11-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿鍗囧簭;12-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿闄嶅簭;13-鎸変剑閲戦噾棰濆崌搴忔帓搴�;14-鎸変剑閲戦噾棰濋檷搴忔帓搴�;15-搴楅摵鎻忚堪璇勫垎鍗囧簭;16-搴楅摵鎻忚堪璇勫垎闄嶅簭;17-搴楅摵鐗╂祦璇勫垎鍗囧簭;18-搴楅摵鐗╂祦璇勫垎闄嶅簭;19-搴楅摵鏈嶅姟璇勫垎鍗囧簭;20-搴楅摵鏈嶅姟璇勫垎闄嶅簭;27-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝28-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝29-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝30-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝31-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝32-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴�
* @return void
*/
- public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0)
+ public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0,$cat_id='')
{
$params = [
'keyword' => $keyword,
@@ -340,6 +340,7 @@
'with_coupon' => empty($with_coupon) ? '' : ($with_coupon == 1 ? "true" : "false"),
'page' => $page,
'sort_type' => $sort_type,
+ 'cat_id' => $cat_id
];
if(!empty(MOBILE_INFO)){
--
Gitblit v1.9.3