diff --git a/.env.development b/.env.development
index b8ccd8b..fbcc74b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
#VITE_SERVER_API_URL=http://127.0.0.1:8000/api
diff --git a/src/api/shop/shopStore/model/index.ts b/src/api/shop/shopStore/model/index.ts
index 81f5e33..34a7cd6 100644
--- a/src/api/shop/shopStore/model/index.ts
+++ b/src/api/shop/shopStore/model/index.ts
@@ -7,11 +7,9 @@ export interface ShopStore {
// 自增ID
id?: number;
// 店铺名称
- shopName?: string;
- // 门店横幅/图片
- shopBanner?: string;
+ name?: string;
// 门店地址
- shopAddress?: string;
+ address?: string;
// 手机号码
phone?: string;
// 邮箱
@@ -28,10 +26,12 @@ export interface ShopStore {
region?: string;
// 经度和纬度
lngAndLat?: string;
- // 经度(部分接口可能拆分返回)
- lng?: string;
- // 纬度(部分接口可能拆分返回)
- lat?: string;
+ // 位置
+ location?:string;
+ // 区域
+ district?: string;
+ // 轮廓
+ points?: string;
// 用户ID
userId?: number;
// 状态
diff --git a/src/views/shop/shopDealerWithdraw/index.vue b/src/views/shop/shopDealerWithdraw/index.vue
index 8c5c663..cff9c8f 100644
--- a/src/views/shop/shopDealerWithdraw/index.vue
+++ b/src/views/shop/shopDealerWithdraw/index.vue
@@ -25,7 +25,7 @@
>待审核
转账成功审核通过
用户取消
已打款
@@ -443,7 +443,7 @@
},
// 行双击事件
onDblclick: () => {
- // openEdit(record);
+ openEdit(record);
}
};
};
diff --git a/src/views/shop/shopStore/components/shopStoreEdit.vue b/src/views/shop/shopStore/components/shopStoreEdit.vue
index 8c0786c..03a5255 100644
--- a/src/views/shop/shopStore/components/shopStoreEdit.vue
+++ b/src/views/shop/shopStore/components/shopStoreEdit.vue
@@ -20,11 +20,11 @@
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
-
+
@@ -49,11 +49,11 @@
placeholder="请选择省/市/区"
/>
-
+
@@ -66,6 +66,25 @@
获取经纬度
+
+
+
+
+ 使用腾讯地图的工具绘制电子围栏
+
+
+
({
id: undefined,
- shopName: undefined,
- shopAddress: undefined,
+ name: undefined,
+ address: undefined,
phone: undefined,
email: undefined,
managerName: undefined,
@@ -142,6 +161,9 @@
city: undefined,
region: undefined,
lngAndLat: undefined,
+ location: undefined,
+ district: undefined,
+ points: undefined,
userId: undefined,
isDelete: undefined,
tenantId: undefined,
@@ -159,7 +181,7 @@
// 表单验证规则
const rules = reactive({
- shopName: [
+ name: [
{
required: true,
type: 'string',
@@ -183,7 +205,7 @@
trigger: 'change'
}
],
- shopAddress: [
+ address: [
{
required: true,
type: 'string',
diff --git a/src/views/shop/shopStore/index.vue b/src/views/shop/shopStore/index.vue
index 5ea17a2..6b2c99d 100644
--- a/src/views/shop/shopStore/index.vue
+++ b/src/views/shop/shopStore/index.vue
@@ -20,6 +20,9 @@
/>
+
+ {{ record.name }}
+
@@ -49,7 +52,7 @@