diff --git a/buyer/docker.sh b/buyer/docker.sh index caa0f20f..71210188 100644 --- a/buyer/docker.sh +++ b/buyer/docker.sh @@ -1 +1 @@ -docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.2.1 . +docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.3.0.1 . diff --git a/buyer/public/config.js b/buyer/public/config.js index f54f0890..555828da 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:8889", + manager: "http://127.0.0.1:8887", + buyer: "http://127.0.0.1:8888", + common: "http://127.0.0.1:8890", }, 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/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..6de478f4 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/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 403a5c3f..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 @@ -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 }); @@ -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..789ec356 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/member/refresh/${token}`, method: Method.GET, needToken: false }) diff --git a/buyer/src/api/login.js b/buyer/src/api/login.js index ab81f1f5..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/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/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/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/members', + url: '/buyer/passport/member', 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/member/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/member/resetPassword`, method: Method.POST, needToken: false, params diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 815eb753..5cfe167d 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 }); @@ -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 @@ -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 }); @@ -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 @@ -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..58d74a02 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 @@ -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/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/Search.vue b/buyer/src/components/Search.vue index 0d19bed0..76d34ccd 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -159,6 +159,6 @@ export default { position: relative; height: 0px; top: -38px; - left: 339px; + left: 352px; } 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/config/index.js b/buyer/src/config/index.js index 7569684e..65be2176 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -7,6 +7,6 @@ module.exports = { }, //公司信息 icpMessage: "京ICP备20009696号-1", //icp备案 aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key - enableCDN: true, //生产环境 是否启用cdn加载 vue等js - port:10000, //端口 + enableCDN: false, //生产环境 是否启用cdn加载 vue等js + port: 10000, //端口 }; 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/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 8c04149a..90106cb7 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/buyer/src/pages/home/memberCenter/Profile.vue b/buyer/src/pages/home/memberCenter/Profile.vue index 663924d5..fe2380a5 100644 --- a/buyer/src/pages/home/memberCenter/Profile.vue +++ b/buyer/src/pages/home/memberCenter/Profile.vue @@ -48,7 +48,7 @@ export default { nickName: [{required: true, message: '用户昵称不能为空'}, { max: 16, message: '用户昵称不能超过15个字符' }] }, formItem: {}, // 表单数据 - action: commonUrl + '/common/upload/file', // 上传接口 + action: commonUrl + '/common/common/upload/file', // 上传接口 accessToken: {} // 验证token } }, diff --git a/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue index 34c41ee3..62abab45 100644 --- a/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue +++ b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue @@ -81,7 +81,7 @@ export default { descriptionScore: 5 }, // 表单 visible: false, // 图片预览 - action: commonUrl + '/common/upload/file', // 上传地址 + action: commonUrl + '/common/common/upload/file', // 上传地址 accessToken: {}, // 验证token previewImage: '', // 预览图片地址 loading: false // 提交加载状态 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/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue index 1617a3d9..3f0441cf 100644 --- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue +++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue @@ -117,7 +117,7 @@ export default { num: 1 }, uploadList: [], // 上传列表 - action: commonUrl + '/common/upload/file', // 上传地址 + action: commonUrl + '/common/common/upload/file', // 上传地址 accessToken: {}, // 验证token visible: false, // 图片预览 previewImage: '', // 预览图片url diff --git a/buyer/src/pages/home/orderCenter/Complain.vue b/buyer/src/pages/home/orderCenter/Complain.vue index 04f868d8..4bc4ccb4 100644 --- a/buyer/src/pages/home/orderCenter/Complain.vue +++ b/buyer/src/pages/home/orderCenter/Complain.vue @@ -68,7 +68,7 @@ export default { content: '' }, // 表单 visible: false, // 图片预览 - action: commonUrl + '/common/upload/file', // 上传地址 + action: commonUrl + '/common/common/upload/file', // 上传地址 accessToken: {}, // 验证token previewImage: '', // 图片地址 loading: false, // 加载状态 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); } }); diff --git a/buyer/src/pages/shopEntry/FirstApply.vue b/buyer/src/pages/shopEntry/FirstApply.vue index 7473a0e9..756f569e 100644 --- a/buyer/src/pages/shopEntry/FirstApply.vue +++ b/buyer/src/pages/shopEntry/FirstApply.vue @@ -205,7 +205,7 @@ export default { }, data () { return { - action: commonUrl + '/common/upload/file', // 上传地址 + action: commonUrl + '/common/common/upload/file', // 上传地址 accessToken: {}, // 验证token visible: false, // 预览图片 loading: false, // 加载状态 diff --git a/buyer/src/pages/shopEntry/ThirdApply.vue b/buyer/src/pages/shopEntry/ThirdApply.vue index 42928161..6a16e4de 100644 --- a/buyer/src/pages/shopEntry/ThirdApply.vue +++ b/buyer/src/pages/shopEntry/ThirdApply.vue @@ -129,7 +129,7 @@ export default { return { loading: false, // 加载状态 uploadLoading: false, // 上传加载状态 - action: commonUrl + '/common/upload/file', // 上传地址 + action: commonUrl + '/common/common/upload/file', // 上传地址 accessToken: {}, // 验证token previewPicture: '', // 预览图片 address: '', // 回显地址 diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index 5f39f210..b9e8a6cf 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -142,7 +142,7 @@ service.interceptors.response.use( const errorResponse = error.response || {}; const errorData = errorResponse.data || {}; - if (errorResponse.status === 403) { + if (errorResponse.status === 403 || error.response.data.code === 20004) { isRefreshToken++; if (isRefreshToken === 1) { diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index 9a68e027..80251a22 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -1,344 +1,383 @@ -import Vue from 'vue'; -import Router from 'vue-router'; -import Index from '@/pages/Index'; -const Login = resolve => require(['@/pages/Login'], resolve); -const SignUp = resolve => require(['@/pages/SignUp'], resolve); -const ForgetPassword = resolve => require(['@/pages/ForgetPassword'], resolve); -const GoodsList = resolve => require(['@/pages/GoodsList'], resolve); -const GoodsDetail = resolve => require(['@/pages/GoodsDetail'], resolve); -const PointGoodsDetail = resolve => require(['@/pages/promotion/PointGoodsDetail'], resolve); -const ShoppingCart = resolve => require(['@/pages/ShoppingCart'], resolve); -const Cart = resolve => require(['@/pages/Cart'], resolve); -const Pay = resolve => require(['@/pages/payment/Pay'], resolve); -const PayDone = resolve => require(['@/pages/payment/PayDone'], resolve); -const PayMent = resolve => require(['@/pages/payment/PayMent'], resolve); -const ThirdPay = resolve => require(['@/pages/payment/ThirdPay'], resolve); -const Coupon = resolve => require(['@/pages/CouponCenter'], resolve); -const seckill = resolve => require(['@/pages/promotion/seckill'], resolve); -const article = resolve => require(['@/pages/article/index'], resolve); -const PointMall = resolve => require(['@/pages/promotion/PointMall'], resolve); +import Vue from "vue"; +import Router from "vue-router"; +import Index from "@/pages/Index"; +const Login = (resolve) => require(["@/pages/Login"], resolve); +const SignUp = (resolve) => require(["@/pages/SignUp"], resolve); +const ForgetPassword = (resolve) => + require(["@/pages/ForgetPassword"], resolve); +const GoodsList = (resolve) => require(["@/pages/GoodsList"], resolve); +const GoodsDetail = (resolve) => require(["@/pages/GoodsDetail"], resolve); +const PointGoodsDetail = (resolve) => + require(["@/pages/promotion/PointGoodsDetail"], resolve); +const ShoppingCart = (resolve) => require(["@/pages/ShoppingCart"], resolve); +const Cart = (resolve) => require(["@/pages/Cart"], resolve); +const Pay = (resolve) => require(["@/pages/payment/Pay"], resolve); +const PayDone = (resolve) => require(["@/pages/payment/PayDone"], resolve); +const PayMent = (resolve) => require(["@/pages/payment/PayMent"], resolve); +const ThirdPay = (resolve) => require(["@/pages/payment/ThirdPay"], resolve); +const Coupon = (resolve) => require(["@/pages/CouponCenter"], resolve); +const seckill = (resolve) => require(["@/pages/promotion/seckill"], resolve); +const article = (resolve) => require(["@/pages/article/index"], resolve); +const articleDetail = (resolve) => require(["@/pages/article/detail"], resolve); +const PointMall = (resolve) => + require(["@/pages/promotion/PointMall"], resolve); /* * 会员中心 * 订单列表 */ -const MyOrder = resolve => require([`@/pages/home/orderCenter/MyOrder`], resolve); -const OrderDetail = resolve => require([`@/pages/home/orderCenter/OrderDetail`], resolve); -const MyAddress = resolve => require(['@/pages/home/orderCenter/MyAddress'], resolve); -const AddAddress = resolve => require(['@/pages/home/orderCenter/AddAddress'], resolve); -const Complain = resolve => require(['@/pages/home/orderCenter/Complain'], resolve); -const AfterSale = resolve => require(['@/pages/home/orderCenter/AfterSale'], resolve); -const AfterSaleDetail = resolve => require(['@/pages/home/orderCenter/AfterSaleDetail'], resolve); -const ApplyAfterSale = resolve => require(['@/pages/home/orderCenter/ApplyAfterSale'], resolve); +const MyOrder = (resolve) => + require([`@/pages/home/orderCenter/MyOrder`], resolve); +const OrderDetail = (resolve) => + require([`@/pages/home/orderCenter/OrderDetail`], resolve); +const MyAddress = (resolve) => + require(["@/pages/home/orderCenter/MyAddress"], resolve); +const AddAddress = (resolve) => + require(["@/pages/home/orderCenter/AddAddress"], resolve); +const Complain = (resolve) => + require(["@/pages/home/orderCenter/Complain"], resolve); +const AfterSale = (resolve) => + require(["@/pages/home/orderCenter/AfterSale"], resolve); +const AfterSaleDetail = (resolve) => + require(["@/pages/home/orderCenter/AfterSaleDetail"], resolve); +const ApplyAfterSale = (resolve) => + require(["@/pages/home/orderCenter/ApplyAfterSale"], resolve); /* * 会员中心 */ -const Profile = resolve => require(['@/pages/home/memberCenter/Profile'], resolve); -const AccountSafe = resolve => require(['@/pages/home/memberCenter/AccountSafe'], resolve); -const ModifyPwd = resolve => require(['@/pages/home/memberCenter/ModifyPwd'], resolve); -const Favorites = resolve => require(['@/pages/home/memberCenter/Favorites'], resolve); -const Distribution = resolve => require(['@/pages/home/memberCenter/Distribution'], resolve); -const CommentList = resolve => require(['@/pages/home/memberCenter/CommentList'], resolve); // 评价列表 -const AddEval = resolve => require(['@/pages/home/memberCenter/evaluation/AddEval'], resolve); // 添加评价 -const EvalDetail = resolve => require(['@/pages/home/memberCenter/evaluation/EvalDetail'], resolve); -const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList'], resolve); -const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve); -const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve); -const MsgList = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgList'], resolve); -const MsgDetail = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgDetail'], resolve); +const Profile = (resolve) => + require(["@/pages/home/memberCenter/Profile"], resolve); +const AccountSafe = (resolve) => + require(["@/pages/home/memberCenter/AccountSafe"], resolve); +const ModifyPwd = (resolve) => + require(["@/pages/home/memberCenter/ModifyPwd"], resolve); +const Favorites = (resolve) => + require(["@/pages/home/memberCenter/Favorites"], resolve); +const Distribution = (resolve) => + require(["@/pages/home/memberCenter/Distribution"], resolve); +const CommentList = (resolve) => + require(["@/pages/home/memberCenter/CommentList"], resolve); // 评价列表 +const AddEval = (resolve) => + require(["@/pages/home/memberCenter/evaluation/AddEval"], resolve); // 添加评价 +const EvalDetail = (resolve) => + require(["@/pages/home/memberCenter/evaluation/EvalDetail"], resolve); +const ComplainList = (resolve) => + require(["@/pages/home/memberCenter/ComplainList"], resolve); +const ComplainDetail = (resolve) => + require(["@/pages/home/memberCenter/ComplainDetail"], resolve); +const Point = (resolve) => + require(["@/pages/home/memberCenter/Point"], resolve); +const MsgList = (resolve) => + require(["@/pages/home/memberCenter/memberMsg/MsgList"], resolve); +const MsgDetail = (resolve) => + require(["@/pages/home/memberCenter/memberMsg/MsgDetail"], resolve); /* * 会员中心 * 账户中心 * */ -const Coupons = resolve => require(['@/pages/home/userCenter/Coupons'], resolve); -const MyTracks = resolve => require(['@/pages/home/userCenter/MyTracks'], resolve); -const MoneyManagement = resolve => require(['@/pages/home/userCenter/MoneyManagement'], resolve); +const Coupons = (resolve) => + require(["@/pages/home/userCenter/Coupons"], resolve); +const MyTracks = (resolve) => + require(["@/pages/home/userCenter/MyTracks"], resolve); +const MoneyManagement = (resolve) => + require(["@/pages/home/userCenter/MoneyManagement"], resolve); -const Home = resolve => require(['@/pages/user/Home'], resolve); +const Home = (resolve) => require(["@/pages/user/Home"], resolve); -const Merchant = resolve => require(['@/pages/Merchant'], resolve); -const UserMain = resolve => require(['@/pages/home/Main'], resolve); +const Merchant = (resolve) => require(["@/pages/Merchant"], resolve); +const UserMain = (resolve) => require(["@/pages/home/Main"], resolve); /** * 店铺入驻 */ -const ShopEntry = resolve => require(['@/pages/shopEntry/ShopEntry'], resolve); +const ShopEntry = (resolve) => + require(["@/pages/shopEntry/ShopEntry"], resolve); Vue.use(Router); export default new Router({ - mode: 'history', - routes: [{ - path: '/', // 首页 - name: 'Index', - component: Index - }, - { - path: '/login', // 登陆 - name: 'login', - component: Login, - meta: { - title: '登录' - } - }, - { - path: '/SignUp', // 注册 - name: 'SignUp', - component: SignUp, - meta: { - title: '注册' - } - }, - { - path: '/forgetPassword', // 忘记密码 - name: 'forgetPassword', - component: ForgetPassword, - meta: { - title: '忘记密码' - } - }, - { - path: '/goodsList', // 商品列表 - name: 'GoodsList', - component: GoodsList - }, - { - path: '/goodsDetail', // 商品详情 - name: 'GoodsDetail', - component: GoodsDetail, - meta: {title: '商品详情'} - }, - { - path: '/pointGoodsDetail', // 商品详情 - name: 'PointGoodsDetail', - component: PointGoodsDetail, - meta: {title: '积分商品'} - }, - { - path: '/shoppingCart', // 头部购物车 - name: 'ShoppingCart', - component: ShoppingCart - }, - { - path: '/cart', // 购物车 - name: 'Cart', - component: Cart, - meta: {title: '购物车'} - }, - { - path: '/pay', // 支付页面 - name: 'Pay', - component: Pay, - meta: {title: '订单结算'} - }, - { - path: '/payMent', - name: 'PayMent', - component: PayMent - }, - { - path: '/PointMall', - name: 'PointMall', - component: PointMall, - meta: {title: '积分商城'} - }, - { - path: '/qrpay', // 三方支付 - name: 'qrpay', - component: ThirdPay - }, - { - path: '/payDone', // 支付成功页面 - name: 'PayDone', - component: PayDone - }, - { - path: '/article', // 文章页面 - name: 'article', - component: article, - meta: { - title: '帮助中心' - } - }, - { - path: '/shopEntry', - name: 'shopEntry', - component: ShopEntry, - meta: { - title: '店铺入驻' - } - }, - { - path: '/coupon', - name: 'coupon', - component: Coupon, - meta: { - title: '领券中心' - } - }, - { - path: '/seckill', - name: 'seckill', - component: seckill, - meta: { - title: '限时秒杀' - } - }, - { - path: '/home', // 主页 - component: Home, - children: [{ - path: '/', - name: 'Home', - component: UserMain, + mode: "history", + routes: [ + { + path: "/", // 首页 + name: "Index", + component: Index, + }, + { + path: "/login", // 登陆 + name: "login", + component: Login, meta: { - title: '会员中心' - } + title: "登录", + }, }, { - path: 'MyTracks', - name: 'MyTracks', - component: MyTracks, - meta: {title: '我的足迹'} + path: "/SignUp", // 注册 + name: "SignUp", + component: SignUp, + meta: { + title: "注册", + }, }, { - path: 'MoneyManagement', - name: 'MoneyManagement', - component: MoneyManagement + path: "/forgetPassword", // 忘记密码 + name: "forgetPassword", + component: ForgetPassword, + meta: { + title: "忘记密码", + }, }, { - path: 'Complain', - name: 'Complain', - component: Complain + path: "/goodsList", // 商品列表 + name: "GoodsList", + component: GoodsList, }, { - path: 'Coupons', - name: 'Coupons', - component: Coupons + path: "/goodsDetail", // 商品详情 + name: "GoodsDetail", + component: GoodsDetail, + meta: { title: "商品详情" }, }, { - path: 'CommentList', - name: 'CommentList', - component: CommentList, - mate: {title: '评价列表'} + path: "/pointGoodsDetail", // 商品详情 + name: "PointGoodsDetail", + component: PointGoodsDetail, + meta: { title: "积分商品" }, }, { - path: 'AddEval', - name: 'AddEval', - component: AddEval, - mate: {title: '添加评价'} + path: "/shoppingCart", // 头部购物车 + name: "ShoppingCart", + component: ShoppingCart, }, { - path: 'EvalDetail', - name: 'EvalDetail', - component: EvalDetail, - mate: {title: '评价详情'} + path: "/cart", // 购物车 + name: "Cart", + component: Cart, + meta: { title: "购物车" }, }, { - path: 'ComplainList', - name: 'ComplainList', - component: ComplainList + path: "/pay", // 支付页面 + name: "Pay", + component: Pay, + meta: { title: "订单结算" }, }, { - path: 'ComplainDetail', - name: 'ComplainDetail', - component: ComplainDetail + path: "/payMent", + name: "PayMent", + component: PayMent, }, { - path: 'AccountSafe', - name: 'AccountSafe', - component: AccountSafe + path: "/PointMall", + name: "PointMall", + component: PointMall, + meta: { title: "积分商城" }, }, { - path: 'ModifyPwd', - name: 'ModifyPwd', - component: ModifyPwd + path: "/qrpay", // 三方支付 + name: "qrpay", + component: ThirdPay, }, { - path: 'Favorites', - name: 'Favorites', - component: Favorites, - meta: {title: '我的收藏'} + path: "/payDone", // 支付成功页面 + name: "PayDone", + component: PayDone, }, { - path: 'Distribution', - name: 'Distribution', - component: Distribution, - meta: {title: '分销推荐'} + path: "/article", // 文章页面 + name: "article", + component: article, + meta: { + title: "帮助中心", + }, }, { - path: 'Point', - name: 'Point', - component: Point, - meta: {title: '我的积分'} + path: "/article/detail", // 文章页面 + name: "articleDetail", + component: articleDetail, + meta: { + title: "帮助中心", + }, }, { - path: 'Profile', - name: 'Profile', - component: Profile + path: "/shopEntry", + name: "shopEntry", + component: ShopEntry, + meta: { + title: "店铺入驻", + }, }, { - path: 'AfterSale', - name: 'AfterSale', - component: AfterSale, - meta: {title: '售后'} + path: "/coupon", + name: "coupon", + component: Coupon, + meta: { + title: "领券中心", + }, }, { - path: 'ApplyAfterSale', - name: 'ApplyAfterSale', - component: ApplyAfterSale, - meta: {title: '申请售后'} + path: "/seckill", + name: "seckill", + component: seckill, + meta: { + title: "限时秒杀", + }, }, { - path: '/home/MyAddress', - name: 'MyAddress', - component: MyAddress, - meta: {title: '收货地址'} + path: "/home", // 主页 + component: Home, + children: [ + { + path: "/", + name: "Home", + component: UserMain, + meta: { + title: "会员中心", + }, + }, + { + path: "MyTracks", + name: "MyTracks", + component: MyTracks, + meta: { title: "我的足迹" }, + }, + { + path: "MoneyManagement", + name: "MoneyManagement", + component: MoneyManagement, + }, + { + path: "Complain", + name: "Complain", + component: Complain, + }, + { + path: "Coupons", + name: "Coupons", + component: Coupons, + }, + { + path: "CommentList", + name: "CommentList", + component: CommentList, + mate: { title: "评价列表" }, + }, + { + path: "AddEval", + name: "AddEval", + component: AddEval, + mate: { title: "添加评价" }, + }, + { + path: "EvalDetail", + name: "EvalDetail", + component: EvalDetail, + mate: { title: "评价详情" }, + }, + { + path: "ComplainList", + name: "ComplainList", + component: ComplainList, + }, + { + path: "ComplainDetail", + name: "ComplainDetail", + component: ComplainDetail, + }, + { + path: "AccountSafe", + name: "AccountSafe", + component: AccountSafe, + }, + { + path: "ModifyPwd", + name: "ModifyPwd", + component: ModifyPwd, + }, + { + path: "Favorites", + name: "Favorites", + component: Favorites, + meta: { title: "我的收藏" }, + }, + { + path: "Distribution", + name: "Distribution", + component: Distribution, + meta: { title: "分销推荐" }, + }, + { + path: "Point", + name: "Point", + component: Point, + meta: { title: "我的积分" }, + }, + { + path: "Profile", + name: "Profile", + component: Profile, + }, + { + path: "AfterSale", + name: "AfterSale", + component: AfterSale, + meta: { title: "售后" }, + }, + { + path: "ApplyAfterSale", + name: "ApplyAfterSale", + component: ApplyAfterSale, + meta: { title: "申请售后" }, + }, + { + path: "/home/MyAddress", + name: "MyAddress", + component: MyAddress, + meta: { title: "收货地址" }, + }, + { + path: "AddAddress", + name: "AddAddress", + component: AddAddress, + }, + { + path: "MsgList", + name: "MsgList", + component: MsgList, + meta: { title: "我的消息" }, + }, + { + path: "MsgDetail", + name: "MsgDetail", + component: MsgDetail, + meta: { title: "我的消息" }, + }, + { + path: "MyOrder", + name: "MyOrder", + component: MyOrder, + meta: { title: "我的订单" }, + }, + { + path: "OrderDetail", + name: "OrderDetail", + component: OrderDetail, + meta: { title: "订单详情" }, + }, + { + path: "AfterSaleDetail", + name: "AfterSaleDetail", + component: AfterSaleDetail, + meta: { title: "售后详情" }, + }, + ], }, { - path: 'AddAddress', - name: 'AddAddress', - component: AddAddress + path: "/merchant", + name: "Merchant", + component: Merchant, + meta: { title: "店铺" }, }, - { - path: 'MsgList', - name: 'MsgList', - component: MsgList, - meta: {title: '我的消息'} - }, - { - path: 'MsgDetail', - name: 'MsgDetail', - component: MsgDetail, - meta: {title: '我的消息'} - }, - { - path: 'MyOrder', - name: 'MyOrder', - component: MyOrder, - meta: {title: '我的订单'} - }, - { - path: 'OrderDetail', - name: 'OrderDetail', - component: OrderDetail, - meta: {title: '订单详情'} - }, - { - path: 'AfterSaleDetail', - name: 'AfterSaleDetail', - component: AfterSaleDetail, - meta: {title: '售后详情'} - } - ] - }, - { - path: '/merchant', - name: 'Merchant', - component: Merchant, - meta: {title: '店铺'} - } - ] + ], }); diff --git a/docker-push.sh b/docker-push.sh index cbf60318..c2c2bb2a 100644 --- a/docker-push.sh +++ b/docker-push.sh @@ -1,5 +1,5 @@ -docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.2.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui:4.2.2.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui:4.2.2.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.2.2.1 +docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.3.0.1 +docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui:4.3.0.1 +docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui:4.3.0.1 +docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.3.0.1 diff --git a/manager/docker.sh b/manager/docker.sh index 39eccb4a..27fdcaf7 100644 --- a/manager/docker.sh +++ b/manager/docker.sh @@ -1 +1 @@ -docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.2.2.1 . +docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.3.0.1 . diff --git a/manager/public/config.js b/manager/public/config.js index da3cda52..048f3158 100644 --- a/manager/public/config.js +++ b/manager/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:8889", + manager: "http://127.0.0.1:8887", + buyer: "http://127.0.0.1:8888", + common: "http://127.0.0.1:8890", }, API_PROD: { common: "https://common-api.pickmall.cn", @@ -27,4 +27,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..fe6aca80 100644 --- a/manager/src/api/common.js +++ b/manager/src/api/common.js @@ -2,20 +2,20 @@ import {commonUrl, getRequest, getRequestWithNoToken, postRequestWithNoToken} fr // 通过id获取子地区 export const getChildRegion = (id) => { - return getRequest(`${commonUrl}/common/region/item/${id}`); + return getRequest(`${commonUrl}/common/common/region/item/${id}`); }; // 点地图获取地址信息 export const getRegion = (params) => { - return getRequest(`${commonUrl}/common/region/region`, params); + return getRequest(`${commonUrl}/common/common/region/region`, 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..cab60545 100644 --- a/manager/src/api/goods.js +++ b/manager/src/api/goods.js @@ -26,15 +26,15 @@ export const disableBrand = (id, params) => { } //根据分类id获取关联品牌 export const getCategoryBrandListData = (category_id, params) => { - return getRequest(`/category/brand/${category_id}`, params) + return getRequest(`/goods/categoryBrand/${category_id}`, params) } //保存获取关联品牌 export const saveCategoryBrand = (category_id, params) => { - return postRequest(`/category/brand/${category_id}`, params) + return postRequest(`/goods/categoryBrand/${category_id}`, params) } //保存获取关联规格 export const saveCategorySpec = (category_id, params) => { - return postRequest(`/goods/category/spec/${category_id}`, params) + return postRequest(`/goods/categorySpec/${category_id}`, params) } //获取所有可用品牌 @@ -88,7 +88,7 @@ export const updateSpec = (id,params) => { } //根据分类id获取关联规格 export const getCategorySpecListData = (category_id, params) => { - return getRequest(`/goods/category/spec/${category_id}`, params) + return getRequest(`/goods/categorySpec/${category_id}`, params) } //删除gUI个 export const delSpec = (id, params) => { @@ -102,35 +102,35 @@ 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) } //查询分类绑定参数信息 export const getCategoryParamsListData = (id, params) => { - return getRequest(`/goods/category/parameters/${id}`, params) + return getRequest(`/goods/categoryParameters/${id}`, params) } //查询商品绑定参数信息 @@ -151,20 +151,20 @@ export const deleteParams = (id, params) => { } //保存参数组 export const insertParamsGroup = (params) => { - return postRequest('/goods/category/parameters', params) + return postRequest('/goods/categoryParameters', params) } //更新参数组 export const updateParamsGroup = (params) => { - return putRequest('/goods/category/parameters', params) + return putRequest('/goods/categoryParameters', params) } //删除参数组 export const deleteParamsGroup = (id, params) => { - return deleteRequest(`/goods/category/parameters/${id}`, params) + return deleteRequest(`/goods/categoryParameters/${id}`, params) } //保存获取关联规格 export const getGoodsSpecInfo = (category_id, params) => { - return getRequest(`/goods/category/spec/goods/${category_id}`, params) + return getRequest(`/goods/categorySpec/goods/${category_id}`, 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 7aae14a2..599600f4 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -16,13 +16,13 @@ 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"; //获取所有city export const getAllCity = (params) => { - return getRequest(commonUrl + '/common/region/allCity', params) + return getRequest(commonUrl + '/common/common/region/allCity', params) } @@ -48,21 +48,21 @@ export const getNoticePage = (params) => { // 登陆 export const login = (params) => { - return postRequestWithNoTokenData("/user/login", params); + return postRequestWithNoTokenData("/passport/user/login", params); }; // 登出 export const logout = () => { - return postRequest("/user/logout"); + return postRequest("/passport/user/logout"); }; // 刷新token export const handleRefreshToken = (token) => { - return getRequestWithNoToken(`/user/refresh/${token}`); + return getRequestWithNoToken(`/passport/user/refresh/${token}`); }; // 获取用户登录信息 export const userInfo = (params) => { - return getRequest("/user/info", params); + return getRequest("/passport/user/info", params); }; // 注册 export const regist = (params) => { @@ -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,30 +232,30 @@ export const deleteRole = (ids, params) => { /****************************** 权限 */ // 获取全部权限数据 export const getAllPermissionList = (params) => { - return getRequest("/menu/tree", params); + return getRequest("/permission/menu/tree", params); }; // 获取全部权限数据 export const getCurrentPermissionList = (params) => { - return getRequest("/menu/memberMenu", params); + return getRequest("/permission/menu/memberMenu", 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); }; /****************************** 权限结束 */ @@ -263,25 +263,25 @@ 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); }; // 分页获取消息数据 export const getMessageData = (params) => { - return getRequest("/message/getByCondition", params); + return getRequest("/other/message/getByCondition", params); }; // 获取单个消息详情 export const getMessageDataById = (id, params) => { - return getRequest(`/message/get/${id}`, params); + return getRequest(`/other/message/get/${id}`, params); }; // 发送消息 export const addMessage = (params) => { @@ -289,11 +289,11 @@ export const addMessage = (params) => { }; // 编辑消息 export const editMessage = (params) => { - return postRequest("/message/edit", params); + return postRequest("/other/message/edit", params); }; // 删除消息 export const deleteMessage = (ids, params) => { - return deleteRequest(`/message/delByIds/${ids}`, params); + return deleteRequest(`/other/message/delByIds/${ids}`, params); }; // 编辑发送消息 export const editMessageSend = (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) => { @@ -324,37 +324,37 @@ 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); }; // 分页查询敏感词 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,75 +376,74 @@ 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}`); }; // 重置用户密码 export const resetPassword = (params) => { - return postRequest(`/user/resetPassword/${params}"`); + return postRequest(`/passport/user/resetPassword/${params}"`); }; // 初始化商品索引 export const createIndex = () => { - return getRequest(`/elasticsearch`); + return getRequest(`/other/elasticsearch`); }; // 初始化商品索引 export const getProgress = () => { - return getRequest(`/elasticsearch/progress`); + return getRequest(`/other/elasticsearch/progress`); }; // 分页查询自定义分词 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/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/member.js b/manager/src/api/member.js index 48850755..1e098d77 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("/member", params); + return getRequest("/passport/member", params); }; // 获取会员详情 export const getMemberInfoData = (id) => { - return getRequest(`/member/${id}`); + return getRequest(`/passport/member/${id}`); }; // 修改会员基本信息 @@ -50,26 +50,26 @@ 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 => { - return getRequest("/recharge", params); + return getRequest("/wallet/recharge", params); }; // 获取预存款明细列表数据 @@ -79,17 +79,17 @@ 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); }; //会员状态修改 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) => { @@ -134,7 +134,7 @@ export const editMemberAddress = (params) => { } //查询会员预存款 export const getMemberWallet = (params) => { - return getRequest(`/members/wallet`, params) + return getRequest(`/wallet/wallet`, params) } diff --git a/manager/src/api/order.js b/manager/src/api/order.js index 9b37f96f..b57ab1e2 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,63 +100,58 @@ 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 = () => { - return getRequest(`/logistics/getChecked`) + return getRequest(`/other/logistics/getChecked`) } //查询物流 export const getTraces = (sn, params) => { - return postRequest(`/orders/getTraces/${sn}`, params) + return postRequest(`/order/order/getTraces/${sn}`, params) } //获取发票列表 export const getReceiptPage = (params) => { - return getRequest(`/receipt`, params) + return getRequest(`/trade/receipt`, 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}`) + return getRequest(`/order/afterSale/getStoreAfterSaleAddress/${sn}`) } - - - - - diff --git a/manager/src/api/other.js b/manager/src/api/other.js index 7dd0ab29..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}`); }; @@ -31,7 +31,7 @@ export const getHomeData = params => { */ export const getHomeList = params => { - return getRequest("/pageData/pageDataList", params); + return getRequest("/other/pageData/pageDataList", 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..6595cd97 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/promotion.js b/manager/src/api/promotion.js index 8fcede9a..50591f28 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -66,29 +66,29 @@ export const updatePintuanStatus = (pintuanId, params) => { // 修改砍价活动商品 export const saveKanJiaActivityGoods = params => { - return postRequest("/promotion/kan-jia-goods", params, { + return postRequest("/promotion/kanJiaGoods", params, { "Content-type": "application/json" }); }; // 修改砍价活动商品 export const editKanJiaActivityGoods = params => { - return putRequest("/promotion/kan-jia-goods", params, { + return putRequest("/promotion/kanJiaGoods", params, { "Content-type": "application/json" }); }; // 获取砍价活动商品 export const getKanJiaGoodsList = params => { - return getRequest(`/promotion/kan-jia-goods`, params); + return getRequest(`/promotion/kanJiaGoods`, params); }; //删除砍价活动商品 export const delKanJiaGoods = ids => { - return deleteRequest(`/promotion/kan-jia-goods/${ids}`); + return deleteRequest(`/promotion/kanJiaGoods/${ids}`); }; // 砍价活动商品详情 export const getKanJiaActivityGoodsById = id => { - return getRequest(`/promotion/kan-jia-goods/${id}`); + return getRequest(`/promotion/kanJiaGoods/${id}`); }; // 保存平台优惠券 diff --git a/manager/src/api/setting.js b/manager/src/api/setting.js index 2388ce09..43665c98 100644 --- a/manager/src/api/setting.js +++ b/manager/src/api/setting.js @@ -7,69 +7,69 @@ import { // 查询短信站内信信息 export const getMessageData = params => { - return getRequest("/message", params); + return getRequest("/other/message", params); }; //修改短信模板 export const editSmsMessageTemplate = (id, params) => { - return putRequest(`/message/sms/${id}`, params) + return putRequest(`/sms/sms/${id}`, params) } //修改站内信模板 export const editNoticeMessage = (id, params) => { - return putRequest(`/noticeMessage/${id}`, params) + return putRequest(`/setting/noticeMessage/${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) } // 查询站内信模板信息 export const getNoticeMessageData = params => { - return getRequest("/noticeMessage", params); + return getRequest("/setting/noticeMessage", params); }; //删除站内信 export const deleteMessage = (id) => { - return deleteRequest(`message/${id}`); + return deleteRequest(`/other/message/${id}`); }; // 开启站内信模板 export const openNoticeMessage = (id) => { - return putRequest(`/noticeMessage/${id}/open`); + return putRequest(`/setting/noticeMessage/${id}/open`); }; // 修改站内信状态 export const updateMessageStatus = (id,status) => { - return putRequest(`/noticeMessage/${id}/${status}`); + return putRequest(`/setting/noticeMessage/${id}/${status}`); }; //获取短信模板 export const getSmsTemplatePage = (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) => { @@ -153,46 +153,46 @@ 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); }; /* * 获取 支付支持设置开关 */ 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) } //获取通知类站内信 export const getNoticeMessageDetail = (id, params) => { - return getRequest(`/noticeMessage/${id}`, params) + return getRequest(`/setting/noticeMessage/${id}`, params) } diff --git a/manager/src/api/shops.js b/manager/src/api/shops.js index 93704f98..93d3493e 100644 --- a/manager/src/api/shops.js +++ b/manager/src/api/shops.js @@ -7,77 +7,77 @@ 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}`) } // 获取结算单分页 export const getBuyBillPage = (params) => { - return getRequest(`/store/bill/getByPage`,params) + return getRequest(`/order/bill/getByPage`,params) } // 获取结算单详情 export const getBuyBillDetail = (id) => { - return getRequest(`/store/bill/get/${id}`) + return getRequest(`/order/bill/get/${id}`) } // 获取商家结算单流水分页 export const getStoreFlow = (id,params) => { - return getRequest(`/store/bill/${id}/getStoreFlow`,params) + return getRequest(`/order/bill/${id}/getStoreFlow`,params) } // 审核结算单 export const examine = (id) => { - return putRequest(`/store/bill/examine/${id}`) + return putRequest(`/order/bill/examine/${id}`) } // 审核结算单 export const pay = (id) => { - return putRequest(`/store/bill/pay/${id}`) + return putRequest(`/order/bill/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/config/index.js b/manager/src/config/index.js index 67f42f81..28e36d58 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -2,6 +2,6 @@ module.exports = { title: "lilishop", //配置显示在浏览器标签的title aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key website: "https://www.pickmall.cn", //官网地址 - enableCDN: true, //生产环境 是否启用cdn加载 vue等js - port:10003, //端口 + enableCDN: false, //生产环境 是否启用cdn加载 vue等js + port: 10003, //端口 }; diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js index 46530847..550bbeba 100644 --- a/manager/src/libs/axios.js +++ b/manager/src/libs/axios.js @@ -60,6 +60,7 @@ service.interceptors.response.use( Message.error("系统异常"); } break; + case 20004: case 401: // 未登录 清除已登录状态 Cookies.set("userInfoManager", ""); @@ -93,7 +94,7 @@ service.interceptors.response.use( // 这种情况一般调到登录页 } else if (error.response.status === 404) { // 避免刷新token报错 - } else if (error.response.status === 403) { + } else if (error.response.status === 403 || error.response.data.code === 20004) { isRefreshToken++; if (isRefreshToken === 1) { const getTokenRes = await refreshToken(); diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue index a2302f04..63733b76 100644 --- a/manager/src/views/goods/goods-manage/category.vue +++ b/manager/src/views/goods/goods-manage/category.vue @@ -4,8 +4,14 @@
- +
@@ -42,18 +68,31 @@ {{ scope.row.commissionRate }}% - @@ -197,7 +211,7 @@ export default { background: #ededed; } .item-title { - background: #d7e7f5!important; + background: #d7e7f5 !important; height: 54px; } .no-more { @@ -239,12 +253,12 @@ export default { display: flex; justify-content: space-between; align-items: center; - div:nth-child(2){ + div:nth-child(2) { margin-right: 80px; } } } -.item:nth-of-type(2n+1) { +.item:nth-of-type(2n + 1) { background: #f5f7fa; } 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/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/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 @@ - diff --git a/manager/src/views/sys/log-manage/logManage.vue b/manager/src/views/sys/log-manage/logManage.vue index f1902238..83af4906 100644 --- a/manager/src/views/sys/log-manage/logManage.vue +++ b/manager/src/views/sys/log-manage/logManage.vue @@ -1,8 +1,13 @@ - 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 @@
-
+ - +

*APP应用 AppID 非必填

 - +

*小程序 AppID 非必填

 - +

*服务号 AppID 非必填

 - + - + - + - + - + - +
-
\ 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..eec96023 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -45,7 +45,11 @@ /> -
- -
- -
- - -
- -
- - -
- -
- - + -
+ --> + + +
+ +
+ + +
+ +
+ + +
+ +
+ +

商品详情描述

- + - - + +

商品物流信息

- + -
直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符
+ +
+ 直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符 +
- -
主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符
+ +
+ 主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符 +
- - + -
直播开播时间需要在当前时间的10分钟后并且,开始时间不能在6个月后,直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）
+
+ 直播开播时间需要在当前时间的10分钟后并且,开始时间不能在6个月后,直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时） +
- -
主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证
+ +
+ 主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证 +
-
- -
+ +
-
- 直播间分享图，图片规则：建议像素800*640，大小不超过1M； -
+
直播间分享图，图片规则：建议像素800*640，大小不超过1M；
-
- -
+ +
-
直播间背景图，图片规则：建议像素1080*1920，大小不超过1M
+
直播间背景图，图片规则：建议像素1080*1920，大小不超过1M
-
- -
+ +
-
直播间分享图，图片规则：建议像素800*640，大小不超过1M
+
直播间分享图，图片规则：建议像素800*640，大小不超过1M
- + -