|
|
@@ -26,7 +26,7 @@ class MerchantClass extends BaseClass
|
|
|
2 => ['id' => 2, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '申请会员'],
|
|
|
3 => ['id' => 3, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '点我付款'],
|
|
|
];
|
|
|
-
|
|
|
+
|
|
|
//商家信息组合 shish 2019.12.20
|
|
|
public static function groupMerchantBaseInfo($list)
|
|
|
{
|
|
|
@@ -211,11 +211,11 @@ class MerchantClass extends BaseClass
|
|
|
//h5商城链接二维码 shish 2020.4.30
|
|
|
public static function getH5MallQrCode($id)
|
|
|
{
|
|
|
- $url = Yii::$app->params['mallDomain'] . "/#/pages/pay/index?account={$merchantId}&shopId=" . $shopId;
|
|
|
+ $url = Yii::$app->params['mallDomain'] . "/#/pages/pay/index?account={$id}&shopId=" . $shopId;
|
|
|
//强制转成https
|
|
|
$url = httpUtil::becomeHttps($url);
|
|
|
$respond = qrCodeUtil::generateH5MallQrCode($url);
|
|
|
return isset($respond['url']) ? $respond['url'] : '';
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
shish