From 3311568e5076cc97ac4d72628269918214431b21 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Tue, 25 Jan 2022 19:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/public/config.js | 6 +-- seller/src/api/goods.js | 38 +++++++-------- seller/src/api/index.js | 10 ++-- seller/src/api/order.js | 46 +++++++++---------- seller/src/api/pages.js | 2 +- seller/src/api/shops.js | 30 ++++++------ seller/src/libs/axios.js | 2 +- .../src/views/my-components/verify/verify.js | 4 +- .../views/order/order/exportOrderDeliver.vue | 2 +- 9 files changed, 69 insertions(+), 71 deletions(-) diff --git a/seller/public/config.js b/seller/public/config.js index 69441029..09ba18de 100644 --- a/seller/public/config.js +++ b/seller/public/config.js @@ -3,10 +3,8 @@ var BASE = { * @description api请求基础路径 */ API_DEV: { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", - seller: "https://store-api.pickmall.cn", - manager: "https://admin-api.pickmall.cn" + common: "http://127.0.0.1:8888", + seller: "http://127.0.0.1:8888" }, API_PROD: { common: "https://common-api.pickmall.cn", diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js index ae41ef83..b85ce2ef 100644 --- a/seller/src/api/goods.js +++ b/seller/src/api/goods.js @@ -144,7 +144,7 @@ export const getGoodsSkuData = params => { // 获取商品分页列表 export const getGoodsListData = params => { - return getRequest("/goods/list", params); + return getRequest("/goods/goods/list", params); }; // 获取待审核商品分页列表 export const getAuthGoodsListData = params => { @@ -178,7 +178,7 @@ export const getShopGoodsLabelListSeller = () => { //查询分类绑定参数信息 export const getCategoryParamsListData = (id, params) => { - return getRequest(`/goods/category/parameters/${id}`, params); + return getRequest(`/goods/categoryParameters/${id}`, params); }; //查询商品绑定参数信息 export const getCategoryParamsByGoodsId = (goodsId, categoryId) => { @@ -194,11 +194,11 @@ export const deleteParams = (id, params) => { }; //更新或者保存参数组 export const insertOrUpdateParamsGroup = params => { - return postRequest("/goods/category/parameters/save", params); + return postRequest("/goods/categoryParameters/save", params); }; //删除参数组 export const deleteParamsGroup = (id, params) => { - return deleteRequest(`/goods/category/parameters/${id}`, params); + return deleteRequest(`/goods/categoryParameters/${id}`, params); }; //获取sku列表 @@ -226,38 +226,38 @@ export const insertSpecSeller = params => { // 更新商品库存 export const updateGoodsSkuStocks = params => { - return putRequest("/goods/update/stocks", params, { + return putRequest("/goods/goods/update/stocks", params, { "Content-Type": "application/json" }); }; // 获取商品分页列表 export const getGoodsListDataSeller = params => { - return getRequest("/goods/list", params); + return getRequest("/goods/goods/list", params); }; // 获取商品告警分页列表 export const getGoodsListDataByStockSeller = params => { - return getRequest("/goods/list/stock", params); + return getRequest("/goods/goods/list/stock", params); }; // 获取商品详情 export const getGoods = id => { - return getRequest(`/goods/get/${id}`); + return getRequest(`/goods/goods/get/${id}`); }; // 上架商品 export const upGoods = params => { - return putRequest(`/goods/up`, params); + return putRequest(`/goods/goods/up`, params); }; // 删除商品 export const deleteGoods = params => { - return putRequest(`/goods/delete`, params); + return putRequest(`/goods/goods/delete`, params); }; // 下架商品 export const lowGoods = params => { - return putRequest(`/goods/under`, params); + return putRequest(`/goods/goods/under`, params); }; // 获取商品单位列表 export const getGoodsUnitList = () => { - return getRequest(`/goods/unit`); + return getRequest(`/goods/goodsUnit`); }; //根据分类id获取关联品牌 export const getCategoryBrandListDataSeller = (category_id, params) => { @@ -265,42 +265,42 @@ export const getCategoryBrandListDataSeller = (category_id, params) => { }; export function createGoods(params) { - return postRequest("/goods/create", params, { + return postRequest("/goods/goods/create", params, { "Content-Type": "application/json" }); } export function editGoods(goodsId, params) { - return putRequest(`/goods/update/${goodsId}`, params, { + return putRequest(`/goods/goods/update/${goodsId}`, params, { "Content-Type": "application/json" }); } // 获取草稿商品分页列表 export const getDraftGoodsListData = params => { - return getRequest("/draft/goods/page", params); + return getRequest("/goods/draftGoods/page", params); }; // 获取草稿商品详情 export const getDraftGoodsDetail = id => { - return getRequest(`/draft/goods/${id}`); + return getRequest(`/goods/draftGoods/${id}`); }; // 保存草稿商品 export function saveDraftGoods(params) { - return postRequest("/draft/goods/save", params, { + return postRequest("/goods/draftGoods/save", params, { "Content-Type": "application/json" }); } // 删除草稿商品 export const deleteDraftGoods = id => { - return deleteRequest(`/draft/goods/${id}`); + return deleteRequest(`/goods/draftGoods/${id}`); }; //查询分类绑定参数信息 export const getCategoryParamsListDataSeller = (id, params) => { - return getRequest(`/goods/category/parameters/${id}`, params); + return getRequest(`/goods/categoryParameters/${id}`, params); }; //保存获取关联规格 diff --git a/seller/src/api/index.js b/seller/src/api/index.js index b5563c7f..0ce491b4 100644 --- a/seller/src/api/index.js +++ b/seller/src/api/index.js @@ -16,7 +16,7 @@ export const getAllCity = (params) => { // 登陆 export const getHomeNotice = params => { - return getRequest("/article/getByPage?type=STORE_ARTICLE&pageSize=15"); + return getRequest("/other/article/getByPage?type=STORE_ARTICLE&pageSize=15"); }; @@ -29,12 +29,12 @@ export const getSellerHomeData = params => { // 登陆 export const login = params => { - return postRequestWithNoTokenData("/login/userLogin", params); + return postRequestWithNoTokenData("/passport/login/userLogin", params); }; // 登出 export const logout = () => { - return postRequest("/login/logout"); + return postRequest("/passport/login/logout"); }; // 获取用户登录信息 @@ -43,7 +43,7 @@ export const userInfo = params => { }; // 获取登录信息 export const userMsg = params => { - return getRequest('/settings', params) + return getRequest('/settings/storeSettings', params) } // 注册 export const regist = params => { @@ -240,7 +240,7 @@ export const aliDownloadFile = (fKey, params) => { // base64上传 export const base64Upload = params => { - return postRequest("/upload/file", params); + return postRequest("/common/common/upload/file", params); }; diff --git a/seller/src/api/order.js b/seller/src/api/order.js index 674fe00f..a6719180 100644 --- a/seller/src/api/order.js +++ b/seller/src/api/order.js @@ -5,66 +5,66 @@ import { baseUrl } from "@/libs/axios.js"; // 下载待发货的订单列表 export const verificationCode = verificationCode => { - return getRequest(`/orders/getOrderByVerificationCode/${verificationCode}`); + return getRequest(`/order/order/getOrderByVerificationCode/${verificationCode}`); }; // 下载待发货的订单列表 export const downLoadDeliverExcel = params => { - return getRequest(`/orders/downLoadDeliverExcel`, params, 'blob'); + return getRequest(`/order/order/downLoadDeliverExcel`, params, 'blob'); }; // 导出待发货订单 export const queryExportOrder = params => { - return getRequest(`/orders/queryExportOrder`, params); + return getRequest(`/order/order/queryExportOrder`, params); }; // 上传待发货的订单列表 export const uploadDeliverExcel = params => { - return postRequestWithNoForm(`/orders/batchDeliver`, params ); + return postRequestWithNoForm(`/order/order/batchDeliver`, params ); }; // 获取普通订单列表 export const getOrderList = params => { - return getRequest(`/orders`, params); + return getRequest(`/order/order`, params); }; // 获取普通订单详细信息 export const getOrderDetail = sn => { - return getRequest(`/orders/${sn}`); + return getRequest(`/order/order/${sn}`); }; // 调整订单金额 export const modifyOrderPrice = (sn, params) => { - return putRequest(`/orders/update/${sn}/price`, params); + return putRequest(`/order/order/update/${sn}/price`, params); }; // 取消订单 export const cancelOrder = (sn, params) => { - return postRequest(`/orders/${sn}/cancel`, params); + return postRequest(`/order/order/${sn}/cancel`, params); }; // 修改收货地址 export const editOrderConsignee = (sn, params) => { - return postRequest(`/orders/update/${sn}/consignee`, params); + return postRequest(`/order/order/update/${sn}/consignee`, params); }; //获取投诉列表 export const getComplainPage = params => { - return getRequest(`/complain`, params); + return getRequest(`/order/complain`, params); }; //获取投诉详情 export const getComplainDetail = id => { - return getRequest(`/complain/${id}`); + return getRequest(`/order/complain/${id}`); }; //添加交易投诉对话 export const addOrderComplaint = params => { - return postRequest(`/complain/communication/`, params); + return postRequest(`/order/complain/communication/`, params); }; //添加交易投诉对话 export const appeal = params => { - return putRequest(`/complain/appeal`, params); + return putRequest(`/order/complain/appeal`, params); }; //获取订单日志 @@ -74,7 +74,7 @@ export const getOrderLog = (sn, params) => { // 订单发货 export const orderDelivery = (sn, params) => { - return postRequest(`/orders/${sn}/delivery`, params); + return postRequest(`/order/order/${sn}/delivery`, params); }; // 获取商家选中的物流公司 @@ -84,44 +84,44 @@ export const getLogisticsChecked = () => { // 订单核验 export const orderTake = (sn, verificationCode) => { - return putRequest(`/orders/take/${sn}/${verificationCode}`); + return putRequest(`/order/order/take/${sn}/${verificationCode}`); }; // 售后服务单 export const afterSaleOrderPage = params => { - return getRequest(`/afterSale/page`, params); + return getRequest(`/order/afterSale/page`, params); }; // 售后服务单详情 export const afterSaleOrderDetail = sn => { - return getRequest(`/afterSale/${sn}`); + return getRequest(`/order/afterSale/${sn}`); }; // 商家审核 export const afterSaleSellerReview = (sn, params) => { - return putRequest(`/afterSale/review/${sn}`, params); + return putRequest(`/order/afterSale/review/${sn}`, params); }; // 商家确认收货 export const afterSaleSellerConfirm = (sn, params) => { - return putRequest(`/afterSale/confirm/${sn}`, params); + return putRequest(`/order/afterSale/confirm/${sn}`, params); }; // 商家换货业务发货 export const afterSaleSellerDelivery = (sn, params) => { - return postRequest(`/afterSale/${sn}/delivery`, params); + return postRequest(`/order/afterSale/${sn}/delivery`, params); }; //查询物流 export const getTraces = (sn, params) => { - return getRequest(`/orders/getTraces/${sn}`, params); + return getRequest(`/order/order/getTraces/${sn}`, params); }; //售后单查询物流 export const getSellerDeliveryTraces = (sn, params) => { - return getRequest(`/afterSale/getSellerDeliveryTraces/${sn}`, params); + return getRequest(`/order/afterSale/getSellerDeliveryTraces/${sn}`, params); }; //售后单查询物流 export const getAfterSaleTraces = (sn, params) => { - return getRequest(`/afterSale/getDeliveryTraces/${sn}`, params); + return getRequest(`/order/afterSale/getDeliveryTraces/${sn}`, params); }; //获取发票列表 export const getReceiptPage = params => { diff --git a/seller/src/api/pages.js b/seller/src/api/pages.js index f3879c77..3adecfae 100644 --- a/seller/src/api/pages.js +++ b/seller/src/api/pages.js @@ -92,7 +92,7 @@ export const seeArticle = (id) => { } //获取文章列表数据 export const getArticle = (params) => { - return getRequest('/article/getByPage', params) + return getRequest('/other/article/getByPage', params) } diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js index eb6bb46e..2acaa049 100644 --- a/seller/src/api/shops.js +++ b/seller/src/api/shops.js @@ -14,27 +14,27 @@ export const getShopListData = (params) => { } // 获取结算单分页 export const getBillPage = (params) => { - return getRequest(`/bill/getByPage`, params) + return getRequest(`/member/bill/getByPage`, params) } // 获取商家结算单流水分页 export const getSellerFlow = (id, params) => { - return getRequest(`/bill/${id}/getStoreFlow`, params) + return getRequest(`/member/bill/${id}/getStoreFlow`, params) } // 商家核对结算单 export const reconciliation = (id, params) => { - return putRequest(`/bill/check/${id}/`, params) + return putRequest(`/member/bill/check/${id}/`, params) } // 获取商家分销订单流水分页 export const getDistributionFlow = (id, params) => { - return getRequest(`/bill/${id}/getDistributionFlow`, params) + return getRequest(`/member/bill/${id}/getDistributionFlow`, params) } // 获取商家结算单详细 export const getBillDetail = (id, params) => { - return getRequest(`/bill/get/${id}`, params) + return getRequest(`/member/bill/get/${id}`, params) } // 获取所有物流公司 @@ -73,48 +73,48 @@ export const deleteShopAddress = (id) => { // 获取商家详细信息 export const getShopInfo = () => { - return getRequest(`/settings`) + return getRequest(`/settings/storeSettings`) } // 保存商家详细信息 export const saveShopInfo = (params) => { - return putRequest(`/settings`, params) + return putRequest(`/settings/storeSettings`, params) } //获取商家退货地址 export const getRefundGoodsAddress = () => { - return getRequest(`/settings/storeAfterSaleAddress`) + return getRequest(`/settings/storeSettings/storeAfterSaleAddress`) } //修改商家退货地址 export const saveRefundGoodsAddress = (params) => { - return putRequest(`/settings/storeAfterSaleAddress`, params) + return putRequest(`/settings/storeSettings/storeAfterSaleAddress`, params) } //修改im商户id export const updatEmerchantId = (params) => { - return putRequest(`/settings/merchantEuid`, params) + return putRequest(`/settings/storeSettings/merchantEuid`, params) } //修改保存库存预警数 export const updateStockWarning = (params) => { - return putRequest(`/settings/updateStockWarning`, params) + return putRequest(`/settings/storeSettings/updateStockWarning`, params) } //查询运费模板 export const getShipTemplate = () => { - return getRequest(`/freightTemplate`) + return getRequest(`/setting/freightTemplate`) } //删除运费模板 export const deleteShipTemplate = (id) => { - return deleteRequest(`/freightTemplate/${id}`) + return deleteRequest(`/setting/freightTemplate/${id}`) } //新增运费模板 export const addShipTemplate = (params, headers) => { - return postRequest(`/freightTemplate`, params, headers) + return postRequest(`/setting/freightTemplate`, params, headers) } //新增运费模板 export const editShipTemplate = (id, params, headers) => { - return putRequest(`/freightTemplate/${id}`, params, headers) + return putRequest(`/setting/freightTemplate/${id}`, params, headers) } diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js index 4d00fe4a..b96ffada 100644 --- a/seller/src/libs/axios.js +++ b/seller/src/libs/axios.js @@ -16,7 +16,7 @@ export const commonUrl = ? BASE.API_DEV.common : BASE.API_PROD.common; // 文件上传接口 -export const uploadFile = commonUrl + "/common/upload/file"; +export const uploadFile = commonUrl + "/common/common/upload/file"; var isRefreshToken = 0; const refreshToken = getTokenDebounce(); const service = axios.create({ diff --git a/seller/src/views/my-components/verify/verify.js b/seller/src/views/my-components/verify/verify.js index 9282f5b3..e4504224 100644 --- a/seller/src/views/my-components/verify/verify.js +++ b/seller/src/views/my-components/verify/verify.js @@ -4,10 +4,10 @@ import {commonUrl, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/a // 获取拼图验证 export const getVerifyImg = (verificationEnums) => { - return getRequestWithNoToken(`${commonUrl}/common/slider/${verificationEnums}`); + return getRequestWithNoToken(`${commonUrl}/common/common/slider/${verificationEnums}`); }; // 拼图验证 export const postVerifyImg = (params) => { - return postRequestWithNoToken(`${commonUrl}/common/slider/${params.verificationEnums}`, params); + return postRequestWithNoToken(`${commonUrl}/common/common/slider/${params.verificationEnums}`, params); }; diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index a48bf3fa..d0af22fb 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -52,7 +52,7 @@ export default { data() { return { file: "", - action: baseUrl + "/orders/batchDeliver", // 上传接口 + action: baseUrl + "/order/order/batchDeliver", // 上传接口 accessToken: {}, // 验证token // 步骤集合 stepList: [