From 61129e697151ca616ef4b2e7eece73afa77ed67a Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Tue, 10 Oct 2023 17:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E5=95=86=E5=93=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E3=80=81=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81=E9=A6=96=E9=A1=B5=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=A0=B7=E5=BC=8F=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Admin/Http/Requests/ProductRequest.php | 7 ++- beike/Admin/Services/ProductService.php | 2 +- .../views/pages/products/form/form.blade.php | 47 +++++++++++++------ resources/lang/en/admin/logistics.php | 2 +- resources/lang/en/order.php | 2 +- resources/lang/en/product.php | 1 + resources/lang/zh_cn/admin/logistics.php | 2 +- resources/lang/zh_cn/product.php | 2 +- themes/default/product/product.blade.php | 39 +++++++-------- themes/default/shared/product.blade.php | 18 +++---- 10 files changed, 73 insertions(+), 49 deletions(-) diff --git a/beike/Admin/Http/Requests/ProductRequest.php b/beike/Admin/Http/Requests/ProductRequest.php index f5ab8cfa..cce03395 100644 --- a/beike/Admin/Http/Requests/ProductRequest.php +++ b/beike/Admin/Http/Requests/ProductRequest.php @@ -37,12 +37,15 @@ class ProductRequest extends FormRequest 'brand_id' => 'int', // 'skus.*.sku' => 'required|string', 'skus.*.price' => 'required|numeric', - 'skus.*.origin_price' => 'required|numeric', + // 'skus.*.origin_price' => 'required|numeric', // 'skus.*.cost_price' => 'numeric', ]; - // 判断：最小起订量是否必填 直接下单产品 - 必填 + // 判断：根据是否为 直接下单产品 进行对应的判断 if($this->active == 1){ + // 直接下单产品 - 最小起订量必填 $rules['minimum_order'] = 'required|numeric|gt:0'; + }else{ + $rules['skus.*.origin_price'] = 'required|numeric'; } // 判断：销售方式为按 批 卖，每批的数量必须大于0 if($this->sales_method == 'batches'){ diff --git a/beike/Admin/Services/ProductService.php b/beike/Admin/Services/ProductService.php index 7f7a97cd..42a53562 100644 --- a/beike/Admin/Services/ProductService.php +++ b/beike/Admin/Services/ProductService.php @@ -77,7 +77,7 @@ class ProductService $skus = []; foreach ($data['skus'] as $index => $sku) { $sku['position'] = $index; - $sku['origin_price'] = (float) $sku['origin_price']; + $sku['origin_price'] = (float) ($sku['origin_price'] ?? 0); $sku['cost_price'] = (float) ($sku['cost_price'] ?? 0); $sku['quantity'] = (int) $sku['quantity']; $skus[] = $sku; diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index 9f6b86dd..d56d0d33 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -159,7 +159,7 @@ {{--交易信息--}}
-
{{ __('product.transaction_info') }}
+
{{ __('product.transaction_info') }}
{{--产品类型--}}
@@ -407,8 +407,13 @@
{{----}} - - + + {{-- --}} @@ -422,8 +427,13 @@ {{ __('common.image') }} {{ __('admin/product.model') }} {{--sku--}} - {{ __('admin/product.price') }} - {{ __('admin/product.origin_price') }} + + {{--{{ __('admin/product.cost_price') }}--}} {{ __('product.quantity') }} @@ -458,16 +468,23 @@ {{ __('common.error_required', ['name' => 'sku']) }} {{ __('admin/product.default_main_product') }} --}} - - - {{ __('common.error_required', ['name' => __('admin/product.price')]) }} - - - - {{ __('common.error_required', ['name' => __('admin/product.origin_price')]) }} - + + + {{-- diff --git a/resources/lang/en/admin/logistics.php b/resources/lang/en/admin/logistics.php index e182d77b..0eb1e08b 100644 --- a/resources/lang/en/admin/logistics.php +++ b/resources/lang/en/admin/logistics.php @@ -75,5 +75,5 @@ return [ 'unit' => 'unit：:unit', 'default_countries' => 'Default display country for the front desk', 'choose_logistics' => 'Select Shipping Service', - 'estimated_time' => 'Shipping Time', + 'estimated_time' => 'Shipping Time(After Shipment)', ]; diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php index 04d1b949..acef31a9 100644 --- a/resources/lang/en/order.php +++ b/resources/lang/en/order.php @@ -24,7 +24,7 @@ return [ 'express_number' => 'Express Number', 'express_company' => 'Express Company', 'expected_arrival' => 'Expected to arrive between :start_time and :end_time', - 'work_days' => '【:start_day】-【:end_day】work days', + 'work_days' => ':start_day-:end_day work days', 'order_shipments' => 'shipment information', diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php index e36f97ec..13c2c14c 100644 --- a/resources/lang/en/product.php +++ b/resources/lang/en/product.php @@ -15,6 +15,7 @@ return [ 'price' => 'Price', 'origin_price' => 'Origin Price', 'cost_price' => 'Cost Price', + 'price_tag' => 'Price Tag', 'brand' => 'Brand', 'category' => 'Category', 'model' => 'Model', diff --git a/resources/lang/zh_cn/admin/logistics.php b/resources/lang/zh_cn/admin/logistics.php index 72ece676..9564386e 100644 --- a/resources/lang/zh_cn/admin/logistics.php +++ b/resources/lang/zh_cn/admin/logistics.php @@ -80,7 +80,7 @@ return [ 'unit' => '单位：:unit', 'default_countries' => '前台默认展示国家', 'choose_logistics' => '选择运输服务', - 'estimated_time' => '运送时间', + 'estimated_time' => '运送时间(装运后)', diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php index 72d8b464..1b36ad9d 100644 --- a/resources/lang/zh_cn/product.php +++ b/resources/lang/zh_cn/product.php @@ -14,6 +14,7 @@ return [ 'sku' => 'SKU', 'price' => '区间低价', 'origin_price' => '区间高价', + 'price_tag' => '价格', 'cost_price' => '起订量', 'brand' => '品牌', 'category' => '分类', @@ -49,5 +50,4 @@ return [ 'trade_term' => '贸易术语', 'multi_specification_settings' => '多规格设置', 'multi_specification_settings_help' => '直接下单产品，根据规格设置价格时必须启用多规格！', - ]; diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php index ef80d15a..26fd2620 100644 --- a/themes/default/product/product.blade.php +++ b/themes/default/product/product.blade.php @@ -163,9 +163,7 @@ } .sku-price-wrap-content{ width: 100%; - font-size: 2rem !important; line-height: 20px !important; - font-weight: 700 !important; } .num-item-content{ white-space: nowrap; @@ -175,7 +173,16 @@ overflow: hidden; text-overflow: ellipsis; width: 100%; - + } + .num-trade-term-content { + height: 54px; + line-height: 85px; + display: inline-flex; + margin-right:10px; + font-size: calc(1.265rem + 0.18vw) !important; + } + .num-trade-term-content-i{ + font-size: 15px; }
@@ -222,25 +229,22 @@

{{ $product['name'] }}

@endhookwrapper @hookwrapper('product.detail.price') - {{--阶梯价--}} + {{-- 非阶梯价 --}}
-
- - {{$product['trade_term'] ?? 'DAP'}} - - - @{{ product.price_format }} - - @{{ product.origin_price_format }} +
+ {{ $product['trade_term'] ?? 'DAP'}} + @{{ product.price_format }} + - @{{ product.origin_price_format }} @if($product['unit']) / {{explode('/',$product['unit'])[0]}} @endif - + @if($product['sales_method'] == 'piece') - | {{ $product['minimum_order'] }} {{explode('/',$product['unit'])[1]}}({{__('product.minimum_order')}}) + | {{ $product['minimum_order'] }} {{explode('/',$product['unit'])[1]}} @else | {{ ($product['piece_to_batch'] * $product['minimum_order']) }} {{explode('/',$product['unit'])[1]}} - ({{__('product.minimum_order')}}) @endif + ({{__('product.minimum_order')}})
{{--{{$product['trade_term'] ?? 'DAP'}}--}} @@ -267,11 +271,8 @@
{{--阶梯价--}}
-
- {{$product['trade_term'] ?? 'DAP'}} -
- -
+
+ {{$product['trade_term'] ?? 'DAP'}}
diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php index bb7eabe2..736b4553 100644 --- a/themes/default/shared/product.blade.php +++ b/themes/default/shared/product.blade.php @@ -54,17 +54,17 @@
{{ $product['name_format'] }}
@if ($product['price_setting'] === 'sku') - {{ $product['price_format'] }} - - + {{ $product['price_format'] }} @if ($product['price'] != $product['origin_price'] && $product['origin_price'] > 0) - {{ $product['origin_price_format'] }} + - + {{ $product['origin_price_format'] }} @endif @elseif($product['price_setting'] === 'num') @if ($product['price'] != $product['origin_price'] && $product['origin_price'] > 0) - {{ $product['origin_price_format'] }} + {{ $product['origin_price_format'] }} @endif - - - {{ $product['price_format'] }} + - + {{ $product['price_format'] }} @endif {{--@if(!empty($product['unit_format'])) @@ -74,8 +74,10 @@ @if ((int)$product['minimum_order'] > 0) -
- {{$product['minimum_order'] ?? 0}} {{ $product['unit_format'] ?? '' }} +
+ + {{$product['minimum_order'] ?? 0}} {{ $product['unit_format'] ? explode('/',$product['unit_format'])[1] : '' }} + ({{__('admin/product.minimum_order')}})
@endif