Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

2025-12-20 09:55:53 +08:00 · 2022-02-15 10:12:53 +08:00
parent 166e889b6f db95647cd8
commit e8e7d27c0d
82 changed files with 3324 additions and 2258 deletions
--- 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
  })
--- 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
--- 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
  });
 }
--- 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
--- 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
  })
--- 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
--- 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
  });
--- 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' }
--- 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
--- 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
  })
--- 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;
 }
 </style>
--- 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,
--- 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, //端口
 };
--- 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: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
            okText: '我的优惠券',
            cancelText: '立即使用',
+            closable: true,
            onOk: () => {
              this.$router.push('/home/Coupons')
            },
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -68,14 +68,31 @@
                已有<span>{{ item.content.commentNum || 0 }}</span
                >人评价
              </div>
-              <div class="goods-show-seller" >
-                <Tag class="goods-show-buyer" v-if="item.content.selfOperated" size="default" color="error">自营
+              <div class="goods-show-seller">
+                <Tag
+                  class="goods-show-buyer"
+                  v-if="item.content.selfOperated"
+                  size="default"
+                  color="error"
+                  >自营
                </Tag>
-                <div class="goods-show-right" > 
-               <div class="goods-show-middle" v-if="goodsListType.content.goodsType == 'VIRTUAL_GOODS'">虚拟</div>
-                <div class="goods-show-middle" v-else-if="goodsListType.content.goodsType == 'PHYSICAL_GOODS'">实物</div>
+                <div class="goods-show-right">
+                  <div
+                    class="goods-show-middle"
+                    v-if="goodsListType.content.goodsType == 'VIRTUAL_GOODS'"
+                  >
+                    虚拟
+                  </div>
+                  <div
+                    class="goods-show-middle"
+                    v-else-if="goodsListType.content.goodsType == 'PHYSICAL_GOODS'"
+                  >
+                    实物
+                  </div>
                </div>
-                <span class="text-bottom" style="color:#e4393c;">{{ item.content.storeName }}</span>
+                <span class="text-bottom" style="color: #e4393c">{{
+                  item.content.storeName
+                }}</span>
              </div>
            </div>
          </div>
@@ -98,134 +115,141 @@
 </template>

 <script>
-import GoodsClassNav from '@/components/nav/GoodsClassNav';
-import * as apiGoods from '@/api/goods';
+import GoodsClassNav from "@/components/nav/GoodsClassNav";
+import * as apiGoods from "@/api/goods";
 export default {
-  name: 'GoodsList',
-  beforeRouteEnter (to, from, next) {
+  name: "GoodsList",
+  beforeRouteEnter(to, from, next) {
    window.scrollTo(0, 0);
    next();
  },
-  data () {
+  data() {
    return {
      sortIndex: 0, // 排序状态
      sortPriceIndex: false, // 判断价格升序还是降序
-      goodsTool: [ // 排序类型
-        { title: '综合', en: '' },
-        { title: '销量', en: 'buyCount' },
-        { title: '评论数', en: 'commentNum' },
-        { title: '新品', en: 'releaseTime' }
+      goodsTool: [
+        // 排序类型
+        { title: "综合", en: "" },
+        { title: "销量", en: "buyCount" },
+        { title: "评论数", en: "commentNum" },
+        { title: "新品", en: "releaseTime" },
      ],
      goodsList: [], // 商品列表
      loading: false, // 加载状态
-      goodsListType:"",
+      goodsListType: "",
      total: 0, // 列表总数
-      params: { // 请求参数
+      params: {
+        // 请求参数
        pageNumber: 0,
        pageSize: 20,
-        categoryId: ''
-      }
+        categoryId: "",
+      },
    };
  },
  watch: {
-    $route () {
-      const keyword = this.$route.query.keyword
-      this.handleSearch(keyword)
-    }
+    $route() {
+      const keyword = this.$route.query.keyword;
+      this.handleSearch(keyword);
+    },
  },
  methods: {
    // 搜索
-    handleSearch (key) {
-      this.params.keyword = key
-      this.params.pageNumber = 0
-      this.getGoodsList()
+    handleSearch(key) {
+      this.params.keyword = key;
+      this.params.pageNumber = 0;
+      this.getGoodsList();
    },
-    orderBy (data, index) {
+    orderBy(data, index) {
      // 排序
      this.sortIndex = index;
      this.params.sort = data;
-      this.params.order = 'desc';
-      if (data === 'price') {
+      this.params.order = "desc";
+      if (data === "price") {
        if (!this.sortPriceIndex) {
-          this.sortPriceIndex = 'asc';
+          this.sortPriceIndex = "asc";
        } else {
-          this.sortPriceIndex === 'desc' ? (this.sortPriceIndex = 'asc') : (this.sortPriceIndex = 'desc');
+          this.sortPriceIndex === "desc"
+            ? (this.sortPriceIndex = "asc")
+            : (this.sortPriceIndex = "desc");
        }
-        this.params.order = this.sortPriceIndex
+        this.params.order = this.sortPriceIndex;
      } else {
-        this.sortPriceIndex = false
+        this.sortPriceIndex = false;
      }
      this.getGoodsList();
    },
-    goGoodsDetail (skuId, goodsId) {
+    goGoodsDetail(skuId, goodsId) {
      // 跳转商品详情
      let routeUrl = this.$router.resolve({
-        path: '/goodsDetail',
-        query: { skuId, goodsId }
+        path: "/goodsDetail",
+        query: { skuId, goodsId },
      });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
    },
    // 分页 修改页码
-    changePageNum (val) {
+    changePageNum(val) {
      this.params.pageNumber = val;
      this.getGoodsList();
    },
    // 分页 修改页数
-    changePageSize (val) {
+    changePageSize(val) {
      this.params.pageNumber = 1;
      this.params.pageSize = val;
      this.getGoodsList();
    },
    // 获取商品列表
-    getGoodsList () {
+    getGoodsList() {
      this.loading = true;
-      apiGoods.goodsList(this.params)
+      apiGoods
+        .goodsList(this.params)
        .then((res) => {
          this.loading = false;
          if (res.success) {
            this.goodsList = res.result.content;
            this.total = res.result.totalElements;
-            for(var i = 0;i<this.goodsList.length; i++){
+            for (var i = 0; i < this.goodsList.length; i++) {
              this.goodsListType = this.goodsList[i];
            }
          }
-        }).catch(() => {
+        })
+        .catch(() => {
          this.loading = false;
        });
    },
-    getParams (val) {
+    getParams(val) {
      // 筛选条件回显
-      Object.assign(this.params, val)
-      this.getGoodsList()
-    }
+      Object.assign(this.params, val);
+      this.getGoodsList();
+    },
  },
-  created () {
+  created() {
    if (this.$route.query.categoryId) {
-      let cateId = this.$route.query.categoryId.split(',')
-      Object.assign(this.params, this.$route.query)
-      this.params.categoryId = cateId[cateId.length - 1]
+      let cateId = this.$route.query.categoryId.split(",");
+      Object.assign(this.params, this.$route.query);
+      this.params.categoryId = cateId[cateId.length - 1];
    } else {
-      Object.assign(this.params, this.$route.query)
+      Object.assign(this.params, this.$route.query);
    }
-    this.getGoodsList()
+    this.getGoodsList();
  },
  components: {
-    GoodsClassNav
-  }
+    GoodsClassNav,
+  },
 };
 </script>

 <style scoped lang="scss">
-@import '../assets/styles/goodsList.scss';  
-.goods-show-info>.goods-show-seller>.goods-show-buyer{
-    height:16px;width:30px;
-    white-space: nowrap;
-    line-height:17px;
-    text-align: center;
-    padding:0 3px;
-    background-color:#E23A3A;
-  }
-.goods-show-seller{
+@import "../assets/styles/goodsList.scss";
+.goods-show-info > .goods-show-seller > .goods-show-buyer {
+  height: 16px;
+  width: 30px;
+  white-space: nowrap;
+  line-height: 17px;
+  text-align: center;
+  padding: 0 3px;
+  background-color: #e23a3a;
+}
+.goods-show-seller {
  // padding:3px 0;
  vertical-align: middle;
 }
@@ -235,8 +259,8 @@ export default {
  min-width: 1000px;
  position: relative;
 }
-.price-sort:hover{
-  color:#E23A3A;
+.price-sort:hover {
+  color: #e23a3a;
 }
 .goods-box {
  display: flex;
@@ -246,26 +270,26 @@ export default {
  width: 200px;
  border: 1px solid #ccc;
 }
-.goods-show-right{
-  width:35px;
-  height:17px;
+.goods-show-right {
+  width: 35px;
+  height: 17px;
  // vertical-align:middle;
  overflow: hidden;
-  margin-top:1.5px;
+  margin-top: 1.5px;
  margin-right: 5px;
  line-height: 16px;
-  background:white;
-  border-radius:4px;
-  margin-bottom:5px;
-  float:left;
-  text-align:center;
-  border:1px solid rgba(112, 123, 187, 0.8);
-  color:rgba(112, 123, 187, 0.8);
+  background: white;
+  border-radius: 4px;
+  margin-bottom: 5px;
+  float: left;
+  text-align: center;
+  border: 1px solid rgba(112, 123, 187, 0.8);
+  color: rgba(112, 123, 187, 0.8);
 }
-.goods-show-middle:hover{
-  color:rgba(2, 15, 88, 0.6);
-  border:0.2px solid rgba(0, 13, 87, 0.6);
-  border-radius:4px;
+.goods-show-middle:hover {
+  color: rgba(2, 15, 88, 0.6);
+  border: 0.2px solid rgba(0, 13, 87, 0.6);
+  border-radius: 4px;
  line-height: 18px;
 }
 .item-as-title {
--- a/buyer/src/pages/article/detail.vue
+++ b/buyer/src/pages/article/detail.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="box">
+    <div class="wrapper">
+      <div class="nav" @click="back">
+        <img src="@/assets/images/logo2.png" alt="" class="logo" />
+        <div class="title">{{ detail.title }}</div>
+      </div>
+      <div v-html="detail.content"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { articleDetail } from "@/api/common.js";
+const config = require("@/config/index");
+export default {
+  data() {
+    return {
+      config,
+      detail: "",
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    back() {
+      this.$router.push("/");
+    },
+    // 初始化文章
+    init() {
+      const id = this.$route.query.id;
+
+      articleDetail(id).then((res) => {
+        if (res.success) {
+          this.detail = res.result;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.logo {
+  max-width: 200px;
+}
+.box {
+  min-height: 100vh;
+  width: 1200px;
+  overflow: hidden;
+  margin: 0 auto;
+  padding: 32px;
+}
+.wrapper {
+  width: 1200px;
+  min-height: 600px;
+  padding: 32px;
+  background: #fff;
+}
+.nav {
+  text-align: center;
+  font-size: 21px;
+  font-weight: bold;
+}
+.title {
+  text-align: center;
+
+  font-size: 21px;
+  margin: 20px 0;
+}
+
+// iphone
+@media screen and (max-width: 767px) {
+  .box {
+    min-height: 100vh;
+    width: 100%;
+    padding: 0;
+    margin: 0 auto;
+  }
+  .wrapper {
+    width: 100%;
+    min-height: 600px;
+    padding: 0 16px;
+    background: #fff;
+  }
+}
+</style>
--- 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
    }
  },
--- 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 // 提交加载状态
--- 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'
      },
--- 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
--- 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, // 加载状态
--- 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);
                }
              });
--- 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, // 加载状态
--- 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: '', // 回显地址
--- 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) {
--- 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: '店铺'}
-  }
-  ]
+  ],
 });