From 2bb83153a9f8dd2d4b80be1df11e70aad5468325 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 12 Aug 2022 16:00:57 +0800
Subject: [PATCH] https://guangdagit.com/beike/beikeshop/issues/25

---
 .../views/pages/customers/form.blade.php      | 20 +++++++++----------
 themes/default/account/address.blade.php      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php
index dd592b0b..cfab7651 100644
--- a/resources/beike/admin/views/pages/customers/form.blade.php
+++ b/resources/beike/admin/views/pages/customers/form.blade.php
@@ -239,16 +239,16 @@
         },
 
         deleteAddress(id, index) {
-          const self = this;
-
-          $.ajax({
-            url: `/admin/customers/{{ $customer['id'] }}/addresses/${id}`,
-            type: 'delete',
-            success: function(res) {
-              self.$message.success(res.message);
-              self.addresses.splice(index, 1)
-            }
-          })
+          this.$confirm('确定要删除地址吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            $http.delete(`customers/{{ $customer['id'] }}/addresses/${id}`).then((res) => {
+              this.$message.success(res.message);
+              this.addresses.splice(index, 1)
+            })
+          }).catch(()=>{})
         },
 
         addressFormSubmit(form) {
diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php
index 19009cc7..49a38dae 100644
--- a/themes/default/account/address.blade.php
+++ b/themes/default/account/address.blade.php
@@ -166,7 +166,7 @@
           this.editIndex = null;
 
           Object.keys(this.form).forEach(key => this.form[key] = '')
-          this.form.country_id =  @json((int)setting('base.country_id'))
+          this.form.country_id =  @json((int)system_setting('base.country_id'))
         },
 
         countryChange(e) {