Merge branch 'master' into wechat

app/common/model/Merchant.php

@@ -128,6 +128,13 @@ class Merchant extends BaseModel
         !empty($params['search']) && $filter[] = ['shop_name|shop_label', 'like', "%{$params['search']}%"];
         // 门店状态
         isset($params['is_select_mechant']) && $filter[] = ['is_select_mechant', '=', (int)$params['is_select_mechant']];
+
+        isset($params['shop_name']) && $filter[] = ['shop_name', '=', $params['shop_name']];
+
+        isset($params['shop_label']) && $filter[] = ['shop_label', '=', $params['shop_label']];
+
+        isset($params['score']) && $filter[] = ['score', '=', (int)$params['score']];
+
         return $filter;
     }