From 1c3d711298d47f6a265013fceba18af3607ec0b7 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Thu, 20 Jan 2022 17:21:30 +0800 Subject: [PATCH 01/20] =?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 15456ae37789cf4548dd5a2043a98a344817de54 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 20 Jan 2022 17:40:05 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AF=84=E8=AE=BA=EF=BC=8C=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E4=B8=8D=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-review/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue index ac2477a5..ecce2cad 100644 --- a/manager/src/views/goods/goods-review/index.vue +++ b/manager/src/views/goods/goods-review/index.vue @@ -304,6 +304,7 @@ export default { loading: true, onOk: () => { API_Member.delMemberReview(v.id).then((res) => { + this.$Modal.remove(); this.$Message.success("修改成功"); this.init(); }); From e1d7b1801d8f912e5e05ecc962c7974eabb311a0 Mon Sep 17 00:00:00 2001 From: fengtianyangyang Date: Fri, 21 Jan 2022 09:14:21 +0800 Subject: [PATCH 03/20] =?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 c8a06191417f5efa7dc6c13d1aad7a885788fc2d Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 21 Jan 2022 16:20:15 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting-manage/setting/POINT_SETTING.vue | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue index 42f8b7da..4b85dddd 100644 --- a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue @@ -1,17 +1,24 @@ - + --> + + +
+ +
+ + +
+ +
+ + +
+ +
+ +

商品详情描述

- + - - + +

商品物流信息

- +