diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index e3905d59..02ede580 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -106,8 +106,8 @@
@{{ variant.name[current_language_code] }} - {{ __('admin/product.edit') }} - {{ __('admin/product.delete') }} + {{ __('common.edit') }} + {{ __('common.delete') }}
{{ __('admin/product.add_variable_image') }} diff --git a/resources/lang/en/shop/checkout.php b/resources/lang/en/shop/checkout.php index 477edd94..d97a4942 100644 --- a/resources/lang/en/shop/checkout.php +++ b/resources/lang/en/shop/checkout.php @@ -28,6 +28,7 @@ return [ 'select_province' => 'Please select province', 'enter_city' => 'Please fill in the city ', 'check_form' => 'Please check that the form is filled out correctly', + 'error_payment_address' => 'Please select a billing address', 'payment' => [ 'index' => 'Please Pay', diff --git a/resources/lang/zh_cn/shop/checkout.php b/resources/lang/zh_cn/shop/checkout.php index 3c0ddb2f..94293c5b 100644 --- a/resources/lang/zh_cn/shop/checkout.php +++ b/resources/lang/zh_cn/shop/checkout.php @@ -28,6 +28,7 @@ return [ 'select_province' => '请选择省份', 'enter_city' => '请填写城市', 'check_form' => '请检查表单是否填写正确', + 'error_payment_address' => '请选择账单地址', 'payment' => [ 'index' => '请付款', diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index 115b61ca..f3176bf2 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -371,6 +371,11 @@ }, checkedBtnCheckoutConfirm() { + if (!this.form.payment_address_id) { + layer.msg('{{ __('shop/checkout.error_payment_address') }}', ()=>{}) + return; + } + $http.post('/checkout/confirm', this.form).then((res) => { location = 'orders/' + res.number + '/success?type=create' })