商家运费模板-取消硬编码

app/common/dao/store/shipping/ShippingTemplateDao.php

@@ -86,7 +86,11 @@ class ShippingTemplateDao  extends BaseDao
 
     public function getList($merId)
     {
-        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
+//        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
+        $list = ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select()->toArray();
+        $default = ['shipping_template_id' => 105, 'name' => '默认包邮'];//默认
+        $list[] = $default;
+        return $list;
     }
 
     /**

app/controller/merchant/store/shipping/ShippingTemplate.php

@@ -47,9 +47,8 @@ class ShippingTemplate extends BaseController
      */
     public function getList()
     {
-//        return app('json')->success($this->repository->getList($this->request->merId()));
-        // 目前只包邮
-        return app('json')->success($this->repository->getList(0));
+        return app('json')->success($this->repository->getList($this->request->merId()));
+//        return app('json')->success($this->repository->getList(0));  取消硬编码
     }
 
     /**