!6 适配接口路径修改

Merge pull request !6 from OceansDeep/fengtianyangyang
升级版本号
2025-12-19 01:15:53 +08:00 · 2022-02-14 07:51:16 +00:00 · 2022-02-14 15:35:01 +08:00 · 2022-02-14 14:21:37 +08:00 · 2022-02-12 15:20:36 +08:00 · 2022-02-11 16:44:27 +08:00
194 changed files with 7526 additions and 5089 deletions
--- a/buyer/.npmrc
+++ b/buyer/.npmrc
@@ -0,0 +1,5 @@
+# 默认依赖包指定淘宝源
+registry=https://registry.npm.taobao.org/
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror=https://npm.taobao.org/mirrors/electron/
--- a/buyer/.yarnrc
+++ b/buyer/.yarnrc
@@ -0,0 +1,5 @@
+registry "https://registry.npmmirror.com"
+sass_binary_site "https://npmmirror.com/mirrors/node-sass"
+phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
+electron_mirror "https://npmmirror.com/mirrors/electron"
+
--- 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 .
--- 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"
    },
  };
-  
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -5,17 +5,10 @@
 </template>

 <script>
-import {v4 as uuidv4} from 'uuid';
-import storage from '@/plugins/storage';
+
 export default {
  name: 'App',
-  mounted () {
-    let uuid = storage.getItem('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      storage.setItem('uuid', uuid);
-    }
-  }
+
 };
 </script>
 <style lang="scss">
--- 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,18 @@ export function articleCateList () {
 // 通过id获取文章
 export function articleDetail (id) {
  return request({
-    url: `/buyer/article/get/${id}`,
+    url: `/buyer/other/article/get/${id}`,
+    method: Method.GET
+  });
+}
+
+
+
+
+// 获取IM接口前缀
+export function getIMDetail () {
+  return request({
+    url: `${commonUrl}/common/IM`,
    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/assets/styles/global.scss
+++ b/buyer/src/assets/styles/global.scss
@@ -10,7 +10,7 @@ $warning_color: #ff9900;
 $error_color: #ed3f14;
 $handle-btn-color: #438cde;

-$theme_color: #ed3f14;
+$theme_color: #ff5c58;

 $border_color: #dddee1;
 $title_color: #8c8c8c;
@@ -336,4 +336,4 @@ li {
    margin:10px auto ;
    text-align: right;
    width: 1200px;
-  }
+  }
--- a/buyer/src/assets/styles/goodsList.scss
+++ b/buyer/src/assets/styles/goodsList.scss
@@ -30,8 +30,18 @@
  margin-top: 6px;
 }
 .goods-show-detail {
+  height: 36px;
  font-size: 12px;
  margin: 6px 0px;
+  overflow:hidden;
+  text-overflow: ellipsis;
+  display:-webkit-box;
+  -webkit-line-clamp:2;
+  -webkit-box-orient:vertical;
+  color:#808080;
+}
+.goods-show-detail :hover{
+  color:#E23A3A;
 }
 .goods-show-num {
  font-size: 12px;
--- a/buyer/src/assets/styles/theme.less
+++ b/buyer/src/assets/styles/theme.less
@@ -1,9 +1,19 @@
-@import '~view-design/src/styles/index.less';
+@import "~view-design/src/styles/index.less";
+// iview 自定义样式

-@primary-color: #ed3f14;
+@primary-color: #ff5c58;
+@info-color: #fa6419;
+@success-color: #68cabe;
+@error-color: #ff3c2a;
+@table-thead-bg: #f8f8f9;
+@table-td-stripe-bg: #f8f8f9;
+@table-td-hover-bg: #ededed;
+@table-td-highlight-bg: #ededed;
+@font-size-base: 12px;

+.ivu-drawer,
+.drawer,
+.ivu-drawer-wrap {
+  z-index: 2600 !important;
+}

-@table-thead-bg               : #f8f8f9;
-@table-td-stripe-bg           : #f8f8f9;
-@table-td-hover-bg            : #ededed;
-@table-td-highlight-bg        : #ededed;
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -157,6 +157,6 @@ export default {
  position: relative;
  height: 0px;
  top: -38px;
-  left: 339px;
+  left: 352px;
 }
 </style>
--- a/buyer/src/components/footer/Footer.vue
+++ b/buyer/src/components/footer/Footer.vue
@@ -39,8 +39,8 @@
            </ul>
            <div class="icp">
              <li v-if="config.icpCard">
-                <a href="https://beian.miit.gov.cn/" target="_blank">
-                  
+                <a :href='"https://tsm.miit.gov.cn/dxxzsp/xkz/xkzgl/resource/qiyesearch.jsp?num="+config.icpCard+"&type=xuke"' target="_blank">
+                  {{config.icpCard}}
                </a>
              </li>
              <li v-if="config.icpMessage">
@@ -54,7 +54,7 @@
          <div class="information">

            <a class="flex " :href="config.company.href">
-              <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.title}}
+              <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.name}}
            </a>
          </div>
        </div>
@@ -68,12 +68,12 @@
 </template>

 <script>
-import config from '@/config'
+
 export default {
  name: "Footer",
  data() {
    return {
-      config,
+      config:require('@/config'),
      guideArr: [
        // 导航链接
        ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -7,6 +7,8 @@
        <div class="item-detail-big-img">
          <pic-zoom :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
        </div>
+        <div v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'" style="margin-top:10px;rgb(153, 149, 149);">实物商品</div>
+        <div v-else-if="skuDetail.goodsType == 'VIRTUAL_GOODS'" style="margin-top:10px;rgb(153, 149, 149);">虚拟商品</div>
        <div class="item-detail-img-row">
          <div
            class="item-detail-img-small"
@@ -19,7 +21,11 @@
        </div>

        <div class="goodsConfig mt_10">
-          <span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span>
+          <span @click="collect"
+            ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{
+              isCollected ? "已收藏" : "收藏"
+            }}</span
+          >
        </div>
      </div>
      <!-- 右侧商品信息、活动信息、操作展示 -->
@@ -30,30 +36,40 @@
          </p>
        </div>
        <div class="sell-point">
-          {{skuDetail.sellingPoint}}
+          {{ skuDetail.sellingPoint }}
        </div>
        <!-- 限时秒杀 -->
-        <Promotion v-if="promotionMap['SECKILL']" :time="promotionMap['SECKILL'].endTime"></Promotion>
+        <Promotion
+          v-if="promotionMap['SECKILL']"
+          :time="promotionMap['SECKILL'].endTime"
+        ></Promotion>
        <!-- 商品详细 价格、优惠券、促销 -->
        <div class="item-detail-price-row">
          <div class="item-price-left">
-            <!-- 商品原价 -->
-            <div class="item-price-row" v-if="!skuDetail.promotionPrice">
+            
+            <!-- 秒杀价格 -->
+            <div class="item-price-row" v-if="skuDetail.promotionPrice && promotionMap['SECKILL']">
              <p>
-                <span class="item-price-title">价 &nbsp;&nbsp;&nbsp;&nbsp;格</span>
-                <span class="item-price">{{skuDetail.price | unitPrice("￥")}}</span>
+                <span class="item-price-title" v-if="promotionMap['SECKILL']"
+                  >秒 &nbsp;杀&nbsp;价</span
+                >
+                <span class="item-price">{{
+                  skuDetail.promotionPrice | unitPrice("￥")
+                }}</span>
+                <span class="item-price-old">{{
+                  skuDetail.price | unitPrice("￥")
+                }}</span>
              </p>
            </div>
-            <!-- 秒杀价格 -->
-            <div class="item-price-row" v-if="skuDetail.promotionPrice">
+            <!-- 商品原价 -->
+            <div class="item-price-row" v-else>
              <p>
-                <span class="item-price-title" v-if="promotionMap['SECKILL']">秒 &nbsp;杀&nbsp;价</span>
-                <span class="item-price">{{skuDetail.promotionPrice | unitPrice("￥")}}</span>
-                <span class="item-price-old">{{skuDetail.price | unitPrice("￥")}}</span>
+                <span class="item-price-title">价 &nbsp;&nbsp;&nbsp;&nbsp;格</span>
+                <span class="item-price">{{ skuDetail.price | unitPrice("￥") }}</span>
              </p>
            </div>
            <!-- 优惠券展示 -->
-            <div class="item-price-row"  v-if="promotionMap['COUPON'].length">
+            <div class="item-price-row" v-if="promotionMap['COUPON'].length">
              <p>
                <span class="item-price-title">优 惠 券</span>
                <span
@@ -61,10 +77,14 @@
                  v-for="(item, index) in promotionMap['COUPON']"
                  :key="index"
                  @click="receiveCoupon(item.id)"
+                >
+                  <span v-if="item.couponType == 'PRICE'"
+                    >满{{ item.consumeThreshold }}减{{ item.price }}</span
                  >
-                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price}}</span>
-                  <span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span>
-                  </span>
+                  <span v-if="item.couponType == 'DISCOUNT'"
+                    >满{{ item.consumeThreshold }}打{{ item.couponDiscount }}折</span
+                  >
+                </span>
              </p>
            </div>
            <!-- 满减展示 -->
@@ -72,8 +92,20 @@
              <p>
                <span class="item-price-title">促&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;销</span>
                <span class="item-promotion">满减</span>
-                <span class="item-desc-pintuan" v-if="promotionMap['FULL_DISCOUNT'].fullMinus">满{{ promotionMap['FULL_DISCOUNT'].fullMoney }}元，立减现金{{ promotionMap['FULL_DISCOUNT'].fullMinus}}元</span>
-                <span class="item-desc-pintuan" v-if="promotionMap['FULL_DISCOUNT'].fullRate">满{{ promotionMap['FULL_DISCOUNT'].fullMoney }}元，立享{{ promotionMap['FULL_DISCOUNT'].fullRate}}折</span>
+                <span
+                  class="item-desc-pintuan"
+                  v-if="promotionMap['FULL_DISCOUNT'].fullMinus"
+                  >满{{ promotionMap["FULL_DISCOUNT"].fullMoney }}元，立减现金{{
+                    promotionMap["FULL_DISCOUNT"].fullMinus
+                  }}元</span
+                >
+                <span
+                  class="item-desc-pintuan"
+                  v-if="promotionMap['FULL_DISCOUNT'].fullRate"
+                  >满{{ promotionMap["FULL_DISCOUNT"].fullMoney }}元，立享{{
+                    promotionMap["FULL_DISCOUNT"].fullRate
+                  }}折</span
+                >
              </p>
            </div>
          </div>
@@ -92,9 +124,13 @@
            <p>{{ sku.name }}</p>
          </div>
          <div class="item-select-column">
-            <div class="item-select-row" v-for="(item) in sku.values" :key="item.value">
-              <div class="item-select-box" @click="select(index, item.value)"
-                :class="{ 'item-select-box-active': item.value === currentSelceted[index] }"
+            <div class="item-select-row" v-for="item in sku.values" :key="item.value">
+              <div
+                class="item-select-box"
+                @click="select(index, item.value)"
+                :class="{
+                  'item-select-box-active': item.value === currentSelceted[index],
+                }"
              >
                <div class="item-select-intro">
                  <p>{{ item.value }}</p>
@@ -110,26 +146,59 @@
              <p>数量</p>
            </div>
            <div class="item-select-row">
-              <InputNumber :min="1" :disabled="skuDetail.quantity === 0" v-model="count"></InputNumber>
-              <span class="inventory"> 库存{{skuDetail.quantity}}</span>
+              <InputNumber
+                :min="1"
+                :max="skuDetail.quantity"
+                :disabled="skuDetail.quantity === 0"
+                v-model="count"
+                :precision="0.1"
+              ></InputNumber>
+              <span class="inventory"> 库存{{ skuDetail.quantity }}</span>
            </div>
          </div>
-          <div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' && skuDetail.weight !== 0">
+          <div
+            class="item-select"
+            v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' && skuDetail.weight !== 0"
+          >
            <div class="item-select-title">
              <p>重量</p>
            </div>
            <div class="item-select-row">
-              <span class="inventory"> {{skuDetail.weight}}kg</span>
+              <span class="inventory"> {{ skuDetail.weight }}kg</span>
            </div>
          </div>
-          <div class="add-buy-car" v-if="$route.query.way === 'POINT' && skuDetail.isAuth === 'PASS'">
-            <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="pointPay">积分购买</Button>
+          <div
+            class="add-buy-car"
+            v-if="$route.query.way === 'POINT' && skuDetail.authFlag === 'PASS'"
+          >
+            <Button
+              type="error"
+              :loading="loading"
+              :disabled="skuDetail.quantity === 0"
+              @click="pointPay"
+              >积分购买</Button
+            >
          </div>
-          <div class="add-buy-car" v-if="$route.query.way !== 'POINT' && skuDetail.isAuth === 'PASS'">
-            <Button type="error" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
-            <Button type="warning" :loading="loading1" :disabled="skuDetail.quantity === 0" @click="buyNow">立即购买</Button>
+          <div
+            class="add-buy-car"
+            v-if="$route.query.way !== 'POINT' && skuDetail.authFlag === 'PASS'"
+          >
+            <Button
+              type="error"
+              v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
+              :loading="loading"
+              :disabled="skuDetail.quantity === 0"
+              @click="addShoppingCartBtn"
+              >加入购物车</Button
+            >
+            <Button
+              type="warning"
+              :loading="loading1"
+              :disabled="skuDetail.quantity === 0"
+              @click="buyNow"
+              >立即购买</Button
+            >
          </div>
-
        </div>
      </div>
    </div>
@@ -137,45 +206,52 @@
 </template>

 <script>
-import Promotion from './Promotion.vue';
-import PicZoom from 'vue-piczoom'; // 图片放大
-import { collectGoods, isCollection, receiveCoupon, cancelCollect } from '@/api/member.js';
-import { addCartGoods } from '@/api/cart.js';
+import Promotion from "./Promotion.vue";
+import PicZoom from "vue-piczoom"; // 图片放大
+import {
+  collectGoods,
+  isCollection,
+  receiveCoupon,
+  cancelCollect,
+} from "@/api/member.js";
+import { addCartGoods } from "@/api/cart.js";
 export default {
-  name: 'ShowGoods',
+  name: "ShowGoods",
  props: {
    // 商品数据
    detail: {
      type: Object,
-      default: null
-    }
+      default: null,
+    },
  },
-  data () {
+  data() {
    return {
      count: 1, // 商品数量
      imgIndex: 0, // 展示图片下标
      currentSelceted: [], // 当前商品sku
-      imgList: [{}], // 商品图片列表
+      imgList: [{ url: "" }], // 商品图片列表
      skuDetail: this.detail.data, // sku详情
      goodsSpecList: this.detail.specs, // 商品spec
-      promotionMap: { // 活动状态
+      promotionMap: {
+        // 活动状态
        SECKILL: null,
        FULL_DISCOUNT: null,
-        COUPON: []
+        COUPON: [],
      }, // 促销活动
      formatList: [], // 选择商品品类的数组
      loading: false, // 立即购买loading
      loading1: false, // 加入购物车loading
-      isCollected: false // 是否收藏
+      isCollected: false, // 是否收藏
    };
  },
  components: { PicZoom, Promotion },
  methods: {
-    select (index, value) { // 选择规格
+    select(index, value) {
+      // 选择规格
      this.$set(this.currentSelceted, index, value);
      let selectedSkuId = this.goodsSpecList.find((i) => {
        let matched = true;
-        let specValues = i.specValues.filter((j) => j.specName !== 'images');
+        let specValues = i.specValues.filter((j) => j.specName !== "images");
        for (let n = 0; n < specValues.length; n++) {
          if (specValues[n].specValue !== this.currentSelceted[n]) {
            matched = false;
@@ -187,76 +263,86 @@ export default {
        }
      });
      this.$router.push({
-        path: '/goodsDetail',
-        query: { skuId: selectedSkuId.skuId, goodsId: this.skuDetail.goodsId }
+        path: "/goodsDetail",
+        query: { skuId: selectedSkuId.skuId, goodsId: this.skuDetail.goodsId },
      });
    },

-    addShoppingCartBtn () { // 添加购物车
-      const params = {
-        num: this.count,
-        skuId: this.skuDetail.id
-      };
-      this.loading = true;
-      addCartGoods(params).then(res => {
-        this.loading = false;
-        if (res.success) {
-          this.$router.push({path: '/shoppingCart', query: {detail: this.skuDetail, count: this.count}});
-        } else {
-          this.$Message.warning(res.message);
-        }
-      }).catch(() => {
-        this.loading = false;
-      });
-    },
-    buyNow () { // 立即购买
+    addShoppingCartBtn() {
+      // 添加购物车
      const params = {
        num: this.count,
        skuId: this.skuDetail.id,
-        cartType: 'BUY_NOW'
+      };
+      this.loading = true;
+      addCartGoods(params)
+        .then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$router.push({
+              path: "/shoppingCart",
+              query: { detail: this.skuDetail, count: this.count },
+            });
+          } else {
+            this.$Message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    buyNow() {
+      // 立即购买
+      const params = {
+        num: this.count,
+        skuId: this.skuDetail.id,
+        cartType: "BUY_NOW",
      };
      // 虚拟商品购买
-      if (this.skuDetail.goodsType === 'VIRTUAL_GOODS') {
-        params.cartType = 'VIRTUAL'
+      if (this.skuDetail.goodsType === "VIRTUAL_GOODS") {
+        params.cartType = "VIRTUAL";
      }
      this.loading1 = true;
-      addCartGoods(params).then(res => {
-        this.loading1 = false;
-        if (res.success) {
-          this.$router.push({path: '/pay', query: {way: params.cartType}});
-        } else {
-          this.$Message.warning(res.message);
-        }
-      }).catch(() => {
-        this.loading1 = false;
-      });
+      addCartGoods(params)
+        .then((res) => {
+          this.loading1 = false;
+          if (res.success) {
+            this.$router.push({ path: "/pay", query: { way: params.cartType } });
+          } else {
+            this.$Message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          this.loading1 = false;
+        });
    },
-    async collect () { // 收藏商品
+    async collect() {
+      // 收藏商品
      if (this.isCollected) {
-        let cancel = await cancelCollect('GOODS', this.skuDetail.id)
+        let cancel = await cancelCollect("GOODS", this.skuDetail.id);
        if (cancel.success) {
-          this.$Message.success('取消收藏成功')
-          this.isCollected = false
+          this.$Message.success("取消收藏成功");
+          this.isCollected = false;
        }
      } else {
-        let collect = await collectGoods('GOODS', this.skuDetail.id);
+        let collect = await collectGoods("GOODS", this.skuDetail.id);
        if (collect.code === 200) {
          this.isCollected = true;
-          this.$Message.success('收藏商品成功,可以前往个人中心我的收藏查看');
+          this.$Message.success("收藏商品成功,可以前往个人中心我的收藏查看");
        }
      }
    },
    // 格式化数据
-    formatSku (list) {
+    formatSku(list) {
      let arr = [{}];
      list.forEach((item, index) => {
        item.specValues.forEach((spec, specIndex) => {
          let name = spec.specName;
          let values = {
            value: spec.specValue,
-            quantity: item.quantity
+            quantity: item.quantity,
          };
-          if (name === 'images') {
+          if (name === "images") {
            return;
          }

@@ -275,7 +361,7 @@ export default {
            if (!keys.includes(name)) {
              arr.push({
                name: name,
-                values: [values]
+                values: [values],
              });
            }
          });
@@ -286,55 +372,58 @@ export default {

      let cur = list.filter((i) => i.skuId === this.$route.query.skuId)[0];
      if (cur) {
-        cur.specValues.filter((i) => i.specName !== 'images')
+        cur.specValues
+          .filter((i) => i.specName !== "images")
          .forEach((value, _index) => {
            this.currentSelceted[_index] = value.specValue;
          });
      }
      this.skuList = list;
    },
-    receiveCoupon (id) { // 领取优惠券
-      receiveCoupon(id).then(res => {
+    receiveCoupon(id) {
+      // 领取优惠券
+      receiveCoupon(id).then((res) => {
        if (res.success) {
-          this.$Message.success('优惠券领取成功')
+          this.$Message.success("优惠券领取成功");
        } else {
-          this.$Message.warning(res.message)
+          this.$Message.warning(res.message);
        }
-      })
+      });
    },
-    promotion () { // 格式化促销活动，返回当前促销的对象
+    promotion() {
+      // 格式化促销活动，返回当前促销的对象
      if (!this.detail.promotionMap) return false;
      let keysArr = Object.keys(this.detail.promotionMap);
      if (keysArr.length === 0) return false;

      for (let i = 0; i < keysArr.length; i++) {
-        let key = keysArr[i].split('-')[0]
-        if (key === 'COUPON') {
-          this.promotionMap[key].push(this.detail.promotionMap[keysArr[i]])
+        let key = keysArr[i].split("-")[0];
+        if (key === "COUPON") {
+          this.promotionMap[key].push(this.detail.promotionMap[keysArr[i]]);
        } else {
-          this.promotionMap[key] = this.detail.promotionMap[keysArr[i]]
+          this.promotionMap[key] = this.detail.promotionMap[keysArr[i]];
        }
      }
-    }
+    },
  },
-  mounted () {
+  mounted() {
    // 用户登录才会判断是否收藏
-    if (this.Cookies.getItem('userInfo')) {
-      isCollection('GOODS', this.skuDetail.id).then(res => {
+    if (this.Cookies.getItem("userInfo")) {
+      isCollection("GOODS", this.skuDetail.id).then((res) => {
        if (res.success && res.result) {
          this.isCollected = true;
        }
-      })
+      });
    }
-    this.detail.data.specList.forEach(e => {
-      if (e.specName === 'images') {
-        this.imgList = e.specImage
+    this.detail.data.specList.forEach((e) => {
+      if (e.specName === "images") {
+        this.imgList = e.specImage;
      }
-    })
+    });
    this.formatSku(this.goodsSpecList);
-    this.promotion()
-    document.title = this.skuDetail.goodsName
-  }
+    this.promotion();
+    document.title = this.skuDetail.goodsName;
+  },
 };
 </script>

@@ -346,7 +435,6 @@ export default {
 }
 .inventory {
  padding-left: 4px;
- 
 }

 .global_color {
@@ -597,7 +685,7 @@ export default {

 .add-buy-car {
  margin-top: 15px;
-  >*{
+  > * {
    margin: 0 4px;
  }
 }
@@ -607,7 +695,7 @@ export default {
  justify-content: space-between;
  > span {
    padding-right: 10px;
-    &:hover{
+    &:hover {
      cursor: pointer;
      color: $theme_color;
    }
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -86,7 +86,7 @@
      <img
        width="1200"
        class="hover-pointer mb_20"
-      
+
        @click="linkTo(element.options.url)"
        :src="element.options.img"
        alt=""
@@ -134,6 +134,7 @@ export default {

 .model-item {
  position: relative;
+  margin-bottom: 10px;
 }

 /** 热门广告 */
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -49,7 +49,7 @@
 </template>

 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -57,7 +57,7 @@ export default {
  props: ['data'],
  data () {
    return {
-      config,
+      config:require('@/config'),
      userInfo: {}, // 用户信息
      articleList: [], // 常见问题
      params: { // 请求常见问题参数
--- a/buyer/src/components/indexDecorate/modelList/Carousel2.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
@@ -57,7 +57,7 @@
 </template>

 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -65,7 +65,7 @@ export default {
  props: ['data'],
  data () {
    return {
-      config,
+      config:require('@/config'),
      userInfo: {}, // 用户信息
      articleList: [], // 常见问题
      params: { // 请求常见问题参数
--- a/buyer/src/components/indexDecorate/modelList/NotEnough.vue
+++ b/buyer/src/components/indexDecorate/modelList/NotEnough.vue
@@ -63,7 +63,7 @@ export default {
  justify-content: center;
  width: 100%;
  margin-bottom: 10px;
-  background-color: rgb(218, 217, 217);
+  background-color: #f3f5f7;
  height: 60px;
  align-items: center;
  position: relative;
--- a/buyer/src/components/map/index.vue
+++ b/buyer/src/components/map/index.vue
@@ -31,7 +31,7 @@
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { handleRegion } from '@/api/address.js';
-import config from '@/config'
+
 export default {
  name: 'map',
  props: {
@@ -42,7 +42,7 @@ export default {
  },
  data () {
    return {
-      config,
+      config:require('@/config'),
      showMap: false, // 展示地图
      mapSearch: '', // 地图搜索
      map: null, // 初始化地图
--- a/buyer/src/components/nav/CateNav.vue
+++ b/buyer/src/components/nav/CateNav.vue
@@ -4,14 +4,15 @@
      <div class="all-categories hover-pointer" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">全部商品分类</div>
      <ul class="nav-item" v-if="showNavBar">
        <li
+          class ="nav-lis"
          v-for="(item, index) in navList.list"
          :key="index"
          @click="linkTo(item.url)"
        >
          {{ item.name }}
        </li>
-      </ul>
-    </div>
+      </ul>   
+    </div> <hr style="width:1200px;height:2px;background:#e4393c;margin-top:-1px;margin-bottom:5px;"/>
    <!-- 全部商品分类 -->
    <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
      <!-- 第一级分类 -->
@@ -155,6 +156,10 @@ export default {
 </script>

 <style scoped lang="scss">
+.nav-lis:hover{
+  color:#e4393c !important;
+  cursor: pointer;
+}
 .cate-nav{
  width: 1200px;
  position: relative;
@@ -170,9 +175,10 @@ export default {
    width: 200px;
    line-height: 40px;
    color: #fff;
-    background-color: $theme_color;
+    background-color: #e4393c;
    text-align: center;
    font-size: 16px;
+    border-bottom:none;
  }
  .nav-item {
    width: 1000px;
@@ -180,13 +186,13 @@ export default {
    line-height: 40px;
    overflow: hidden;
    list-style: none;
-    background-color: #eee;
+    // background-color: #eee;
    display: flex;
    li {
      float: left;
      font-weight: bold;
      margin-left: 20px;
-      color: rgb(89, 88, 88);
+      color: rgb(129, 127, 127);
      font-size: 15px;
      &:hover {
        color: $theme_color;
--- a/buyer/src/components/nav/GoodsClassNav.vue
+++ b/buyer/src/components/nav/GoodsClassNav.vue
@@ -414,7 +414,7 @@ export default {
    font-size: 18px;
    font-weight: bold;
    &:hover {
-      color: $theme_color;
+      color: #e4393c;
      cursor: pointer;
    }
  }
@@ -428,8 +428,8 @@ export default {
    text-align: center;
    margin: 0 3px;
    &:hover {
-      color: $theme_color;
-      border-color: $theme_color;
+      color: #e4393c;
+      border-color: #e4393c;
      border-bottom-color: #fff;
      cursor: pointer;
      ul {
@@ -447,7 +447,7 @@ export default {
      width: 300px;
      padding: 5px 10px;
      background: #fff;
-      border: 1px solid $theme_color;
+      border: 1px solid #e4393c;
      z-index: 1;
      &::before {
        content: "";
@@ -470,7 +470,7 @@ export default {
        margin: 3px 0;
        text-align: left;
        &:hover {
-          color: $theme_color;
+          color: #e4393c;
          cursor: pointer;
        }
      }
@@ -489,23 +489,23 @@ export default {
    background-color: #f3f3f3;
    border: 1px solid #ddd;
    &:hover {
-      border-color: $theme_color;
+      border-color: #e4393c;
      background-color: #fff;
      .ivu-icon {
        color: #fff;
-        background-color: $theme_color;
+        background-color: #e4393c;
      }
    }

    span:nth-child(2) {
-      color: $theme_color;
+      color: #e4393c;
    }

    .ivu-icon {
      position: absolute;
      right: 0;
      top: 0;
-      color: $theme_color;
+      color: #e4393c;
      line-height: 22px;
      width: 21px;
      height: 22px;
@@ -545,7 +545,7 @@ export default {
        width: 100px;
        height: 50px;
        float: left;
-        line-height: 50px;
+        line-height: 45px;
        border: 1px solid #ddd;
        margin: -1px -1px 0 0;
        overflow: hidden;
@@ -557,7 +557,8 @@ export default {
        }

        &:hover {
-          border-color: $theme_color;
+          border-color: #e4393c;
+          border: 2px solid #e4393c;
          top: 0;
          left: 0;
          position: relative;
@@ -571,7 +572,7 @@ export default {
          display: inline-block;
          width: 100%;
          height: 100%;
-          color: $theme_color;
+          color: #e4393c;
          text-align: center;
          font-size: 12px;
          cursor: pointer;
@@ -584,7 +585,7 @@ export default {
          div {
            width: 0;
            border-top: 20px solid transparent;
-            border-right: 20px solid $theme_color;
+            border-right: 20px solid #e4393c;
          }
          .ivu-icon {
            font-size: 12px;
@@ -597,7 +598,7 @@ export default {
        }
      }
      .border-color {
-        border-color: $theme_color;
+        border-color: #e4393c;
        z-index: 1;
      }
    }
@@ -619,8 +620,8 @@ export default {
        font-size: 12px;
        &:hover {
          cursor: pointer;
-          color: $theme_color;
-          border-color: $theme_color;
+          color: #e4393c;
+          border-color: #e4393c;
        }
      }
    }
@@ -666,14 +667,14 @@ export default {
        height: 30px;
        float: left;
        line-height: 30px;
-        color: $primary_color;
+        color:#4d9cf1;
        overflow: hidden;
        position: relative;
        font-size: 12px;
        padding: 2px;
        cursor: pointer;
        &:hover {
-          color: $theme_color;
+          color: #e4393c;
        }
      }
    }
@@ -695,8 +696,8 @@ export default {
        font-size: 12px;
        &:hover {
          cursor: pointer;
-          color: $theme_color;
-          border-color: $theme_color;
+          color: #e4393c;
+          border-color: #e4393c;
        }
      }
    }
@@ -716,11 +717,13 @@ export default {
 }
 .more-options{
  margin: 5px;
-  color: #2d8cf0;
+  color: #4d9cf1;
  font-size: 12px;
  cursor: pointer;
  text-align: right;
 }
-
+.more-options:hover{
+  color:#0165d1;
+}
 /** 其他筛选项  end */
 </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
@@ -1,42 +1,12 @@
-export default {
-  /**
-   * @description 配置显示在浏览器标签的title、底部信息、部分信息展示的值
-   */
-  title: "lili-shop",
-  /**
-   * @description icp证
-   */
-  icpCard: "",
-
-  company:{
-    href:"https://pickmall.cn",
-    name:"北京宏业汇成科技有限公司"
-  },
-  /**
-   * @description icp备案号
-   */
-  icpMessage: "京ICP备20009696号-1",
-  /**
-   * @description token在Cookie中存储的天数，默认1天
-   */
-  cookieExpires: 1,
-  /**
-   * @description 是否使用国际化，默认为false
-   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
-   *              用来在菜单中显示文字
-   */
-  useI18n: false,
-  /**
-   * @description 高德web端申请的api key
-   */
-  aMapKey: "b440952723253aa9fe483e698057bf7d",
-  /**
-   * @description 需要加载的插件
-   */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+module.exports = {
+  title: "lili-shop", //配置显示在浏览器标签的title、底部信息、部分信息展示的值
+  icpCard: "", // icp证
+  company: {
+    href: "https://pickmall.cn",
+    name: "北京宏业汇成科技有限公司",
+  }, //公司信息
+  icpMessage: "京ICP备20009696号-1", //icp备案
+  aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key
+  enableCDN: true, //生产环境 是否启用cdn加载 vue等js
+  port: 10000, //端口
 };
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -10,6 +10,7 @@ import storage from '@/plugins/storage';
 // 全局引入封装组件
 import {InstallAll} from '@/components/global.js';

+let title = require('@/config').title
 Vue.use(ViewUI);
 Vue.use(InstallAll);
 Vue.config.productionTip = false;
@@ -20,7 +21,7 @@ Object.keys(filters).forEach(key => {

 router.beforeEach((to, from, next) => {
  ViewUI.LoadingBar.start();
-  window.document.title = to.meta.title === undefined ? 'lili shop' : to.meta.title
+  window.document.title = to.meta.title === undefined ? title : to.meta.title
  next();
 });

--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -4,9 +4,10 @@
    <!-- LOGO 搜索 -->
    <div class="width_1200 logo">
      <div>
-        <router-link to="/"><img :src="$store.state.logoImg"  /></router-link>
+        <router-link to="/"><img :src="$store.state.logoImg" /></router-link>
        <div>
-          购物车(<span>{{ goodsTotal }}</span>)
+          购物车(<span>{{ goodsTotal }}</span
+          >)
        </div>
      </div>
      <Search :showTag="false" :showLogo="false"></Search>
@@ -17,9 +18,15 @@
      <div class="available-area">
        <div class="cart-steps">
          <span :class="stepIndex == 0 ? 'active' : ''">1.我的购物车</span>
-          <Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
+          <Icon
+            :class="stepIndex == 0 ? 'active-arrow' : ''"
+            custom="icomoon icon-next"
+          ></Icon>
          <span :class="stepIndex == 1 ? 'active' : ''">2.填写订单信息</span>
-          <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
+          <Icon
+            :class="stepIndex == 1 ? 'active-arrow' : ''"
+            custom="icomoon icon-next"
+          ></Icon>
          <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
        </div>
      </div>
@@ -27,7 +34,9 @@
      <div class="cart-goods">
        <div class="cart-goods-title">
          <div class="width_60">
-            <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')">全选</Checkbox>
+            <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')"
+              >全选</Checkbox
+            >
          </div>
          <div class="goods-title">商品</div>
          <div class="width_150">单价（元）</div>
@@ -39,97 +48,156 @@
          <p>购物车空空如也</p>
          <router-link to="/">去选购&gt;</router-link>
        </div>
-        <div v-else class="cart-goods-items" v-for="(shop, index) in cartList" :key="index">
+        <div
+          v-else
+          class="cart-goods-items"
+          v-for="(shop, index) in cartList"
+          :key="index"
+        >
          <div class="shop-name">
            <div>
-              <Checkbox v-model="shop.checked" @on-change="changeChecked(shop.checked, 'shop', shop.storeId)"></Checkbox>
-              <span class="go-shop-page" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>
+              <Checkbox
+                v-model="shop.checked"
+                @on-change="changeChecked(shop.checked, 'shop', shop.storeId)"
+              ></Checkbox>
+              <span class="go-shop-page" @click="goShopPage(shop.storeId)">{{
+                shop.storeName
+              }}</span>
            </div>
-            <span class="shop-coupon" v-if="shop.couponList.length" :class="couponAvailable === index ? 'shop-coupon-show' : ''" @click.stop="showCoupon(shop.id, index)">
+            <span
+              class="shop-coupon"
+              v-if="shop.couponList.length"
+              :class="couponAvailable === index ? 'shop-coupon-show' : ''"
+              @click.stop="showCoupon(shop.id, index)"
+            >
              <!-- 优惠券模态框 -->
              <div v-if="couponAvailable === index">
-                <div class="coupon-item" v-for="(item, index) in shop.couponList" :key="index">
+                <div
+                  class="coupon-item"
+                  v-for="(item, index) in shop.couponList"
+                  :key="index"
+                >
                  <span v-if="item.couponType === 'PRICE'">￥{{ item.price }}</span>
-                  <span v-if="item.couponType === 'DISCOUNT'">{{ item.couponDiscount }}折</span>
-                  <span>满{{item.consumeThreshold}}元可用</span>
-                  <Button class="coupon-btn" size="small" type="primary" @click="receiveShopCoupon(item)" :disabled="item.disabled">{{ item.disabled ? "已领取" : "领取" }}</Button>
+                  <span v-if="item.couponType === 'DISCOUNT'"
+                    >{{ item.couponDiscount }}折</span
+                  >
+                  <span>满{{ item.consumeThreshold }}元可用</span>
+                  <Button
+                    class="coupon-btn"
+                    size="small"
+                    type="primary"
+                    @click="receiveShopCoupon(item)"
+                    :disabled="item.disabled"
+                    >{{ item.disabled ? "已领取" : "领取" }}</Button
+                  >
                </div>
              </div>
            </span>
-            <div class="promotion-notice">{{shop.promotionNotice}}</div>
+            <div class="promotion-notice">{{ shop.promotionNotice }}</div>
          </div>
          <template v-for="(goods, goodsIndex) in shop.skuList">
            <div class="goods-item" :key="goodsIndex">
              <div class="width_60">
-                <Checkbox v-model="goods.checked" @on-change="changeChecked(goods.checked, 'goods', goods.goodsSku.id)"></Checkbox>
+                <Checkbox
+                  v-model="goods.checked"
+                  @on-change="changeChecked(goods.checked, 'goods', goods.goodsSku.id)"
+                ></Checkbox>
              </div>
-              <div class="goods-title" @click="goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)">
-                <img :src="
-                    goods.goodsSku.thumbnail || '../assets/images/goodsDetail/item-detail-1.jpg'
-                  " />
+              <div
+                class="goods-title"
+                @click="goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)"
+              >
+                <img
+                  :src="
+                    goods.goodsSku.thumbnail ||
+                    '../assets/images/goodsDetail/item-detail-1.jpg'
+                  "
+                />
                <div>
                  <p>{{ goods.goodsSku.goodsName }}</p>
                  <template v-for="(promotion, promotionIndex) in goods.promotions">
-                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'SECKILL'">
+                    <div
+                      class="promotion"
+                      :key="promotionIndex"
+                      v-if="promotion.promotionType === 'SECKILL'"
+                    >
                      <span>秒杀</span>
                      <promotion :time="promotion.endTime" type="cart"></promotion>
                    </div>
                  </template>
                  <template v-for="(promotion, promotionIndex) in goods.promotions">
-                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'FULL_DISCOUNT'">
+                    <div
+                      class="promotion"
+                      :key="promotionIndex"
+                      v-if="promotion.promotionType === 'FULL_DISCOUNT'"
+                    >
                      <span>满优惠活动</span>
                      <promotion :time="promotion.endTime" type="cart"></promotion>
                    </div>
                  </template>
-                  <template v-for="(promotion, promotionIndex) in goods.promotions">
-                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'COUPON'">
-                      <span>优惠券</span>
-                      <promotion :time="promotion.endTime" type="cart"></promotion>
-                    </div>
-                  </template>
                </div>
              </div>
              <div class="width_150">
                {{ goods.purchasePrice | unitPrice("￥") }}
              </div>
              <div class="width_100">
-                <InputNumber :min="1" size="small" v-model="goods.num" @on-change="changeNum(goods.num, goods.goodsSku.id)"></InputNumber>
-                <div class="fontsize_12">{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</div>
+                <InputNumber
+                  :min="1"
+                  size="small"
+                  v-model="goods.num"
+                  @on-change="changeNum(goods.num, goods.goodsSku.id)"
+                ></InputNumber>
+                <div class="fontsize_12">
+                  {{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}
+                </div>
              </div>
              <div class="width_150">
                {{ goods.subTotal | unitPrice("￥") }}
              </div>
              <div class="width_100">
-                <span class="handle-btn" v-if="!goods.errorMessage" @click="delGoods(goods.goodsSku.id)">删除</span>
-                <span class="handle-btn" v-if="!goods.errorMessage" @click="collectGoods(goods.goodsSku.id)">收藏</span>
+                <span
+                  class="handle-btn"
+                  v-if="!goods.errorMessage"
+                  @click="delGoods(goods.goodsSku.id)"
+                  >删除</span
+                >
+                <span
+                  class="handle-btn"
+                  v-if="!goods.errorMessage"
+                  @click="collectGoods(goods.goodsSku.id)"
+                  >收藏</span
+                >
              </div>
              <div class="error-goods" v-if="goods.errorMessage">
-                <div>{{goods.errorMessage}}</div>
+                <div>{{ goods.errorMessage }}</div>
                <Button type="primary" @click="delGoods(goods.goodsSku.id)">删除</Button>
              </div>
            </div>
-
          </template>
        </div>
        <!-- 底部支付栏 -->
        <div class="cart-goods-footer">
          <div>
            <div class="width_60">
-              <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')">全选</Checkbox>
+              <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')"
+                >全选</Checkbox
+              >
            </div>
-            <div class="width_100 handle-btn" @click="delGoods">删除选中商品</div>
+            <div class="width_100 handle-btn" @click="delGoods()">删除选中商品</div>
            <!-- <div class="width_100 handle-btn" @click="collectGoods">移到我的收藏</div> -->
            <div class="width_100 handle-btn" @click="clearCart">清空购物车</div>
          </div>
          <div>
            <div class="selected-count">
-              已选择<span>{{ checkedNum }}</span>件商品
+              已选择<span>{{ checkedNum }}</span
+              >件商品
            </div>
            <div class="ml_20 save-price">
              已节省<span>{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
            </div>
            <div class="ml_20 total-price">
-              总价（不含运费）:<div>{{ priceDetailDTO.flowPrice | unitPrice("￥") }}</div>
+              总价（不含运费）:
+              <div>{{ priceDetailDTO.flowPrice | unitPrice("￥") }}</div>
            </div>
            <div class="pay ml_20" @click="pay">去结算</div>
          </div>
@@ -142,21 +210,21 @@
 </template>

 <script>
-import Promotion from '@/components/goodsDetail/Promotion';
-import Search from '@/components/Search';
-import * as APICart from '@/api/cart';
-import * as APIMember from '@/api/member';
+import Promotion from "@/components/goodsDetail/Promotion";
+import Search from "@/components/Search";
+import * as APICart from "@/api/cart";
+import * as APIMember from "@/api/member";
 export default {
-  name: 'Cart',
-  beforeRouteEnter (to, from, next) {
+  name: "Cart",
+  beforeRouteEnter(to, from, next) {
    window.scrollTo(0, 0);
    next();
  },
  components: {
    Search,
-    Promotion
+    Promotion,
  },
-  data () {
+  data() {
    return {
      couponAvailable: false, // 展示优惠券
      stepIndex: 0, // 当前处于哪一步，购物车==0，填写订单信息==1，成功提交订单==2
@@ -167,101 +235,103 @@ export default {
      cartList: [], // 购物车列表
      couponList: [], // 优惠券列表
      priceDetailDTO: {}, // 价格明细
-      skuList: [] // sku列表
+      skuList: [], // sku列表
    };
  },
  methods: {
    // 跳转商品详情
-    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");
    },
    // 跳转店铺首页
-    goShopPage (id) {
+    goShopPage(id) {
      let routeUrl = this.$router.resolve({
-        path: '/Merchant',
-        query: { id }
+        path: "/Merchant",
+        query: { id },
      });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
    },
    // 收藏商品
-    collectGoods (id) {
+    collectGoods(id) {
      this.$Modal.confirm({
-        title: '收藏',
-        content: '<p>商品收藏后可在个人中心我的收藏查看</p>',
+        title: "收藏",
+        content: "<p>商品收藏后可在个人中心我的收藏查看</p>",
        onOk: () => {
-          APIMember.collectGoods('GOODS', id).then((res) => {
+          APIMember.collectGoods("GOODS", id).then((res) => {
            if (res.success) {
-              this.$Message.success('收藏商品成功');
+              this.$Message.success("收藏商品成功");
              this.getCartList();
            }
          });
        },
-        onCancel: () => {}
+        onCancel: () => {},
      });
    },
    // 删除商品
-    delGoods (id) {
+    delGoods(id) {
      const idArr = [];
      if (!id) {
        const list = this.cartList;
        list.forEach((shop) => {
          shop.skuList.forEach((goods) => {
-            idArr.push(goods.goodsSku.id);
+            if(goods.checked) {
+              idArr.push(goods.goodsSku.id);
+            }
          });
        });
      } else {
        idArr.push(id);
      }
      this.$Modal.confirm({
-        title: '删除',
-        content: '<p>确定要删除该商品吗？</p>',
+        title: "删除",
+        content: "<p>确定要删除该商品吗？</p>",
        onOk: () => {
          APICart.delCartGoods({ skuIds: idArr.toString() }).then((res) => {
            if (res.success) {
-              this.$Message.success('删除成功');
+              this.$Message.success("删除成功");
              this.getCartList();
            } else {
              this.$Message.error(res.message);
            }
          });
-        }
+        },
      });
    },
    // 清空购物车
-    clearCart () {
+    clearCart() {
      this.$Modal.confirm({
-        title: '提示',
-        content: '<p>确定要清空购物车吗？清空后不可恢复</p>',
+        title: "提示",
+        content: "<p>确定要清空购物车吗？清空后不可恢复</p>",
        onOk: () => {
          APICart.clearCart().then((res) => {
            if (res.success) {
-              this.$Message.success('清空购物车成功');
+              this.$Message.success("清空购物车成功");
              this.getCartList();
            } else {
              this.$Message.error(res.message);
            }
          });
-        }
+        },
      });
    },
    // 跳转支付页面
-    pay () {
+    pay() {
      if (this.checkedNum) {
-        this.$router.push({ path: '/pay', query: { way: 'CART' } });
+        this.$router.push({ path: "/pay", query: { way: "CART" } });
      } else {
-        this.$Message.warning('请至少选择一件商品');
+        this.$Message.warning("请至少选择一件商品");
      }
    },
    // 展示优惠券
-    showCoupon (storeId, index) {
+    showCoupon(storeId, index) {
      this.couponAvailable = index;
    },
    // 设置购买数量
-    changeNum (val, id) {
+    changeNum(val, id) {
      console.log(val, id);
      APICart.setCartGoodsNum({ skuId: id, num: val }).then((res) => {
        console.log(res);
@@ -271,12 +341,12 @@ export default {
      });
    },
    // 设置商品选中状态
-    async changeChecked (status, type, id) {
+    async changeChecked(status, type, id) {
      const check = status ? 1 : 0;
-      if (type === 'all') {
+      if (type === "all") {
        // 全选
        await APICart.setCheckedAll({ checked: check });
-      } else if (type === 'shop') {
+      } else if (type === "shop") {
        // 选中店铺所有商品
        await APICart.setCheckedSeller({ checked: check, storeId: id });
      } else {
@@ -287,17 +357,17 @@ export default {
      this.getCartList();
    },
    // 领取优惠券
-    async receiveShopCoupon (item) {
+    async receiveShopCoupon(item) {
      let res = await APIMember.receiveCoupon(item.id);
      if (res.success) {
-        this.$set(item, 'disabled', true);
-        this.$Message.success('领取成功');
+        this.$set(item, "disabled", true);
+        this.$Message.success("领取成功");
      } else {
        this.$Message.error(res.message);
      }
    },
    // 购物车列表
-    async getCartList () {
+    async getCartList() {
      this.loading = true;
      try {
        let res = await APICart.cartGoodsAll();
@@ -326,15 +396,15 @@ export default {
      } catch (error) {
        this.loading = false;
      }
-    }
+    },
  },
-  mounted () {
+  mounted() {
    this.getCartList();
    APICart.cartCount().then((res) => {
      // 购物车商品数量
      if (res.success) this.goodsTotal = res.result;
    });
-  }
+  },
 };
 </script>

@@ -657,12 +727,12 @@ export default {
    color: #999;
  }
 }
-.cart-goods-footer > div{
+.cart-goods-footer > div {
  display: flex;
  align-items: center;
  overflow: hidden;
 }
-.total-price{
+.total-price {
  display: flex;
  align-items: center;
 }
--- 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/ForgetPassword.vue
+++ b/buyer/src/pages/ForgetPassword.vue
@@ -108,7 +108,7 @@
 </template>

 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -119,7 +119,7 @@ export default {
  components: { Verify },
  data () {
    return {
-      config,
+      config:require('@/config'),
      loading: false, // 加载状态
      loading1: false, // 第二步加载状态
      formFirst: { // 手机验证码表单
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -13,14 +13,24 @@
          </BreadcrumbItem>
        </Breadcrumb>
        <div class="store-collect">
-          <span class="mr_10" v-if="goodsMsg.data"><router-link
-            :to="'Merchant?id=' + goodsMsg.data.storeId">{{ goodsMsg.data.storeName }}</router-link></span>
-          <span @click="collect"><Icon type="ios-heart"
-              :color="storeCollected ? '#ed3f14' : '#666'"/>
-              {{storeCollected ? '已收藏店铺' : '收藏店铺'}}
-            </span>
-          <span @click="connectCs(storeMsg.yzfSign)" class="ml_10"><Icon
-            custom="icomoon icon-customer-service"/>联系客服</span>
+          <span class="mr_10" v-if="goodsMsg.data">
+
+            <router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{ goodsMsg.data.storeName }}</router-link>
+          </span>
+          <span @click="collect">
+            <Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
+            {{storeCollected ? '已收藏店铺' : '收藏店铺'}}
+          </span>
+          <!-- 
+               先看下udesk merchantEuid 是否有值
+               有的话 链接udesk
+               没有的话 显示云智服
+           -->
+          <span class="ml_10" v-if="storeMsg.merchantEuid" @click="IMService()">联系客服</span>
+
+          <span v-else @click="connectCs(storeMsg.yzfSign)" class="ml_10">
+            <Icon custom="icomoon icon-customer-service" />联系客服
+          </span>
        </div>
      </div>
    </div>
@@ -35,128 +45,158 @@
 </template>

 <script>
-import Search from '@/components/Search';
-import ShopHeader from '@/components/header/ShopHeader';
-import ShowGoods from '@/components/goodsDetail/ShowGoods';
-import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
-import {goodsSkuDetail} from '@/api/goods';
-import {cancelCollect, collectGoods, isCollection, getGoodsDistribution} from '@/api/member';
-import {getDetailById} from '@/api/shopentry'
-
+import Search from "@/components/Search";
+import ShopHeader from "@/components/header/ShopHeader";
+import ShowGoods from "@/components/goodsDetail/ShowGoods";
+import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
+import { goodsSkuDetail } from "@/api/goods";
+import {
+  cancelCollect,
+  collectGoods,
+  isCollection,
+  getGoodsDistribution,
+} from "@/api/member";
+import { getDetailById } from "@/api/shopentry";
+import { getIMDetail } from "@/api/common";
 export default {
-  name: 'GoodsDetail',
-  beforeRouteEnter (to, from, next) {
+  name: "GoodsDetail",
+  beforeRouteEnter(to, from, next) {
    window.scrollTo(0, 0);
    next();
  },
-  created () {
+  created() {
    this.getGoodsDetail();
+    // this.getIMDetailMethods();
  },
-  data () {
+  data() {
    return {
      goodsMsg: {}, // 商品信息
      isLoading: false, // 加载状态
      categoryBar: [], // 分类
      storeCollected: false, // 商品收藏
-      storeMsg: {} // 店铺信息
+      storeMsg: {}, // 店铺信息
+      IMLink: "",
    };
  },
  methods: {
+    // 跳转im客服
+    IMService() {
+      window.open(this.IM);
+    },
+    // 获取im信息
+    async getIMDetailMethods() {
+      let res = await getIMDetail();
+      if (res.success) {
+        this.IMLink = res.result;
+      }
+    },
    // 获取商品详情
-    getGoodsDetail () {
+    getGoodsDetail() {
      this.isLoading = true;
      const params = this.$route.query;
      // 分销员id
-      let distributionId = (params && params.distributionId) ? params.distributionId : this.Cookies.getItem('distributionId');
+      let distributionId =
+        params && params.distributionId
+          ? params.distributionId
+          : this.Cookies.getItem("distributionId");
      // 如果有分销信息
      if (distributionId) {
-        console.log(distributionId)
+        console.log(distributionId);
        // 先存储
-        this.Cookies.setItem('distributionId', params.distributionId)
+        this.Cookies.setItem("distributionId", params.distributionId);
        let _this = this;
        // 绑定关系
-        getGoodsDistribution(params.distributionId).then(res => {
+        getGoodsDistribution(params.distributionId).then((res) => {
          // 绑定成功，则清除关系
          if (res.success) {
-            _this.Cookies.removeItem('distributionId');
+            _this.Cookies.removeItem("distributionId");
          }
-        })
+        });
      }

-      goodsSkuDetail(params).then((res) => {
-        this.isLoading = false;
-        if (res.success) {
-          const result = res.result;
-          const cateName = res.result.categoryName;
-          const cateId = result.data.categoryPath.split(',');
-          const cateArr = [];
-          cateId.forEach((e, index) => { // 插入分类id和name
-            cateArr.push({
-              id: e,
-              name: cateName[index]
+      goodsSkuDetail(params)
+        .then((res) => {
+          this.isLoading = false;
+          if (res.success) {
+            const result = res.result;
+            const cateName = res.result.categoryName;
+            const cateId = result.data.categoryPath.split(",");
+            const cateArr = [];
+            cateId.forEach((e, index) => {
+              // 插入分类id和name
+              cateArr.push({
+                id: e,
+                name: cateName[index],
+              });
            });
-          });
-          this.categoryBar = cateArr;
-          this.goodsMsg = res.result;
-          // 判断是否收藏
-          if (this.Cookies.getItem('userInfo')) {
-            isCollection('STORE', this.goodsMsg.data.storeId).then(res => {
-              if (res.success && res.result) {
-                this.storeCollected = true;
-              }
-            })
-          }
-          // 获取店铺信息
-          getDetailById(this.goodsMsg.data.storeId).then(res => {
-            if (res.success) {
-              this.storeMsg = res.result
+            this.categoryBar = cateArr;
+            this.goodsMsg = res.result;
+            // 判断是否收藏
+            if (this.Cookies.getItem("userInfo")) {
+              isCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
+                if (res.success && res.result) {
+                  this.storeCollected = true;
+                }
+              });
            }
-          })
-        } else {
-          this.$Message.error(res.message)
-          this.$router.push('/')
-        }
-      }).catch(() => {
-        this.$router.push('/')
-      });
+            // 获取店铺信息
+            getDetailById(this.goodsMsg.data.storeId).then((res) => {
+              if (res.success) {
+                this.storeMsg = res.result;
+              }
+            });
+          } else {
+            this.$Message.error(res.message);
+            this.$router.push("/");
+          }
+        })
+        .catch(() => {
+          this.$router.push("/");
+        });
    },
-    goGoodsList (currIndex) { // 跳转商品列表
-      const arr = []
+    goGoodsList(currIndex) {
+      // 跳转商品列表
+      const arr = [];
      this.categoryBar.forEach((e, index) => {
        if (index <= currIndex) {
-          arr.push(e.id)
+          arr.push(e.id);
        }
-      })
-      return location.origin + '/goodsList?categoryId=' + arr.toString()
+      });
+      return location.origin + "/goodsList?categoryId=" + arr.toString();
    },
-    async collect () { // 收藏店铺
+    async collect() {
+      // 收藏店铺
      if (this.storeCollected) {
-        let cancel = await cancelCollect('STORE', this.goodsMsg.data.storeId)
+        let cancel = await cancelCollect("STORE", this.goodsMsg.data.storeId);
        if (cancel.success) {
-          this.$Message.success('已取消收藏')
+          this.$Message.success("已取消收藏");
          this.storeCollected = false;
        }
      } else {
-        let collect = await collectGoods('STORE', this.goodsMsg.data.storeId);
+        let collect = await collectGoods("STORE", this.goodsMsg.data.storeId);
        if (collect.code === 200) {
          this.storeCollected = true;
-          this.$Message.success('收藏店铺成功,可以前往个人中心我的收藏查看');
+          this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
        }
      }
-    }
+    },
  },
  watch: {
-    '$route.query.skuId': function (val) {
+    "$route.query.skuId": function (val) {
      location.reload();
-    }
+    },
+  },
+  computed: {
+    IM() {
+      return this.IMLink + this.storeMsg.merchantEuid;
+    },
  },
-  computed: {},
  components: {
    Search,
    ShopHeader,
    ShowGoods,
-    ShowGoodsDetail
-  }
+    ShowGoodsDetail,
+  },
 };
 </script>
 <style scoped lang="scss">
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -69,7 +69,30 @@
                >人评价
              </div>
              <div class="goods-show-seller">
-                <Tag v-if="item.content.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.content.storeName }}</span>
+                <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>
+                <span class="text-bottom" style="color: #e4393c">{{
+                  item.content.storeName
+                }}</span>
              </div>
            </div>
          </div>
@@ -92,127 +115,153 @@
 </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: "",
      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++) {
+              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';
+@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;
+}
 .container {
  margin: 15px auto;
  width: 1200px;
  min-width: 1000px;
  position: relative;
 }
+.price-sort:hover {
+  color: #e23a3a;
+}
 .goods-box {
  display: flex;
 }
@@ -221,10 +270,32 @@ export default {
  width: 200px;
  border: 1px solid #ccc;
 }
+.goods-show-right {
+  width: 35px;
+  height: 17px;
+  // vertical-align:middle;
+  overflow: hidden;
+  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);
+}
+.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 {
  width: 100%;
  height: 36px;
-  color: $theme_color;
+  color: #e4393c;
  line-height: 36px;
  font-size: 18px;
 }
@@ -235,7 +306,7 @@ export default {
  float: right;
  margin-right: 15px;
  font-size: 10px;
-  color: #ccc;
+  color: rgb(204, 204, 204);
 }
 .item-as {
  width: 160px;
@@ -284,6 +355,7 @@ export default {
    display: block;
    clear: left;
  }
+
  .price-sort {
    span {
      display: inline-block;
@@ -324,7 +396,7 @@ export default {
  background-color: #fff;
 }
 .goods-list-tool span:hover {
-  border-color: $theme_color;
+  border-color: #e4393c;
  position: relative;
  text-decoration: none;
  z-index: 1;
@@ -336,7 +408,7 @@ export default {
 .goods-list-tool-active {
  color: #fff;
  border-left: 1px solid #ccc;
-  background-color: $theme_color !important;
+  background-color: #e4393c !important;
 }

 /* ---------------商品栏结束------------------- */
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -96,14 +96,14 @@
      <Row type="flex" justify="center" class="copyright">
        Copyright © {{year}} - Present
        <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">{{config.title}}</a>
-        版权所有
+        版权所有 
      </Row>
    </div>
  </div>
 </template>

 <script>
-import config from '@/config'
+
 import * as RegExp from "@/plugins/RegExp.js";
 import { md5 } from "@/plugins/md5.js";
 import * as apiLogin from "@/api/login.js";
@@ -119,7 +119,7 @@ export default {
  },
  data() {
    return {
-      config,
+      config:require('@/config'),
      type: true, // true 账号登录  false 验证码登录
      formData: {
        // 登录表单
--- a/buyer/src/pages/SignUp.vue
+++ b/buyer/src/pages/SignUp.vue
@@ -97,7 +97,7 @@
 </template>

 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -108,7 +108,7 @@ export default {
  components: { Verify },
  data () {
    return {
-      config,
+      config:require('@/config'),
      year: new Date().getFullYear(),
      formRegist: {
        // 注册表单
--- 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/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -342,7 +342,7 @@ export default {
  font-weight: bold;
 }
 .subTips {
- 
+  margin-left: 10px;
 }
 .fontsize_48 {
  font-size: 48px;
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -150,6 +150,9 @@ export default {
 }
 .goodsBuy {
  margin-left: 80px;
+  >*{
+    margin: 0 4px;
+  }
 }
 .page-size{
  text-align: right;
--- 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'
      },
@@ -345,7 +345,7 @@ export default {
 }

 .goods-list {
-  width: 500px;
+  // width: 500px;
  display: flex;
  margin-bottom: 10px;

@@ -362,6 +362,5 @@ export default {

 .modal-goods {
  padding: 5px;
-  background-color: #eee;
 }
 </style>
--- 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/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -35,15 +35,17 @@
      <h3>配送信息</h3>
      <p>配送方式：{{order.deliveryMethodValue}}</p>
      <p>配送状态：{{order.deliverStatusValue}}</p>
+      <p v-if="logistics">物流信息：{{logistics.shipper || '暂无物流信息'}}</p>
+      <p v-if="logistics">物流单号：{{logistics.logisticCode || '暂无物流单号'}}</p>
      <div class="div-express-log" v-if="logistics">
-          <p class="express-log">
+          <div class="express-log">
            <p>订单日志：</p>
-            <p v-for="(item, index) in logistics.traces" :key="index">
+            <div v-for="(item, index) in logistics.traces" :key="index">
              <span class="time">{{ item.AcceptTime }}</span>
              <span class="detail">{{ item.AcceptStation }}</span>
-            </p>
-          </p>
-        </div>
+            </div>
+          </div>
+      </div>
    </div>
    <div class="order-card">
      <h3>发票信息</h3>
@@ -75,9 +77,9 @@
        <tbody>
          <tr v-for="(goods, goodsIndex) in order.orderItems" :key="goodsIndex">
            <td>
-              <img @click="goodsDetail(goods.id, goods.goodsId)" :src="goods.image" alt="" />
+              <img @click="goodsDetail(goods.skuId, goods.goodsId)" :src="goods.image" alt="" />
              <div>
-                <p @click="goodsDetail(goods.id, goods.goodsId)" class="hover-color">
+                <p @click="goodsDetail(goods.skuId, goods.goodsId)" class="hover-color">
                  {{ goods.goodsName }}
                </p>
              </div>
@@ -87,7 +89,7 @@
            <td>{{ goods.num }}</td>
            <td>{{ (goods.goodsPrice * goods.num) | unitPrice('￥') }}</td>
            <td>
-              <Button v-if="goods.afterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(goods.sn)" type="info" size="small" class="mb_5">申请售后</Button>
+              <Button v-if="goods.afterSaleStatus.includes('NOT_APPLIED') || goods.afterSaleStatus.includes('PART_AFTER_SALE')" @click="applyAfterSale(goods.sn)" type="info" size="small" class="mb_5">申请售后</Button>
              <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.order.sn, goodsIndex)" size="small" type="success" class="fontsize_12 mb_5" >评价</Button>
              <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small">投诉</Button>
            </td>
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -496,7 +496,7 @@ export default {
  font-weight: bold;
 }
 .subTips {
- 
+  margin-left: 10px;
 }
 .account-btns {
  margin: 10px 0;
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -4,9 +4,7 @@
    <!-- LOGO 步骤条 -->
    <div class="width_1200 logo">
      <div>
-        <router-link to="/"
-        ><img :src="$store.state.logoImg"
-        /></router-link>
+        <router-link to="/"><img :src="$store.state.logoImg" /></router-link>
        <div>结算页</div>
      </div>
      <div class="cart-steps">
@@ -23,7 +21,7 @@
        <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
      </div>
    </div>
-    <Divider/>
+    <Divider />
    <div class="content width_1200">
      <!-- 收货地址 -->
      <div class="address">
@@ -45,31 +43,23 @@
            <div>
              <span>{{ item.name }}</span>
              <Tag class="ml_10" v-if="item.isDefault" color="red">默认</Tag>
-              <Tag class="ml_10" v-if="item.alias" color="warning">{{
-                  item.alias
-                }}
-              </Tag>
+              <Tag class="ml_10" v-if="item.alias" color="warning">{{ item.alias }} </Tag>
            </div>
            <div>{{ item.mobile }}</div>
-            <div>
-              {{ item.consigneeAddressPath | unitAddress }} {{ item.detail }}
-            </div>
+            <div>{{ item.consigneeAddressPath | unitAddress }} {{ item.detail }}</div>
            <div class="edit-btn" v-show="showEditBtn === index">
              <span @click.stop="editAddress(item.id)">修改</span>
-              <span
-                class="ml_10"
-                v-if="!item.isDefault"
-                @click.stop="delAddress(item)"
-              >删除</span
+              <span class="ml_10" v-if="!item.isDefault" @click.stop="delAddress(item)"
+                >删除</span
              >
            </div>
            <div class="corner-icon" v-show="selectedAddress.id === item.id">
              <div></div>
-              <Icon type="md-checkmark"/>
+              <Icon type="md-checkmark" />
            </div>
          </div>
          <div class="add-address" @click="editAddress('')">
-            <Icon type="ios-add-circle-outline"/>
+            <Icon type="ios-add-circle-outline" />
            <div>添加新地址</div>
          </div>
        </div>
@@ -80,8 +70,8 @@
          v-if="addressList.length > 3"
        >
          {{ moreAddr ? "收起地址" : "更多地址" }}
-          <Icon v-show="!moreAddr" type="md-arrow-dropdown"/>
-          <Icon v-show="moreAddr" type="md-arrow-dropup"/>
+          <Icon v-show="!moreAddr" type="md-arrow-dropdown" />
+          <Icon v-show="moreAddr" type="md-arrow-dropup" />
        </div>
      </div>
      <!-- 商品信息 -->
@@ -90,16 +80,12 @@
          <span>商品信息</span>
          <span @click="$router.push('/cart')">返回购物车</span>
        </div>
-        <div
-          class="goods-msg"
-          v-for="(shop, shopIndex) in goodsList"
-          :key="shopIndex"
-        >
+        <div class="goods-msg" v-for="(shop, shopIndex) in goodsList" :key="shopIndex">
          <div class="shop-name">
            <span>
              <span class="hover-color" @click="goShopPage(shop.storeId)">{{
-                  shop.storeName
-                }}</span
+                shop.storeName
+              }}</span
              >&nbsp;&nbsp;
            </span>
          </div>
@@ -111,23 +97,15 @@
            >
              <span
                class="hover-color"
-                @click="
-                  goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)
-                "
+                @click="goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)"
              >
-                <img :src="goods.goodsSku.thumbnail" alt=""/>
-                <span style="vertical-align: top">{{
-                    goods.goodsSku.goodsName
-                  }}</span>
+                <img :src="goods.goodsSku.thumbnail" alt="" />
+                <span style="vertical-align: top">{{ goods.goodsSku.goodsName }}</span>
              </span>
-              <span class="goods-price">{{
-                  goods.purchasePrice | unitPrice("￥")
-                }}</span>
+              <span class="goods-price">{{ goods.purchasePrice | unitPrice("￥") }}</span>
              <span>x{{ goods.num }}</span>
              <span>{{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}</span>
-              <span class="goods-price">{{
-                  goods.subTotal | unitPrice("￥")
-                }}</span>
+              <span class="goods-price">{{ goods.subTotal | unitPrice("￥") }}</span>
            </div>
          </div>
          <div class="order-mark">
@@ -139,7 +117,7 @@
              placeholder="订单备注"
            />
            <span style="font-size: 12px; color: #999"
-            >提示：请勿填写有关支付、收货、发票方面的信息</span
+              >提示：请勿填写有关支付、收货、发票方面的信息</span
            >
          </div>
        </div>
@@ -148,7 +126,7 @@
      <div class="invoice">
        <div class="card-head mt_20 mb_20">
          <span class="relative"
-          >发票信息<span class="inv-tips">
+            >发票信息<span class="inv-tips">
              <Icon
                type="ios-alert-outline"
              />开企业抬头发票须填写纳税人识别号，以免影响报销
@@ -168,29 +146,19 @@
        </div>
        <div v-if="couponList.length === 0">无可用优惠券</div>
        <ul v-else class="coupon-list">
-          <li
-            v-for="(item, index) in couponList"
-            class="coupon-item"
-            :key="index"
-          >
+          <li v-for="(item, index) in couponList" class="coupon-item" :key="index">
            <div class="c-left">
              <div>
-                <span
-                  v-if="item.couponType === 'PRICE'"
-                  class="fontsize_12 global_color"
-                >￥<span class="price">{{
-                    item.price | unitPrice
-                  }}</span></span
+                <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color"
+                  >￥<span class="price">{{ item.price | unitPrice }}</span></span
                >
                <span
                  v-if="item.couponType === 'DISCOUNT'"
                  class="fontsize_12 global_color"
-                ><span class="price">{{ item.discount }}</span
-                >折</span
-                >
-                <span class="describe"
-                >满{{ item.consumeThreshold }}元可用</span
+                  ><span class="price">{{ item.discount }}</span
+                  >折</span
                >
+                <span class="describe">满{{ item.consumeThreshold }}元可用</span>
              </div>
              <p>使用范围：{{ useScope(item.scopeType) }}</p>
              <p>有效期：{{ item.endTime }}</p>
@@ -207,7 +175,7 @@
              class="c-right"
              v-if="usedCouponId.includes(item.id)"
              @click="useCoupon(item.id, false)"
-            >放弃优惠</a
+              >放弃优惠</a
            >
            <i class="circle-top"></i>
            <i class="circle-bottom"></i>
@@ -220,32 +188,22 @@
          <span>{{ totalNum }}件商品，总商品金额：</span
          ><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span>
        </div>
-        <div v-if="priceDetailDTO.freightPrice>0">
+        <div v-if="priceDetailDTO.freightPrice > 0">
          <span>运费：</span
          ><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span>
        </div>
-        <div v-if="priceDetailDTO.discountPrice>0">
+        <div v-if="priceDetailDTO.discountPrice > 0">
          <span>优惠金额：</span
-          ><span
-        >-{{
-            priceDetailDTO.discountPrice | unitPrice("￥")
-          }}</span
-        >
+          ><span>-{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
        </div>
-        <div v-if="priceDetailDTO.couponPrice>0">
+        <div v-if="priceDetailDTO.couponPrice > 0">
          <span>优惠券金额：</span
-          ><span
-        >-{{
-            priceDetailDTO.couponPrice | unitPrice("￥")
-          }}</span
-        >
+          ><span>-{{ priceDetailDTO.couponPrice | unitPrice("￥") }}</span>
        </div>

        <div v-if="$route.query.way === 'POINTS'">
          <span>应付积分：</span
-          ><span class="actrual-price">{{
-            priceDetailDTO.payPoint
-          }}</span>
+          ><span class="actrual-price">{{ priceDetailDTO.payPoint }}</span>
        </div>
        <div v-else>
          <span>应付金额：</span
@@ -267,73 +225,65 @@
    </div>
    <BaseFooter></BaseFooter>
    <!-- 添加发票模态框 -->
-    <invoice-modal
-      ref="invModal"
-      :invoiceData="invoiceData"
-      @change="getInvMsg"
-    />
+    <invoice-modal ref="invModal" :invoiceData="invoiceData" @change="getInvMsg" />
    <!-- 选择地址模态框 -->
-    <address-manage
-      ref="address"
-      :id="addrId"
-      @change="addrChange"
-    ></address-manage>
+    <address-manage ref="address" :id="addrId" @change="addrChange"></address-manage>
  </div>
 </template>

 <script>
-import invoiceModal from '@/components/invoiceModal';
-import addressManage from '@/components/addressManage';
-import {memberAddress, delMemberAddress} from '@/api/address';
+import invoiceModal from "@/components/invoiceModal";
+import addressManage from "@/components/addressManage";
+import { memberAddress, delMemberAddress } from "@/api/address";
 import {
  cartGoodsPay,
  createTrade,
  selectAddr,
  selectCoupon,
-  couponNum
-} from '@/api/cart';
-import {canUseCouponList} from '@/api/member.js';
+  couponNum,
+} from "@/api/cart";
+import { canUseCouponList } from "@/api/member.js";

 export default {
-  name: 'Pay',
-  components: {invoiceModal, addressManage},
-  data () {
+  name: "Pay",
+  components: { invoiceModal, addressManage },
+  data() {
    return {
      stepIndex: 1, // 顶部步骤条状态
      invoiceAvailable: false, // 发票编辑按钮
-      showEditBtn: '', // 鼠标移入显示编辑按钮
-      orderMark: '', // 订单备注
+      showEditBtn: "", // 鼠标移入显示编辑按钮
+      orderMark: "", // 订单备注
      invoiceData: {
        // 发票数据
-        receiptTitle: '个人',
-        receiptContent: '不开发票'
+        receiptTitle: "个人",
+        receiptContent: "不开发票",
      },
      addressList: [], // 地址列表
      selectedAddress: {}, // 所选地址
      goodsList: [], // 商品列表
      priceDetailDTO: {}, // 商品价格
      totalNum: 0, // 购买数量
-      addrId: '', // 编辑地址传入的id
+      addrId: "", // 编辑地址传入的id
      moreAddr: false, // 更多地址
      canUseCouponNum: 0, // 可用优惠券数量
      couponList: [], // 可用优惠券列表
      usedCouponId: [], // 已使用优惠券id
-      selectedCoupon: {} // 已选优惠券对象
+      selectedCoupon: {}, // 已选优惠券对象
    };
  },
-  mounted () {
+  mounted() {
    this.init();
  },
  methods: {
    // 初始化数据
-    init () {
+    init() {
      this.getGoodsDetail();
    },
-    goAddressManage () {
+    goAddressManage() {
      // 跳转地址管理页面
-      this.$router.push('/home/MyAddress');
+      this.$router.push("/home/MyAddress");
    },
-    getAddress () {
+    getAddress() {
      // 获取收货地址列表
      memberAddress().then((res) => {
        if (res.success) {
@@ -346,10 +296,10 @@ export default {
        }
      });
    },
-    getGoodsDetail () {
+    getGoodsDetail() {
      // 订单商品详情
      this.$Spin.show();
-      cartGoodsPay({way: this.$route.query.way})
+      cartGoodsPay({ way: this.$route.query.way })
        .then((res) => {
          this.$Spin.hide();
          if (res.success) {
@@ -358,22 +308,27 @@ export default {
            this.skuList = res.result.skuList;

            if (res.result.receiptVO) {
-              this.invoiceData = res.result.receiptVO
+              this.invoiceData = res.result.receiptVO;
            }
            let notSupArea = res.result.notSupportFreight;
            this.selectedCoupon = {};
-            if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon;
-            Object.assign(this.selectedCoupon, res.result.storeCoupons);
+            if (res.result.platformCoupon)
+              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 = '';
+              let title = "";
              notSupArea.forEach((e) => {
                title = e.errorMessage;
                content.push(e.goodsSku.goodsName);
              });
              this.$Modal.warning({
-                title: '以下商品超出配送区域' || title,
-                content: content.toString()
+                title: "以下商品超出配送区域" || title,
+                content: content.toString(),
              });
            }
            if (res.result.memberAddress) {
@@ -384,16 +339,28 @@ export default {
            for (let i = 0; i < this.skuList.length; i++) {
              this.totalNum += this.skuList[i].num;
            }
-            this.getCouponNum();
+            this.usedCouponId = [];
+            this.couponList = res.result.canUseCoupons;
+            const couponKeys = Object.keys(this.selectedCoupon);
+            if (couponKeys.length) {
+              this.couponList.forEach((e) => {
+                if (this.selectedCoupon[e.id] && e.id === this.selectedCoupon[e.id].memberCoupon.id) {
+                  this.usedCouponId.push(e.id);
+                }
+              });
+              this.$nextTick(() => {
+                this.$forceUpdate();
+              });
+            }
          }
        })
        .catch(() => {
          this.$Spin.hide();
        });
    },
-    getCouponNum () {
+    getCouponNum() {
      // 获取可用优惠券数量
-      couponNum({way: this.$route.query.way}).then((res) => {
+      couponNum({ way: this.$route.query.way }).then((res) => {
        this.canUseCouponNum = res.result;
        if (res.result) {
          let storeArr = [];
@@ -407,10 +374,10 @@ export default {
          let params = {
            pageNumber: 1,
            pageSize: 100,
-            memberCouponStatus: 'NEW',
+            memberCouponStatus: "NEW",
            scopeId: skuArr.toString(),
            storeId: storeArr.toString(),
-            totalPrice: this.priceDetailDTO.goodsPrice
+            totalPrice: this.priceDetailDTO.goodsPrice,
          };
          canUseCouponList(params).then((res) => {
            // 可用优惠券列表
@@ -431,78 +398,77 @@ export default {
        }
      });
    },
-    selectAddress (item) {
+    selectAddress(item) {
      // 选择地址
      let params = {
        way: this.$route.query.way,
-        shippingAddressId: item.id
+        shippingAddressId: item.id,
      };
      selectAddr(params).then((res) => {
        if (res.success) {
-          this.$Message.success('选择收货地址成功');
+          this.$Message.success("选择收货地址成功");
          this.selectedAddress = item;
          this.getGoodsDetail();
        }
      });
    },
-    editAddress (id) {
+    editAddress(id) {
      // 编辑地址
      this.addrId = id;
      this.$refs.address.show();
    },
-    addrChange () {
+    addrChange() {
      // 添加，编辑地址回显
      this.getAddress();
    },
-    delAddress (item) {
+    delAddress(item) {
      // 删除地址
      this.$Modal.confirm({
-        title: '提示',
-        content: '你确定删除这个收货地址',
+        title: "提示",
+        content: "你确定删除这个收货地址",
        onOk: () => {
          delMemberAddress(item.id).then((res) => {
            if (res.success) {
-              this.$Message.success('删除成功');
+              this.$Message.success("删除成功");
              this.getAddress();
            }
          });
        },
-        onCancel: () => {
-        }
+        onCancel: () => {},
      });
    },
-    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");
    },
    // 跳转店铺首页
-    goShopPage (id) {
+    goShopPage(id) {
      let routeUrl = this.$router.resolve({
-        path: '/Merchant',
-        query: {id: id}
+        path: "/Merchant",
+        query: { id: id },
      });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
    },
-    useCoupon (id, used) {
+    useCoupon(id, used) {
      // 使用优惠券
      let params = {
        way: this.$route.query.way,
        memberCouponId: id,
-        used: used // true 为使用， false为弃用
+        used: used, // true 为使用， false为弃用
      };
      selectCoupon(params).then((res) => {
        if (res.success) this.init();
      });
    },
-    editInvoice () {
+    editInvoice() {
      // 编辑发票信息
      this.$refs.invModal.invoiceAvailable = true;
    },
-    getInvMsg (item) {
+    getInvMsg(item) {
      // 获取发票信息
      if (item) {
        this.init();
@@ -510,18 +476,18 @@ export default {
      }
    },

-    pay () {
+    pay() {
      // 结算
      const params = {
-        client: 'PC',
+        client: "PC",
        remark: [],
-        way: this.$route.query.way
+        way: this.$route.query.way,
      };
      this.goodsList.forEach((e) => {
        if (e.remark) {
          params.remark.push({
            remark: e.remark,
-            storeId: e.storeId
+            storeId: e.storeId,
          });
        }
      });
@@ -533,12 +499,13 @@ export default {
        .then((res) => {
          this.$Spin.hide();
          if (res.success) {
-            if (params.way === 'POINTS') { // 积分支付不需要跳转支付页面
-              this.$router.push('/payDone')
+            if (params.way === "POINTS") {
+              // 积分支付不需要跳转支付页面
+              this.$router.push("/payDone");
            } else {
              this.$router.push({
-                path: '/payment',
-                query: {orderType: 'TRADE', sn: res.result.sn}
+                path: "/payment",
+                query: { orderType: "TRADE", sn: res.result.sn },
              });
            }
          }
@@ -548,28 +515,28 @@ export default {
        });
    },
    // 优惠券可用范围
-    useScope (type) {
-      let goods = '全部商品';
+    useScope(type) {
+      let goods = "全部商品";
      switch (type) {
-        case 'ALL':
-          goods = '全部商品';
+        case "ALL":
+          goods = "全部商品";
          break;
-        case 'PORTION_GOODS':
-          goods = '部分商品';
+        case "PORTION_GOODS":
+          goods = "部分商品";
          break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品';
+        case "PORTION_GOODS_CATEGORY":
+          goods = "部分分类商品";
          break;
      }
      return `${goods}可用`;
-    }
-  }
+    },
+  },
 };
 </script>

 <style scoped lang="scss">
@import "../../assets/styles/coupon.scss";
-.goods-msg{
+.goods-msg {
  overflow: hidden;
 }
 /** logo start */
@@ -781,7 +748,7 @@ export default {

  .goods-item {
    display: flex;
-    width:100%;
+    width: 100%;
    align-items: center;
    justify-content: space-between;
    padding: 20px 0;
@@ -807,12 +774,11 @@ export default {

      flex: 1;
      text-align: left;
-      >span{
+      > span {
        margin-left: 10px;
      }
    }

-
    > span:last-child {
      color: $theme_color;
      font-weight: bold;
--- 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/pages/user/Home.vue
+++ b/buyer/src/pages/user/Home.vue
@@ -65,8 +65,23 @@ export default {
    };
  },
  computed: {
-    userInfo () { // 用户信息
-      return JSON.parse(Storage.getItem('userInfo'));
+    userInfo () { // 用户信息  
+      if(Storage.getItem('userInfo')){
+         return JSON.parse(Storage.getItem('userInfo'));  
+      } else{
+         this.$Modal.confirm({
+          title:'请登录',
+          content:"<p>请登录后执行此操作</p>",
+          okText: '立即登录',
+          cancelText: '继续浏览',
+          onOk:()=>{
+            if(true){
+              this.$router.push('/login');
+            }
+          }
+        }) 
+          return {}
+      }  
    }
  },

--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -5,6 +5,8 @@ import Storage from './storage';
 import router from '../router/index.js';
 import store from '../vuex/store';
 import { handleRefreshToken } from '@/api/index';
+import {v4 as uuidv4} from 'uuid';
+
 const qs = require('qs');
 // api地址
 export const buyerUrl =
@@ -59,7 +61,11 @@ service.interceptors.request.use(
      config.loading = Spin.show();
    }

-    const uuid = Storage.getItem('uuid');
+    let uuid = Storage.getItem('uuid');
+    if (!uuid) {
+      uuid = uuidv4();
+      Storage.setItem('uuid', uuid);
+    }
    config.headers['uuid'] = uuid;

    // 获取访问Token
@@ -135,7 +141,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: '店铺'}
-  }
-  ]
+  ],
 });
--- a/buyer/vue.config.js
+++ b/buyer/vue.config.js
@@ -4,6 +4,7 @@ const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 const resolve = dir => {
  return path.join(__dirname, dir);
 };
+const configs = require('./src/config')
 /**
 * 在项目开发的时候将生产环境以及开发环境进行判断
 * 将生产环境中的路径用cdn来进行优化处理
@@ -12,6 +13,7 @@ const resolve = dir => {
 */
 const enableProduction = process.env.NODE_ENV === "production"; // 是否生产环境

+
 let externals = {
  vue: "Vue",
  axios: "axios",
@@ -52,8 +54,8 @@ let jsPlugin = [
  })
 ];
 // 判断是否需要加载CDN
-cdn = enableProduction ? cdn : { css: [], js: [] };
-externals = enableProduction ? externals : {};
+cdn = enableProduction && configs.enableCDN ? cdn : { css: [], js: [] };
+externals = enableProduction && configs.enableCDN  ? externals : {};
 jsPlugin = enableProduction ? jsPlugin : [];

 module.exports = {
@@ -79,7 +81,7 @@ module.exports = {
    }
  },
  devServer: {
-    port: 10000
+    port: configs.port
  },

  // 打包时不生成.map文件 避免看到源码
@@ -128,6 +130,7 @@ module.exports = {
    config.resolve.alias.set("@", resolve("src"));
    config.plugin("html").tap(args => {
      args[0].cdn = cdn;
+      args[0].title = configs.title;
      return args;
    });
  }
--- 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

--- a/manager/.npmrc
+++ b/manager/.npmrc
@@ -0,0 +1,5 @@
+# 默认依赖包指定淘宝源
+registry=https://registry.npm.taobao.org/
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror=https://npm.taobao.org/mirrors/electron/
--- a/manager/.yarnrc
+++ b/manager/.yarnrc
@@ -0,0 +1,5 @@
+registry "https://registry.npmmirror.com"
+sass_binary_site "https://npmmirror.com/mirrors/node-sass"
+phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
+electron_mirror "https://npmmirror.com/mirrors/electron"
+
--- 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 .
--- 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"
  };
-  
--- a/manager/src/App.vue
+++ b/manager/src/App.vue
@@ -5,7 +5,6 @@
 </template>

 <script>
-import {v4 as uuidv4} from 'uuid';
 import {getCategoryTree} from '@/api/goods.js'
 export default {
  updated() {
@@ -17,13 +16,7 @@ export default {
      })
    }
  },
-  mounted() {
-    let uuid = this.getStore('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      this.setStore('uuid', uuid);
-    }
-  },
+
 };
 </script>

--- 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);
 };
--- 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)
 }

 //保存更新分销设置
--- 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)
 }
-
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -7,6 +7,7 @@ import {
  importRequest,
  getRequestWithNoToken,
  putRequestWithNoForm,
+  postRequestWithNoTokenData,
  postRequestWithNoForm,
  managerUrl
 } from "@/libs/axios";
@@ -15,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)
 }


@@ -47,12 +48,12 @@ export const getNoticePage = (params) => {

 // 登陆
 export const login = (params) => {
-  return getRequestWithNoToken("/user/login", params);
+  return postRequestWithNoTokenData("/passport/user/login", params);
 };

 // 登出
 export const logout = () => {
-  return postRequest("/user/logout");
+  return postRequest("/passport/user/logout");
 };

 // 刷新token
@@ -61,7 +62,7 @@ export const handleRefreshToken = (token) => {
 };
 // 获取用户登录信息
 export const userInfo = (params) => {
-  return getRequest("/user/info", params);
+  return getRequest("/passport/user/info", params);
 };
 // 注册
 export const regist = (params) => {
@@ -98,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);
 };

 /****************************** 角色结束 */
@@ -231,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);
 };

 /****************************** 权限结束 */
@@ -262,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) => {
@@ -288,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) => {
@@ -305,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) => {
@@ -323,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}`);
 };

 // 添加商品计量单位
@@ -375,71 +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/hotwords/${words}`);
+};

 // 获取热搜词
 export const getHotWords = () => {
-  return getRequest(`/hotwords`);
+  return getRequest(`/hotwords/hotwords`);
 };
-
--- 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);
 };


--- 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)
 }


--- 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}`)
 }
-
-
-
-
-
--- 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);
 };
-
-
--- 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}`)
 }
-
-
-
-
-
-
-
-
-
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -60,35 +60,35 @@ export const getPintuanGoodsList = params => {
 };

 // 关闭拼团活动
-export const closePintuan = pintuanId => {
-  return putRequest(`/promotion/pintuan/close/${pintuanId}`);
+export const updatePintuanStatus = (pintuanId, params) => {
+  return putRequest(`/promotion/pintuan/status/${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}`);
 };

 // 保存平台优惠券
@@ -187,12 +187,14 @@ export const saveSeckill = params => {

 // 修改秒杀活动
 export const updateSeckill = params => {
-  return putRequest("/promotion/seckill", params);
+  return putRequest("/promotion/seckill", params, {
+    "Content-type": "application/json"
+  });
 };

 // 关闭秒杀活动
-export const closeSeckill = id => {
-  return putRequest(`/promotion/seckill/close/${id}`);
+export const updateSeckillStatus = (id, params) => {
+  return putRequest(`/promotion/seckill/status/${id}`, params);
 };
 // 删除秒杀商品
 export const delSeckillGoods = params => {
@@ -213,7 +215,7 @@ export const getFullDiscountById = id => {
 };
 // 开启、关闭满额活动
 export const updateFullDiscount = (id, promotionStatus) => {
-  return putRequest(`/promotion/fullDiscount/status/${id}/${promotionStatus}`)
+  return putRequest(`/promotion/fullDiscount/status/${id}`)
 }
 // 积分商品列表
 export const getPointsGoodsList = params => {
@@ -237,7 +239,7 @@ export const updatePointsGoods = params => {
 };
 // 修改积分商品状态
 export const editPointsGoodsStatus = (id, params) => {
-  return putRequest(`/promotion/pointsGoods/${id}`, params);
+  return putRequest(`/promotion/pointsGoods/status/${id}`, params);
 };
 // 删除积分商品
 export const deletePointsGoodsStatus = id => {
--- 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)
 }
--- 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`)
 }
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -1,36 +1,7 @@
-export default {
-  /**
-   * @description 配置显示在浏览器标签的title
-   */
-  title: "lilishop",
-  /**
-   * @description token在Cookie中存储的天数，默认1天
-   */
-  cookieExpires: 1,
-  /**
-   * @description 是否使用国际化，默认为false
-   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
-   *              用来在菜单中显示文字
-   */
-  useI18n: true,
-  /**
-   * @description api请求基础路径
-   */
-   /**
-   * @description 高德web端申请的api key
-   */
-    aMapKey: "b440952723253aa9fe483e698057bf7d",
-    /**
-     * @description 官网地址
-     */
-    website: "https://www.pickmall.cn",
-  /**
-   * @description 需要加载的插件
-   */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+module.exports = {
+  title: "lilishop", //配置显示在浏览器标签的title
+  aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key
+  website: "https://www.pickmall.cn", //官网地址
+  enableCDN: true, //生产环境 是否启用cdn加载 vue等js
+  port: 10003, //端口
 };
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -4,6 +4,7 @@ import { router } from "../router/index";
 import { Message } from "view-design";
 import Cookies from "js-cookie";
 import { handleRefreshToken } from "../api/index";
+import {v4 as uuidv4} from 'uuid';

 // 统一请求路径前缀
 export const commonUrl =
@@ -29,7 +30,11 @@ service.interceptors.request.use(
        ...config.params
      };
    }
-    const uuid = getStore("uuid");
+    let uuid = getStore("uuid");
+    if (!uuid) {
+      uuid = uuidv4();
+      setStore('uuid', uuid);
+    }
    config.headers["uuid"] = uuid;
    return config;
  },
@@ -55,6 +60,7 @@ service.interceptors.response.use(
          Message.error("系统异常");
        }
        break;
+      case 20004:
      case 401:
        // 未登录 清除已登录状态
        Cookies.set("userInfoManager", "");
@@ -88,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();
@@ -337,3 +343,19 @@ export const postRequestWithNoToken = (url, params) => {
    params: params
  });
 };
+
+/**
+ * 无需token验证的请求 避免旧token过期导致请求失败
+ * @param {*} url 
+ * @param {*} params
+ */
+export const postRequestWithNoTokenData = (url, params) => {
+  return service({
+    method: "post",
+    url: `${url}`,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    data: params
+  });
+};
--- a/manager/src/libs/table2excel.js
+++ b/manager/src/libs/table2excel.js
@@ -1,100 +0,0 @@
-var idTmr;
-function getExplorer () {
-    var explorer = window.navigator.userAgent;
-    if (explorer.indexOf('MSIE') >= 0) {
-        // ie
-        return 'ie';
-    } else if (explorer.indexOf('Firefox') >= 0) {
-        // firefox
-        return 'Firefox';
-    } else if (explorer.indexOf('Chrome') >= 0) {
-        // Chrome
-        return 'Chrome';
-    } else if (explorer.indexOf('Opera') >= 0) {
-        // Opera
-        return 'Opera';
-    } else if (explorer.indexOf('Safari') >= 0) {
-        // Safari
-        return 'Safari';
-    };
-};
-function tranform (table, aId, name) {
-    let tableHead = table.$children[0].$el;
-    let tableBody = table.$children[1].$el;
-    let tableInnerHTML = '<thead><tr>';
-    if (table.$children.length !== 1) {
-        let len = tableBody.rows.length;
-        let i = -1;
-        while (i < len) {
-            if (i == -1) {
-                Array.from(tableHead.rows[0].children).forEach((td) => {
-                    tableInnerHTML = tableInnerHTML + '<th>' + td.children[0].children[0].innerHTML + '</th>';
-                });
-                tableInnerHTML += '</tr><thead><tbody>';
-            } else {
-                tableInnerHTML += '<tr>';
-                Array.from(tableBody.rows[i].children).forEach((td) => {
-                    tableInnerHTML = tableInnerHTML + '<td>' + td.children[0].children[0].innerHTML + '</td>';
-                });
-                tableInnerHTML += '</tr>';
-            }
-            i++;
-        }
-        tableInnerHTML += '</tbody>';
-    }
-
-    if (getExplorer() !== 'Safari' && name.substr(-1, 4) !== '.xls') {
-        name += '.xls';
-    }
-
-    if (getExplorer() == 'ie') {
-        var curTbl = table;
-        var oXL = new ActiveXObject('Excel.Application');
-        var oWB = oXL.Workbooks.Add();
-        var xlsheet = oWB.Worksheets(1);
-        var sel = document.body.createTextRange();
-        sel.moveToElementText(curTbl);
-        sel.select();
-        sel.execCommand('Copy');
-        xlsheet.Paste();
-        oXL.Visible = true;
-
-        try {
-            var fname = oXL.Application.GetSaveAsFilename('Excel.xls', 'Excel Spreadsheets (*.xls), *.xls');
-        } catch (e) {
-            print('Nested catch caught ' + e);
-        } finally {
-            oWB.SaveAs(fname);
-            // oWB.Close(savechanges = false);
-            oXL.Quit();
-            oXL = null;
-            idTmr = setInterval(Cleanup(), 1);
-        }
-    } else {
-        tableToExcel(tableInnerHTML, aId, name);
-    }
-}
-function Cleanup () {
-    window.clearInterval(idTmr);
-    // CollectGarbage();
-}
-let tableToExcel = (function () {
-    let uri = 'data:application/vnd.ms-excel;base64,';
-    let template = '<html><head><meta charset="UTF-8"></head><body><table>{table}</table></body></html>';
-    let base64 = function (s) { return window.btoa(unescape(encodeURIComponent(s))); };
-    let format = function (s, c) {
-        return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
-    };
-    return function (table, aId, name) {
-        let ctx = {worksheet: name || 'Worksheet', table: table};
-        document.getElementById(aId).href = uri + base64(format(template, ctx));
-        document.getElementById(aId).download = name;
-        document.getElementById(aId).click();
-    };
-})();
-
-const table2excel = {};
-
-table2excel.transform = tranform;
-
-export default table2excel;
--- a/manager/src/libs/zh.json
+++ b/manager/src/libs/zh.json
@@ -1,20 +0,0 @@
-{
-    "name": "zh",
-    "options": {
-        "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-        "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-        "toolbar": {
-            "exportToSVG": "下载图表 SVG",
-            "exportToPNG": "下载图表 PNG",
-            "menu": "菜单",
-            "selection": "选择",
-            "selectionZoom": "区域缩放",
-            "zoomIn": "缩小",
-            "zoomOut": "放大",
-            "pan": "移动",
-            "reset": "重置缩放"
-        }
-    }
-  }
--- a/manager/src/locale/lang/en-US.js
+++ b/manager/src/locale/lang/en-US.js
@@ -1,7 +1,5 @@

-import config from '@/config/index'
 export default {
-    lili: config.title,
    usernameLogin: 'UsernameLogin',
    mobileLogin: 'MobileLogin',
    autoLogin: 'Auto Login',
--- a/manager/src/locale/lang/zh-CN.js
+++ b/manager/src/locale/lang/zh-CN.js
@@ -1,6 +1,5 @@
-import config from '@/config/index'
+
 export default {
-    lili: config.title,
    usernameLogin: '账户密码登录',
    mobileLogin: '手机号登录',
    autoLogin: '自动登录',
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -1,5 +1,6 @@
 import Main from "@/views/Main.vue";
-import config from '@/config/index'
+
+const config = require('@/config/index')
 // 不作为Main组件的子页面展示的页面单独写，如下
 export const loginRouter = {
  path: "/login",
@@ -154,103 +155,103 @@ export const otherRouter = {
      component: () => import("@/views/goods/goods-info/goodsDetail.vue")
    },
    {
-      path: "promotion/add-points-goods",
+      path: "promotions/add-points-goods",
      title: "添加积分商品",
      name: "add-points-goods",
      component: () =>
-        import("@/views/promotion/pointsGoods/addPointsGoods.vue")
+        import("@/views/promotions/points-goods/points-goods-add.vue")
    },
    {
-      path: "promotion/edit-points-goods",
+      path: "promotions/edit-points-goods",
      title: "修改积分商品",
      name: "edit-points-goods",
      component: () =>
-        import("@/views/promotion/pointsGoods/editPointsGoods.vue")
+        import("@/views/promotions/points-goods/points-goods-edit.vue")
    },
    {
-      path: "promotion/manager-points-goods-category",
+      path: "promotions/manager-points-goods-category",
      title: "积分商品分类",
      name: "manager-points-goods-category",
      component: () =>
-        import("@/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue")
+        import("@/views/promotions/points-goods-category/points-goods-category.vue")
    },
    {
-      path: "promotion/add-kanJia-activity-goods",
+      path: "promotions/add-kanJia-activity-goods",
      title: "添加砍价活动",
      name: "add-kanJia-activity-goods",
-      component: () => import("@/views/promotion/kanjia/kanjiaActivityAddGoods.vue")
+      component: () => import("@/views/promotions/kanjia/kanjia-activity-add-goods.vue")
    },
    {
-      path: "promotion/edit-kanJia-activity-goods",
+      path: "promotions/edit-kanJia-activity-goods",
      title: "修改砍价活动",
      name: "edit-kanJia-activity-goods",
-      component: () => import("@/views/promotion/kanjia/kanjiaActivityEditGoods.vue")
+      component: () => import("@/views/promotions/kanjia/kanjia-activity-edit-goods.vue")
    },
    {
-      path: "promotion/manager-coupon",
+      path: "promotions/manager-coupon",
      title: "平台优惠券",
      name: "manager-coupon",
-      component: () => import("@/views/promotion/coupon/coupon.vue")
+      component: () => import("@/views/promotions/coupon/coupon.vue")
    },
    {
-      path: "promotion/add-platform-coupon",
+      path: "promotions/add-platform-coupon",
      title: "添加平台优惠券",
      name: "add-platform-coupon",
-      component: () => import("@/views/promotion/coupon/couponPublish.vue")
+      component: () => import("@/views/promotions/coupon/coupon-publish.vue")
    },
    {
-      path: "promotion/edit-platform-coupon",
+      path: "promotions/edit-platform-coupon",
      title: "编辑平台优惠券",
      name: "edit-platform-coupon",
-      component: () => import("@/views/promotion/coupon/couponPublish.vue")
+      component: () => import("@/views/promotions/coupon/coupon-publish.vue")
    },
    {
-      path: "coupon-activity/add",
+      path: "promotions/add-coupon-activity",
      title: "添加优惠券活动",
      name: "add-coupon-activity",
-      component: () => import("@/views/promotion/couponActivity/couponPublish.vue")
+      component: () => import("@/views/promotions/coupon-activity/coupon-publish.vue")
    },
    {
-      path: "coupon-activity/edit",
+      path: "promotions/edit-coupon-activity",
      title: "编辑平台优惠券活动",
      name: "edit-coupon-activity",
-      component: () => import("@/views/promotion/couponActivity/couponPublish.vue")
+      component: () => import("@/views/promotions/coupon-activity/coupon-publish.vue")
    },
    {
-      path: "promotion/coupon-activity-info",
+      path: "promotions/coupon-activity-info",
      title: "券活动详情",
      name: "coupon-activity-info",
-      component: () => import("@/views/promotion/couponActivity/couponInfo.vue")
+      component: () => import("@/views/promotions/coupon-activity/coupon-info.vue")
    },
    {
-      path: "promotion/manager-pintuan",
+      path: "promotions/manager-pintuan",
      title: "平台拼团",
      name: "manager-pintuan",
-      component: () => import("@/views/promotion/pintuan/pintuan.vue")
+      component: () => import("@/views/promotions/pintuan/pintuan.vue")
    },
    {
-      path: "promotion/pintuan/pintuan-goods",
+      path: "promotions/pintuan/pintuan-goods",
      title: "拼团商品",
      name: "pintuan-goods",
-      component: () => import("@/views/promotion/pintuan/pintuanGoods.vue")
+      component: () => import("@/views/promotions/pintuan/pintuan-goods.vue")
    },
    {
-      path: "promotion/full-cut-detail",
+      path: "promotions/full-discount-detail",
      title: "满减满折详情",
-      name: "full-cut-detail",
-      component: () => import("@/views/promotion/fullCut/fullCutDetail.vue")
+      name: "full-discount-detail",
+      component: () => import("@/views/promotions/full-discount/full-discount-detail.vue")
    },
    {
-      path: "promotion/seckill/manager-seckill-add",
+      path: "promotions/seckill/manager-seckill-add",
      title: "编辑秒杀活动",
      name: "manager-seckill-add",
-      component: () => import("@/views/promotion/seckill/addSeckill.vue")
+      component: () => import("@/views/promotions/seckill/seckill-add.vue")
    },
    {
-      path: "promotion/seckill/seckill-goods",
+      path: "promotions/seckill/seckill-goods",
      title: "秒杀商品",
      name: "seckill-goods",
-      component: () => import("@/views/promotion/seckill/seckillGoods.vue")
+      component: () => import("@/views/promotions/seckill/seckill-goods.vue")
    },
    {
      path: "/floorList/renovation",
@@ -271,10 +272,10 @@ export const otherRouter = {
      component: () => import("@/views/sys/message/smsSign.vue")
    },
    {
-      path: "liveDetail",
+      path: "live-detail",
      title: "查看直播",
-      name: "liveDetail",
-      component: () => import("@/views/promotion/live/liveDetail.vue")
+      name: "live-detail",
+      component: () => import("@/views/promotions/live/live-detail.vue")
    }
  ]
 };
--- a/manager/src/styles/common.scss
+++ b/manager/src/styles/common.scss
@@ -93,7 +93,7 @@ ul,li{
 $success_color: #68cabe;
 $warning_color: #fa6419;
 $error_color: #ff3c2a;
-$theme_color: #FF5C58;  
+$theme_color: #FF5C58;
 .theme_color {
  color: $theme_color !important;
 }
--- a/manager/src/styles/table-common.scss
+++ b/manager/src/styles/table-common.scss
@@ -3,10 +3,7 @@
    margin-bottom: 2vh;
  }

-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
+

  .select-clear {
    margin-left: 10px;
--- a/manager/src/styles/tree-common.scss
+++ b/manager/src/styles/tree-common.scss
@@ -3,10 +3,6 @@
        margin-bottom: 2vh;
    }

-    .select-title {
-        font-weight: 600;
-        color: #40a9ff;
-    }

    .select-clear {
        margin-left: 10px;
--- a/manager/src/utils/promotions.js
+++ b/manager/src/utils/promotions.js
@@ -0,0 +1,60 @@
+
+export function promotionsStatusRender(h, params) {
+  let text = "未知",
+    color = "red";
+  if (params.row.promotionStatus == "NEW") {
+    text = "未开始";
+    color = "geekblue";
+  } else if (params.row.promotionStatus == "START") {
+    text = "已开始";
+    color = "green";
+  } else if (params.row.promotionStatus == "END") {
+    text = "已结束";
+    color = "red";
+  } else if (params.row.promotionStatus == "CLOSE") {
+    text = "已关闭";
+    color = "red";
+  }
+  return h("div", [
+    h(
+      "Tag",
+      {
+        props: {
+          color: color,
+        },
+      },
+      text
+    ),
+  ]);
+}
+
+export function promotionsScopeTypeRender(h, params) {
+  let text = "未知",
+    color = "red";
+  if (params.row.scopeType == "ALL") {
+    text = "全品类";
+    color = "default";
+  } else if (params.row.scopeType == "PORTION_GOODS_CATEGORY") {
+    text = "商品分类";
+    color = "yellow";
+  } else if (params.row.scopeType == "PORTION_SHOP_CATEGORY") {
+    text = "店铺分类";
+    color = "pink";
+  } else if (params.row.scopeType == "PORTION_GOODS") {
+    text = "指定商品";
+    color = "magenta";
+  }
+  return h("div", [
+    h(
+      "Tag",
+      {
+        props: {
+          color: color,
+        },
+      },
+      text
+    ),
+  ]);
+}
+
+
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -7,7 +7,7 @@
        inline
        :label-width="70"
        class="search-form"
-          @keydown.enter.native="handleSearch"
+        @keydown.enter.native="handleSearch"
      >
        <Form-item label="商品名称" prop="goodsName">
          <Input
@@ -39,12 +39,19 @@
          </Select>
        </Form-item>
        <Form-item label="商品类型" prop="status">
-          <Select v-model="searchForm.goodsType" placeholder="请选择" clearable style="width: 200px">
+          <Select
+            v-model="searchForm.goodsType"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
            <Option value="PHYSICAL_GOODS">实物商品</Option>
            <Option value="VIRTUAL_GOODS">虚拟商品</Option>
          </Select>
        </Form-item>
-        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search"
+          >搜索</Button
+        >
      </Form>
      <Table
        :loading="loading"
@@ -55,25 +62,39 @@
        class="mt_10"
      >
        <!-- 商品栏目格式化 -->
-        <template slot="goodsSlot" slot-scope="{row}">
-          <div style="margin: 5px 0px;height: 80px; display: flex;">
+        <template slot="goodsSlot" slot-scope="{ row }">
+          <div style="margin: 5px 0px; height: 80px; display: flex">
            <div style="">
-              <img :src="row.original" style="height: 60px;margin-top: 1px;width: 60px">
+              <img
+                :src="row.original"
+                style="height: 60px; margin-top: 1px; width: 60px"
+              />
            </div>

-            <div style="margin-left: 13px;">
+            <div style="margin-left: 13px">
              <div class="div-zoom">
-                <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
+                <a @click="linkTo(row.id, row.skuId)">{{ row.goodsName }}</a>
              </div>
              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
                <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                  <vue-qr
+                    :text="wapLinkTo(row.id, row.skuId)"
+                    :margin="0"
+                    colorDark="#000"
+                    colorLight="#fff"
+                    :size="150"
+                  ></vue-qr>
                </div>
-                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+                <img
+                  src="../../../assets/qrcode.svg"
+                  class="hover-pointer"
+                  width="20"
+                  height="20"
+                  alt=""
+                />
              </Poptip>
            </div>
          </div>
-
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -91,26 +112,15 @@
        ></Page>
      </Row>
    </Card>
-    <Modal
-      title="下架操作"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        ref="underForm"
-        :model="underForm"
-        :label-width="100"
-      >
+    <Modal title="下架操作" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="underForm" :model="underForm" :label-width="100">
        <FormItem label="下架原因" prop="reason">
          <Input v-model="underForm.reason" clearable style="width: 100%" />
        </FormItem>
      </Form>
      <div slot="footer">
        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="lower"
-          >提交</Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="lower">提交</Button>
      </div>
    </Modal>
  </div>
@@ -118,10 +128,10 @@

 <script>
 import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
-import vueQr from 'vue-qr'
+import vueQr from "vue-qr";
 export default {
  components: {
-      "vue-qr":vueQr
+    "vue-qr": vueQr,
  },
  name: "goods",
  data() {
@@ -136,7 +146,8 @@ export default {
        sort: "create_time", // 默认排序字段
        order: "desc", // 默认排序方式
      },
-      underForm: { // 下架原因
+      underForm: {
+        // 下架原因
        reason: "",
      },
      submitLoading: false, // 添加或编辑提交状态
@@ -151,17 +162,14 @@ export default {
          title: "商品编号",
          key: "id",
          minWidth: 150,
-          tooltip: true
+          tooltip: true,
        },
        {
          title: "价格",
          key: "price",
          width: 130,
          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.price, "￥")
-            );
+            return h("div", this.$options.filters.unitPrice(params.row.price, "￥"));
          },
        },
        {
@@ -169,12 +177,12 @@ export default {
          key: "goodsType",
          width: 130,
          render: (h, params) => {
-            if (params.row.goodsType === 'PHYSICAL_GOODS') {
-              return h("Tag", {props: {color: "green",},}, "实物商品");
-            } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
-              return h("Tag", {props: {color: "volcano",},}, "虚拟商品");
+            if (params.row.goodsType === "PHYSICAL_GOODS") {
+              return h("Tag", { props: { color: "green" } }, "实物商品");
+            } else if (params.row.goodsType === "VIRTUAL_GOODS") {
+              return h("Tag", { props: { color: "volcano" } }, "虚拟商品");
            } else {
-              return h("Tag", {props: {color: "geekblue",},}, "电子卡券");
+              return h("Tag", { props: { color: "geekblue" } }, "电子卡券");
            }
          },
        },
@@ -184,23 +192,23 @@ export default {
          width: 100,
          render: (h, params) => {
            if (params.row.marketEnable == "DOWN") {
-              return h("Tag", {props: {color: "volcano"},},"下架");
+              return h("Tag", { props: { color: "volcano" } }, "下架");
            } else if (params.row.marketEnable == "UPPER") {
-              return h("Tag", {props: {color: "green",},},"上架");
+              return h("Tag", { props: { color: "green" } }, "上架");
            }
          },
        },
        {
          title: "审核状态",
-          key: "isAuth",
+          key: "authFlag",
          width: 130,
          render: (h, params) => {
-            if (params.row.isAuth == "TOBEAUDITED") {
-              return h("Tag", {props: {color: "volcano",},},"待审核");
-            } else if (params.row.isAuth == "PASS") {
-              return h("Tag", {props: {color: "green"},},"通过");
-            } else if (params.row.isAuth == "REFUSE") {
-              return h("Tag", {props: {color: "red",},},"拒绝");
+            if (params.row.authFlag == "TOBEAUDITED") {
+              return h("Tag", { props: { color: "volcano" } }, "待审核");
+            } else if (params.row.authFlag == "PASS") {
+              return h("Tag", { props: { color: "green" } }, "通过");
+            } else if (params.row.authFlag == "REFUSE") {
+              return h("Tag", { props: { color: "red" } }, "拒绝");
            }
          },
        },
@@ -208,7 +216,7 @@ export default {
          title: "店铺名称",
          key: "storeName",
          minWidth: 100,
-          tooltip: true
+          tooltip: true,
        },
        {
          title: "操作",
@@ -236,7 +244,8 @@ export default {
                    },
                  },
                  "上架"
-                ), h(
+                ),
+                h(
                  "Button",
                  {
                    props: {
@@ -249,7 +258,7 @@ export default {
                    },
                  },
                  "查看"
-                )
+                ),
              ]);
            } else {
              return h("div", [
@@ -270,7 +279,8 @@ export default {
                    },
                  },
                  "下架"
-                ), h(
+                ),
+                h(
                  "Button",
                  {
                    props: {
@@ -283,7 +293,7 @@ export default {
                    },
                  },
                  "查看"
-                )
+                ),
              ]);
            }
          },
@@ -369,7 +379,7 @@ export default {
        name: "goods-detail",
        query: { id: id },
      });
-    }
+    },
  },
  mounted() {
    this.init();
--- a/manager/src/views/goods/goods-info/goodsApply.vue
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -27,7 +27,9 @@
            style="width: 200px"
          />
        </Form-item>
-        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
+        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search"
+          >搜索</Button
+        >
      </Form>
      <Table
        :loading="loading"
@@ -39,18 +41,20 @@
      >
        <!-- 商品栏目格式化 -->
        <template slot="goodsSlot" slot-scope="scope">
-          <div style="margin-top: 5px;height: 80px; display: flex;">
+          <div style="margin-top: 5px; height: 80px; display: flex">
            <div style="">
-              <img :src="scope.row.original" style="height: 60px;margin-top: 3px;width: 60px">
+              <img
+                :src="scope.row.original"
+                style="height: 60px; margin-top: 3px; width: 60px"
+              />
            </div>

            <div style="margin-left: 13px">
-              <div class="div-zoom" >
-                <a>{{scope.row.goodsName}}</a>
+              <div class="div-zoom">
+                <a>{{ scope.row.goodsName }}</a>
              </div>
            </div>
          </div>
-
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -72,220 +76,224 @@
 </template>

 <script>
-  import {authGoods, getAuthGoodsListData} from "@/api/goods";
+import { authGoods, getAuthGoodsListData } from "@/api/goods";

-  export default {
-    name: "goods",
-    components: {},
-    data() {
-      return {
-        id: "", //要操作的id
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "create_time", // 默认排序字段
-          order: "desc", // 默认排序方式
+export default {
+  name: "goods",
+  components: {},
+  data() {
+    return {
+      id: "", //要操作的id
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      goodsAuditForm: {
+        // 商品编辑表单
+        auth_flag: 1,
+      },
+      columns: [
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 180,
+          slot: "goodsSlot",
+          tooltip: true,
        },
-        goodsAuditForm: { // 商品编辑表单
-          is_auth: 1,
+        {
+          title: "商品编号",
+          key: "id",
+          minWidth: 100,
+          tooltip: true,
        },
-        columns: [
-          {
-            title: "商品名称",
-            key: "goodsName",
-            minWidth: 180,
-            slot: "goodsSlot",
-            tooltip: true
+        {
+          title: "价格",
+          key: "price",
+          minWidth: 130,
+          render: (h, params) => {
+            return h("div", this.$options.filters.unitPrice(params.row.price, "￥"));
          },
-          {
-            title: "商品编号",
-            key: "id",
-            minWidth: 100,
-            tooltip: true
-          },
-          {
-            title: "价格",
-            key: "price",
-            minWidth: 130,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.price, "￥")
-              );
-            },
-          },
-          {
-            title: "审核状态",
-            key: "isAuth",
-            minWidth: 130,
-            render: (h, params) => {
-              if (params.row.isAuth == "TOBEAUDITED") {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "error",
-                      text: "待审核",
-                    },
-                  }),
-                ]);
-              } else if (params.row.isAuth == "PASS") {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "success",
-                      text: "审核通过",
-                    },
-                  }),
-                ]);
-              } else if (params.row.isAuth == "REFUSE") {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "error",
-                      text: "审核拒绝",
-                    },
-                  }),
-                ]);
-              }
-            },
-          },
-
-          {
-            title: "店铺名称",
-            key: "storeName",
-            minWidth: 100,
-            tooltip: true
-          },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            fixed: "right",
-            width: 200,
-            render: (h, params) => {
+        },
+        {
+          title: "审核状态",
+          key: "authFlag",
+          minWidth: 130,
+          render: (h, params) => {
+            if (params.row.authFlag == "TOBEAUDITED") {
              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "success",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.examine(params.row, 1);
-                      },
-                    },
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "待审核",
                  },
-                  "通过"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.examine(params.row, 2);
-                      },
-                    },
-                  },
-                  "拒绝"
-                ), h(
-                  "Button",
-                  {
-                    props: {
-                      size: "small",
-                    },
-                    on: {
-                      click: () => {
-                        this.showDetail(params.row);
-                      },
-                    },
-                  },
-                  "查看"
-                )
+                }),
              ]);
-            },
+            } else if (params.row.authFlag == "PASS") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "审核通过",
+                  },
+                }),
+              ]);
+            } else if (params.row.authFlag == "REFUSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核拒绝",
+                  },
+                }),
+              ]);
+            }
          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
-    },
-    methods: {
-      init() { // 初始化数据
-        this.getDataList();
-      },
-      changePage(v) { // 改变页码
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-      },
-      changePageSize(v) { // 改变每页数量
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      handleSearch() { // 搜索
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
-      getDataList() { // 获取列表数据
-        this.loading = true;
-        // 带多条件搜索参数获取表单数据
-        this.searchForm.isAuth = 0;
-        getAuthGoodsListData(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.records) {
-            this.data = res.records;
-            this.total = res.total;
-          }
-        });
-      },
-      examine(v, isAuth) { // 审核商品
-        let examine = "通过";
-        this.goodsAuditForm.isAuth = "PASS";
-        if (isAuth != 1) {
-          examine = "拒绝";
-          this.goodsAuditForm.isAuth = "REFUSE";
-        }
-        this.$Modal.confirm({
-          title: "确认审核",
-          content: "您确认要审核" + examine + " " + v.goodsName + " ?",
-          loading: true,
-          onOk: () => {
-            authGoods(v.id, this.goodsAuditForm).then((res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("审核成功");
-                this.getDataList();
-              }
-            });
-          },
-        });
-      },
-      //查看商品详情
-      showDetail(v) {
-        let id = v.id;
-        this.$router.push({
-          name: "goods-detail",
-          query: { id: id },
-        });
-      },
-    },
-    mounted() {
-      this.init();
-    },
-  };
-</script>
+        },

+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 100,
+          tooltip: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.examine(params.row, 1);
+                    },
+                  },
+                },
+                "通过"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.examine(params.row, 2);
+                    },
+                  },
+                },
+                "拒绝"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.showDetail(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      // 初始化数据
+      this.getDataList();
+    },
+    changePage(v) {
+      // 改变页码
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      // 改变每页数量
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      // 搜索
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    getDataList() {
+      // 获取列表数据
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据
+      this.searchForm.authFlag = 0;
+      getAuthGoodsListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.records) {
+          this.data = res.records;
+          this.total = res.total;
+        }
+      });
+    },
+    examine(v, authFlag) {
+      // 审核商品
+      let examine = "通过";
+      this.goodsAuditForm.authFlag = "PASS";
+      if (authFlag != 1) {
+        examine = "拒绝";
+        this.goodsAuditForm.authFlag = "REFUSE";
+      }
+      this.$Modal.confirm({
+        title: "确认审核",
+        content: "您确认要审核" + examine + " " + v.goodsName + " ?",
+        loading: true,
+        onOk: () => {
+          authGoods(v.id, this.goodsAuditForm).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("审核成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //查看商品详情
+    showDetail(v) {
+      let id = v.id;
+      this.$router.push({
+        name: "goods-detail",
+        query: { id: id },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -4,8 +4,14 @@
      <div class="mb_10">
        <Button @click="addParent" icon="md-add">添加一级分类</Button>
      </div>
-      <Table class="table" :load-data="handleLoadData" row-key="id" :loading="loading" :data="tableData"
-        :columns="columns">
+      <Table
+        class="table"
+        :load-data="handleLoadData"
+        row-key="id"
+        :loading="loading"
+        :data="tableData"
+        :columns="columns"
+      >
        <template slot="action" slot-scope="scope">
          <Dropdown v-show="scope.row.level == 2" trigger="click">
            <Button size="small">
@@ -13,9 +19,15 @@
              <Icon type="ios-arrow-down"></Icon>
            </Button>
            <DropdownMenu slot="list">
-              <DropdownItem @click.native="brandOperation(scope.row)">编辑绑定品牌</DropdownItem>
-              <DropdownItem @click.native="specOperation(scope.row)">编辑绑定规格</DropdownItem>
-              <DropdownItem @click.native="parameterOperation(scope.row)">编辑绑定参数</DropdownItem>
+              <DropdownItem @click.native="brandOperation(scope.row)"
+                >编辑绑定品牌</DropdownItem
+              >
+              <DropdownItem @click.native="specOperation(scope.row)"
+                >编辑绑定规格</DropdownItem
+              >
+              <DropdownItem @click.native="parameterOperation(scope.row)"
+                >编辑绑定参数</DropdownItem
+              >
            </DropdownMenu>
          </Dropdown>

@@ -27,14 +39,28 @@
            </Button>
            <DropdownMenu slot="list">
              <DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
-              <DropdownItem v-if="scope.row.deleteFlag == 1" @click.native="enable(scope.row)">启用</DropdownItem>
-              <DropdownItem v-if="scope.row.deleteFlag == 0" @click.native="disable(scope.row)">禁用</DropdownItem>
+              <DropdownItem
+                v-if="scope.row.deleteFlag == 1"
+                @click.native="enable(scope.row)"
+                >启用</DropdownItem
+              >
+              <DropdownItem
+                v-if="scope.row.deleteFlag == 0"
+                @click.native="disable(scope.row)"
+                >禁用</DropdownItem
+              >
              <DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
            </DropdownMenu>
          </Dropdown>
          &nbsp;
-          <Button v-show="scope.row.level != 2" type="primary" @click="addChildren(scope.row)" size="small"
-            icon="md-add" style="margin-right: 5px">添加子分类
+          <Button
+            v-show="scope.row.level != 2"
+            type="primary"
+            @click="addChildren(scope.row)"
+            size="small"
+            icon="md-add"
+            style="margin-right: 5px"
+            >添加子分类
          </Button>
        </template>

@@ -42,18 +68,31 @@
          {{ scope.row.commissionRate }}%
        </template>

-        <template slot="deleteFlag" slot-scope="{row}">
-          <Tag :class="{'ml_10': row.deleteFlag}" :color="row.deleteFlag == false ? 'success' : 'error'">
-            {{row.deleteFlag == false ? '正常启用' : '禁用'}}</Tag>
+        <template slot="deleteFlag" slot-scope="{ row }">
+          <Tag
+            :class="{ ml_10: row.deleteFlag }"
+            :color="row.deleteFlag == false ? 'success' : 'error'"
+          >
+            {{ row.deleteFlag == false ? "正常启用" : "禁用" }}</Tag
+          >
        </template>
      </Table>

-      <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Modal
+        :title="modalTitle"
+        v-model="modalVisible"
+        :mask-closable="false"
+        :width="500"
+      >
        <Form ref="form" :model="formAdd" :label-width="100" :rules="formValidate">
          <div v-if="showParent">
            <FormItem label="上级分类" prop="parentId">
              {{ parentTitle }}
-              <Input v-model="formAdd.parentId" clearable style="width: 100%; display: none" />
+              <Input
+                v-model="formAdd.parentId"
+                clearable
+                style="width: 100%; display: none"
+              />
            </FormItem>
          </div>
          <FormItem label="层级" prop="level" style="display: none">
@@ -63,7 +102,10 @@
            <Input v-model="formAdd.name" clearable style="width: 100%" />
          </FormItem>
          <FormItem label="分类图标" prop="image" v-if="formAdd.level !== 1">
-            <upload-pic-input v-model="formAdd.image" style="width: 100%"></upload-pic-input>
+            <upload-pic-input
+              v-model="formAdd.image"
+              style="width: 100%"
+            ></upload-pic-input>
          </FormItem>
          <FormItem label="排序值" prop="sortOrder" style="width: 345px">
            <InputNumber v-model="formAdd.sortOrder"></InputNumber>
@@ -72,7 +114,12 @@
            <InputNumber v-model="formAdd.commissionRate"></InputNumber>
          </FormItem>
          <FormItem label="是否启用" prop="deleteFlag">
-            <i-switch size="large" v-model="formAdd.deleteFlag" :true-value="0" :false-value="1">
+            <i-switch
+              size="large"
+              v-model="formAdd.deleteFlag"
+              :true-value="0"
+              :false-value="1"
+            >
              <span slot="open">启用</span>
              <span slot="close">禁用</span>
            </i-switch>
@@ -84,33 +131,52 @@
        </div>
      </Modal>

-      <Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500">
+      <Modal
+        :title="modalBrandTitle"
+        v-model="modalBrandVisible"
+        :mask-closable="false"
+        :width="500"
+      >
        <Form ref="brandForm" :model="brandForm" :label-width="100">
          <Select v-model="brandForm.categoryBrands" filterable multiple>
-            <Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option>
-
+            <Option v-for="item in brandWay" :value="item.id" :key="item.id">{{
+              item.name
+            }}</Option>
          </Select>
        </Form>
        <div slot="footer">
          <Button type="text" @click="modalBrandVisible = false">取消</Button>
-          <Button type="primary" :loading="submitLoading" @click="saveCategoryBrand">提交</Button>
+          <Button type="primary" :loading="submitLoading" @click="saveCategoryBrand"
+            >提交</Button
+          >
        </div>
      </Modal>

-      <Modal :title="modalSpecTitle" v-model="modalSpecVisible" :mask-closable="false" :width="500">
+      <Modal
+        :title="modalSpecTitle"
+        v-model="modalSpecVisible"
+        :mask-closable="false"
+        :width="500"
+      >
        <Form ref="specForm" :model="specForm" :label-width="100">
          <Select v-model="specForm.categorySpecs" multiple>
-            <Option v-for="item in specifications" :value="item.id" :key="item.id" :label="item.specName">
+            <Option
+              v-for="item in specifications"
+              :value="item.id"
+              :key="item.id"
+              :label="item.specName"
+            >
            </Option>
          </Select>
        </Form>
        <div slot="footer">
          <Button type="text" @click="modalSpecVisible = false">取消</Button>
-          <Button type="primary" :loading="submitLoading" @click="saveCategorySpec">提交</Button>
+          <Button type="primary" :loading="submitLoading" @click="saveCategorySpec"
+            >提交</Button
+          >
        </div>
      </Modal>
    </Card>
-
  </div>
 </template>
 <script>
@@ -170,18 +236,9 @@ export default {
      specForm: {}, // 规格数据
      // 表单验证规则
      formValidate: {
-        commissionRate: [
-          regular.REQUIRED,
-          regular.INTEGER
-        ],
-        name:[
-          regular.REQUIRED,
-          regular.VARCHAR20,
-        ],
-        sortOrder:[
-          regular.REQUIRED,
-          regular.INTEGER
-        ]
+        commissionRate: [regular.REQUIRED, regular.INTEGER],
+        name: [regular.REQUIRED, regular.VARCHAR20],
+        sortOrder: [regular.REQUIRED, regular.INTEGER],
      },
      columns: [
        {
@@ -235,7 +292,6 @@ export default {
    //弹出品牌关联框
    brandOperation(v) {
      getCategoryBrandListData(v.id).then((res) => {
-        console.warn(res);
        this.categoryId = v.id;
        this.modalBrandTitle = "品牌关联";
        this.brandForm.categoryBrands = res.result.map((item) => item.id);
@@ -277,7 +333,6 @@ export default {
    },
    // 添加子分类
    addChildren(v) {
-      console.log(v);
      this.modalType = 0;
      this.modalTitle = "添加子分类";
      this.parentTitle = v.name;
@@ -367,7 +422,6 @@ export default {

    // 异步手动加载分类名称
    handleLoadData(item, callback) {
-      console.warn(item);
      if (item.level == 0) {
        let categoryList = JSON.parse(JSON.stringify(this.categoryList));
        categoryList.forEach((val) => {
@@ -384,7 +438,6 @@ export default {
        });
      } else {
        this.deepCategoryChildren(item.id, this.categoryList);
-        console.log(this.checkedCategoryChildren);
        setTimeout(() => {
          callback(this.checkedCategoryChildren);
        }, 1000);
@@ -420,8 +473,6 @@ export default {
            }
            return item;
          });
-
-          console.log(this.tableData);
        }
      });
    },
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -304,6 +304,7 @@ export default {
        loading: true,
        onOk: () => {
          API_Member.delMemberReview(v.id).then((res) => {
+            this.$Modal.remove();
            this.$Message.success("修改成功");
            this.init();
          });
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -53,7 +53,7 @@ export default {
        sn: "",
        categoryPath: "",
        marketEnable: "UPPER",
-        isAuth: "PASS",
+        authFlag: "PASS",
      },
      category: [], // 分类
      goodsData: [], // 商品数据
--- a/manager/src/views/lili-dialog/template/pages.vue
+++ b/manager/src/views/lili-dialog/template/pages.vue
@@ -25,7 +25,7 @@ export default {
    callbackArticle(val) {
      val.___type = "pages";

-      val.___path = "/pages/public/article";
+      val.___path = "/pages/passport/article";

      this.$emit("selected", [val]);
    },
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -1,8 +1,13 @@
 <template>
  <div class="wrapper">
    <Card class="category">
-      <div :class="{active:i == selectedIndex}" class="category-item" v-for="(typeItem,i) in pageTypes" :key="typeItem.type">
-        <div @click="clickType(typeItem.type,i)">{{typeItem.title}}</div>
+      <div
+        :class="{ active: i == selectedIndex }"
+        class="category-item"
+        v-for="(typeItem, i) in pageTypes"
+        :key="typeItem.type"
+      >
+        <div @click="clickType(typeItem.type, i)">{{ typeItem.title }}</div>
      </div>
    </Card>
    <Card class="content">
@@ -24,16 +29,19 @@
              <span slot="open">开</span>
              <span slot="close">关</span>
            </i-switch>
-            <Button type="info" placement="right" @click="Template(item)" size="small">编辑</Button>
-            <Button type="success" placement="right" @click="decorate(item)" size="small">装修</Button>
+            <Button type="info" placement="right" @click="Template(item)" size="small"
+              >编辑</Button
+            >
+            <Button type="success" placement="right" @click="decorate(item)" size="small"
+              >装修</Button
+            >
            <Poptip confirm title="删除此模板？" @on-ok="delTemplate(item.id)">
              <Button type="error" size="small">删除</Button>
            </Poptip>
          </div>
        </div>
-        <div class="no-more" v-if="list.length ==0">暂无更多模板</div>
+        <div class="no-more" v-if="list.length == 0">暂无更多模板</div>
      </div>
-
    </Card>
    <Modal
      v-model="showModal"
@@ -42,7 +50,7 @@
      width="600"
      :z-index="100"
      :loading="loading"
-      mask-closable="false"
+      :mask-closable="false"
      @on-ok="newTemplate"
      @on-cancel="showModal = false"
    >
@@ -61,13 +69,15 @@ export default {
  name: "floorList",
  data() {
    return {
-      showModal: false,  // 添加modal的显示
+      showModal: false, // 添加modal的显示
      selectedIndex: 0, // 首页还是专题选择的index
-      formData: { // 新建模态框的数据
+      formData: {
+        // 新建模态框的数据
        status: false, // 模板是否开启
        name: "", // 模板名称
      },
-      columns: [ // 列表展示的column
+      columns: [
+        // 列表展示的column
        {
          title: "页面名称",
          key: "name",
@@ -82,11 +92,12 @@ export default {
      ],

      loading: false, // 加载状态
-      pageTypes: [ // 那种类别的模板
+      pageTypes: [
+        // 那种类别的模板
        {
          type: "INDEX",
          title: "首页",
-        }
+        },
        // {
        //   type: "SPECIAL",
        //   title: "专题",
@@ -134,14 +145,17 @@ export default {

    Template(item) {
      // 编辑表单
-      item.status = item.pageShow
+      item.status = item.pageShow;
      this.formData = item;
      this.showModal = true;
    },

    decorate(val) {
      // 装修
-      this.$router.push({ name: "renovation", query: { id: val.id,pageShow:val.pageShow } });
+      this.$router.push({
+        name: "renovation",
+        query: { id: val.id, pageShow: val.pageShow },
+      });
    },

    getTemplateList() {
@@ -155,13 +169,13 @@ export default {
      API_floor.getHomeList(params).then((res) => {
        if (res.success) {
          this.list = res.result.records;
-          this.list.forEach(e => {
-            if (e.pageShow === 'OPEN') {
-              e.pageShow = true
+          this.list.forEach((e) => {
+            if (e.pageShow === "OPEN") {
+              e.pageShow = true;
            } else {
-              e.pageShow = false
+              e.pageShow = false;
            }
-          })
+          });
        }
      });
    },
@@ -184,7 +198,7 @@ export default {
        }
      });
    },
-  }
+  },
 };
 </script>

@@ -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;
 }
 </style>
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -22,7 +22,7 @@
            <div class="search-con">
                <img :src="require('@/assets/logo.png')" class="logo" alt="">
                <div class="search">
-                    <i-input v-model="searchData" size="large" placeholder="输入你想查找的商品">
+                    <i-input  size="large" placeholder="输入你想查找的商品">
                        <Button slot="append">搜索</Button>
                    </i-input>
                </div>
@@ -58,9 +58,9 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+           
            >
            <!-- 顶部广告 -->
            <div class="modal-top-advert">
@@ -87,9 +87,7 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
            >
            <!-- 分类tab栏 -->
            <div class="modal-tab-bar">
@@ -121,7 +119,7 @@
        <liliDialog
            ref="liliDialog"
            @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+           
        ></liliDialog>
        <!-- 选择图片 -->
        <Modal width="1200px" v-model="picModelFlag" footer-hide>
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -147,9 +147,7 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
    >
      <div class="modal-top-advert">
        <div>
@@ -216,7 +214,7 @@
    <liliDialog
      ref="liliDialog"
      @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+  
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
@@ -287,10 +285,7 @@ export default {
    selectedLink(val) {
      this.selected.url = this.$options.filters.formatLinkType(val);
    },
-    // 拖动结束回调
-    handleMoveEnd({ newIndex, oldIndex }) {
-      console.log("index", newIndex, oldIndex);
-    },
+    
    handleSelectImg() {
      // 选择图片
      this.$refs.ossManage.selectImage = true;
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -48,9 +48,9 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
    >
      <div class="modal-tab-bar">
        <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -110,7 +110,7 @@
    <liliDialog
      ref="liliDialog"
      @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
--- a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
@@ -25,9 +25,9 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
    >
      <div class="modal-tab-bar">
        <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -81,7 +81,7 @@
    <liliDialog
      ref="liliDialog"
      @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
--- a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
@@ -70,7 +70,7 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
    >
      <div class="modal-tab-bar">
        <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -124,7 +124,7 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
    >
      <div class="modal-tab-bar">
        <Button type="primary" size="small" @click="handleAddGroup">添加组</Button>
@@ -173,7 +173,7 @@
    <liliDialog
      ref="liliDialog"
      @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+     
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
--- a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
@@ -18,9 +18,9 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
            >
            <div class="modal-top-advert">
                <div>
@@ -54,7 +54,7 @@
        <liliDialog
            ref="liliDialog"
            @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+          
        ></liliDialog>
        <!-- 选择图片 -->
        <Modal width="1200px" v-model="picModelFlag" footer-hide>
--- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -72,9 +72,9 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
            >
            <div class="modal-top-advert">
                <div>
@@ -107,9 +107,9 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
            >
            <div class="modal-top-advert">
                <div>
--- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -32,9 +32,7 @@
            draggable
            width="800"
            :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
            >
            <div class="modal-tab-bar">
                <Button type="primary" size='small' @click="handleAddNav">添加分类</Button>
--- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -107,9 +107,9 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
    >
      <div class="modal-top-advert">
        <div>
@@ -169,9 +169,9 @@
      draggable
      width="800"
      :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
    >
      <div class="modal-top-advert">
        <div><span>主标题：</span><Input v-model="selected.title" /></div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OceansDeep	329e6df722	!6 适配接口路径修改 Merge pull request !6 from OceansDeep/fengtianyangyang	2022-02-14 07:51:16 +00:00
paulGao	8023852b3c	升级版本号	2022-02-14 15:35:01 +08:00
paulGao	228935034d	适配api	2022-02-14 14:21:37 +08:00
paulGao	acff55dc65	适配修改后的api	2022-02-12 15:20:36 +08:00
paulGao	61a9110c51	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang	2022-02-11 16:44:27 +08:00
paulGao	3a3e14e0a7	适配微服务	2022-02-10 18:57:36 +08:00
lemon橪	6ba767419e	新增文库详情页面，转门为审核使用	2022-02-10 17:13:26 +08:00
lemon橪	925365018b	优化商家发布商品丢失规格问题，修改开启cdn	2022-02-10 14:26:53 +08:00
lemon橪	5960df31bd	合并并提交修改	2022-02-09 20:50:09 +08:00
lemon橪	21f9fd92e2	取消cdn加载	2022-02-09 20:49:49 +08:00
paulGao	9765310136	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang	2022-02-09 10:32:50 +08:00
paulGao	51cde2dd0d	fix bugs	2022-01-27 14:58:37 +08:00
fengtianyangyang	3311568e50	修改路径	2022-01-25 19:08:47 +08:00
fengtianyangyang	e5918b041a	路径修改	2022-01-25 12:01:40 +08:00
paulGao	f46330ecf0	Merge branch 'fengtianyangyang' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang	2022-01-25 09:46:15 +08:00
paulGao	846e80f1fa	适配微服务版本	2022-01-25 09:46:12 +08:00
fengtianyangyang	631519d7c7	路径修改	2022-01-25 09:22:22 +08:00
paulGao	bbeb31e8a3	修复店铺和平台优惠券同时选择时，显示问题	2022-01-21 19:02:09 +08:00
paulGao	52bcf07e25	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2022-01-21 16:53:28 +08:00
paulGao	4d725221a5	优化店铺搜索栏	2022-01-21 16:53:16 +08:00
Chopper	c8a0619141	积分设置优化	2022-01-21 16:20:15 +08:00
fengtianyangyang	e1d7b1801d	接口修改	2022-01-21 09:14:21 +08:00
paulGao	15456ae377	修复删除会员评论，弹出框不关闭问题	2022-01-20 17:40:05 +08:00
fengtianyangyang	1c3d711298	路径修改	2022-01-20 17:21:30 +08:00
paulGao	1bee69cefb	优化管理端和卖家端登录	2022-01-17 18:00:49 +08:00
paulGao	cf740d9605	修复富文本编辑器xss过滤样式问题	2022-01-17 16:49:55 +08:00
paulGao	d2aca24d06	优化申请售后退货	2022-01-04 19:57:40 +08:00
paulGao	6e042c4b78	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2022-01-04 09:21:03 +08:00
paulGao	1afd1704ab	修复pc显示促销价格问题	2022-01-04 09:21:00 +08:00
夜良king	d5f81fe5d8	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-31 18:23:05 +08:00
夜良king	fada0a735f	修改样式和查看虚拟实物	2021-12-31 18:22:30 +08:00
夜良king	35de0c031d	样式加虚拟实物查看	2021-12-31 18:22:06 +08:00
lemon橪	2e5eefc079	提交 buyer和seller退出uuid清空bug	2021-12-30 11:16:08 +08:00
学习很差啦	1fa264b0bf	!5 修复登出账号、修改密码等操作会清除uuid的bug 感谢大佬ray 提出的pr Merge pull request !5 from master	2021-12-30 03:06:29 +00:00
zhanglei829	d2a0940858	修复登出账号、修改密码等操作会清除uuidbug	2021-12-30 10:13:34 +08:00
paulGao	4ff8eb6494	修复优化拼团	2021-12-29 19:50:24 +08:00
paulGao	8ca87cdb2a	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-28 19:54:58 +08:00
paulGao	f45b115355	修复满额活动赠送积分不显示填写积分。商品规格默认项无法退格删除。权限菜单选择某一子项获取选择全部问题	2021-12-28 19:54:40 +08:00
夜良king	7490211340	修改了小样式按钮	2021-12-28 18:33:47 +08:00
夜良king	76d028277a	buyer一些样式和一个弹框	2021-12-28 17:51:23 +08:00
lemon橪	0a0066fe5c	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-27 16:16:27 +08:00
lemon橪	4f7e38db3b	修改移动端楼层装修文章地址	2021-12-27 16:16:26 +08:00
paulGao	54dcd2d8be	修复优化促销问题	2021-12-25 18:36:15 +08:00
paulGao	6c1d7cce8d	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-25 17:05:19 +08:00
lemon橪	06b090cdf6	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-25 10:59:02 +08:00
lemon橪	3653b4e7cb	优化buyer底部信息，优化购物车显示规格数量可能导致的bug 新增订单物流显示	2021-12-25 10:59:00 +08:00
paulGao	c6c890da63	修复拼团排序问题	2021-12-24 16:55:30 +08:00
paulGao	75e7bc2d9c	优化搜索热词管理	2021-12-24 16:09:57 +08:00
paulGao	649f983990	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-23 21:20:52 +08:00
paulGao	193628913a	优化店铺详情页	2021-12-23 21:20:37 +08:00
lemon橪	cb304d7d53	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-23 19:02:30 +08:00
lemon橪	4bb7bd4603	buyer端部分颜色优化以及部分间距优化	2021-12-23 19:02:29 +08:00
paulGao	1e408eb8ae	修复管理端积分商品问题	2021-12-23 17:11:30 +08:00
Chopper	d762d18c7b	将支付应用id分别配置	2021-12-23 11:58:09 +08:00
Chopper	3622c7bb53	pc订单详情无法跳转商品详情页面问题处理	2021-12-22 18:29:29 +08:00
paulGao	1b9b2d9c95	适配字段变化	2021-12-22 10:50:43 +08:00
paulGao	0d5c60ed8c	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-21 18:59:57 +08:00
paulGao	ab2bcb515f	优化促销相关代码	2021-12-21 18:59:45 +08:00
lemon橪	b3e6eb72eb	新增npmrc以及yarnrc文件，修改config配置变成可配置的cdn加载以及端口设置	2021-12-21 16:30:54 +08:00
lemon橪	9742aaf0bc	udesk 技术储备方案	2021-12-20 17:37:22 +08:00
lemon橪	bc1942c492	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-20 16:48:10 +08:00
lemon橪	44facf549a	提交udesk方案	2021-12-20 16:48:08 +08:00
eeer	09dd9861fd	update seller/vue.config.js. 统一取消cdn加载目前cdn链接的https请求挂了	2021-12-20 06:31:42 +00:00
eeer	8d3b5cf91d	update manager/vue.config.js. 统一取消cdn加载目前cdn链接的https请求挂了	2021-12-20 06:31:08 +00:00
eeer	5a90567e98	update buyer/vue.config.js. 统一取消cdn加载目前cdn链接的https请求挂了	2021-12-20 06:30:40 +00:00
lemon橪	246ba9057f	删除最低购买金额	2021-12-16 13:41:57 +08:00
lemon橪	9eecc603db	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-12-13 19:27:23 +08:00
lemon橪	1fe4078115	化楼层装修中商品分类判断	2021-12-13 19:27:20 +08:00
paulGao	ef73a6fe94	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-11 13:51:33 +08:00
paulGao	edef393535	适配重构促销	2021-12-11 13:50:58 +08:00
Chopper	97e6fc79ea	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui	2021-12-09 20:21:49 +08:00
Chopper	0b82ae7569	商家设置坐席id代码补充	2021-12-09 20:21:46 +08:00
lemon橪	3cb0e52ca0	优化楼层装修中商品分类代码可能会出现的bug . 如果更新此版本建议同步更新uni版本更新	2021-12-09 18:32:11 +08:00
lemon橪	fd1d32d431	管理端优惠券判断优化	2021-12-03 10:00:23 +08:00
lemon橪	8c169489eb	修改统计中发现的bug	2021-11-30 17:15:37 +08:00
lemon橪	6ecb6b8055	修改部分冗余代码，新增商家端npmrc配置后续还会新增yarnrc	2021-11-22 11:16:32 +08:00
lemon橪	515cd3ebbd	新增部分售后判断	2021-11-18 18:07:58 +08:00
lemon橪	6c6b89f512	优化buyer端配置信息完善性	2021-11-18 17:10:44 +08:00
lemon橪	1ac5dcfe25	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui	2021-11-18 14:51:46 +08:00
lemon橪	ccd5decbf7	优化楼层装修 pc端中控制台因类型转换问题导致的报错信息	2021-11-18 14:51:44 +08:00