diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue index ad83aec..7526c3e 100644 --- a/pages/order/afterSales/afterSales.vue +++ b/pages/order/afterSales/afterSales.vue @@ -21,7 +21,7 @@ {{ order.serviceType_text }} - + @@ -276,12 +276,20 @@ export default { /** * 查看详情 */ - onDetail(sku) { - if (!this.$u.test.isEmpty(sku.skuId)) { + onDetail(goods,sku) { + // 售后申请 + if(this.current == 0){ uni.navigateTo({ - url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`, + url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId || sku.goodsId}`, }); } + + else{ + uni.navigateTo({ + url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId || goods.goodsId}`, + }); + + } }, /** diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue index a930e2b..8cc750b 100644 --- a/pages/order/afterSales/afterSalesDetail.vue +++ b/pages/order/afterSales/afterSalesDetail.vue @@ -10,7 +10,8 @@ - + @@ -27,7 +28,8 @@ 申请数量 - + @@ -36,7 +38,8 @@ - + @@ -47,7 +50,8 @@ 上传凭证(最多5张) - + @@ -81,11 +85,14 @@ - 提交申请 + 提交申请 - + + - + + @@ -462,7 +469,6 @@ page, align-items: center; } .images-view { - display: flex; flex-direction: row; align-items: center; @@ -484,12 +490,11 @@ page, background-color: #ffffff; height: 100rpx; width: 750rpx; + justify-content: flex-end; + display: flex; align-items: center; width: 100%; - /deep/ .u-btn{ - width: 94% !important; - - } + padding-right: 32rpx; } diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue index c2b399a..c637def 100644 --- a/pages/order/afterSales/applyDetail.vue +++ b/pages/order/afterSales/applyDetail.vue @@ -90,11 +90,13 @@ serviceDetail.afterSaleImage && serviceDetail.afterSaleImage.split(',').length != 0 "> - - + 收货地址: {{ @@ -103,12 +105,14 @@ - + 联系人: {{ storeAfterSaleAddress.salesConsigneeName }} - + 联系方式: {{ storeAfterSaleAddress.salesConsigneeMobile || "" | secrecyMobile @@ -339,7 +343,7 @@ export default { getAfterSaleReason(serviceType).then((res) => { if (res.data.success) { // 1357583466371219456 - this.reason = this.serviceDetail.reason; + this.reason = this.serviceDetail.reason; } }); }, @@ -365,12 +369,13 @@ export default { (this.serviceDetail.serviceType === "RETURN_GOODS" || this.serviceDetail.serviceType === "ORDER_CANCEL") && this.serviceDetail.refundWay === "OFFLINE"; + this.bankShow = - this.serviceDetail.serviceType === "RETURN_MONEY" || - ((this.serviceDetail.serviceType === "RETURN_GOODS" || - this.serviceDetail.serviceType === "ORDER_CANCEL") && - this.serviceDetail.refundWay === "OFFLINE" && - this.serviceDetail.accountType === "BANK_TRANSFER"); + this.serviceDetail.accountType === "BANK_TRANSFER" && + this.serviceDetail.refundWay === "OFFLINE" && + ((this.serviceDetail.serviceType === "RETURN_GOODS") | + (this.serviceDetail.serviceType === "ORDER_CANCEL") || + this.serviceDetail.serviceType === "RETURN_MONEY"); this.getReasonList(this.serviceDetail.serviceType); }); diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue index 83228f0..2f3a8f2 100644 --- a/pages/tabbar/cart/cartList.vue +++ b/pages/tabbar/cart/cartList.vue @@ -64,8 +64,8 @@ 失效 - +