From 1c3d711298d47f6a265013fceba18af3607ec0b7 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Thu, 20 Jan 2022 17:21:30 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/public/config.js | 9 ++++----- buyer/src/api/goods.js | 2 +- buyer/src/api/member.js | 10 +++++----- manager/public/config.js | 7 ++----- manager/src/api/common.js | 4 ++-- manager/src/api/distribution.js | 8 ++++---- manager/src/api/goods.js | 4 ++-- manager/src/api/index.js | 12 ++++++------ manager/src/api/other.js | 2 +- manager/src/views/my-components/verify/verify.js | 4 ++-- seller/src/api/distribution.js | 8 ++++---- seller/src/libs/routerJson.js | 4 ++-- 12 files changed, 35 insertions(+), 39 deletions(-) diff --git a/buyer/public/config.js b/buyer/public/config.js index f54f0890..d4394ce6 100644 --- a/buyer/public/config.js +++ b/buyer/public/config.js @@ -3,10 +3,10 @@ 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" + seller: "http://127.0.0.1:8888", + manager: "http://127.0.0.1:8888" + buyer: "http://127.0.0.1:8888", + common: "http://127.0.0.1:8888", }, API_PROD: { common: "https://common-api.pickmall.cn", @@ -15,4 +15,3 @@ var BASE = { manager: "https://admin-api.pickmall.cn" }, }; - \ No newline at end of file diff --git a/buyer/src/api/goods.js b/buyer/src/api/goods.js index 403a5c3f..de77e633 100644 --- a/buyer/src/api/goods.js +++ b/buyer/src/api/goods.js @@ -44,7 +44,7 @@ export function goodsSkuDetail (params) { // 获取所有商品分类 export function getCategory (parentId) { return request({ - url: `/buyer/category/get/${parentId}`, + url: `/buyer/goods/category/get/${parentId}`, method: Method.GET, needToken: false }); diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 815eb753..86dc640e 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -301,7 +301,7 @@ export function clearComplain (id) { */ export function distribution () { return request({ - url: `/buyer/distribution`, + url: `/buyer/distribution/distribution`, method: Method.GET, needToken: true }); @@ -314,7 +314,7 @@ export function distribution () { */ export function applyDistribution (params) { return request({ - url: `/buyer/distribution`, + url: `/buyer/distribution/distribution`, method: Method.POST, needToken: true, params @@ -326,7 +326,7 @@ export function applyDistribution (params) { */ export function getDistOrderList (params) { return request({ - url: `/buyer/distribution/distributionOrder`, + url: `/buyer/distribution/order`, method: Method.GET, needToken: true, params @@ -338,7 +338,7 @@ export function getDistOrderList (params) { */ export function getDistGoodsList (params) { return request({ - url: `/buyer/distributionGoods`, + url: `/buyer/distribution/goods`, method: Method.GET, needToken: true, params @@ -352,7 +352,7 @@ export function getDistGoodsList (params) { */ export function selectDistGoods (params) { return request({ - url: `/buyer/distributionGoods/checked/${params.distributionGoodsId}`, + url: `/buyer/distribution/goods/checked/${params.distributionGoodsId}`, method: Method.GET, needToken: true, params diff --git a/manager/public/config.js b/manager/public/config.js index da3cda52..da98823b 100644 --- a/manager/public/config.js +++ b/manager/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", + manager: "http://127.0.0.1:8888", }, API_PROD: { common: "https://common-api.pickmall.cn", @@ -27,4 +25,3 @@ var BASE = { */ PREFIX: "/manager" }; - \ No newline at end of file diff --git a/manager/src/api/common.js b/manager/src/api/common.js index d0690dda..f556a4c3 100644 --- a/manager/src/api/common.js +++ b/manager/src/api/common.js @@ -12,10 +12,10 @@ export const getRegion = (params) => { // 获取拼图验证 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/manager/src/api/distribution.js b/manager/src/api/distribution.js index 0e8c66b7..15ab8a91 100644 --- a/manager/src/api/distribution.js +++ b/manager/src/api/distribution.js @@ -4,21 +4,21 @@ import {getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios'; //查询分销商 export const getDistributionListData = (params) => { - return getRequest('/distribution/getByPage', params) + return getRequest('/distribution/distribution/getByPage', params) } //审核分销商 export const auditDistribution = (id, params) => { - return putRequest(`/distribution/audit/${id}`, params) + return putRequest(`/distribution/distribution/audit/${id}`, params) } // 清退分销商 export const retreatDistribution = (id, params) => { - return putRequest(`/distribution/retreat/${id}`, params) + return putRequest(`/distribution/distribution/retreat/${id}`, params) } // 恢复分销商 export const resumeDistribution = (id, params) => { - return putRequest(`/distribution/resume/${id}`, params) + return putRequest(`/distribution/distribution/resume/${id}`, params) } //保存更新分销设置 diff --git a/manager/src/api/goods.js b/manager/src/api/goods.js index 13a4a41a..34b2c770 100644 --- a/manager/src/api/goods.js +++ b/manager/src/api/goods.js @@ -26,11 +26,11 @@ export const disableBrand = (id, params) => { } //根据分类id获取关联品牌 export const getCategoryBrandListData = (category_id, params) => { - return getRequest(`/category/brand/${category_id}`, params) + return getRequest(`/goods/category/brand/${category_id}`, params) } //保存获取关联品牌 export const saveCategoryBrand = (category_id, params) => { - return postRequest(`/category/brand/${category_id}`, params) + return postRequest(`/goods/category/brand/${category_id}`, params) } //保存获取关联规格 export const saveCategorySpec = (category_id, params) => { diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 7aae14a2..66216a5b 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -48,7 +48,7 @@ export const getNoticePage = (params) => { // 登陆 export const login = (params) => { - return postRequestWithNoTokenData("/user/login", params); + return postRequestWithNoTokenData("/passport/user/login", params); }; // 登出 @@ -62,7 +62,7 @@ export const handleRefreshToken = (token) => { }; // 获取用户登录信息 export const userInfo = (params) => { - return getRequest("/user/info", params); + return getRequest("/passport/user/info", params); }; // 注册 export const regist = (params) => { @@ -237,7 +237,7 @@ export const getAllPermissionList = (params) => { // 获取全部权限数据 export const getCurrentPermissionList = (params) => { - return getRequest("/menu/memberMenu", params); + return getRequest("/permission/menu/memberMenu", params); }; // 添加权限 @@ -306,16 +306,16 @@ export const deleteMessageSend = (ids, params) => { // 分页获取文件数据 export const getFileListData = (params) => { - return getRequest("/file", params); + return getRequest("/common/file", params); }; // 重命名文件 export const renameFile = (params) => { - return postRequest("/file/rename", params); + return postRequest("/common/file/rename", params); }; // 删除文件 export const deleteFile = (ids, params) => { - return deleteRequest(`/file/delete/${ids}`, params); + return deleteRequest(`/common/file/delete/${ids}`, params); }; // 下载文件 export const aliDownloadFile = (fKey, params) => { diff --git a/manager/src/api/other.js b/manager/src/api/other.js index 7dd0ab29..9054f972 100644 --- a/manager/src/api/other.js +++ b/manager/src/api/other.js @@ -31,7 +31,7 @@ export const getHomeData = params => { */ export const getHomeList = params => { - return getRequest("/pageData/pageDataList", params); + return getRequest("/other/pageData/pageDataList", params); }; diff --git a/manager/src/views/my-components/verify/verify.js b/manager/src/views/my-components/verify/verify.js index 9282f5b3..e4504224 100644 --- a/manager/src/views/my-components/verify/verify.js +++ b/manager/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/api/distribution.js b/seller/src/api/distribution.js index 4f22c1e3..da525f6d 100644 --- a/seller/src/api/distribution.js +++ b/seller/src/api/distribution.js @@ -5,17 +5,17 @@ import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRe //获取分销商品列表 export const getDistributionGoods = (params) => { - return getRequest('/distributionGoods', params) + return getRequest('/distribution/goods', params) } // 取消分销商品 export const distributionGoodsCancel = (id) => { - return deleteRequest(`/distributionGoods/cancel/${id}`) + return deleteRequest(`/distribution/goods/cancel/${id}`) } // 选择分销商品 export const distributionGoodsCheck = (id,param) => { - return putRequest(`/distributionGoods/checked/${id}`,param) + return putRequest(`/distribution/goods/checked/${id}`,param) } @@ -51,7 +51,7 @@ export const getDistributionSetting = (id, params) => { //获取分销订单列表 export const getDistributionOrder = (params) => { - return getRequest('/distributionOrder', params) + return getRequest('/distribution/order', params) } diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js index 216fe8a8..692ad0e4 100644 --- a/seller/src/libs/routerJson.js +++ b/seller/src/libs/routerJson.js @@ -311,7 +311,7 @@ export const result = [{ type: 0, title: "分销商品", path: "distributionGoods", - component: "distribution/distributionGoods", + component: "distribution/distribution/goods", children: null }, { @@ -320,7 +320,7 @@ export const result = [{ type: 0, title: "分销订单", path: "distributionOrder", - component: "distribution/distributionOrder", + component: "distribution/distribution/order", children: null } ] From e1d7b1801d8f912e5e05ecc962c7974eabb311a0 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Fri, 21 Jan 2022 09:14:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/member.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manager/src/api/member.js b/manager/src/api/member.js index 48850755..d5fd20ee 100644 --- a/manager/src/api/member.js +++ b/manager/src/api/member.js @@ -35,12 +35,12 @@ export const insertOrUpdateSpec = params => { // 获取会员列表 export const getMemberListData = params => { - return getRequest("/member", params); + return getRequest("/passport/member", params); }; // 获取会员详情 export const getMemberInfoData = (id) => { - return getRequest(`/member/${id}`); + return getRequest(`/passport/member/${id}`); }; // 修改会员基本信息 @@ -50,22 +50,22 @@ export const updateMember = (params) => { // 添加会员基本信息 export const addMember = params => { - return postRequest(`/member`, params); + return postRequest(`/passport/member`, params); }; // 获取会员列表 export const getMemberAll = () => { - return getRequest("/member/getAll"); + return getRequest("/passport/member/getAll"); }; // 增加或修改会员列表 export const operationMemberListData = params => { - return postRequest("/member/insertOrUpdate", params); + return postRequest("/passport/member/insertOrUpdate", params); }; // 增加或修改会员列表 export const deleteMemberListData = ids => { - return deleteRequest(`/member/delByIds/${ids}`); + return deleteRequest(`/passport/member/delByIds/${ids}`); }; // 获取充值记录列表数据 export const getUserRecharge = params => { @@ -89,7 +89,7 @@ export const withdrawApply = params => { //会员状态修改 export const updateMemberStatus = params => { - return putRequest("/member/updateMemberStatus", params); + return putRequest("/passport/member/updateMemberStatus", params); }; // 获取会员注册统计列表 @@ -110,7 +110,7 @@ export const historyMemberChartList = () => { //查询会员数量 export const getMemberNum = params => { - return getRequest("/member/num", params); + return getRequest("/passport/member/num", params); }; //查询会员历史积分 export const getHistoryPointData = (params) => { From 631519d7c7656c4571e608ce5ae5227401ea668d Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Tue, 25 Jan 2022 09:22:22 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/member.js | 10 +- buyer/src/api/order.js | 2 +- manager/src/api/goods.js | 15 ++- manager/src/api/index.js | 97 +++++++++---------- manager/src/api/member.js | 28 +++--- manager/src/api/order.js | 57 +++++------ manager/src/api/other.js | 24 +++-- manager/src/api/pages.js | 29 ++---- manager/src/api/setting.js | 6 +- manager/src/api/shops.js | 20 ++-- .../src/views/sys/oss-manage/ossManage.vue | 2 +- seller/src/api/member.js | 8 +- seller/src/api/other.js | 4 +- 13 files changed, 142 insertions(+), 160 deletions(-) diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 86dc640e..6d1fd088 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -22,7 +22,7 @@ export function getDepositLog (params) { // 查询充值记录 export function getRecharge (params) { return request({ - url: '/buyer/member/recharge', + url: '/buyer/wallet/recharge', method: Method.GET, needToken: true, params @@ -99,7 +99,7 @@ export function collectList (params) { // 单个商品评价 export function goodsComment (params) { return request({ - url: `/buyer/memberEvaluation/${params.goodsId}/goodsEvaluation`, + url: `/buyer/member/evaluation/${params.goodsId}/goodsEvaluation`, method: Method.GET, needToken: false, params @@ -109,7 +109,7 @@ export function goodsComment (params) { // 商品各评价类别数量 export function goodsCommentNum (goodsId) { return request({ - url: `/buyer/memberEvaluation/${goodsId}/evaluationNumber`, + url: `/buyer/member/evaluation/${goodsId}/evaluationNumber`, method: Method.GET, needToken: false }); @@ -118,7 +118,7 @@ export function goodsCommentNum (goodsId) { // 添加会员评价 export function addEvaluation (params) { return request({ - url: `/buyer/memberEvaluation`, + url: `/buyer/member/evaluation`, method: Method.POST, needToken: true, params @@ -128,7 +128,7 @@ export function addEvaluation (params) { // 会员评价详情 export function evaluationDetail (id) { return request({ - url: `/buyer/memberEvaluation/get/${id}`, + url: `/buyer/member/evaluation/get/${id}`, method: Method.GET, needToken: true }); diff --git a/buyer/src/api/order.js b/buyer/src/api/order.js index c120f60f..0c47b3d9 100644 --- a/buyer/src/api/order.js +++ b/buyer/src/api/order.js @@ -80,7 +80,7 @@ export function getTraces (orderSn) { */ export function evolutionList (params) { return request({ - url: `/buyer/memberEvaluation`, + url: `/buyer/member/evaluation`, method: Method.GET, needToken: true, params diff --git a/manager/src/api/goods.js b/manager/src/api/goods.js index 34b2c770..2e29313b 100644 --- a/manager/src/api/goods.js +++ b/manager/src/api/goods.js @@ -102,30 +102,30 @@ export const getGoodsCategory = (parent_id) => { // 上架商品 export const upGoods = (id, params) => { - return putRequest(`/goods/${id}/up`, params) + return putRequest(`/goods/goods/${id}/up`, params) } // 下架商品 export const lowGoods = (id, params) => { - return putRequest(`/goods/${id}/under`, params) + return putRequest(`/goods/goods/${id}/under`, params) } // 获取商品sku分页列表 export const getGoodsSkuData = (params) => { - return getRequest('/goods/sku/list', params) + return getRequest('/goods/goods/sku/list', params) } // 获取商品分页列表 export const getGoodsListData = (params) => { - return getRequest('/goods/list', params) + return getRequest('/goods/goods/list', params) } // 获取待审核商品分页列表 export const getAuthGoodsListData = (params) => { - return getRequest('/goods/auth/list', params) + return getRequest('/goods/goods/auth/list', params) } // 审核商品 export const authGoods = (id, params) => { - return putRequest(`/goods/${id}/auth`, params) + return putRequest(`/goods/goods/${id}/auth`, params) } //查询分类绑定参数信息 @@ -176,7 +176,7 @@ export const getSkuPage = (params) => { //查看商品详情 export const getGoodsDetail = (id) => { - return getRequest(`/goods/get/${id}`) + return getRequest(`/goods/goods/get/${id}`) } @@ -225,4 +225,3 @@ export const refundStatistics = (params) => { export const refundPriceStatistics = (params) => { return getRequest(`/statistics/refund/order/getPrice`, params) } - diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 66216a5b..a04802de 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -16,7 +16,7 @@ import { let commonUrl = (process.env.NODE_ENV === 'development' ? BASE.API_DEV.common : BASE.API_PROD.common) // 文件上传接口 -export const uploadFile = commonUrl+ "/common/upload/file"; +export const uploadFile = commonUrl+ "/common/common/upload/file"; // Websocket export const ws = managerUrl + "/ws"; @@ -99,131 +99,131 @@ export const ipInfo = (params) => { }; // 个人中心编辑 export const userInfoEdit = (params) => { - return putRequest("/user/edit", params); + return putRequest("/passport/user/edit", params); }; // 个人中心修改密码 export const changePass = (params) => { - return putRequest("/user/editPassword", params); + return putRequest("/passport/user/editPassword", params); }; // 个人中心修改手机 export const changeMobile = (params) => { - return postRequest("/user/changeMobile", params); + return postRequest("/passport/user/changeMobile", params); }; // 获取用户数据 多条件 export const getUserListData = (params) => { - return getRequest("/user", params); + return getRequest("/passport/user", params); }; // 通过用户名搜索 export const searchUserByName = (username, params) => { - return getRequest("/user/searchByName/" + username, params); + return getRequest("/passport/user/searchByName/" + username, params); }; // 获取全部用户数据 export const getAllUserData = (params) => { - return getRequest("/user/getAll", params); + return getRequest("/passport/user/getAll", params); }; // 添加用户 export const addUser = (params) => { - return postRequest("/user", params); + return postRequest("/passport/user", params); }; // 编辑管理员自身 export const editUser = (params) => { - return putRequest("/user/edit", params); + return putRequest("/passport/user/edit", params); }; // 编辑用户 export const editOtherUser = (params) => { - return putRequest("/user/admin/edit", params); + return putRequest("/passport/user/admin/edit", params); }; // 启用用户 export const enableUser = (id, params) => { - return putRequest(`/user/enable/${id}`, params); + return putRequest(`/passport/user/enable/${id}`, params); }; // 删除用户 export const deleteUser = (ids, params) => { - return deleteRequest(`/user/${ids}`, params); + return deleteRequest(`/passport/user/${ids}`, params); }; // 导入用户 export const importUserData = (params) => { - return importRequest("/user/importData", params); + return importRequest("/passport/user/importData", params); }; /****************************** 部门 */ // 通过部门获取全部角色数据 export const getUserByDepartmentId = (id, params) => { - return getRequest(`/departmentRole/${id}`, params); + return getRequest(`/permission/departmentRole/${id}`, params); }; // 通过部门修改绑定角色 export const updateDepartmentRole = (id, params) => { - return putRequestWithNoForm(`/departmentRole/${id}`, params); + return putRequestWithNoForm(`/permission/departmentRole/${id}`, params); }; // 获取一级部门 export const initDepartment = (params) => { - return getRequest("/department", params); + return getRequest("/permission/department", params); }; // 加载部门子级数据 export const loadDepartment = (id) => { - return getRequest(`/department/${id}`); + return getRequest(`/permission/department/${id}`); }; // 添加部门 export const addDepartment = (params) => { - return postRequest("/department", params); + return postRequest("/permission/department", params); }; // 编辑部门 export const editDepartment = (ids, params) => { - return putRequest(`/department/${ids} `, params); + return putRequest(`/permission/department/${ids} `, params); }; // 删除部门 export const deleteDepartment = (ids, params) => { - return deleteRequest(`/department/${ids}`, params); + return deleteRequest(`/permission/department/${ids}`, params); }; // 搜索部门 export const searchDepartment = (params) => { - return getRequest("/department/search", params); + return getRequest("/permission/department/search", params); }; /****************************** 部门结束 */ // 获取全部角色数据 export const getAllRoleList = (params) => { - return getRequest("/role", params); + return getRequest("/permission/role", params); }; // 分页获取角色数据 export const getRoleList = (params) => { - return getRequest("/role", params); + return getRequest("/permission/role", params); }; // 添加角色 export const addRole = (params) => { - return postRequest("/role", params); + return postRequest("/permission/role", params); }; // 编辑角色 export const editRole = (params) => { - return putRequest(`/role/${params.roleId}`, params); + return putRequest(`/permission/role/${params.roleId}`, params); }; // 查看某角色拥有的菜单 export const selectRoleMenu = (params) => { - return getRequest(`/roleMenu/${params}`); + return getRequest(`/permission/roleMenu/${params}`); }; // 保存角色菜单 export const saveRoleMenu = (id, params) => { - return postRequestWithNoForm(`/roleMenu/${id}`, params); + return postRequestWithNoForm(`/permission/roleMenu/${id}`, params); }; // 分配角色权限 export const editRolePerm = (params) => { - return postRequest("/role/editRolePerm", params); + return postRequest("/permission/role/editRolePerm", params); }; // 分配角色数据权限 export const editRoleDep = (params) => { - return postRequest("/role/editRoleDep", params); + return postRequest("/permission/role/editRoleDep", params); }; // 删除角色 export const deleteRole = (ids, params) => { - return deleteRequest(`/role/${ids}`, params); + return deleteRequest(`/permission/role/${ids}`, params); }; /****************************** 角色结束 */ @@ -232,7 +232,7 @@ export const deleteRole = (ids, params) => { /****************************** 权限 */ // 获取全部权限数据 export const getAllPermissionList = (params) => { - return getRequest("/menu/tree", params); + return getRequest("/permission/menu/tree", params); }; // 获取全部权限数据 @@ -242,20 +242,20 @@ export const getCurrentPermissionList = (params) => { // 添加权限 export const addPermission = (params) => { - return postRequest("/menu", params); + return postRequest("/permission/menu", params); }; // 编辑权限 export const editPermission = (params) => { - return putRequest(`/menu/${params.id}`, params); + return putRequest(`/permission/menu/${params.id}`, params); }; // 删除权限 export const deletePermission = (ids, params) => { - return deleteRequest(`/menu/${ids}`, params); + return deleteRequest(`/permission/menu/${ids}`, params); }; // 搜索权限 export const searchPermission = (params) => { - return getRequest("/menu", params); + return getRequest("/permission/menu", params); }; /****************************** 权限结束 */ @@ -311,11 +311,11 @@ export const getFileListData = (params) => { // 重命名文件 export const renameFile = (params) => { - return postRequest("/common/file/rename", params); + return postRequest("/common/common/file/rename", params); }; // 删除文件 export const deleteFile = (ids, params) => { - return deleteRequest(`/common/file/delete/${ids}`, params); + return deleteRequest(`/common/common/file/delete/${ids}`, params); }; // 下载文件 export const aliDownloadFile = (fKey, params) => { @@ -324,16 +324,16 @@ export const aliDownloadFile = (fKey, params) => { // base64上传 export const base64Upload = (params) => { - return postRequest("/upload/file", params); + return postRequest("/common/common/upload/file", params); }; // 系统设置 export const getSetting = (key) => { - return getRequest(`/system/setting/get/${key}`); + return getRequest(`/setting/setting/get/${key}`); }; // 更新系统配置 export const setSetting = (key, params) => { - return putRequestWithNoForm(`/system/setting/put/${key}`, params); + return putRequestWithNoForm(`/setting/setting/put/${key}`, params); }; // 分页查询敏感词 @@ -400,7 +400,7 @@ export const getChildRegion = (id) => { // 重置用户密码 export const resetPassword = (params) => { - return postRequest(`/user/resetPassword/${params}"`); + return postRequest(`/passport/user/resetPassword/${params}"`); }; // 初始化商品索引 @@ -415,36 +415,35 @@ export const getProgress = () => { // 分页查询自定义分词 export const getCustomWordsPage = (params) => { - return getRequest(`/custom-words/page`, params); + return getRequest(`/other/customWords/page`, params); }; // 添加自定义分词 export const insertCustomWords = (params) => { - return postRequest(`/custom-words`, params); + return postRequest(`/other/customWords`, params); }; // 修改自定义分词 export const updateCustomWords = (params) => { - return putRequest(`/custom-words`, params); + return putRequest(`/other/customWords`, params); }; // 删除自定义分词 export const delCustom = (id) => { - return deleteRequest(`/custom-words/${id}`); + return deleteRequest(`/other/customWords/${id}`); }; // 设置热搜词 export const setHotWords = (params) => { - return postRequest(`/hotwords`, params); + return postRequest(`/hotwords/hotwords`, params); }; // 删除热搜词 export const deleteHotWords = (words) => { - return deleteRequest(`/hotwords/${words}`); + return deleteRequest(`/hotwords/hotwords/${words}`); }; // 获取热搜词 export const getHotWords = () => { - return getRequest(`/hotwords`); + return getRequest(`/hotwords/hotwords`); }; - diff --git a/manager/src/api/member.js b/manager/src/api/member.js index d5fd20ee..b9d17ab7 100644 --- a/manager/src/api/member.js +++ b/manager/src/api/member.js @@ -9,22 +9,22 @@ export const getMember = params => { // 分页获取会员评价 export const getMemberReview = params => { - return getRequest("/memberEvaluation/getByPage", params); + return getRequest("/member/evaluation/getByPage", params); }; // 获取id export const getMemberInfoReview = id => { - return getRequest(`/memberEvaluation/get/${id}`); + return getRequest(`/member/evaluation/get/${id}`); }; // 删除评论 export const delMemberReview = id => { - return putRequest(`/memberEvaluation/delete/${id}`); + return putRequest(`/member/evaluation/delete/${id}`); }; // 修改评价状态 export const updateMemberReview = (id, params) => { - return getRequest(`/memberEvaluation/updateStatus/${id}`, params); + return getRequest(`/member/evaluation/updateStatus/${id}`, params); }; @@ -35,12 +35,12 @@ export const insertOrUpdateSpec = params => { // 获取会员列表 export const getMemberListData = params => { - return getRequest("/passport/member", params); + return getRequest("/member/passport", params); }; // 获取会员详情 export const getMemberInfoData = (id) => { - return getRequest(`/passport/member/${id}`); + return getRequest(`/member/passport/${id}`); }; // 修改会员基本信息 @@ -50,26 +50,26 @@ export const updateMember = (params) => { // 添加会员基本信息 export const addMember = params => { - return postRequest(`/passport/member`, params); + return postRequest(`/member/passport`, params); }; // 获取会员列表 export const getMemberAll = () => { - return getRequest("/passport/member/getAll"); + return getRequest("/member/passport/getAll"); }; // 增加或修改会员列表 export const operationMemberListData = params => { - return postRequest("/passport/member/insertOrUpdate", params); + return postRequest("/member/passport/insertOrUpdate", params); }; // 增加或修改会员列表 export const deleteMemberListData = ids => { - return deleteRequest(`/passport/member/delByIds/${ids}`); + return deleteRequest(`/member/passport/delByIds/${ids}`); }; // 获取充值记录列表数据 export const getUserRecharge = params => { - return getRequest("/recharge", params); + return getRequest("/wallet/recharge", params); }; // 获取预存款明细列表数据 @@ -79,12 +79,12 @@ export const getUserWallet = params => { // 获取提现申请列表数据 export const getUserWithdrawApply = params => { - return getRequest("/members/withdraw-apply", params); + return getRequest("/wallet/withdrawApply", params); }; // 审核提现申请 export const withdrawApply = params => { - return postRequest("/members/withdraw-apply", params); + return postRequest("/wallet/withdrawApply", params); }; //会员状态修改 @@ -110,7 +110,7 @@ export const historyMemberChartList = () => { //查询会员数量 export const getMemberNum = params => { - return getRequest("/passport/member/num", params); + return getRequest("/member/passport/num", params); }; //查询会员历史积分 export const getHistoryPointData = (params) => { diff --git a/manager/src/api/order.js b/manager/src/api/order.js index 9b37f96f..7e18feb2 100644 --- a/manager/src/api/order.js +++ b/manager/src/api/order.js @@ -9,88 +9,88 @@ import { // 交由商家申诉 export const storeComplain = (params) => { - return putRequest(`/complain/status`, params) + return putRequest(`/order/complain/status`, params) } // 获取售后原因分页列表 export const getAfterSaleReasonPage = (params) => { - return getRequest('/afterSaleReason/getByPage', params) + return getRequest('/order/afterSaleReason/getByPage', params) } // 删除售后原因 export const delAfterSaleReason = (id) => { - return deleteRequest(`/afterSaleReason/delByIds/${id}`) + return deleteRequest(`/order/afterSaleReason/delByIds/${id}`) } // 添加售后原因 export const addAfterSaleReason = (params) => { - return postRequest(`/afterSaleReason`, params) + return postRequest(`/order/afterSaleReason`, params) } // 修改售后原因 export const editAfterSaleReason = (id, params) => { - return putRequest(`/afterSaleReason/update/${id}`, params) + return putRequest(`/order/afterSaleReason/update/${id}`, 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 putRequest(`/afterSale/${sn}/delivery`, params) + return putRequest(`/order/afterSale/${sn}/delivery`, params) } // 获取交易投诉信息 export const getOrderComplain = (params) => { - return getRequest('/complain', params) + return getRequest('/order/complain', params) } // 获取交易投诉详细信息 export const getOrderComplainDetail = (id) => { - return getRequest(`/complain/${id}`) + return getRequest(`/order/complain/${id}`) } // 交易投诉对话 export const addOrderCommunication = (params) => { - return postRequest(`/complain/communication`, params) + return postRequest(`/order/complain/communication`, params) } // 平台仲裁 export const orderComplete = (id, params) => { - return putRequest(`/complain/complete/${id}`, params) + return putRequest(`/order/complain/complete/${id}`, params) } // 查询订单列表 export const getOrderList = (params) => { - return getRequest(`/orders`, params) + return getRequest(`/order/order`, params) } // 订单付款 export const orderPay = (sn) => { - return postRequest(`/orders/${sn}/pay`) + return postRequest(`/order/order/${sn}/pay`) } // 订单付款 export const orderDetail = (sn) => { - return getRequest(`/orders/${sn}`) + return getRequest(`/order/order/${sn}`) } // 修改订单价格 export const updateOrderPrice = (sn, params) => { - return putRequest(`/orders/update/${sn}/price`, params) + return putRequest(`/order/order/update/${sn}/price`, params) } // 获取订单日志 @@ -100,26 +100,26 @@ export const getOrderLog = (params) => { // 订单取消 export const orderCancel = (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 getAfterSaleOrderPage = (params) => { - return getRequest('/afterSale/page', params) + return getRequest('/order/afterSale/page', params) } // 获取售后订单详情 export const getAfterSaleOrderDetail = (sn) => { - return getRequest(`/afterSale/get/${sn}`) + return getRequest(`/order/afterSale/get/${sn}`) } //售后单查询物流 export const getAfterSaleTraces = (sn) => { - return getRequest(`/afterSale/getDeliveryTraces/${sn}`) + return getRequest(`/order/afterSale/getDeliveryTraces/${sn}`) } // 获取商家选中的物流公司 export const getLogisticsChecked = () => { @@ -128,7 +128,7 @@ export const getLogisticsChecked = () => { //查询物流 export const getTraces = (sn, params) => { - return postRequest(`/orders/getTraces/${sn}`, params) + return postRequest(`/order/order/getTraces/${sn}`, params) } //获取发票列表 export const getReceiptPage = (params) => { @@ -136,27 +136,22 @@ export const getReceiptPage = (params) => { } //平台退款 export const refundPrice = (afterSaleSn, params) => { - return putRequest(`/afterSale/refund/${afterSaleSn}`, params) + return putRequest(`/order/afterSale/refund/${afterSaleSn}`, params) } //平台收款记录 export const paymentLog = (params) => { - return getRequest(`/paymentLog`, params) + return getRequest(`/order/paymentLog`, params) } //平台退款记录 export const refundLog = (params) => { - return getRequest(`/refundLog`, params) + return getRequest(`/order/refundLog`, params) } //售后单商家收货信息 export const storeAddress = (sn) => { return getRequest(`/afterSale/getStoreAfterSaleAddress/${sn}`) } - - - - - diff --git a/manager/src/api/other.js b/manager/src/api/other.js index 9054f972..4c3b5ab0 100644 --- a/manager/src/api/other.js +++ b/manager/src/api/other.js @@ -12,7 +12,7 @@ import { */ export const setHomeSetup = params => { - return postRequest("/pageData/add", params); + return postRequest("/other/pageData/add", params); }; /** @@ -21,7 +21,7 @@ export const setHomeSetup = params => { */ export const getHomeData = params => { - return getRequest(`/pageData/${params}`); + return getRequest(`/other/pageData/${params}`); }; @@ -41,7 +41,7 @@ export const getHomeList = params => { */ export const updateHome = (id, params) => { - return putRequest(`/pageData/update/${id}`, params); + return putRequest(`/other/pageData/update/${id}`, params); }; /** @@ -50,7 +50,7 @@ export const updateHome = (id, params) => { */ export const removePageHome = (id) => { - return deleteRequest(`/pageData/remove/${id}`); + return deleteRequest(`/other/pageData/remove/${id}`); }; @@ -60,35 +60,33 @@ export const removePageHome = (id) => { */ export const releasePageHome = (id) => { - return putRequest(`/pageData/release/${id}`); + return putRequest(`/other/pageData/release/${id}`); }; //管理员获取发送列表 export const getMessagePage = (params) => { - return getRequest(`/message`, params); + return getRequest(`/other/message`, params); }; //管理员获取发送列表 export const sendMessage = (params) => { - return postRequest(`/message`, params); + return postRequest(`/other/message`, params); }; //管理员获取发送详情列表 export const getShopMessage = (params) => { - return getRequest(`/message/store`, params); + return getRequest(`/other/storeMessage`, params); }; //管理员获取会员意见反馈 export const getMemberFeedback = (params) => { - return getRequest(`/feedback`, params); + return getRequest(`/other/feedback`, params); }; //管理员获取会员意见反馈 export const getMemberFeedbackDetail = (id) => { - return getRequest(`/feedback/${id}`); + return getRequest(`/other/feedback/${id}`); }; //管理员获取发送详情列表 export const getMemberMessage = (params) => { - return getRequest(`/message/member`, params); + return getRequest(`/other/memberMessage`, params); }; - - diff --git a/manager/src/api/pages.js b/manager/src/api/pages.js index 8a8283f3..1ca3c4f7 100644 --- a/manager/src/api/pages.js +++ b/manager/src/api/pages.js @@ -63,54 +63,45 @@ export const savePageData = (params) => { } //获取分类列表数据 export const getArticleCategory = () => { - return getRequest(`/article-category/all-children`) + return getRequest(`/other/articleCategory/all-children`) } //文章分类添加 export const saveArticleCategory = (params) => { - return postRequest('/article-category', params) + return postRequest('/other/articleCategory', params) } //删除文章分类 export const delArticleCategory = (id) => { - return deleteRequest(`/article-category/${id}`) + return deleteRequest(`/other/articleCategory${id}`) } //修改文章分类 export const updateArticleCategory = (params, id) => { - return putRequest(`/article-category/update/${id}`, params) + return putRequest(`/other/articleCategory/update/${id}`, params) } //文章添加 export const saveArticle = (params) => { - return postRequest('/article', params, {"Content-Type": "application/json"}) + return postRequest('/other/article', params, {"Content-Type": "application/json"}) } //文章修改 export const updateArticle = (params) => { - return putRequest(`/article/update/${params.id}`, params, {"Content-Type": "application/json"}) + return putRequest(`/other/article/update/${params.id}`, params, {"Content-Type": "application/json"}) } //文章是否展示修改 export const updateArticleStatus = (id,params) => { - return putRequest(`/article/update/status/${id}`, params) + return putRequest(`/other/article/update/status/${id}`, params) } //查看文章 export const seeArticle = (id) => { - return getRequest(`/article/${id}`) + return getRequest(`/other/article/${id}`) } //获取文章列表数据 export const getArticle = (params) => { - return getRequest('/article/getByPage', params) + return getRequest('/other/article/getByPage', params) } //删除文章数据 export const delArticle = (ids) => { - return deleteRequest(`/article/delByIds/${ids}`) + return deleteRequest(`/other/article/delByIds/${ids}`) } - - - - - - - - - diff --git a/manager/src/api/setting.js b/manager/src/api/setting.js index 2388ce09..bc50bdce 100644 --- a/manager/src/api/setting.js +++ b/manager/src/api/setting.js @@ -7,7 +7,7 @@ import { // 查询短信站内信信息 export const getMessageData = params => { - return getRequest("/message", params); + return getRequest("/other/message", params); }; //修改短信模板 export const editSmsMessageTemplate = (id, params) => { @@ -153,12 +153,12 @@ export const editInstantDeliveryImage = (bean, params) => { //查询短信发送记录 export const getSmsPage = (params) => { - return getRequest(`sms`, params); + return getRequest(`sms/sms`, params); }; //发送短信 export const sendSms = (params) => { - return postRequest(`sms`, params); + return postRequest(`sms/sms`, params); }; /* * 获取 支付支持设置开关 diff --git a/manager/src/api/shops.js b/manager/src/api/shops.js index 93704f98..20239cf7 100644 --- a/manager/src/api/shops.js +++ b/manager/src/api/shops.js @@ -7,40 +7,40 @@ export const getBillPage = (params) => { } //查询店铺列表 export const getShopListData = (params) => { - return getRequest('/store', params) + return getRequest('/store/store', params) } //禁用店铺 export const disableShop = (id) => { - return putRequest(`/store/disable/${id}`) + return putRequest(`/store/store/disable/${id}`) } //开启店铺 export const enableBrand = (id) => { - return putRequest(`/store/enable/${id}`) + return putRequest(`/store/store/enable/${id}`) } //查询店铺详细 export const getShopDetailData = (id, params) => { - return getRequest(`/store/get/detail/${id}`, params) + return getRequest(`/store/store/get/detail/${id}`, params) } //增加店铺列表 export const shopAdd = (params) => { - return postRequest(`/store/add`, params) + return postRequest(`/store/store/add`, params) } //修改店铺列表 export const shopEdit = (id,params) => { - return putRequest(`/store/edit/${id}`, params) + return putRequest(`/store/store/edit/${id}`, params) } //审核店铺 export const shopAudit = (id, passed) => { - return putRequest(`/store/audit/${id}/${passed}`) + return putRequest(`/store/store/audit/${id}/${passed}`) } //查询店铺详情 export const shopDetail = (id) => { - return getRequest(`/store/get/detail/${id}`) + return getRequest(`/store/store/get/detail/${id}`) } @@ -74,10 +74,10 @@ export const pay = (id) => { //获取所有商家 export const getShopList = () => { - return getRequest(`/store/all`) + return getRequest(`/store/store/all`) } //根据id获取店铺信息 export const getShopByMemberId = (id) => { - return getRequest(`/store/${id}/member`) + return getRequest(`/store/store/${id}/member`) } diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index d8eade76..eb194c2d 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -47,7 +47,7 @@
{ - return getRequest("/memberEvaluation", params); + return getRequest("/member/evaluation", params); }; // 根据id获取评价详情 export const getMemberInfoReview = id => { - return getRequest(`/memberEvaluation/get/${id}`); + return getRequest(`/member/evaluation/get/${id}`); }; //回复评价信息 export const replyMemberReview = (id, params) => { - return putRequest(`/memberEvaluation/reply/${id}`, params); + return putRequest(`/member/evaluation/reply/${id}`, params); }; // 获取会员注册统计列表 @@ -72,7 +72,7 @@ export const deleteMemberListData = ids => { }; // 获取充值记录列表数据 export const getUserRecharge = params => { - return getRequest("/recharge", params); + return getRequest("/wallet/recharge", params); }; // 获取预存款明细列表数据 diff --git a/seller/src/api/other.js b/seller/src/api/other.js index fd8c5ce1..371b3ab1 100644 --- a/seller/src/api/other.js +++ b/seller/src/api/other.js @@ -16,7 +16,7 @@ import { */ export const setHomeSetup = params => { - return postRequest("/pageData/add", params); + return postRequest("/other/pageData/add", params); }; /** @@ -25,7 +25,7 @@ export const setHomeSetup = params => { */ export const getHomeData = params => { - return getRequest(`/pageData/${params}`); + return getRequest(`/other/pageData/${params}`); }; From 846e80f1fa4e650b09573acf6bff3a3ea09e83a4 Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 25 Jan 2022 09:46:12 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/account.js | 12 ++--- buyer/src/api/address.js | 12 ++--- buyer/src/api/common.js | 14 +++--- buyer/src/api/goods.js | 10 ++-- buyer/src/api/index.js | 6 +-- buyer/src/api/login.js | 16 +++---- buyer/src/api/member.js | 46 +++++++++---------- buyer/src/api/order.js | 18 ++++---- buyer/src/api/pay.js | 6 +-- buyer/src/api/shopentry.js | 16 +++---- buyer/src/components/verify/verify.js | 4 +- buyer/src/pages/CouponCenter.vue | 2 + .../src/pages/home/orderCenter/AfterSale.vue | 4 +- buyer/src/pages/payment/Pay.vue | 10 ++-- 14 files changed, 91 insertions(+), 85 deletions(-) diff --git a/buyer/src/api/account.js b/buyer/src/api/account.js index f42da5f5..d0058117 100644 --- a/buyer/src/api/account.js +++ b/buyer/src/api/account.js @@ -11,7 +11,7 @@ import request, {Method} from '@/plugins/request.js' // 获取密码状态 export function getPwdStatus (params) { return request({ - url: '/buyer/members/wallet/check', + url: '/buyer/passport/members/wallet/check', method: Method.GET, needToken: true, params @@ -21,7 +21,7 @@ export function getPwdStatus (params) { // 设置密码 export function setPwd (params) { return request({ - url: '/buyer/members/wallet/set-password', + url: '/buyer/passport/members/wallet/set-password', method: Method.POST, needToken: true, data: params @@ -31,7 +31,7 @@ export function setPwd (params) { // 设置支付密码 export function setUpdatePwdOrdinary (params) { return request({ - url: '/buyer/members/wallet/update-password/ordinary', + url: '/buyer/passport/members/wallet/update-password/ordinary', method: Method.GET, needToken: true, data: params @@ -41,7 +41,7 @@ export function setUpdatePwdOrdinary (params) { // 修改会员资料 export function editMemberInfo (params) { return request({ - url: '/buyer/members/editOwn', + url: '/buyer/passport/members/editOwn', method: Method.PUT, needToken: true, data: params @@ -51,7 +51,7 @@ export function editMemberInfo (params) { // 修改密码 export function editPwd (params) { return request({ - url: `/buyer/members/modifyPass`, + url: `/buyer/passport/members/modifyPass`, method: Method.PUT, needToken: true, data: params @@ -61,7 +61,7 @@ export function editPwd (params) { // 获取密码状态 export function logout () { return request({ - url: '/buyer/members/logout', + url: '/buyer/passport/members/logout', method: Method.POST, needToken: true }) diff --git a/buyer/src/api/address.js b/buyer/src/api/address.js index c3163bb0..76e060de 100644 --- a/buyer/src/api/address.js +++ b/buyer/src/api/address.js @@ -5,7 +5,7 @@ import request, { // 会员收货地址列表 export function memberAddress () { return request({ - url: '/buyer/memberAddress', + url: '/buyer/member/address', needToken: true, method: Method.GET }); @@ -14,7 +14,7 @@ export function memberAddress () { // 添加收货地址 export function newMemberAddress (params) { return request({ - url: '/buyer/memberAddress', + url: '/buyer/member/address', needToken: true, method: Method.POST, data: params @@ -24,7 +24,7 @@ export function newMemberAddress (params) { // 编辑收货地址 export function editMemberAddress (params) { return request({ - url: '/buyer/memberAddress', + url: '/buyer/member/address', needToken: true, method: Method.PUT, params @@ -34,7 +34,7 @@ export function editMemberAddress (params) { // 删除收货地址 export function delMemberAddress (id) { return request({ - url: `/buyer/memberAddress/delById/${id}`, + url: `/buyer/member/address/delById/${id}`, needToken: true, method: Method.DELETE }); @@ -43,7 +43,7 @@ export function delMemberAddress (id) { // 根据id获取会员地址详情 export function getAddrDetail (id) { return request({ - url: `/buyer/memberAddress/get/${id}`, + url: `/buyer/member/address/get/${id}`, needToken: true, method: Method.GET }); @@ -52,7 +52,7 @@ export function getAddrDetail (id) { // 传给后台citycode 获取城市街道等id export function handleRegion (params) { return request({ - url: `${commonUrl}/common/region/region`, + url: `${commonUrl}/common/common/common/region/region`, needToken: true, method: Method.GET, params diff --git a/buyer/src/api/common.js b/buyer/src/api/common.js index 68bebf68..a508640f 100644 --- a/buyer/src/api/common.js +++ b/buyer/src/api/common.js @@ -5,7 +5,7 @@ import request, {Method, commonUrl} from '@/plugins/request.js'; */ export function getVerifyImg (verificationEnums) { return request({ - url: `${commonUrl}/common/slider/${verificationEnums}`, + url: `${commonUrl}/common/common/slider/${verificationEnums}`, method: Method.GET, needToken: false }); @@ -15,7 +15,7 @@ export function getVerifyImg (verificationEnums) { */ export function postVerifyImg (params) { return request({ - url: `${commonUrl}/common/slider/${params.verificationEnums}`, + url: `${commonUrl}/common/common/slider/${params.verificationEnums}`, method: Method.POST, needToken: false, params @@ -26,7 +26,7 @@ export function postVerifyImg (params) { */ export function sendSms (params) { return request({ - url: `${commonUrl}/common/sms/${params.verificationEnums}/${params.mobile}`, + url: `${commonUrl}/common/common/sms/${params.verificationEnums}/${params.mobile}`, method: Method.GET, needToken: false, params @@ -45,7 +45,7 @@ export function getLogo () { // 地区数据，用于三级联动 export function getRegion (id) { return request({ - url: `${commonUrl}/common/region/item/${id}`, + url: `${commonUrl}/common/common/region/item/${id}`, needToken: true, method: Method.GET }); @@ -57,7 +57,7 @@ export function getRegion (id) { */ export function articleList (params) { return request({ - url: `/buyer/article`, + url: `/buyer/other/article`, method: Method.GET, params }); @@ -69,7 +69,7 @@ export function articleList (params) { */ export function articleCateList () { return request({ - url: `/buyer/article/articleCategory/list`, + url: `/buyer/other/article/articleCategory/list`, method: Method.GET }); } @@ -77,7 +77,7 @@ export function articleCateList () { // 通过id获取文章 export function articleDetail (id) { return request({ - url: `/buyer/article/get/${id}`, + url: `/buyer/other/article/get/${id}`, method: Method.GET }); } diff --git a/buyer/src/api/goods.js b/buyer/src/api/goods.js index de77e633..d38d97e4 100644 --- a/buyer/src/api/goods.js +++ b/buyer/src/api/goods.js @@ -5,7 +5,7 @@ import request, { // 商品列表 export function goodsList (params) { return request({ - url: '/buyer/goods/es', + url: '/buyer/goods/goods/es', method: Method.GET, needToken: false, params @@ -15,7 +15,7 @@ export function goodsList (params) { // 商品分类 筛选条件 品牌， 尺寸等 export function filterList (params) { return request({ - url: '/buyer/goods/es/related', + url: '/buyer/goods/goods/es/related', method: Method.GET, needToken: false, params @@ -25,7 +25,7 @@ export function filterList (params) { // id获取商品详情 export function goodsDetail (goodsId) { return request({ - url: `/buyer/goods/get/${goodsId}`, + url: `/buyer/goods/goods/get/${goodsId}`, method: Method.GET, needToken: false }); @@ -34,7 +34,7 @@ export function goodsDetail (goodsId) { // id获取商品Sku详情 export function goodsSkuDetail (params) { return request({ - url: `/buyer/goods/sku/${params.goodsId}/${params.skuId}`, + url: `/buyer/goods/goods/sku/${params.goodsId}/${params.skuId}`, method: Method.GET, needToken: true, params @@ -65,7 +65,7 @@ export function pintuanMembers (pintuanId) { */ export function hotWords (params) { return request({ - url: `/buyer/goods/hot-words`, + url: `/buyer/goods/goods/hot-words`, method: Method.GET, needToken: false, params diff --git a/buyer/src/api/index.js b/buyer/src/api/index.js index 900df3ee..c3a32e68 100644 --- a/buyer/src/api/index.js +++ b/buyer/src/api/index.js @@ -3,7 +3,7 @@ import request, {Method} from '@/plugins/request.js' // 获取首页楼层装修数据 export function indexData (params) { return request({ - url: '/buyer/pageData/getIndex', + url: '/buyer/other/pageData/getIndex', method: Method.GET, needToken: false, params @@ -17,7 +17,7 @@ export function indexData (params) { */ export function pageData (params) { return request({ - url: `/buyer/pageData`, + url: `/buyer/other/pageData`, method: Method.GET, needToken: false, params @@ -28,7 +28,7 @@ export function pageData (params) { */ export function handleRefreshToken (token) { return request({ - url: `/buyer/members/refresh/${token}`, + url: `/buyer/passport/members/refresh/${token}`, method: Method.GET, needToken: false }) diff --git a/buyer/src/api/login.js b/buyer/src/api/login.js index ab81f1f5..fb745279 100644 --- a/buyer/src/api/login.js +++ b/buyer/src/api/login.js @@ -6,7 +6,7 @@ import request, {Method, buyerUrl} from '@/plugins/request.js'; */ export function regist (params) { return request({ - url: '/buyer/members/register', + url: '/buyer/passport/members/register', method: Method.POST, needToken: false, data: params @@ -18,7 +18,7 @@ export function regist (params) { */ export function login (params) { return request({ - url: '/buyer/members/userLogin', + url: '/buyer/passport/members/userLogin', method: Method.POST, needToken: false, data: params, @@ -31,7 +31,7 @@ export function login (params) { */ export function smsLogin (params) { return request({ - url: '/buyer/members/smsLogin', + url: '/buyer/passport/members/smsLogin', method: Method.POST, needToken: false, data: params, @@ -44,7 +44,7 @@ export function smsLogin (params) { */ export function getMemberMsg (params) { return request({ - url: '/buyer/members', + url: '/buyer/passport/members', method: Method.GET, needToken: true, params @@ -55,7 +55,7 @@ export function getMemberMsg (params) { * 第三方登录 支付宝，微博，qq,微信 */ export function webLogin (type) { - window.open(`${buyerUrl}/buyer/connect/login/web/${type}`, 'blank'); + window.open(`${buyerUrl}/buyer/passport/connect/connect/login/web/${type}`, 'blank'); } /** @@ -63,7 +63,7 @@ export function webLogin (type) { */ export function loginCallback (uuid) { return request({ - url: `/buyer/connect/result?state=${uuid}`, + url: `/buyer/passport/connect/connect/result?state=${uuid}`, method: Method.GET, needToken: false }); @@ -74,7 +74,7 @@ export function loginCallback (uuid) { */ export function validateCode (params) { return request({ - url: `/buyer/members/resetByMobile`, + url: `/buyer/passport/members/resetByMobile`, method: Method.POST, needToken: false, params @@ -86,7 +86,7 @@ export function validateCode (params) { */ export function resetPassword (params) { return request({ - url: `/buyer/members/resetPassword`, + url: `/buyer/passport/members/resetPassword`, method: Method.POST, needToken: false, params diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 86dc640e..ab863d0d 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -3,7 +3,7 @@ import request, {Method} from '@/plugins/request.js'; // 查询账户余额 export function getMembersWallet () { return request({ - url: '/buyer/members/wallet', + url: '/buyer/passport/members/wallet', method: Method.GET, needToken: true }); @@ -52,7 +52,7 @@ export function recharge (params) { // 提现 export function withdrawalApply (params) { return request({ - url: '/buyer/members/wallet/withdrawal', + url: '/buyer/passport/members/wallet/withdrawal', method: Method.POST, needToken: true, data: params @@ -99,7 +99,7 @@ export function collectList (params) { // 单个商品评价 export function goodsComment (params) { return request({ - url: `/buyer/memberEvaluation/${params.goodsId}/goodsEvaluation`, + url: `/buyer/member/evaluation/${params.goodsId}/goodsEvaluation`, method: Method.GET, needToken: false, params @@ -109,7 +109,7 @@ export function goodsComment (params) { // 商品各评价类别数量 export function goodsCommentNum (goodsId) { return request({ - url: `/buyer/memberEvaluation/${goodsId}/evaluationNumber`, + url: `/buyer/member/evaluation/${goodsId}/evaluationNumber`, method: Method.GET, needToken: false }); @@ -118,7 +118,7 @@ export function goodsCommentNum (goodsId) { // 添加会员评价 export function addEvaluation (params) { return request({ - url: `/buyer/memberEvaluation`, + url: `/buyer/member/evaluation`, method: Method.POST, needToken: true, params @@ -128,7 +128,7 @@ export function addEvaluation (params) { // 会员评价详情 export function evaluationDetail (id) { return request({ - url: `/buyer/memberEvaluation/get/${id}`, + url: `/buyer/member/evaluation/get/${id}`, method: Method.GET, needToken: true }); @@ -195,7 +195,7 @@ export function receiveCoupon (couponId) { // 获取申请售后列表 export function afterSaleList (params) { return request({ - url: `/buyer/afterSale/page`, + url: `/buyer/order/afterSale/page`, method: Method.GET, needToken: true, params @@ -205,7 +205,7 @@ export function afterSaleList (params) { // 获取申请售后页面信息 export function afterSaleInfo (sn) { return request({ - url: `/buyer/afterSale/applyAfterSaleInfo/${sn}`, + url: `/buyer/order/afterSale/applyAfterSaleInfo/${sn}`, method: Method.GET, needToken: true }); @@ -214,7 +214,7 @@ export function afterSaleInfo (sn) { // 获取申请售后、投诉原因 export function afterSaleReason (serviceType) { return request({ - url: `/buyer/afterSale/get/afterSaleReason/${serviceType}`, + url: `/buyer/order/afterSale//get/afterSaleReason/${serviceType}`, method: Method.GET, needToken: true }); @@ -222,7 +222,7 @@ export function afterSaleReason (serviceType) { // 获取申请售后详情 export function afterSaleDetail (sn) { return request({ - url: `/buyer/afterSale/get/${sn}`, + url: `/buyer/order/afterSale//get/${sn}`, method: Method.GET, needToken: true }); @@ -230,7 +230,7 @@ export function afterSaleDetail (sn) { // 售后日志 export function afterSaleLog (sn) { return request({ - url: `/buyer/afterSale/get/getAfterSaleLog/${sn}`, + url: `/buyer/order/afterSale//get/getAfterSaleLog/${sn}`, method: Method.GET, needToken: true }); @@ -239,7 +239,7 @@ export function afterSaleLog (sn) { // 申请售后 export function applyAfterSale (params) { return request({ - url: `/buyer/afterSale/save/${params.orderItemSn}`, + url: `/buyer/order/afterSale/save/${params.orderItemSn}`, method: Method.POST, needToken: true, params @@ -249,7 +249,7 @@ export function applyAfterSale (params) { // 取消售后申请 export function cancelAfterSale (afterSaleSn) { return request({ - url: `/buyer/afterSale/cancel/${afterSaleSn}`, + url: `/buyer/order/afterSale/cancel/${afterSaleSn}`, method: Method.POST, needToken: true }); @@ -258,7 +258,7 @@ export function cancelAfterSale (afterSaleSn) { // 投诉商品 export function handleComplain (data) { return request({ - url: `/buyer/complain`, + url: `/buyer/order/complain`, method: Method.POST, needToken: true, data @@ -267,7 +267,7 @@ export function handleComplain (data) { // 分页获取我的投诉列表 export function complainList (params) { return request({ - url: `/buyer/complain`, + url: `/buyer/order/complain`, method: Method.GET, needToken: true, params @@ -279,7 +279,7 @@ export function complainList (params) { */ export function getComplainDetail (id) { return request({ - url: `/buyer/complain/${id}`, + url: `/buyer/order/complain/${id}`, method: Method.GET, needToken: true }); @@ -290,7 +290,7 @@ export function getComplainDetail (id) { */ export function clearComplain (id) { return request({ - url: `/buyer/complain/status/${id}`, + url: `/buyer/order/complain/status/${id}`, method: Method.PUT, needToken: true }); @@ -390,7 +390,7 @@ export function distCash (params) { */ export function tracksList (params) { return request({ - url: `/buyer/footprint`, + url: `/buyer/member/footprint`, method: Method.GET, needToken: true, params @@ -402,7 +402,7 @@ export function tracksList (params) { */ export function clearTracks () { return request({ - url: `/buyer/footprint`, + url: `/buyer/member/footprint`, method: Method.DELETE, needToken: true }); @@ -414,7 +414,7 @@ export function clearTracks () { */ export function clearTracksById (ids) { return request({ - url: `/buyer/footprint/delByIds/${ids}`, + url: `/buyer/member/footprint/delByIds/${ids}`, method: Method.DELETE, needToken: true }); @@ -449,7 +449,7 @@ export function memberPointHistory (params) { */ export function memberMsgList (params) { return request({ - url: `/buyer/member/message`, + url: `/buyer/message/member`, method: Method.GET, needToken: true, params @@ -462,7 +462,7 @@ export function memberMsgList (params) { export function readMemberMsg (id) { return request({ - url: `/buyer/member/message/${id}`, + url: `/buyer/message/member/${id}`, method: Method.PUT, needToken: true }); @@ -473,7 +473,7 @@ export function readMemberMsg (id) { */ export function delMemberMsg (id) { return request({ - url: `/buyer/member/message/${id}`, + url: `/buyer/message/member/${id}`, method: Method.DELETE, needToken: true }); diff --git a/buyer/src/api/order.js b/buyer/src/api/order.js index c120f60f..d04f48fa 100644 --- a/buyer/src/api/order.js +++ b/buyer/src/api/order.js @@ -5,7 +5,7 @@ import request, { // 查询会员订单列表 export function getOrderList (params) { return request({ - url: `/buyer/orders`, + url: `/buyer/order/order`, method: Method.GET, needToken: true, params @@ -18,7 +18,7 @@ export function getOrderList (params) { */ export function orderDetail (orderSn) { return request({ - url: `/buyer/orders/${orderSn}`, + url: `/buyer/order/order/${orderSn}`, method: Method.GET, needToken: true }); @@ -31,7 +31,7 @@ export function orderDetail (orderSn) { */ export function cancelOrder (params) { return request({ - url: `/buyer/orders/${params.orderSn}/cancel`, + url: `/buyer/order/order/${params.orderSn}/cancel`, method: Method.POST, needToken: true, params @@ -44,7 +44,7 @@ export function cancelOrder (params) { */ export function delOrder (orderSn) { return request({ - url: `/buyer/orders/${orderSn}`, + url: `/buyer/order/order/${orderSn}`, method: Method.DELETE, needToken: true }); @@ -56,7 +56,7 @@ export function delOrder (orderSn) { */ export function sureReceived (orderSn) { return request({ - url: `/buyer/orders/${orderSn}/receiving`, + url: `/buyer/order/order/${orderSn}/receiving`, method: Method.POST, needToken: true }); @@ -68,7 +68,7 @@ export function sureReceived (orderSn) { */ export function getTraces (orderSn) { return request({ - url: `/buyer/orders/getTraces/${orderSn}`, + url: `/buyer/order/order/getTraces/${orderSn}`, method: Method.POST, needToken: true }); @@ -80,7 +80,7 @@ export function getTraces (orderSn) { */ export function evolutionList (params) { return request({ - url: `/buyer/memberEvaluation`, + url: `/buyer/member/evaluation`, method: Method.GET, needToken: true, params @@ -90,7 +90,7 @@ export function evolutionList (params) { // 添加交易投诉对话 export function communication (params) { return request({ - url: `/buyer/complain/communication`, + url: `/buyer/order/complain/communication`, method: Method.POST, needToken: true, params @@ -100,7 +100,7 @@ export function communication (params) { // 退换货服务 提交物流 export function afterSaleDelivery (params) { return request({ - url: `/buyer/afterSale/delivery/${params.afterSaleSn}`, + url: `/buyer/order/afterSale/delivery/${params.afterSaleSn}`, method: Method.POST, needToken: true, params diff --git a/buyer/src/api/pay.js b/buyer/src/api/pay.js index c573a583..c18d9db1 100644 --- a/buyer/src/api/pay.js +++ b/buyer/src/api/pay.js @@ -10,7 +10,7 @@ import request, { */ export function tradeDetail (params) { return request({ - url: '/buyer/cashier/tradeDetail', + url: '/buyer/payment/cashier/tradeDetail', needToken: true, method: Method.GET, params @@ -26,7 +26,7 @@ export function tradeDetail (params) { */ export function pay (params) { return request({ - url: `/buyer/cashier/pay/${params.paymentMethod}/${params.paymentClient}`, + url: `/buyer/payment/cashier/pay/${params.paymentMethod}/${params.paymentClient}`, needToken: true, method: Method.GET, params @@ -40,7 +40,7 @@ export function pay (params) { */ export function payCallback (params) { return request({ - url: `/buyer/cashier/result`, + url: `/buyer/payment/cashier/result`, needToken: true, method: Method.GET, params diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js index ae8e6309..861800cf 100644 --- a/buyer/src/api/shopentry.js +++ b/buyer/src/api/shopentry.js @@ -5,7 +5,7 @@ import request, { // 店铺分页列表 export function shopList (params) { return request({ - url: '/buyer/store', + url: '/buyer/store/store', needToken: true, method: Method.GET, params @@ -15,7 +15,7 @@ export function shopList (params) { // 申请店铺第一步-填写企业信息 export function applyFirst (params) { return request({ - url: '/buyer/store/apply/first', + url: '/buyer/store/store/apply/first', needToken: true, method: Method.PUT, params @@ -25,7 +25,7 @@ export function applyFirst (params) { // 申请店铺第一步-填写企业信息 export function applySecond (params) { return request({ - url: '/buyer/store/apply/second', + url: '/buyer/store/store/apply/second', needToken: true, method: Method.PUT, params @@ -35,7 +35,7 @@ export function applySecond (params) { // 申请店铺第一步-填写企业信息 export function applyThird (params) { return request({ - url: '/buyer/store/apply/third', + url: '/buyer/store/store/apply/third', needToken: true, method: Method.PUT, params @@ -45,7 +45,7 @@ export function applyThird (params) { // 店铺详情 export function getDetailById (id) { return request({ - url: `/buyer/store/get/detail/${id}`, + url: `/buyer/store/store/get/detail/${id}`, needToken: true, method: Method.GET }) @@ -53,7 +53,7 @@ export function getDetailById (id) { // 店铺分类 export function getCateById (id) { return request({ - url: `/buyer/store/label/get/${id}`, + url: `/buyer/goods/store/label/get/${id}`, needToken: true, method: Method.GET }) @@ -61,7 +61,7 @@ export function getCateById (id) { // 店铺入驻协议 export function agreement () { return request({ - url: `/buyer/article/type/STORE_REGISTER`, + url: `/buyer/other/article/type/STORE_REGISTER`, needToken: true, method: Method.GET }) @@ -70,7 +70,7 @@ export function agreement () { // 获取当前登录会员的店铺信息 export function applyStatus () { return request({ - url: `/buyer/store/apply`, + url: `/buyer/store/store/apply`, needToken: true, method: Method.GET }) diff --git a/buyer/src/components/verify/verify.js b/buyer/src/components/verify/verify.js index eb385668..e6cda9f6 100644 --- a/buyer/src/components/verify/verify.js +++ b/buyer/src/components/verify/verify.js @@ -7,7 +7,7 @@ import storage from '@/plugins/storage.js'; */ export function getVerifyImg (verificationEnums) { return request({ - url: `${commonUrl}/common/slider/${verificationEnums}`, + url: `${commonUrl}/common/common/slider/${verificationEnums}`, method: Method.GET, needToken: false, headers: {uuid: storage.getItem('uuid')} @@ -19,7 +19,7 @@ export function getVerifyImg (verificationEnums) { */ export function postVerifyImg (params) { return request({ - url: `${commonUrl}/common/slider/${params.verificationEnums}`, + url: `${commonUrl}/common/common/slider/${params.verificationEnums}`, method: Method.POST, needToken: false, params, diff --git a/buyer/src/pages/CouponCenter.vue b/buyer/src/pages/CouponCenter.vue index e6220a07..e334f550 100644 --- a/buyer/src/pages/CouponCenter.vue +++ b/buyer/src/pages/CouponCenter.vue @@ -51,6 +51,7 @@ export default { list: [], // 优惠券列表 total: 0, // 优惠券总数 params: { // 请求参数 + getType: 'FREE', pageNumber: 1, pageSize: 20 } @@ -95,6 +96,7 @@ export default { content: '

优惠券领取成功，可到我的优惠券页面查看

', okText: '我的优惠券', cancelText: '立即使用', + closable: true, onOk: () => { this.$router.push('/home/Coupons') }, diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue index e9766042..fdd92c5b 100644 --- a/buyer/src/pages/home/orderCenter/AfterSale.vue +++ b/buyer/src/pages/home/orderCenter/AfterSale.vue @@ -9,7 +9,7 @@ class="width_300" search enter-button - v-model="params.keywords" + v-model="params.sn" @on-search="getList" placeholder="请输入订单号搜索" /> @@ -125,7 +125,7 @@ export default { params: { // 请求参数 pageNumber: 1, pageSize: 10, - keywords: '', + sn: '', sort: 'createTime', order: 'desc' }, diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index b0d3a547..9b5d83b7 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -313,8 +313,12 @@ export default { let notSupArea = res.result.notSupportFreight; this.selectedCoupon = {}; if (res.result.platformCoupon) - this.selectedCoupon.platformCoupon = res.result.platformCoupon; - Object.assign(this.selectedCoupon, res.result.storeCoupons); + this.selectedCoupon[res.result.platformCoupon.memberCoupon.id] = res.result.platformCoupon; + if (res.result.storeCoupons && Object.keys(res.result.storeCoupons)[0]) { + let storeMemberCouponsId = Object.keys(res.result.storeCoupons)[0]; + let storeCouponId = res.result.storeCoupons[storeMemberCouponsId].memberCoupon.id; + this.selectedCoupon[storeCouponId] = res.result.storeCoupons[storeMemberCouponsId]; + } if (notSupArea) { let content = []; let title = ""; @@ -340,7 +344,7 @@ export default { const couponKeys = Object.keys(this.selectedCoupon); if (couponKeys.length) { this.couponList.forEach((e) => { - if (e.id === this.selectedCoupon[couponKeys].memberCoupon.id) { + if (this.selectedCoupon[e.id] && e.id === this.selectedCoupon[e.id].memberCoupon.id) { this.usedCouponId.push(e.id); } }); From e5918b041aba9b5b2bc945ca9d585d7e178695bf Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Tue, 25 Jan 2022 12:01:40 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/order.js | 2 +- manager/src/api/index.js | 24 ++++++++++++------------ manager/src/api/logistics.js | 10 +++++----- manager/src/api/order.js | 2 +- manager/src/api/setting.js | 36 ++++++++++++++++++------------------ seller/src/api/logistics.js | 10 +++++----- seller/src/api/order.js | 2 +- seller/src/api/shops.js | 6 +++--- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/buyer/src/api/order.js b/buyer/src/api/order.js index d04f48fa..58d74a02 100644 --- a/buyer/src/api/order.js +++ b/buyer/src/api/order.js @@ -109,7 +109,7 @@ export function afterSaleDelivery (params) { // 获取退货可选物流公司 export function getLogisticsCompany () { return request({ - url: `/buyer/logistics`, + url: `/buyer/other/logistics`, method: Method.GET, needToken: true, params: { pageNumber: 1, pageSize: 200, disabled: 'OPEN' } diff --git a/manager/src/api/index.js b/manager/src/api/index.js index a04802de..629b0787 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -263,15 +263,15 @@ export const searchPermission = (params) => { // 分页获取日志数据 export const getLogListData = (params) => { - return getRequest("/log/getAllByPage", params); + return getRequest("/setting/log/getAllByPage", params); }; // 删除日志 export const deleteLog = (ids, params) => { - return deleteRequest(`/log/${ids}`, params); + return deleteRequest(`/setting/log/${ids}`, params); }; // 清空日志 export const deleteAllLog = (params) => { - return deleteRequest("/log", params); + return deleteRequest("/setting/log", params); }; @@ -339,22 +339,22 @@ export const setSetting = (key, params) => { // 分页查询敏感词 export const getSensitiveWordsPage = (params) => { - return getRequest(`/sensitiveWords`, params); + return getRequest(`/other/sensitiveWords`, params); }; // 分页查询敏感词 export const insertSensitiveWords = (params) => { - return postRequest(`/sensitiveWords`, params); + return postRequest(`/other/sensitiveWords`, params); }; // 修改 export const updateSensitiveWords = (id, params) => { - return putRequest(`/sensitiveWords/${id}`, params); + return putRequest(`/other/sensitiveWords/${id}`, params); }; // 删除敏感词 export const delSensitive = (ids) => { - return deleteRequest(`/sensitiveWords/delByIds/${ids}`); + return deleteRequest(`/other/sensitiveWords/delByIds/${ids}`); }; // 添加商品计量单位 @@ -376,26 +376,26 @@ export const delGoodsUnit = (ids) => { // 同步高德行政地区数据 export const asyncRegion = () => { - return postRequest(`/region/sync`); + return postRequest(`/setting/region/sync`); }; // 批量id删除 export const delRegion = (ids) => { - return deleteRequest(`/region/${ids}`); + return deleteRequest(`/setting/region/${ids}`); }; // 更新地区 export const updateRegion = (id, params) => { - return putRequest(`/region/${id}`, params); + return putRequest(`/setting/region/${id}`, params); }; // 添加地区 export const addRegion = (params) => { - return postRequest(`/region`, params); + return postRequest(`/setting/region`, params); }; // 通过id获取子地区 export const getChildRegion = (id) => { - return getRequest(`/region/item/${id}`); + return getRequest(`/setting/region/item/${id}`); }; // 重置用户密码 diff --git a/manager/src/api/logistics.js b/manager/src/api/logistics.js index da8561d8..4f09d2c1 100644 --- a/manager/src/api/logistics.js +++ b/manager/src/api/logistics.js @@ -10,23 +10,23 @@ import { // 分页获取物流公司 export const getLogisticsPage = params => { - return getRequest(`/logistics/getByPage`, params); + return getRequest(`/other/logistics/getByPage`, params); }; // 删除 export const delLogistics = id => { - return deleteRequest(`/logistics/delete/${id}`); + return deleteRequest(`/other/logistics/delete/${id}`); }; // 添加 export const addLogistics = params => { - return postRequest(`/logistics/save`,params); + return postRequest(`/other/logistics/save`,params); }; // 通过id查询详情 export const getLogisticsDetail = id => { - return getRequest(`/logistics/get/${id}`); + return getRequest(`/other/logistics/get/${id}`); }; // 编辑 export const updateLogistics = (id,params) => { - return putRequest(`/logistics/${id}`,params); + return putRequest(`/other/logistics/${id}`,params); }; diff --git a/manager/src/api/order.js b/manager/src/api/order.js index 7e18feb2..11a06389 100644 --- a/manager/src/api/order.js +++ b/manager/src/api/order.js @@ -123,7 +123,7 @@ export const getAfterSaleTraces = (sn) => { } // 获取商家选中的物流公司 export const getLogisticsChecked = () => { - return getRequest(`/logistics/getChecked`) + return getRequest(`/other/logistics/getChecked`) } //查询物流 diff --git a/manager/src/api/setting.js b/manager/src/api/setting.js index bc50bdce..c77facfd 100644 --- a/manager/src/api/setting.js +++ b/manager/src/api/setting.js @@ -20,37 +20,37 @@ export const editNoticeMessage = (id, params) => { //微信消息同步 export const wechatMessageSync = (params) => { - return getRequest("/message/wechat/init", params) + return getRequest("/wechat/wechatMessage/init", params) } //分页获取微信消息 export const getWechatMessagePage = (params) => { - return getRequest("/message/wechat", params) + return getRequest("/wechat/wechatMessage", params) } //编辑微信消息模版 export const editWechatMessageTemplate = (id, params) => { - return putRequest(`/message/wechat/${id}`, params) + return putRequest(`/wechat/wechatMessage/${id}`, params) } //删除微信消息模版 export const delWechatMessageTemplate = (id, params) => { - return deleteRequest(`/message/wechat/${id}`, params) + return deleteRequest(`/wechat/wechatMessage/${id}`, params) } //微信消息订阅同步 export const wechatMPMessageSync = (params) => { - return getRequest("/message/wechatMPMessage/init", params) + return getRequest("/wechat/wechatMPMessage/init", params) } //分页获取微信消息订阅 export const getWechatMPMessagePage = (params) => { - return getRequest("/message/wechatMPMessage", params) + return getRequest("/wechat/wechatMPMessage", params) } //编辑微信消息订阅模版 export const editWechatMPMessageTemplate = (id, params) => { - return putRequest(`/message/wechatMPMessage/${id}`, params) + return putRequest(`/wechat/wechatMPMessage/${id}`, params) } //删除微信消息订阅模版 export const delWechatMPMessageTemplate = (id, params) => { - return deleteRequest(`/message/wechatMPMessage/${id}`, params) + return deleteRequest(`/wechat/wechatMPMessage/${id}`, params) } @@ -118,19 +118,19 @@ export const smsSignDetail = (id) => { //分页查询app版本信息 export const appVersionPage = (params) => { - return getRequest(`systems/app/version`, params); + return getRequest(`/other/appVersion`, params); }; //添加app版本信息 export const addVersion = (params) => { - return postRequest(`systems/app/version`, params); + return postRequest(`/other/appVersion`, params); }; //修改app版本信息 export const editVersion = (params, id) => { - return putRequest(`systems/app/version/${id}`, params); + return putRequest(`/other/appVersion/${id}`, params); }; //删除app版本信息 export const deleteVersion = (id) => { - return deleteRequest(`systems/app/version/${id}`); + return deleteRequest(`/other/appVersion/${id}`); }; //查询同城配送列表 export const getInstantDelivery = (params) => { @@ -164,32 +164,32 @@ export const sendSms = (params) => { * 获取 支付支持设置开关 */ export const getPaymentSupportForm = () => { - return getRequest(`system/settingx/paymentSupport`); + return getRequest(`setting/settingx/paymentSupport`); } // 验证码源文件删除 export const delVerification = (id) => { - return deleteRequest(`/verificationSource/${id}`) + return deleteRequest(`/other/verificationSource/${id}`) } // 添加验证码源文件 export const addVerification = (params) => { - return postRequest(`/verificationSource`, params) + return postRequest(`/other/verificationSource`, params) } // 修改验证码源文件 export const editVerification = (id, params) => { - return putRequest(`/verificationSource/${id}`, params) + return putRequest(`/other/verificationSource/${id}`, params) } // 验证码源文件详情 export const verificationDetail = (id) => { - return getRequest(`/verificationSource/${id}`) + return getRequest(`/other/verificationSource/${id}`) } // 验证码源文件列表 export const verificationPage = (params) => { - return getRequest(`/verificationSource`, params) + return getRequest(`/other/verificationSource`, params) } //获取通知类站内信 diff --git a/seller/src/api/logistics.js b/seller/src/api/logistics.js index e08c989d..1d4d7ebf 100644 --- a/seller/src/api/logistics.js +++ b/seller/src/api/logistics.js @@ -12,23 +12,23 @@ import { // 分页获取物流公司 export const getLogisticsPage = params => { - return getRequest(`/logistics/getByPage`, params); + return getRequest(`/other/logistics/getByPage`, params); }; // 删除 export const delLogistics = id => { - return deleteRequest(`/logistics/delete/${id}`); + return deleteRequest(`/other/logistics/delete/${id}`); }; // 添加 export const addLogistics = params => { - return postRequest(`/logistics/save`,params); + return postRequest(`/other/logistics/save`,params); }; // 通过id查询详情 export const getLogisticsDetail = id => { - return getRequest(`/logistics/get/${id}`); + return getRequest(`/other/logistics/get/${id}`); }; // 编辑 export const updateLogistics = (id,params) => { - return putRequest(`/logistics/${id}`,params); + return putRequest(`/other/logistics/${id}`,params); }; diff --git a/seller/src/api/order.js b/seller/src/api/order.js index 9f6cd7bf..674fe00f 100644 --- a/seller/src/api/order.js +++ b/seller/src/api/order.js @@ -79,7 +79,7 @@ export const orderDelivery = (sn, params) => { // 获取商家选中的物流公司 export const getLogisticsChecked = () => { - return getRequest(`/logistics/getChecked`); + return getRequest(`/other/logistics/getChecked`); }; // 订单核验 diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js index edf8321e..eb6bb46e 100644 --- a/seller/src/api/shops.js +++ b/seller/src/api/shops.js @@ -39,17 +39,17 @@ export const getBillDetail = (id, params) => { // 获取所有物流公司 export const getLogistics = (id, params) => { - return getRequest(`/logistics`, params) + return getRequest(`/other/logistics`, params) } // 开启物流公司 export const logisticsChecked = (id, params) => { - return postRequest(`/logistics/${id}`, params) + return postRequest(`/other/logistics/${id}`, params) } // 关闭开启物流公司 export const logisticsUnChecked = (id, params) => { - return deleteRequest(`/logistics/${id}`, params) + return deleteRequest(`/other/logistics/${id}`, params) } // 获取商家自提点 export const getShopAddress = (id, params) => { From 3311568e5076cc97ac4d72628269918214431b21 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Tue, 25 Jan 2022 19:08:47 +0800 Subject: [PATCH 06/10] =?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: [ From 3a3e14e0a75b34388be74f24422f54b48ed70899 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 10 Feb 2022 18:57:36 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/public/config.js | 2 +- buyer/src/api/index.js | 2 +- buyer/src/api/login.js | 12 +- buyer/src/pages/GoodsList.vue | 192 ++++--- buyer/src/pages/home/memberCenter/Profile.vue | 2 +- .../home/memberCenter/evaluation/AddEval.vue | 2 +- .../pages/home/orderCenter/ApplyAfterSale.vue | 2 +- buyer/src/pages/home/orderCenter/Complain.vue | 2 +- buyer/src/pages/shopEntry/FirstApply.vue | 2 +- buyer/src/pages/shopEntry/ThirdApply.vue | 2 +- buyer/src/plugins/request.js | 2 +- manager/src/api/common.js | 2 +- manager/src/api/index.js | 8 +- manager/src/api/member.js | 2 +- manager/src/api/order.js | 2 +- manager/src/api/setting.js | 10 +- manager/src/api/shops.js | 2 +- manager/src/libs/axios.js | 3 +- .../views/lili-floor-renovation/floorList.vue | 58 ++- .../lili-floor-renovation/wap/decorate.vue | 141 +++-- .../lili-floor-renovation/wap/navbar.vue | 20 +- .../order/after-order/afterSaleOrder.vue | 459 ++++++++-------- .../after-order/afterSaleOrderDetail.vue | 287 ++++++---- manager/src/views/order/order/orderDetail.vue | 316 +++++++---- .../page/article-manage/ArticleCategory.vue | 3 +- .../src/views/sys/log-manage/logManage.vue | 493 +++++++++--------- seller/src/api/goods.js | 6 +- seller/src/api/index.js | 24 +- seller/src/api/order.js | 4 +- seller/src/api/pages.js | 8 +- seller/src/api/shops.js | 4 +- seller/src/libs/routerJson.js | 4 +- .../goods-seller/goodsOperationFirst.vue | 102 ++-- .../goods/goods-seller/goodsOperationSec.vue | 3 + seller/src/views/promotion/live/addLive.vue | 250 ++++++--- 35 files changed, 1438 insertions(+), 995 deletions(-) diff --git a/buyer/public/config.js b/buyer/public/config.js index d4394ce6..3058e142 100644 --- a/buyer/public/config.js +++ b/buyer/public/config.js @@ -4,7 +4,7 @@ var BASE = { */ API_DEV: { seller: "http://127.0.0.1:8888", - manager: "http://127.0.0.1:8888" + manager: "http://127.0.0.1:8888", buyer: "http://127.0.0.1:8888", common: "http://127.0.0.1:8888", }, diff --git a/buyer/src/api/index.js b/buyer/src/api/index.js index c3a32e68..789ec356 100644 --- a/buyer/src/api/index.js +++ b/buyer/src/api/index.js @@ -28,7 +28,7 @@ export function pageData (params) { */ export function handleRefreshToken (token) { return request({ - url: `/buyer/passport/members/refresh/${token}`, + url: `/buyer/passport/member/refresh/${token}`, method: Method.GET, needToken: false }) diff --git a/buyer/src/api/login.js b/buyer/src/api/login.js index fb745279..6d61f91d 100644 --- a/buyer/src/api/login.js +++ b/buyer/src/api/login.js @@ -6,7 +6,7 @@ import request, {Method, buyerUrl} from '@/plugins/request.js'; */ export function regist (params) { return request({ - url: '/buyer/passport/members/register', + url: '/buyer/passport/member/register', method: Method.POST, needToken: false, data: params @@ -18,7 +18,7 @@ export function regist (params) { */ export function login (params) { return request({ - url: '/buyer/passport/members/userLogin', + url: '/buyer/passport/member/userLogin', method: Method.POST, needToken: false, data: params, @@ -31,7 +31,7 @@ export function login (params) { */ export function smsLogin (params) { return request({ - url: '/buyer/passport/members/smsLogin', + url: '/buyer/passport/member/smsLogin', method: Method.POST, needToken: false, data: params, @@ -44,7 +44,7 @@ export function smsLogin (params) { */ export function getMemberMsg (params) { return request({ - url: '/buyer/passport/members', + url: '/buyer/passport/member', method: Method.GET, needToken: true, params @@ -74,7 +74,7 @@ export function loginCallback (uuid) { */ export function validateCode (params) { return request({ - url: `/buyer/passport/members/resetByMobile`, + url: `/buyer/passport/member/resetByMobile`, method: Method.POST, needToken: false, params @@ -86,7 +86,7 @@ export function validateCode (params) { */ export function resetPassword (params) { return request({ - url: `/buyer/passport/members/resetPassword`, + url: `/buyer/passport/member/resetPassword`, method: Method.POST, needToken: false, params diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 25dd3c0d..b836510f 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -68,14 +68,31 @@ 已有{{ item.content.commentNum || 0 }}人评价
-
- 自营 +
+ 自营 -
-
虚拟
-
实物
+
+
+ 虚拟 +
+
+ 实物 +
- {{ item.content.storeName }} + {{ + item.content.storeName + }}
@@ -98,134 +115,141 @@ diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue index 0f968410..8829c91d 100644 --- a/manager/src/views/lili-floor-renovation/wap/decorate.vue +++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue @@ -2,17 +2,27 @@
{{ res.name }} - +
-
+
{{ item.name }}
@@ -20,18 +30,29 @@ -
+
卡片
- +
-
+
标题{{ title_index + 1 }}
@@ -46,19 +67,28 @@
绑定商品
-
- +
-
- {{bindGoods.title}}, +
+ {{ bindGoods.title }},
-
- +
-
@@ -72,7 +102,13 @@
- +
@@ -90,50 +126,54 @@ 已选链接： - {{ ways.find((e)=>{return item.url.___type == e.name}).title }} + {{ + ways.find((e) => { + return item.url.___type == e.name; + }).title + }} - - {{item.url.goodsName}} + {{ item.url.goodsName }} - {{item.url.name}} + {{ item.url.name }} - {{item.url.memberName}} + {{ item.url.memberName }} - {{item.url.title}} + {{ item.url.title }} - - 秒杀 - - - 满减 - - - 拼团 - - {{item.url.title || item.url.goodsName}} + 秒杀 + 满减 + 拼团 + {{ item.url.title || item.url.goodsName }} - {{item.url.title}} - + {{ item.url.title }} -
- +
- + - + @@ -179,18 +219,17 @@ export default { }, // 回调的商品信息 selectedGoodsData(val) { - if (!val) return false; let data = val.map((item) => { delete item.selected; - delete item.intro - delete item.mobileIntro + delete item.intro; + delete item.mobileIntro; return { img: item.thumbnail, title: item.goodsName, type: this.selectedGoods.title, - ___index:this.selectedGoods.___index, - ...item + ___index: this.selectedGoods.___index, + ...item, }; }); this.res.options.list[0].listWay.push(...data); @@ -236,7 +275,7 @@ export default { title: "标题", link: "", url: "", - size: this.res.options.list[0].size, + size: this.res.options.list[0]?.size, }; this.res.options.list.push(way); }, diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue index df1369f9..21aa9c28 100644 --- a/manager/src/views/lili-floor-renovation/wap/navbar.vue +++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue @@ -3,7 +3,13 @@
店铺装修
-
@@ -18,7 +24,13 @@ --> - +
模板名称 @@ -65,7 +77,7 @@ export default { // selected: false, // }, ], - + submitWay: { // 表单信息 pageShow: this.$route.query.type || false, @@ -99,7 +111,7 @@ export default { return false; } - this.submitWay.pageShow + this.submitWay?.pageShow === true ? (this.submitWay.pageShow = "OPEN") : (this.submitWay.pageShow = "CLOSE"); diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue index 41ea8e67..490b972a 100644 --- a/manager/src/views/order/after-order/afterSaleOrder.vue +++ b/manager/src/views/order/after-order/afterSaleOrder.vue @@ -2,7 +2,13 @@
-
+ - @@ -63,12 +74,23 @@ /> - - +
- diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue index 1a2bb4dd..a4a5edda 100644 --- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue +++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue @@ -7,56 +7,54 @@

退货申请

退货状态
-
{{afterSaleInfo.serviceName}}
+
{{ afterSaleInfo.serviceName }}
退货退款编号
-
{{afterSaleInfo.sn}}
+
{{ afterSaleInfo.sn }}
退货退款原因
-
{{afterSaleInfo.reason}}
+
{{ afterSaleInfo.reason }}
申请退款金额
-
￥{{afterSaleInfo.applyRefundPrice | unitPrice}}
+
￥{{ afterSaleInfo.applyRefundPrice | unitPrice }}
实际退款金额
-
￥{{afterSaleInfo.actualRefundPrice | unitPrice}}
+
￥{{ afterSaleInfo.actualRefundPrice | unitPrice }}
退还积分
-
{{afterSaleInfo.refundPoint}}
+
{{ afterSaleInfo.refundPoint }}
退货数量
-
{{afterSaleInfo.num}}
+
{{ afterSaleInfo.num }}
问题描述
-
{{afterSaleInfo.problemDesc}}
+
{{ afterSaleInfo.problemDesc }}
凭证
-
- 暂无凭证 -
+
暂无凭证
- +
-
+

处理意见

商家
- {{afterSaleInfo.storeName}} + {{ afterSaleInfo.storeName }}
@@ -64,7 +62,11 @@
是否同意
- + 同意 @@ -77,37 +79,49 @@
申请退款金额
-
{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}
+
{{ afterSaleInfo.applyRefundPrice | unitPrice("￥") }}
实际退款金额
- +
备注信息
- +
-
-
-
+

商家处理

商家
- {{afterSaleInfo.storeName}} + {{ afterSaleInfo.storeName }}
@@ -128,139 +142,176 @@
备注信息
- {{afterSaleInfo.auditRemark || '暂无备注信息'}} + {{ afterSaleInfo.auditRemark || "暂无备注信息" }}
-
- -
+

相关商品交易信息

- +
- {{afterSaleInfo.goodsName}} + {{ + afterSaleInfo.goodsName + }}
- +
- +
-
数量：x{{afterSaleInfo.num}}
- +
+ 数量：x{{ afterSaleInfo.num }} +
-

订单相关信息

-
- 订单编号 -
+
订单编号
- {{afterSaleInfo.orderSn}} + {{ afterSaleInfo.orderSn }}
银行开户行
- {{afterSaleInfo.bankDepositName}} + {{ afterSaleInfo.bankDepositName }}
银行开户名
- {{afterSaleInfo.bankAccountName}} + {{ afterSaleInfo.bankAccountName }}
银行卡号
- {{afterSaleInfo.bankAccountNumber}} + {{ afterSaleInfo.bankAccountNumber }}
-
-
+

平台退款

银行开户行
- {{afterSaleInfo.bankDepositName}} + {{ afterSaleInfo.bankDepositName }}
银行开户名
- {{afterSaleInfo.bankAccountName}} + {{ afterSaleInfo.bankAccountName }}
银行卡号
- {{afterSaleInfo.bankAccountNumber}} + {{ afterSaleInfo.bankAccountNumber }}
备注信息
- +
操作
-
-
+

物流信息

收货商家
-
{{afterSaleInfo.storeName}}
+
{{ afterSaleInfo.storeName }}
收货商家手机
-
{{storeMsg.salesConsigneeMobile}}
+
{{ storeMsg.salesConsigneeMobile }}
收货地址
-
{{storeMsg.salesConsigneeAddressPath}} {{storeMsg.salesConsigneeDetail}}
+
+ {{ storeMsg.salesConsigneeAddressPath }} + {{ storeMsg.salesConsigneeDetail }} +
物流公司
-
{{afterSaleInfo.mlogisticsName}}
+
{{ afterSaleInfo.mlogisticsName }}
-
- 物流单号 -
+
物流单号
- {{afterSaleInfo.mlogisticsNo}} + {{ afterSaleInfo.mlogisticsNo }}
操作
-
-
-
@@ -273,33 +324,32 @@
售后单号：
-
{{sn}}
+
{{ sn }}
物流公司：
-
{{afterSaleInfo.mlogisticsName}}
+
{{ afterSaleInfo.mlogisticsName }}
快递单号：
-
{{afterSaleInfo.mlogisticsNo}}
+
{{ afterSaleInfo.mlogisticsNo }}
    -
@@ -312,14 +362,17 @@ - \ No newline at end of file +@import "./addGoods.scss"; + diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index f7a8d0ca..a3e6df33 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -1279,6 +1279,9 @@ export default { delete sku.specValueId; return sku; }); + if (this.firstData.tempId) { + delete submit.id; + } if (submit.goodsGalleryFiles.length > 0) { submit.goodsGalleryList = submit.goodsGalleryFiles.map((i) => i.url); diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 7f6e474e..0a22b582 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -1,9 +1,8 @@