From 99c09459890427c7ebdc0a0667d6be83423cb5db Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 13 Oct 2025 09:53:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90mall=20=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E9=97=A8=E5=BA=97=E7=AE=A1=E7=90=86=E7=9A=84=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=EF=BC=88antd=20100%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/trade/delivery/pickUpStore/index.ts  | 17 ++---
 .../mall/trade/delivery/pickUpStore/data.ts   | 28 --------
 .../pickUpStore/modules/bind-form.vue         | 13 ++--
 .../delivery/pickUpStore/modules/form.vue     | 68 ++++++++++++++++++-
 4 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
index b97f2c3d5..321df41fb 100644
--- a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
+++ b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
@@ -29,21 +29,18 @@ export namespace MallDeliveryPickUpStoreApi {
     longitude: number;
     /** 状态 */
     status: number;
-    /** 绑定用户编号组数 */
-    verifyUserIds: number[];
     /** 营业时间 用于fieldMappingTime */
     rangeTime: any[];
+    /** 绑定用户编号组数 */
+    verifyUserIds?: number[];
+    verifyUsers?: any[];
   }
 
   /** 绑定自提店员请求 */
-  export interface BindStaffRequest {
+  export interface DeliveryPickUpBindReqVO {
     id?: number;
-    /** 门店名称 */
-    name: string;
-    /** 门店编号 */
-    storeId: number;
     /** 用户编号列表 */
-    userIds: number[];
+    verifyUserIds: number[];
   }
 }
 
@@ -89,8 +86,8 @@ export function deleteDeliveryPickUpStore(id: number) {
 }
 
 /** 绑定自提店员 */
-export function bindStoreStaffId(
-  data: MallDeliveryPickUpStoreApi.BindStaffRequest,
+export function bindDeliveryPickUpStore(
+  data: MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO,
 ) {
   return requestClient.post('/trade/delivery/pick-up-store/bind', data);
 }
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
index d8bb851c6..612d9aaef 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
@@ -119,16 +119,6 @@ export function useFormSchema(): VbenFormSchema[] {
         placeholder: '请输入门店纬度',
       },
     },
-    // TODO @xingyu：缺少地图
-    {
-      component: 'Input',
-      fieldName: 'getGeo',
-      label: '获取经纬度',
-      formItemClass: 'col-span-2',
-      componentProps: {
-        placeholder: '点击获取经纬度',
-      },
-    },
   ];
 }
 
@@ -165,24 +155,6 @@ export function useBindFormSchema(): VbenFormSchema[] {
         placeholder: '请选择门店店员',
       },
     },
-    {
-      component: 'Select',
-      fieldName: 'verifyUsers',
-      label: '店员列表',
-      rules: 'required',
-      componentProps: {
-        options: [],
-        mode: 'tags',
-        placeholder: '店员列表',
-      },
-      dependencies: {
-        triggerFields: ['verifyUserIds'],
-        trigger(values, form) {
-          form.setFieldValue('verifyUsers', values.verifyUserIds);
-        },
-        disabled: true,
-      },
-    },
   ];
 }
 
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
index 5977ba6c5..379b0561a 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
 
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -9,7 +9,7 @@ import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import {
-  bindStoreStaffId,
+  bindDeliveryPickUpStore,
   getDeliveryPickUpStore,
 } from '#/api/mall/trade/delivery/pickUpStore';
 import { $t } from '#/locales';
@@ -41,9 +41,9 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data =
-      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.BindStaffRequest;
+      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO;
     try {
-      await bindStoreStaffId(data);
+      await bindDeliveryPickUpStore(data);
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data =
-      modalApi.getData<MallDeliveryPickUpStoreApi.BindStaffRequest>();
+      modalApi.getData<MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO>();
     if (!data || !data.id) {
       return;
     }
@@ -67,6 +67,9 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDeliveryPickUpStore(data.id);
       // 设置到 values
+      formData.value.verifyUserIds = formData.value.verifyUsers?.map(
+        (item: any) => item.id,
+      );
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
index 67c744dbd..79d7ea8b3 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
@@ -5,10 +5,11 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { message } from 'ant-design-vue';
+import { Button, message } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
 import { useVbenForm } from '#/adapter/form';
+import { getTradeConfig } from '#/api/mall/trade/config';
 import {
   createDeliveryPickUpStore,
   getDeliveryPickUpStore,
@@ -26,6 +27,50 @@ const getTitle = computed(() => {
     : $t('ui.actionTitle.create', ['门店']);
 });
 
+const mapVisible = ref(false); // 是否显示地图弹窗
+const tencentLbsUrl = ref(''); // 腾讯位置服务 url
+
+/** 获取经纬度相关方法 */
+function selectAddress(loc: any) {
+  if (loc.latlng?.lat) {
+    formApi.setFieldValue('latitude', loc.latlng.lat);
+  }
+  if (loc.latlng?.lng) {
+    formApi.setFieldValue('longitude', loc.latlng.lng);
+  }
+  mapVisible.value = false;
+}
+
+/** 初始化腾讯地图 */
+async function initTencentLbsMap() {
+  // 从配置中获取腾讯地图的 key
+  const data = await getTradeConfig();
+  const key = data.tencentLbsKey;
+  if (!key) {
+    message.warning('请先配置腾讯位置服务的 key');
+    return;
+  }
+
+  // 设置 url
+  if (!window) {
+    return;
+  }
+  (window as any).selectAddress = selectAddress;
+  window.addEventListener(
+    'message',
+    (event) => {
+      // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+      const loc = event.data;
+      if (loc && loc.module === 'locationPicker') {
+        // 防止其他应用也会向该页面 post 信息，需判断 module 是否为 'locationPicker'
+        (window.parent as any).selectAddress(loc);
+      }
+    },
+    false,
+  );
+  tencentLbsUrl.value = `https://apis.map.qq.com/tools/locpicker?type=1&key=${key}&referer=myapp`;
+}
+
 const [Form, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
@@ -70,6 +115,8 @@ const [Modal, modalApi] = useVbenModal({
     // 加载数据
     const data = modalApi.getData<MallDeliveryPickUpStoreApi.PickUpStore>();
     if (!data || !data.id) {
+      // 初始化地图
+      await initTencentLbsMap();
       return;
     }
     modalApi.lock();
@@ -83,6 +130,8 @@ const [Modal, modalApi] = useVbenModal({
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
+      // 初始化地图
+      await initTencentLbsMap();
     }
   },
 });
@@ -91,5 +140,22 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-4" />
+    <template #prepend-footer>
+      <Button @click="mapVisible = true"> 获取经纬度 </Button>
+    </template>
   </Modal>
+
+  <!-- 地图弹窗 -->
+  <a-modal
+    v-model:open="mapVisible"
+    title="获取经纬度"
+    :width="800"
+    :footer="null"
+  >
+    <iframe
+      v-if="mapVisible && tencentLbsUrl"
+      :src="tencentLbsUrl"
+      class="h-[600px] w-full border-0"
+    ></iframe>
+  </a-modal>
 </template>