diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 9ecdbb50..e963eaa2 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -346,14 +346,16 @@ export function getDistGoodsList (params) { } /** - * 选择分销商品 + * 绑定、解绑分销商品 * @param distributionGoodsId 分销商品id + * @param checked 分销商品id,true为绑定，false为解绑 */ -export function selectDistGoods (distributionGoodsId) { +export function selectDistGoods (params) { return request({ - url: `/buyer/distributionGoods/checked/${distributionGoodsId}`, + url: `/buyer/distributionGoods/checked/${params.distributionGoodsId}`, method: Method.GET, - needToken: true + needToken: true, + params }); } @@ -457,7 +459,8 @@ export function memberMsgList (params) { * 设置消息为已读 * @param {String} messageId 消息id */ - export function readMemberMsg (id) { + +export function readMemberMsg (id) { return request({ url: `/buyer/member/message/${id}`, method: Method.PUT, @@ -468,7 +471,7 @@ export function memberMsgList (params) { * 删除会员消息 * @param {String} messageId 消息id */ - export function delMemberMsg (id) { +export function delMemberMsg (id) { return request({ url: `/buyer/member/message/${id}`, method: Method.DELETE, diff --git a/buyer/src/assets/styles/coupon.scss b/buyer/src/assets/styles/coupon.scss index 52399f82..9afd57a7 100644 --- a/buyer/src/assets/styles/coupon.scss +++ b/buyer/src/assets/styles/coupon.scss @@ -55,9 +55,6 @@ color: #fff; font-size: 16px; padding: 20px; - &:hover{ - font-weight: bold; - } } i{ position: absolute; diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue index 6c8afeac..2bb3b3dd 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -97,12 +97,12 @@ export default { const time = new Date().getTime() - 5 * 60 * 1000 if (!reloadTime) { hotWords({count: 5}).then(res => { - if (res.success) storage.setItem('hotWordsList', res.result) + if (res.success && res.result) storage.setItem('hotWordsList', res.result) }) storage.setItem('hotWordsReloadTime', new Date().getTime()) } else if (reloadTime && time > reloadTime) { hotWords({count: 5}).then(res => { - if (res.success) storage.setItem('hotWordsList', res.result) + if (res.success && res.result) storage.setItem('hotWordsList', res.result) }) storage.setItem('hotWordsReloadTime', new Date().getTime()) } diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 351a37ad..8f23da65 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -556,9 +556,6 @@ export default { } .item-select-row { - // display: flex; - // flex-direction: row; - // flex-wrap: wrap; margin-bottom: 8px; } @@ -568,10 +565,6 @@ export default { align-items: center; } -.item-select-img { - width: 36px; -} - .item-select-box { padding: 5px; margin-right: 8px; @@ -589,31 +582,11 @@ export default { border: 0.5px solid $theme_color; } -.item-select-box-disabled { - background-color: gray; -} - -.item-select-img img { - width: 100%; -} - .item-select-intro p { margin: 0px; padding: 5px; } -.item-select-class { - padding: 5px; - margin-right: 8px; - @include sub_background_color($light_background_color); - border: 0.5px solid #ccc; - cursor: pointer; -} - -.item-select-class:hover { - border: 0.5px solid $theme_color; -} - .add-buy-car-box { width: 100%; margin-top: 15px; diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue index 95e90d5c..5dfc6517 100644 --- a/buyer/src/components/nav/CateNav.vue +++ b/buyer/src/components/nav/CateNav.vue @@ -89,7 +89,11 @@ export default { }, computed: { navList () { // 导航列表 - return JSON.parse(storage.getItem('navList')) || [] + if (storage.getItem('navList')) { + return JSON.parse(storage.getItem('navList')) + } else { + return [] + } } }, methods: { diff --git a/buyer/src/components/nav/GoodsClassNav.vue b/buyer/src/components/nav/GoodsClassNav.vue index 9a3db4c0..570fec48 100644 --- a/buyer/src/components/nav/GoodsClassNav.vue +++ b/buyer/src/components/nav/GoodsClassNav.vue @@ -188,7 +188,7 @@ export default { }, computed: { cateList () { // 商品分类 - return this.$store.state.category + return this.$store.state.category || [] } }, watch: { diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue index 95e90d5c..5dfc6517 100644 --- a/buyer/src/components/nav/cateNav.vue +++ b/buyer/src/components/nav/cateNav.vue @@ -89,7 +89,11 @@ export default { }, computed: { navList () { // 导航列表 - return JSON.parse(storage.getItem('navList')) || [] + if (storage.getItem('navList')) { + return JSON.parse(storage.getItem('navList')) + } else { + return [] + } } }, methods: { diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 23784c11..b2b6bfdc 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,10 +17,10 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: 'http://192.168.0.101:8890', - // buyer: 'http://192.168.0.101:8888', - // seller: 'http://192.168.0.101:8889', - // manager: 'http://192.168.0.101:8887' + // common: 'http://192.168.0.100:8890', + // buyer: 'http://192.168.0.100:8888', + // seller: 'http://192.168.0.100:8889', + // manager: 'http://192.168.0.100:8887' common: 'https://common-api.pickmall.cn', buyer: 'https://buyer-api.pickmall.cn', diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index 4c452885..293d7d65 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -117,7 +117,7 @@ 已节省{{ priceDetailDTO.discountPrice | unitPrice("￥") }}
- 总价（不含运费）:
{{ priceDetailDTO.billPrice | unitPrice("￥") }}
+ 总价（不含运费）:
{{ priceDetailDTO.flowPrice | unitPrice("￥") }}
去结算
diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue index 5ed806ed..4a059584 100644 --- a/buyer/src/pages/Index.vue +++ b/buyer/src/pages/Index.vue @@ -70,7 +70,6 @@ export default { }, async getListByDay () { // 当天秒杀活动 const res = await seckillByDay() - console.log(res); if (res.success && res.result.length) { return res.result } else { diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue index 14db72cc..cdf934a9 100644 --- a/buyer/src/pages/Merchant.vue +++ b/buyer/src/pages/Merchant.vue @@ -20,7 +20,7 @@