1

app/common/model/Goods.php

@@ -503,7 +503,11 @@ class Goods extends BaseModel
         if (isset($param['spec_type']) && $param['spec_type'] !== '') {
             $filter[] = ['spec_type', '=', $params['spec_type']];
         }
-        //gj
+        //gj -前台小程序
+        if (isset($param['merchantId']) && $param['merchantId']) {
+            $filter[] = ['goods.merchant_id', '=', $param['merchantId']];
+        }
+        //后台管理
         if (isset($param['merchant_id']) && $param['merchant_id']) {
             $filter[] = ['goods.merchant_id', '=', $param['merchant_id']];
         }