diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index fa6db6e9..bb297ac9 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -46,15 +46,15 @@
| ID | -订单号 | -客户姓名 | -支付方式 | -状态 | -总计 | -生成日期 | -修改日期 | -操作 | +{{ __('order.id') }} | +{{ __('order.number') }} | +{{ __('order.customer_name') }} | +{{ __('order.payment_method') }} | +{{ __('order.status') }} | +{{ __('order.total') }} | +{{ __('order.created_at') }} | +{{ __('order.updated_at') }} | +{{ __('common.action') }} | {{ __('admin/region.describe') }} | {{ __('common.created_at') }} | {{ __('common.updated_at') }} | -{{ __('common.operate') }} | +{{ __('common.action') }} | diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php index 9b542d42..479046e5 100644 --- a/resources/beike/admin/views/pages/tax_classes/index.blade.php +++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php @@ -25,7 +25,7 @@{{ __('admin/region.describe') }} | {{ __('common.created_at') }} | {{ __('common.updated_at') }} | -{{ __('common.operate') }} | +{{ __('common.action') }} | diff --git a/resources/beike/admin/views/pages/tax_rates/index.blade.php b/resources/beike/admin/views/pages/tax_rates/index.blade.php index e13ddf6e..33fcd3f9 100644 --- a/resources/beike/admin/views/pages/tax_rates/index.blade.php +++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php @@ -27,7 +27,7 @@{{ __('admin/tax_rate.area') }} | {{ __('common.created_at') }} | {{ __('common.updated_at') }} | -{{ __('common.operate') }} | +{{ __('common.action') }} | diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 88f4d23c..30d58c44 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -37,7 +37,7 @@ return [ 'created_at' => 'Created At', 'updated_at' => 'Updated At', 'edit' => 'Edit', - 'operate' => 'Operate', + 'action' => 'Action', 'add' => 'Add', 'please_choose' => 'Please Choose', 'recommend_size' => 'Recommend Size', diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php index ae6ea8ad..6c43783b 100644 --- a/resources/lang/en/order.php +++ b/resources/lang/en/order.php @@ -13,9 +13,11 @@ return [ 'id' => 'ID', 'number' => 'Number', 'customer_name' => 'Customer Name', + 'payment_method' => 'Payment Method', 'email' => 'Email', 'telephone' => 'Telephone', 'created_at' => 'Created', 'updated_at' => 'Updated', 'status' => 'Status', + 'total' => 'Total', ]; diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index f0f42231..ae04bc7b 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -54,7 +54,6 @@ return [ 'order_details' => 'Order Details', 'amount' => 'Amount', 'state' => 'State', - 'operate' => 'Operate', 'order_number' => 'Order Number', 'check' => 'Check', @@ -116,7 +115,6 @@ return [ 'service_type' => 'Service Type', 'return_reason' => 'Reason For Return', 'creation_time' => 'Creation Time', - 'operate' => 'Operate', 'check' => 'Check', 'rma_info' => [ diff --git a/resources/lang/en/shop/carts.php b/resources/lang/en/shop/carts.php index c62deea8..8960ff51 100644 --- a/resources/lang/en/shop/carts.php +++ b/resources/lang/en/shop/carts.php @@ -16,7 +16,6 @@ return [ 'commodity' => 'Commodity', 'quantity' => 'Quantity', 'subtotal' => 'Subtotal', - 'operate' => 'Operate', 'product_total' => 'Product Totals', 'all' => 'All', 'selected' => 'Selected', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index b0f68f26..b2ca6813 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -36,7 +36,7 @@ return [ 'created_at' => '创建时间', 'updated_at' => '修改时间', 'edit' => '编辑', - 'operate' => '操作', + 'action' => '操作', 'add' => '添加', 'please_choose' => '请选择', 'recommend_size' => '建议尺寸', diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php index f7b97ca6..5e88da8b 100644 --- a/resources/lang/zh_cn/order.php +++ b/resources/lang/zh_cn/order.php @@ -13,9 +13,11 @@ return [ 'id' => 'ID', 'number' => '订单号', 'customer_name' => '客户姓名', + 'payment_method' => '支付方式', 'email' => 'Email', 'telephone' => '联系电话', 'created_at' => '创建时间', 'updated_at' => '更新时间', 'status' => '状态', + 'total' => '订单总额', ]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 50089aaa..6a0d6ed1 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -54,7 +54,6 @@ return [ 'order_details' => '订单详情', 'amount' => '金额', 'state' => '状态', - 'operate' => '操作', 'order_number' => '订单号', 'check' => '查看', @@ -116,7 +115,6 @@ return [ 'service_type' => '服务类型', 'return_reason' => '退换原因', 'creation_time' => '创建时间', - 'operate' => '操作', 'check' => '查看', 'rma_info' => [ diff --git a/resources/lang/zh_cn/shop/carts.php b/resources/lang/zh_cn/shop/carts.php index 86fd3f34..e924b084 100644 --- a/resources/lang/zh_cn/shop/carts.php +++ b/resources/lang/zh_cn/shop/carts.php @@ -16,7 +16,6 @@ return [ 'commodity' => '商品', 'quantity' => '数量', 'subtotal' => '小计', - 'operate' => '操作', 'product_total' => '商品总计', 'all' => '全部', 'selected' => '已选', diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php index 6e752b35..8b5fef1a 100644 --- a/themes/default/account/order.blade.php +++ b/themes/default/account/order.blade.php @@ -25,7 +25,7 @@{{ __('shop/account.order.order_details') }} | {{ __('shop/account.order.amount') }} | {{ __('shop/account.order.state') }} | -{{ __('shop/account.order.operate') }} | +{{ __('common.action') }} | @foreach ($orders as $order) diff --git a/themes/default/account/rmas/index.blade.php b/themes/default/account/rmas/index.blade.php index 7b906881..0cf98493 100644 --- a/themes/default/account/rmas/index.blade.php +++ b/themes/default/account/rmas/index.blade.php @@ -3,9 +3,9 @@ @section('body-class', 'page-account-rmas') @section('content') -
|---|