diff --git a/src/api/sameCityTransport/sameCityTransport.js b/src/api/sameCityTransport/sameCityTransport.js new file mode 100644 index 0000000..ea252cf --- /dev/null +++ b/src/api/sameCityTransport/sameCityTransport.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' +import { URL } from '@/config' + + +export function getSameCityTransport(params){ + return request({ + url: URL.shop.store.sameCityTransport.getSameCityTransport, + method: 'get', + params, + }) +} + +export function delectArea(params){ + return request({ + url: URL.shop.store.sameCityTransport.delectArea, + method: 'post', + params, + }) +} + + +export function saveSameCityTransport(params){ + params = JSON.stringify(params) + return request({ + url: URL.shop.store.sameCityTransport.saveSameCityTransport, + method: 'post', + headers: { + 'Content-Type': 'application/json', + }, + data:params, + }) +} diff --git a/src/baiduMap/index.js b/src/baiduMap/index.js index 48978c4..d1e0756 100644 --- a/src/baiduMap/index.js +++ b/src/baiduMap/index.js @@ -8,10 +8,11 @@ import BaiduMap from './../components/baidu_Map_xiufu' // ak: 'uwBrIUOZuTDMHsuRGm0hdmeG9sosN8sQ', // }) +//xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI Vue.use(BaiduMap, { // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */ - ak: 'xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI', + ak: 'chsSzRvFcU1uXYoDHAHlsF98NkTVbzvE', }) diff --git a/src/config/net.config.js b/src/config/net.config.js index 65d0de7..048c30b 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -1029,6 +1029,11 @@ let url = { updatePrnterStatus: api_url + '/admin/shop/store/printer/status/update', //商家端-测试打印 testPrinter:api_url + '/admin/shop/store/printer/print/order' + }, + sameCityTransport:{ + getSameCityTransport: api_url + '/admin/shop/store/same-city-transport/detail', + saveSameCityTransport: api_url + '/admin/shop/store/same-city-transport/save', + delectArea:api_url + '/admin/shop/store/same-city-transport/delete/area' } }, user: { diff --git a/src/views/store/base/distributionSetup/localDelivery.vue b/src/views/store/base/distributionSetup/localDelivery.vue index e5e252e..a503ec5 100644 --- a/src/views/store/base/distributionSetup/localDelivery.vue +++ b/src/views/store/base/distributionSetup/localDelivery.vue @@ -422,9 +422,9 @@ - 按不同区域 + 按不同区域 按不同距离 - 按行政区域 + 按行政区域 - 半径 - 自定义 + 半径 + 自定义 kg - + @@ -535,7 +538,7 @@
-
+
删除
@@ -677,7 +680,7 @@
-
+
+添加配送区域{{ - form.divideType == 0 + form.divideType == 1 ? mapForm.radiusList.length : mapForm.customList.length }}/10 @@ -827,10 +830,10 @@ @ready="handlerBaiduMap" > -
+