From ecb1212a2b09abd7cf5c3ca92f7c00e2ceb9b54d Mon Sep 17 00:00:00 2001
From: wangchen147 <30853657+wangchen147@users.noreply.github.com>
Date: Fri, 16 May 2025 09:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=8F=92=E4=BB=B6=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../addon/shop/admin/views/address/edit.vue | 5 +-
.../shop/admin/views/delivery/store_edit.vue | 127 +-
webroot/addon/shop/jar/shop.jar | Bin 3147058 -> 3146944 bytes
.../order/ShopOrderDeliveryController.java | 4 +-
.../goods/impl/ShopGoodsServiceImpl.java | 7 -
.../api/cart/impl/ShopCartServiceImpl.java | 3 +
.../api/goods/impl/GoodsServiceImpl.java | 2 +-
.../impl/CoreManjianServiceImpl.java | 8 +-
.../CoreOrderBatchDeliveryServiceImpl.java | 2 +-
webroot/addon/shop/menu/site.json | 2373 -----------------
.../addon/shop/uni-app/pages/goods/cart.vue | 2 +-
11 files changed, 78 insertions(+), 2455 deletions(-)
diff --git a/webroot/addon/shop/admin/views/address/edit.vue b/webroot/addon/shop/admin/views/address/edit.vue
index c59fa07f..3fd455f7 100644
--- a/webroot/addon/shop/admin/views/address/edit.vue
+++ b/webroot/addon/shop/admin/views/address/edit.vue
@@ -42,7 +42,7 @@
-
+
@@ -326,7 +326,8 @@ const areaChange = debounce(() => {
const address = [
formData.province_id ? provinceRef.value.states.selectedLabel : '',
formData.city_id ? cityRef.value.states.selectedLabel : '',
- formData.district_id ? districtRef.value.states.selectedLabel : ''
+ formData.district_id ? districtRef.value.states.selectedLabel : '',
+ formData.address
]
addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
diff --git a/webroot/addon/shop/admin/views/delivery/store_edit.vue b/webroot/addon/shop/admin/views/delivery/store_edit.vue
index eaf0d19d..1b276fb9 100644
--- a/webroot/addon/shop/admin/views/delivery/store_edit.vue
+++ b/webroot/addon/shop/admin/views/delivery/store_edit.vue
@@ -1,63 +1,63 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ t('tradeTimeTips') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ t('tradeTimeTips') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+