1

6 months ago · 3867abb56f
parent 63d6fa6dbf
commit 3867abb56f
2 changed files with 8 additions and 0 deletions
--- a/app/api/controller/Controller.php
+++ b/app/api/controller/Controller.php
@ -60,6 +60,7 @@ class Controller extends BaseController
 //                throwError('很抱歉，您没有权限进入系统');
 //            }
 //        }
+
        $this->getMerchantId();
    }

--- a/app/common/model/Goods.php
+++ b/app/common/model/Goods.php
@ -433,7 +433,11 @@ class Goods extends BaseModel
                $filter[] = ['stock_total', '=', 0];    // 已售罄
            }
        }
+<<<<<<< Updated upstream

+=======
+        
+>>>>>>> Stashed changes
        if (isset($params['data_type']) && $params['data_type'] != "") {
            if ($params['data_type'] == 1) {
                $filter[] = ['data_type', '=', 1];        // 出售中
@ -444,7 +448,10 @@ class Goods extends BaseModel
            }
        }

+<<<<<<< Updated upstream

+=======
+>>>>>>> Stashed changes
        // 商品状态
        $params['status'] > 0 && $filter[] = ['status', '=', (int)$params['status']];
        $a = 1;