diff --git a/src/api/order.js b/src/api/order.js index 67ae2aa..b2ca282 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -7,6 +7,12 @@ import request from './request' export function orderListApi(data) { return request.get('store/order/lst', data) } +/** + * @description 订单 -- 下载物流公司对照表 + */ +export function downloadLogisticsApi() { + return request.get('/excel/download/express') +} /** * @description 开启退款 */ diff --git a/src/api/setting.js b/src/api/setting.js index fcb5386..261196e 100644 --- a/src/api/setting.js +++ b/src/api/setting.js @@ -14,6 +14,12 @@ export function menuRoleApi(data) { export function serviceCodeApi() { return request.get(`service/code`) } +/** + * @description 签署 -- 签署链接 + */ +export function contactApi() { + return request.get(`contact`) +} /** * @description 商品上架费用 -- 列表 * @param {Object} param params {Object} 传值参数 diff --git a/src/views/order/index.vue b/src/views/order/index.vue index da55485..c433b9a 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -128,6 +128,7 @@ 导入批量发货 批量发货记录 + 导出全部物流公司 @@ -477,7 +478,8 @@ import { exprTempsLst, getEleTempData, getDeliveryStoreLst, - openRefundApi + openRefundApi, + downloadLogisticsApi } from '@/api/order' import createWorkBook from '@/utils/newToExcel.js' import { serveInfoApi } from '@/api/setting' @@ -1013,7 +1015,7 @@ export default { }, // 下载物流公司对照表 downloadLogistics() { - window.open(SettingMer.https + `/excel/download/express?token=` + getToken()) + window.open(`${location.origin}/statics/express.xlsx`) }, // 订单核销 orderCancellation(code) { diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index fa62b8d..6950cb1 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -538,7 +538,7 @@ - + 点击上传 - @@ -1059,6 +1058,14 @@ class="priceBox" disabled /> + + + + + + + + -