diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 584f208..8c6955b 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -872,10 +872,52 @@ export default { }) }, goStore(order) { - if(order.isTravelGroup === 1 || order.experienceOrderInfo) { - // uni.showToast({ - // title: '该订单为团体订单,无法查看店铺信息!' - // }) + if (!order) { + return + } + + if (order.experienceOrderInfo) { + const experienceMerchantId = + order.merId || + order.merchantId || + order.hotelId || + (order.experienceOrderInfo && order.experienceOrderInfo.merId) || + (order.experienceOrderInfo && order.experienceOrderInfo.merchantId) + if (!experienceMerchantId) { + uni.showToast({ + title: '未找到体验店信息', + icon: 'none' + }) + return + } + this.$yrouter.push({ + path: "/pkg_product/views/experienceProjectDetail", + query: { + experienceMerchantId + } + }) + return + } + if (order.isTravelGroup === 1) { + const travelStoreId = + order.merId || + order.hotelId || + order.travelMerchantId || + (order.travelGroupOrderInfo && order.travelGroupOrderInfo.travelMerchantId) || + (order.travelGroupOrderInfo && order.travelGroupOrderInfo.travelGroupProduct && order.travelGroupOrderInfo.travelGroupProduct.travelMerchantId) + if (!travelStoreId) { + uni.showToast({ + title: '未找到旅居店铺信息', + icon: 'none' + }) + return + } + this.$yrouter.push({ + path: "/pkg_product/views/sojoumStore", + query: { + id: travelStoreId + } + }) return } if(!order.hotelId) { diff --git a/pkg_product/views/experienceCouponOrderDetail.vue b/pkg_product/views/experienceCouponOrderDetail.vue index dd5bfb1..cde0597 100644 --- a/pkg_product/views/experienceCouponOrderDetail.vue +++ b/pkg_product/views/experienceCouponOrderDetail.vue @@ -13,7 +13,7 @@ - + {{ orderInfo.merchantName }} @@ -271,6 +271,16 @@ export default { uni.showToast({ title: '暂无位置信息', icon: 'none' }) } }, + goStoreDetail() { + const merchantId = this.orderInfo.merId || this.orderInfo.merchantId || this.orderInfo.hotelId + if (!merchantId) { + uni.showToast({ title: '未找到店铺信息', icon: 'none' }) + return + } + uni.navigateTo({ + url: '/pkg_product/views/experienceProjectDetail?experienceMerchantId=' + encodeURIComponent(merchantId) + }) + }, copyVerifyCode() { if (!this.orderInfo.verifyCode) { return