|
|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace mobile\controllers;
|
|
|
|
|
|
+use biz\merchant\services\MerchantExtendService;
|
|
|
use biz\merchant\services\MerchantService;
|
|
|
use biz\user\services\UserService;
|
|
|
use common\components\httpUtil;
|
|
|
@@ -20,7 +21,7 @@ class BaseController extends PublicController
|
|
|
public $validate = true;
|
|
|
public $withoutLogin = [];//不需要登陆可以访问的方法
|
|
|
public $userId, $user;
|
|
|
- public $merchantId, $merchant;
|
|
|
+ public $merchantId, $merchant, $merchantExtend;
|
|
|
public $isWeixin;
|
|
|
|
|
|
public function beforeAction($action)
|
|
|
@@ -39,6 +40,7 @@ class BaseController extends PublicController
|
|
|
}
|
|
|
$this->merchantId = $account;
|
|
|
$this->merchant = $merchant;
|
|
|
+ $this->merchantExtend = MerchantExtendService::getByMerchantId($account);
|
|
|
|
|
|
$this->isWeixin = util::isWeixin();
|
|
|
|