diff --git a/beike/Admin/Http/Controllers/AttributeController.php b/beike/Admin/Http/Controllers/AttributeController.php index a630b26b..730d679a 100644 --- a/beike/Admin/Http/Controllers/AttributeController.php +++ b/beike/Admin/Http/Controllers/AttributeController.php @@ -26,10 +26,10 @@ class AttributeController extends Controller { try { $attributes = AttributeRepo::getList(); - $data = [ - 'attribute_list' => $attributes, + $data = [ + 'attribute_list' => $attributes, 'attribute_list_format' => AttributeResource::collection($attributes), - 'attribute_group' => AttributeGroupRepo::getList(), + 'attribute_group' => AttributeGroupRepo::getList(), ]; $data = hook_filter('admin.attribute.index.data', $data); if ($request->expectsJson()) { diff --git a/beike/Admin/Http/Controllers/AttributeGroupController.php b/beike/Admin/Http/Controllers/AttributeGroupController.php index 1102a508..fca1c030 100644 --- a/beike/Admin/Http/Controllers/AttributeGroupController.php +++ b/beike/Admin/Http/Controllers/AttributeGroupController.php @@ -35,7 +35,7 @@ class AttributeGroupController extends Controller { try { $requestData = json_decode($request->getContent(), true); - $item = AttributeGroupRepo::create($requestData); + $item = AttributeGroupRepo::create($requestData); } catch (Exception $e) { return json_fail($e->getMessage(), []); } diff --git a/beike/Admin/Services/MarketingService.php b/beike/Admin/Services/MarketingService.php index 6273d48d..ad1b329c 100644 --- a/beike/Admin/Services/MarketingService.php +++ b/beike/Admin/Services/MarketingService.php @@ -59,7 +59,7 @@ class MarketingService */ public function getPlugin($pluginCode): mixed { - $url = config('beike.api_url') . "/api/plugins/{$pluginCode}"; + $url = config('beike.api_url') . "/api/plugins/{$pluginCode}?version=" . config('beike.version'); $plugin = $this->httpClient->get($url)->json(); if (empty($plugin)) { throw new NotFoundHttpException('该插件不存在或已下架'); diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index fbb3a1a5..574ae757 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -204,11 +204,11 @@ class OrderRepo $shippingAddress->country_id = $shippingAddress->country->id ?? 0; $paymentAddress->country = $paymentAddress->country->name ?? ''; $paymentAddress->country_id = $paymentAddress->country->id ?? 0; - $email = $customer->email; + $email = $customer->email; } else { $shippingAddress = new Address($current['guest_shipping_address'] ?? []); $paymentAddress = new Address($current['guest_payment_address'] ?? []); - $email = $current['guest_shipping_address']['email']; + $email = $current['guest_shipping_address']['email']; } $shippingMethodCode = $current['shipping_method_code'] ?? ''; diff --git a/beike/Repositories/PageCategoryRepo.php b/beike/Repositories/PageCategoryRepo.php index 99d27412..5c88039a 100644 --- a/beike/Repositories/PageCategoryRepo.php +++ b/beike/Repositories/PageCategoryRepo.php @@ -153,8 +153,13 @@ class PageCategoryRepo * @param $page * @return string */ - public static function getName($page) + public static function getName($pageCategoryId) { - return $page->description->title ?? ''; + // 根据 pageCategoryId 获取 name，判断是否存在 + $pageCategory = PageCategory::query()->whereHas('description', function ($query) use ($pageCategoryId) { + $query->where('page_category_id', $pageCategoryId); + })->first(); + + return $pageCategory->description->title ?? ''; } } diff --git a/plugins/LatestProducts/Bootstrap.php b/plugins/LatestProducts/Bootstrap.php index 7d2a35bc..bbfa640d 100644 --- a/plugins/LatestProducts/Bootstrap.php +++ b/plugins/LatestProducts/Bootstrap.php @@ -136,11 +136,13 @@ class Bootstrap /** * 修改订单状态机流程演示 */ - private function handlePaidOrder() { + private function handlePaidOrder() + { add_hook_filter('service.state_machine.machines', function ($data) { - $data['machines']['unpaid']['paid'][] = function (){ + $data['machines']['unpaid']['paid'][] = function () { // 这里写订单由 unpaid 变为 paid 执行的逻辑 }; + return $data; }, 0); } diff --git a/resources/beike/admin/views/components/form/rich-text.blade.php b/resources/beike/admin/views/components/form/rich-text.blade.php index d4252b02..6d20a83a 100644 --- a/resources/beike/admin/views/components/form/rich-text.blade.php +++ b/resources/beike/admin/views/components/form/rich-text.blade.php @@ -15,7 +15,7 @@
@foreach (locales() as $locale)
- +
@endforeach
diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index 742374e1..18cdc92a 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -20,7 +20,7 @@ @hookwrapper('admin.header.vip')
  • - + VIP @@ -157,13 +157,13 @@ layer.close(updatePop) }); - $('.vip-serve').click(function(event) { - layer.open({ - type: 2, - title: '', - area: ['840px', '80%'], - content: `${config.api_url}/api/vip_rights?domain=${config.app_url}&developer_token={{ system_setting('base.developer_token') }}`, - }); - }); + // $('.vip-serve').click(function(event) { + // layer.open({ + // type: 2, + // title: '', + // area: ['840px', '80%'], + // content: `${config.api_url}/api/vip_rights?domain=${config.app_url}&developer_token={{ system_setting('base.developer_token') }}`, + // }); + // }); @endpush diff --git a/resources/beike/admin/views/pages/attributes/form.blade.php b/resources/beike/admin/views/pages/attributes/form.blade.php index 6da15eea..c485d339 100644 --- a/resources/beike/admin/views/pages/attributes/form.blade.php +++ b/resources/beike/admin/views/pages/attributes/form.blade.php @@ -179,7 +179,7 @@ cancelButtonText: '{{__('common.cancel')}}', type: 'warning' }).then(() => { - $http.delete(`customers/{{ $attribute['id'] }}/addresses/${id}`).then((res) => { + $http.delete(`attributes/{{ $attribute['id'] }}/values/${id}`).then((res) => { this.$message.success(res.message); this.source.attributeValues.splice(index, 1) }) diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index e22c3d5b..52c3e152 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -20,6 +20,9 @@ + @if (locale() != 'zh_cn') + + @endif @stack('header')