diff --git a/resources/lang/zh_cn/shop/cart.php b/resources/lang/zh_cn/shop/cart.php deleted file mode 100644 index 66985d60..00000000 --- a/resources/lang/zh_cn/shop/cart.php +++ /dev/null @@ -1,32 +0,0 @@ - - * @created 2022-08-17 23:10:20 - * @modified 2022-08-17 23:10:20 - */ - -return [ - 'index' => '购物车', - 'added_to_cart' => '已加入购物车', - 'select_all' => '全选', - 'commodity' => '商品', - 'quantity' => '数量', - 'subtotal' => '小计', - 'operate' => '操作', - 'product_total' => '商品总计', - 'all' => '全部', - 'selected' => '已选', - 'total_price' => '总价', - 'to_checkout' => '去结账', - 'cart_empty' => '您的购物车是空的', - 'go_buy' => '您可以去看看有哪些想买的', - 'go_shopping' => '去逛逛', - 'must_select' => '请选择至少一个商品', - 'mini' => '您的购物车', - 'delete' => '删除', - 'check_cart' => '查看购物车', -]; diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php index 92756f3c..7a60e579 100644 --- a/themes/default/cart/cart.blade.php +++ b/themes/default/cart/cart.blade.php @@ -10,6 +10,9 @@ @section('content')
+ + +
@include('shared.steps', ['steps' => 1])
@@ -23,13 +26,13 @@ - {{ __('shop/cart.index') }} - {{ __('shop/cart.commodity') }} - {{ __('shop/cart.subtotal') }} - {{ __('shop/cart.operate') }} + {{ __('shop/carts.index') }} + {{ __('shop/carts.commodity') }} + {{ __('shop/carts.subtotal') }} + {{ __('shop/carts.operate') }} @@ -67,15 +70,15 @@
-
{{ __('shop/cart.product_total') }}
+
{{ __('shop/carts.product_total') }}
    -
  • {{ __('shop/cart.all') }}@{{ products.length }}
  • -
  • {{ __('shop/cart.selected') }}@{{ total_quantity }}
  • -
  • {{ __('shop/cart.total_price') }}@{{ amount_format }}
  • +
  • {{ __('shop/carts.all') }}@{{ products.length }}
  • +
  • {{ __('shop/carts.selected') }}@{{ total_quantity }}
  • +
  • {{ __('shop/carts.total_price') }}@{{ amount_format }}
  • {{-- 去结账 --}} - +
@@ -88,11 +91,11 @@
-
{{ __('shop/cart.cart_empty') }}
-

{{ __('shop/cart.go_buy') }}

+
{{ __('shop/carts.cart_empty') }}
+

{{ __('shop/carts.go_buy') }}

- {{ __('shop/cart.go_shopping') }} + {{ __('shop/carts.go_shopping') }}
@@ -130,7 +133,7 @@ methods: { checkedBtnToCheckout() { if (!this.products.some(e => e.selected)) { - layer.msg('{{ __('shop/cart.nust_select') }}', ()=>{}) + layer.msg('{{ __('shop/carts.nust_select') }}', ()=>{}) return } diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php index aa668c8b..5884d2de 100644 --- a/themes/default/cart/mini.blade.php +++ b/themes/default/cart/mini.blade.php @@ -1,5 +1,5 @@
-
{{ __('shop/cart.mini') }}
+
{{ __('shop/carts.mini') }}
@@ -14,7 +14,7 @@
{{ $cart['price_format'] }} x {{ $cart['quantity'] }}
- {{ __('shop/cart.delete') }} + {{ __('shop/carts.delete') }}
@@ -27,11 +27,11 @@
-
{{ __('shop/cart.cart_empty') }}
-

{{ __('shop/cart.go_buy') }}

+
{{ __('shop/carts.cart_empty') }}
+

{{ __('shop/carts.go_buy') }}

- {{ __('shop/cart.go_shopping') }} + {{ __('shop/carts.go_shopping') }}
@@ -45,8 +45,8 @@ {{ $amount_format }}
- {{ __('shop/cart.to_checkout') }} - {{ __('shop/cart.check_cart') }} + {{ __('shop/carts.to_checkout') }} + {{ __('shop/carts.check_cart') }}
@endif diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index f002c309..04ce2b40 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -10,6 +10,9 @@ @section('content')
+ + +
@include('shared.steps', ['steps' => 2])
@@ -18,7 +21,7 @@
-
地址
+
{{ __('shop/checkout.address') }}
@@ -32,15 +35,15 @@
@{{ address.zipcode }}
@{{ address.country }} @{{ address.zone }} @{{ address.city }} @{{ address.address_1 }}
- 已选择 - 编辑 + {{ __('shop/checkout.chosen') }} + {{ __('shop/checkout.edit') }}
- - + +
@@ -48,7 +51,7 @@
-
支付方式
+
{{ __('shop/checkout.payment_method') }}
@@ -64,7 +67,7 @@
-
配送方式
+
{{ __('shop/checkout.delivery_method') }}
@@ -83,7 +86,7 @@
-
CART TOTALS
+
{{ __('shop/checkout.cart_totals') }}
@{{ source.carts.quantity }}
@@ -107,7 +110,7 @@ @endforeach
- +
@@ -158,11 +161,11 @@ }, addressRules: { - name: [{required: true, message: '请输入姓名', trigger: 'blur'}, ], - phone: [{required: true, message: '请输入联系电话', trigger: 'blur'}, ], - address_1: [{required: true, message: '请输入详细地址 1', trigger: 'blur'}, ], - zone_id: [{required: true, message: '请选择省份', trigger: 'blur'}, ], - city: [{required: true, message: '请填写 city', trigger: 'blur'}, ], + name: [{required: true, message: '{{ __('shop/checkout.enter_name') }}', trigger: 'blur'}, ], + phone: [{required: true, message: '{{ __('shop/checkout.enter_phone') }}', trigger: 'blur'}, ], + address_1: [{required: true, message: '{{ __('shop/checkout.enter_address') }}', trigger: 'blur'}, ], + zone_id: [{required: true, message: '{{ __('shop/checkout.select_province') }}', trigger: 'blur'}, ], + city: [{required: true, message: '{{ __('shop/checkout.enter_city') }}', trigger: 'blur'}, ], } }, @@ -199,7 +202,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('shop/checkout.check_form') }}'); return; }