diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index efad016d..792ca1dd 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -606,6 +606,7 @@ header .header-content .right-btn .cart-badge-quantity { top: -3px; text-align: center; font-size: 12px; + display: none; width: 23px; zoom: 0.9; height: 23px; diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php index 1249d007..75d806fe 100644 --- a/resources/beike/admin/views/pages/orders/form.blade.php +++ b/resources/beike/admin/views/pages/orders/form.blade.php @@ -20,7 +20,7 @@ {{ __('order.total') }}: - {{ $order->total_format }} + {{ currency_format($order->total, $order->currency_code, $order->currency_value) }} @@ -120,9 +120,10 @@ ID {{ __('order.product_name') }} + {{ __('order.product_sku') }} {{ __('order.product_price') }} - {{ __('order.product_quantity') }} - {{ __('order.product_sku') }} + {{ __('order.product_quantity') }} + {{ __('order.product_sub_price') }} @@ -134,17 +135,18 @@
{{ $product->name }} - {{ $product->price_format }} - {{ $product->quantity }} - {{ $product->product_sku }} + {{ $product->product_sku }} + {{ currency_format($product->price, $order->currency_code, $order->currency_value) }} + {{ $product->quantity }} + {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }} @endforeach @foreach ($order->orderTotals as $orderTotal) - {{ $orderTotal->title }} - {{ $orderTotal->value_format }} + {{ $orderTotal->title }} + {{ currency_format($orderTotal->value, $order->currency_code, $order->currency_value) }} @endforeach diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index b7c5d347..e0ac9074 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -73,7 +73,7 @@ {{ sub_string($order->customer_name, 14) }} {{ $order->payment_method_name }} {{ $order->status_format }} - {{ $order->total_format }} + {{ currency_format($order->total, $order->currency_code, $order->currency_value) }} {{ $order->created_at }} {{ $order->updated_at }} 'Shipping Address', 'payment_address' => 'Payment Address', 'order_status' => 'Order Status', + 'product_sub_price' => 'Subtotal', 'current_status' => 'Current', 'change_to_status' => 'Change To', 'comment' => 'Comment', diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php index a851bd81..1c003c1b 100644 --- a/resources/lang/zh_cn/order.php +++ b/resources/lang/zh_cn/order.php @@ -34,6 +34,7 @@ return [ 'product_info' => '商品信息', 'product_name' => '名称', 'product_price' => '价格', + 'product_sub_price' => '小计', 'product_quantity' => '数量', 'product_sku' => 'SKU', diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php index 5b36b898..67627c84 100644 --- a/themes/default/account/account.blade.php +++ b/themes/default/account/account.blade.php @@ -79,7 +79,7 @@ {{ __('shop/account.state') }}:{{ $order->status_format }} - {{ __('shop/account.amount') }}:{{ $order->total_format }} + {{ __('shop/account.amount') }}:{{ currency_format($order->total, $order->currency_code, $order->currency_value) }} diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php index 392b350d..f8e708dd 100644 --- a/themes/default/account/order.blade.php +++ b/themes/default/account/order.blade.php @@ -49,7 +49,7 @@ @if ($loop->first) - {{ currency_format($order->total) }} + {{ currency_format($order->total, $order->currency_code, $order->currency_value) }} {{ __("common.order.{$order->status}") }} {{ __('shop/account.order.check') }} diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php index c1423503..ed951d08 100644 --- a/themes/default/account/order_info.blade.php +++ b/themes/default/account/order_info.blade.php @@ -43,7 +43,7 @@ {{ __("common.order.{$order->status}") }} - {{ $order->total_format }} + {{ currency_format($order->total, $order->currency_code, $order->currency_value) }} @@ -62,9 +62,13 @@
- {{ $product->name }}
x {{ $product->quantity }} + {{ $product->name }} +
+
+ {{ currency_format($product->price, $order->currency_code, $order->currency_value) }} + x {{ $product->quantity }} + = {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}
-
{{ $product->price_format }}
@if ($order->status == 'completed') @@ -87,7 +91,7 @@ @foreach ($totals as $total) {{ $total->title }} - {{ $total->value_format }} + {{ currency_format($total->value, $order->currency_code, $order->currency_value) }} @endforeach @endforeach