|
@@ -12,6 +12,7 @@
|
|
|
|
|
|
namespace app\admin\controller;
|
|
|
|
|
|
+use app\model\goods\GoodsBrand as GoodsBrandModel;
|
|
|
use app\model\shop\Shop as ShopModel;
|
|
|
use app\model\shop\ShopAccount;
|
|
|
use app\model\shop\ShopCategory as ShopCategoryModel;
|
|
@@ -206,6 +207,11 @@ class Shop extends BaseAdmin
|
|
|
$shop_category_list = $shop_category_model->getCategoryList([], 'category_id, category_name', 'sort asc');
|
|
|
$this->assign('shop_category_list', $shop_category_list['data']);
|
|
|
|
|
|
+ //商品品牌
|
|
|
+ $goods_brand_model = new GoodsBrandModel();
|
|
|
+ $brand_list = $goods_brand_model->getBrandList([ [ 'site_id', 'in', ("0,$this->site_id") ] ], "brand_id, brand_name");
|
|
|
+ $brand_list = $brand_list['data'];
|
|
|
+ $this->assign("brand_list", $brand_list);
|
|
|
//商家主营行业
|
|
|
$shop_group_model = new ShopGroupModel();
|
|
|
$shop_group_list = $shop_group_model->getGroupList([['is_own','=',0]], 'group_id,is_own,group_name,fee,remark', 'is_own asc,fee asc');
|