diff --git a/public/image/trade_term_web.png b/public/image/trade_term_web.png new file mode 100644 index 00000000..c373e0de Binary files /dev/null and b/public/image/trade_term_web.png differ diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php index dee73b84..ef80d15a 100644 --- a/themes/default/product/product.blade.php +++ b/themes/default/product/product.blade.php @@ -154,7 +154,28 @@ .num-min-order{ position: absolute; bottom: 5px; - left: 90px; + left: 85px; + } + .sku-price-wrap{ + position: relative; + flex-direction: row; + flex-wrap: wrap; + } + .sku-price-wrap-content{ + width: 100%; + font-size: 2rem !important; + line-height: 20px !important; + font-weight: 700 !important; + } + .num-item-content{ + white-space: nowrap; + color: #777777; + font-size: 18px; + margin-bottom: 5px; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; + }
@@ -201,50 +222,63 @@

{{ $product['name'] }}

@endhookwrapper @hookwrapper('product.detail.price') -
-
{{$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')}}) - @else -  {{ ($product['piece_to_batch'] * $product['minimum_order']) }} {{explode('/',$product['unit'])[1]}}({{__('product.minimum_order')}}) + {{--阶梯价--}} +
+
+ + {{$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')}}) + @else + | {{ ($product['piece_to_batch'] * $product['minimum_order']) }} {{explode('/',$product['unit'])[1]}} + ({{__('product.minimum_order')}}) + @endif +
+ {{--{{$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')}})--}} + {{-- @else--}} + {{--  {{ ($product['piece_to_batch'] * $product['minimum_order']) }} {{explode('/',$product['unit'])[1]}}({{__('product.minimum_order')}})--}} + {{-- @endif--}} + {{----}} @if($product['sales_method'] == 'batches') -
+ {{__('product.minimum_order')}}:@{{ minimum_order }} {{ __('product.batches') }} (1 {{ __('product.batches') }} = {{ $product['piece_to_batch'] }} {{ strpos($product['unit'], '/') !== false ? explode('/',$product['unit'])[0] : $product['unit']}} in total) -
+ @endif
+ {{--阶梯价--}}
-
+
{{$product['trade_term'] ?? 'DAP'}}
-
: -
-
-
@{{ item.num }} - @{{ numPrices[index + 1].num - 1 }} {{ strpos($product['unit'], '/') !== false ? explode('/',$product['unit'])[1] : $product['unit']}}
-
>= @{{ item.num }} {{ strpos($product['unit'], '/') !== false ? explode('/',$product['unit'])[1] : $product['unit']}} +
+
+
+ @{{ item.num }} - @{{ numPrices[index + 1].num - 1 }} {{ strpos($product['unit'], '/') !== false ? explode('/',$product['unit'])[1] : $product['unit']}} +
+
+ >= @{{ item.num }} {{ strpos($product['unit'], '/') !== false ? explode('/',$product['unit'])[1] : $product['unit']}}
@{{ item.price_format }}
@@ -1189,7 +1223,7 @@ html: true,//开启html 为true的话,data-content里就能放html代码了 placement: 'bottom', delay: { "show": 0, "hide": 100 }, - content:"" + content:"" }); });