|
@@ -32,10 +32,9 @@ class MerchantController extends BaseController
|
|
|
if (empty($merchant)) {
|
|
if (empty($merchant)) {
|
|
|
util::success([]);
|
|
util::success([]);
|
|
|
}
|
|
}
|
|
|
- $default = $this->shop->default ?? 0;
|
|
|
|
|
$name = $merchant['name'] ?? '';
|
|
$name = $merchant['name'] ?? '';
|
|
|
- if ($default != 1) {
|
|
|
|
|
- $shopName = $this->shop->shopName ?? '';
|
|
|
|
|
|
|
+ $shopName = $this->shop->shopName ?? '';
|
|
|
|
|
+ if ($shopName != '首店') {
|
|
|
$name .= ' ' . $shopName;
|
|
$name .= ' ' . $shopName;
|
|
|
}
|
|
}
|
|
|
$merchant['name'] = $name;
|
|
$merchant['name'] = $name;
|
