From 9212617242a94a2e2676906bbffcb793d5424936 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 30 Aug 2022 11:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E8=B4=A6=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E5=9C=B0=E5=9D=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beike/admin/views/pages/products/form/form.blade.php     | 4 ++--
 resources/lang/en/shop/checkout.php                          | 1 +
 resources/lang/zh_cn/shop/checkout.php                       | 1 +
 themes/default/checkout.blade.php                            | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

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 @@
                           <div class="title">
                             <div>
                               <b>@{{ variant.name[current_language_code] }}</b>
-                              <el-link type="primary" @click="modalVariantOpenButtonClicked(variantIndex, null)">{{ __('admin/product.edit') }}</el-link>
-                              <el-link type="danger" class="ms-2" @click="removeSourceVariant(variantIndex)">{{ __('admin/product.delete') }}</el-link>
+                              <el-link type="primary" @click="modalVariantOpenButtonClicked(variantIndex, null)">{{ __('common.edit') }}</el-link>
+                              <el-link type="danger" class="ms-2" @click="removeSourceVariant(variantIndex)">{{ __('common.delete') }}</el-link>
                             </div>
                             <div>
                               <el-checkbox v-model="variant.isImage" border size="mini" class="me-2 bg-white">{{ __('admin/product.add_variable_image') }}</el-checkbox>
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'
           })