diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue index 2e70229..903fbaf 100644 --- a/pages/home/components/filters.vue +++ b/pages/home/components/filters.vue @@ -515,27 +515,27 @@ if (this.idType == 1) { if (this.activeFirstId == 1) { uni.navigateTo({ - url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`, + url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`, }); } if (this.activeFirstId == 2) { uni.navigateTo({ - url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2`, + url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`, }); } if (this.activeFirstId == 3) { uni.navigateTo({ - url: `/pages/shop/SellerDetail?order_id=${order.id}`, + url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`, }); } if (this.activeFirstId == 4) { uni.navigateTo({ - url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`, + url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`, }); } if (this.activeFirstId == 5) { uni.navigateTo({ - url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2`, + url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`, }); } } diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue index ceeb3a2..5ae0473 100644 --- a/pages/shop/buy-order.vue +++ b/pages/shop/buy-order.vue @@ -272,7 +272,8 @@ }, getDisplayPrice(order) { - const price = order.pay_money || order.order_money || 0 + const price = Number(order.pay_money) || Number(order.order_money) || 0 + return Number(price).toFixed(2) }, diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue index adf82db..5768e0a 100644 --- a/pages/shop/buyorder-detail.vue +++ b/pages/shop/buyorder-detail.vue @@ -82,7 +82,11 @@ ×1 - + + 应付金额: + ¥{{orderInfo.order_money}} + + 实际支付金额: ¥{{orderInfo.pay_money}} diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue index 4331ac0..80f8863 100644 --- a/pages/shop/userorder-detail.vue +++ b/pages/shop/userorder-detail.vue @@ -272,7 +272,7 @@ + v-if="haveButton && (orderInfo.state == 2 || orderInfo.state == 3 || orderInfo.state == 4)">