diff --git a/buyer/package.json b/buyer/package.json index 9f64b7fb..2f20c8d4 100644 --- a/buyer/package.json +++ b/buyer/package.json @@ -17,13 +17,10 @@ "mv-count-down": "^0.1.15", "psl": "^1.8.0", "qs": "^6.9.4", - "swiper": "^5.2.0", "uuid": "^8.3.2", "v-distpicker": "^1.0.17", "view-design": "^4.3.2", "vue": "^2.5.2", - "vue-awesome": "^4.0.2", - "vue-awesome-swiper": "^4.1.1", "vue-piczoom": "^1.0.6", "vue-qr": "^2.3.0", "vue-router": "^3.0.1", diff --git a/buyer/src/api/promotion.js b/buyer/src/api/promotion.js index 432f1ebf..e0856d52 100644 --- a/buyer/src/api/promotion.js +++ b/buyer/src/api/promotion.js @@ -46,3 +46,14 @@ export function pointGoods (params) { params }); } +/** + * 获取积分商品详情 + */ +export function pointGoodsDetail (id) { + return request({ + url: `/buyer/promotion/pointsGoods/${id}`, + method: Method.GET, + needToken: true, + id + }); +} diff --git a/buyer/src/components/drawer/Main.vue b/buyer/src/components/drawer/Main.vue index 78252f5a..4b5e3436 100644 --- a/buyer/src/components/drawer/Main.vue +++ b/buyer/src/components/drawer/Main.vue @@ -36,9 +36,11 @@ export default { }, components: {drawerPage}, computed: { + // 用户信息 userInfo () { return Storage.getItem('userInfo'); }, + // 购物车商品数量 cartNum () { return this.$store.state.cartNum } diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 35ec9fe7..ed748f3a 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -144,6 +144,7 @@ import { addCartGoods } from '@/api/cart.js'; export default { name: 'ShowGoods', props: { + // 商品数据 detail: { type: Object, default: null @@ -168,10 +169,7 @@ export default { isCollected: false // 是否收藏 }; }, - components: { - PicZoom, - Promotion - }, + components: { PicZoom, Promotion }, methods: { select (index, value) { // 选择规格 this.$set(this.currentSelceted, index, value); diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue index 2d2aec3c..f5f560c1 100644 --- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue +++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue @@ -1,23 +1,6 @@ diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 98a877e1..8c06b576 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -22,7 +22,10 @@ export default { buyer: "https://buyer-api.pickmall.cn", seller: "https://store-api.pickmall.cn", manager: "https://admin-api.pickmall.cn" - + // 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' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index 0d592219..b6101c2f 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -507,7 +507,7 @@ export default { }, // 返回售后状态中文描述 filterStatus(status) { - let label = ""; + let label = ''; for (let i = 0; i < this.afterSaleStatus.length; i++) { const obj = this.afterSaleStatus[i]; if (obj.status === status) { @@ -518,8 +518,6 @@ export default { return label; }, }, - - mounted() { this.sn = this.$route.query.sn; this.getDetail(); diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index 896aff61..30509f6d 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -14,8 +14,8 @@ @@ -50,7 +50,7 @@ export default { pageSize: 10, // 页面大小 sort: "createTime", // 默认排序字段 order: "desc", // 默认排序方式 - receiptStatus: "", // 起始时间 + receiptStatus: "", // 发票状态 }, columns: [ { @@ -110,13 +110,13 @@ export default { width: 100, tooltip: true, render: (h, params) => { - if (params.row.receiptStatus == 0) { + if (params.row.receiptStatus === 0) { return h("div", [ h("tag", { props: { color: "volcano" } }, "未开票"), ]); } else { return h("div", [ - h("tag", { props: { color: "green" } }, "未开票"), + h("tag", { props: { color: "green" } }, "已开票"), ]); } }, diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index a4de7017..83cde02b 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -165,17 +165,14 @@ export default { { title: "入账时间", key: "createTime", - minWidth: 120 }, { title: "订单编号", key: "sn", - minWidth: 120 }, { title: "订单金额", key: "finalPrice", - minWidth: 120, render: (h, params) => { return h( "div", @@ -183,10 +180,29 @@ export default { ); }, }, + { + title: "砍价商品结算价格", + key: "kanjiaSettlementPrice", + render: (h, params) => { + return h( + "div", + this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥") + ); + }, + }, + { + title: "积分商品结算价格", + key: "pointSettlementPrice", + render: (h, params) => { + return h( + "div", + this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥") + ); + }, + }, { title: "平台分佣", key: "commissionPrice", - minWidth: 120, render: (h, params) => { return h( "div", @@ -197,7 +213,6 @@ export default { { title: "平台优惠券", key: "siteCouponPrice", - minWidth: 120, render: (h, params) => { if(params.row.siteCouponPrice == null){ return h( @@ -216,7 +231,6 @@ export default { { title: "分销金额", key: "distributionRebate", - minWidth: 100, render: (h, params) => { if(params.row.distributionRebate == null){ return h( @@ -235,7 +249,6 @@ export default { { title: "应结金额", key: "billPrice", - minWidth: 120, render: (h, params) => { return h( "div",