diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue index e52c4b44..2bb3b3dd 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -97,13 +97,11 @@ export default { const time = new Date().getTime() - 5 * 60 * 1000 if (!reloadTime) { hotWords({count: 5}).then(res => { - console.log(res); 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 => { - console.log(res); 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/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/home/memberCenter/Point.vue b/buyer/src/pages/home/memberCenter/Point.vue index 39ed1068..444b9d60 100644 --- a/buyer/src/pages/home/memberCenter/Point.vue +++ b/buyer/src/pages/home/memberCenter/Point.vue @@ -8,7 +8,7 @@

积分日志

diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue index 50419a9a..7a8ab255 100644 --- a/buyer/src/pages/home/orderCenter/AfterSale.vue +++ b/buyer/src/pages/home/orderCenter/AfterSale.vue @@ -50,10 +50,12 @@
- - - + + +
diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 084546f4..eb7e2224 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -65,10 +65,10 @@
- - - - + + + +
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 65a3b0b1..812806f6 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -213,29 +213,6 @@ - -
-
- 其他信息 -
-
-
- 使用积分: - 您当前的可用积分为 - {{ otherMsgForm.totalPoint }} ,本订单最多可以使用{{ - otherMsgForm.availablePoint - }} -
-
-
@@ -257,7 +234,13 @@ }}
-
+
+ 应付积分:{{ + priceDetailDTO.payPoint + }} +
+
应付金额:{{ priceDetailDTO.flowPrice | unitPrice("¥") @@ -299,7 +282,6 @@ import { cartGoodsPay, createTrade, selectAddr, - shippingMethod, selectCoupon, couponNum } from '@/api/cart'; @@ -318,13 +300,6 @@ export default { receiptTitle: '个人', receiptContent: '不开发票' }, - otherMsgForm: { - // 其他信息模块数据 - point: 0, - availablePoint: 10, - totalPoint: 100, - noGoods: 0 - }, addressList: [], // 地址列表 selectedAddress: {}, // 所选地址 goodsList: [], // 商品列表 @@ -549,10 +524,14 @@ export default { .then((res) => { this.$Spin.hide(); if (res.success) { - this.$router.push({ - path: '/payment', - query: { orderType: 'TRADE', sn: res.result.sn } - }); + if (params.way === 'POINTS') { // 积分支付不需要跳转支付页面 + this.$router.push('/payDone') + } else { + this.$router.push({ + path: '/payment', + query: { orderType: 'TRADE', sn: res.result.sn } + }); + } } }) .catch(() => { diff --git a/buyer/src/pages/promotion/PointGoodsDetail.vue b/buyer/src/pages/promotion/PointGoodsDetail.vue index 63d8e4c3..fe4e8135 100644 --- a/buyer/src/pages/promotion/PointGoodsDetail.vue +++ b/buyer/src/pages/promotion/PointGoodsDetail.vue @@ -1,12 +1,12 @@