|
@@ -64,7 +64,7 @@ class Info
|
|
}
|
|
}
|
|
|
|
|
|
# 获取店铺的商品列表
|
|
# 获取店铺的商品列表
|
|
- public function getGoods($shop, $column = false, $price_type = false, $sell_type = false)
|
|
|
|
|
|
+ public function getGoods($shop, $column = false, $price_type = false, $sell_type = false, $status = false)
|
|
{
|
|
{
|
|
$table = 'shop/goods';
|
|
$table = 'shop/goods';
|
|
$where['shop_id'] = isset($shop['id']) ? $shop['id'] : $shop;
|
|
$where['shop_id'] = isset($shop['id']) ? $shop['id'] : $shop;
|
|
@@ -75,6 +75,10 @@ class Info
|
|
} else {
|
|
} else {
|
|
$method = 'getDataPage';
|
|
$method = 'getDataPage';
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if ($status) {
|
|
|
|
+ $where['status'] = 1;
|
|
|
|
+ }
|
|
|
|
|
|
$name = Dever::input('name');
|
|
$name = Dever::input('name');
|
|
if ($name) {
|
|
if ($name) {
|