Merge branch 'dev' into dev-sxb

app/common/repositories/store/coupon/StoreCouponRepository.php

@@ -172,9 +172,13 @@ class StoreCouponRepository extends BaseRepository
     }
 
     /*店铺列表*/
-    public function merList($merId)
+    public function merList($merId = null)
     {
-        $data =  Db::name("merchant")->where(['status'=>1,'mer_id'=>$merId])->field('mer_id,mer_name')->select()->toArray();
+        $where = ['status'=>1];
+        if (!empty($merId)) {
+            $where['mer_id'] = $merId;
+        }
+        $data =  Db::name("merchant")->where($where)->field('mer_id,mer_name')->select()->toArray();
         $return=[];
         foreach ($data as $k => $item){
             $return [] = ['value' => $item['mer_id'],  'label' => $item['mer_name']];
@@ -189,7 +193,7 @@ class StoreCouponRepository extends BaseRepository
      * @author xaboy
      * @day 2020/5/20
      */
-    public function form($merId)
+    public function form($merId = null)
     {
         return Elm::createForm(Route::buildUrl('merchantCouponCreate')->build(), [
             Elm::input('title', '优惠券名称')->required(),