diff --git a/beike/Admin/Http/Resources/CustomerResource.php b/beike/Admin/Http/Resources/CustomerResource.php
index 479a7bf1..9d5840e1 100644
--- a/beike/Admin/Http/Resources/CustomerResource.php
+++ b/beike/Admin/Http/Resources/CustomerResource.php
@@ -19,6 +19,7 @@ class CustomerResource extends JsonResource
'name' => $this->name,
'email' => $this->email,
'status' => $this->status,
+ 'created_at' => time_format($this->created_at),
'avatar' => image_resize($this->avatar),
'from' => $this->from,
'customer_group_name' => $this->customerGroup->description->name ?? '',
diff --git a/beike/Models/Customer.php b/beike/Models/Customer.php
index 7c0d0a6c..5607f4f2 100644
--- a/beike/Models/Customer.php
+++ b/beike/Models/Customer.php
@@ -2,6 +2,7 @@
namespace Beike\Models;
+use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -18,6 +19,11 @@ class Customer extends Authenticatable
protected $fillable = ['name', 'email', 'password', 'status', 'avatar', 'customer_group_id', 'locale', 'status', 'from'];
+ protected function serializeDate(\DateTimeInterface $date): string
+ {
+ return Carbon::createFromFormat('Y-m-d H:i:s', $date)->format('Y-m-d H:i:s');
+ }
+
public function addresses(): HasMany
{
return $this->hasMany(Address::class);
diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php
index 14eea72b..a01bb9ae 100644
--- a/resources/beike/admin/views/pages/customers/index.blade.php
+++ b/resources/beike/admin/views/pages/customers/index.blade.php
@@ -85,31 +85,31 @@
:total="customers.total">
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
- 保存
- 取消
+ {{ __('common.save') }}
+ {{ __('common.cancel') }}
@@ -142,12 +142,12 @@
},
rules: {
- name: [{required: true,message: '请输入用户名',trigger: 'blur'}, ],
+ name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/customer.user_name')] ) }}', trigger: 'blur'}, ],
email: [
- {required: true, message: '请输入邮箱', trigger: 'blur'},
- {type: 'email', message: '请输入正确邮箱格式' ,trigger: 'blur'},
+ {required: true, message: '{{ __('common.error_required', ['name' => __('common.email')] ) }}', trigger: 'blur'},
+ {type: 'email', message: '{{ __('admin/customer.error_email') }}' ,trigger: 'blur'},
],
- password: [{required: true,message: '请输入密码',trigger: 'blur'}, ],
+ password: [{required: true,message: '{{ __('common.error_required', ['name' => __('shop/login.password')] ) }}',trigger: 'blur'}, ],
},
url: @json(admin_route('customers.index')),
@@ -203,7 +203,7 @@
this.$refs[form].validate((valid) => {
if (!valid) {
- this.$message.error('请检查表单是否填写正确');
+ this.$message.error('{{ __('common.error_form') }}');
return;
}
@@ -217,9 +217,9 @@
deleteCustomer(url, index) {
const self = this;
- this.$confirm('确定要删除用户吗?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+ confirmButtonText: '{{ __('common.confirm') }}',
+ cancelButtonText: '{{ __('common.cancel') }}',
type: 'warning'
}).then(() => {
$http.delete(url).then((res) => {
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index e0c71b8f..2725702e 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -12,6 +12,10 @@
@endif
+ @if (session()->has('message'))
+
+ @endif
+
diff --git a/resources/lang/zh_cn/admin/customer.php b/resources/lang/zh_cn/admin/customer.php
index 924fb02e..61f759ee 100644
--- a/resources/lang/zh_cn/admin/customer.php
+++ b/resources/lang/zh_cn/admin/customer.php
@@ -33,11 +33,6 @@ return [
'address_1' => '详细地址 1',
'address_2' => '详细地址 2',
- // 'customers_delete' => '邮箱',
- // 'customers_delete' => '密码',
- // 'customers_delete' => '用户组',
- // 'customers_delete' => '添加地址',
-
'cannot_delete_root' => '不能删除Root账户',
'error_email' => '请输入正确邮箱格式',
'confirm_delete_address' => '确定要删除地址吗?',