diff --git a/src/subpage/pages/trade/comps/detail-item.js b/src/subpage/pages/trade/comps/detail-item.js
index da822cd..4aa6564 100755
--- a/src/subpage/pages/trade/comps/detail-item.js
+++ b/src/subpage/pages/trade/comps/detail-item.js
@@ -32,11 +32,15 @@ export default class DetailItem extends Component {
handleClickAfterSale = (item) => {
const {
- info: { tid: order_id, is_all_delivery, delivery_status }
+ info: { tid, is_all_delivery, delivery_status, aftersales_bn }
} = this.props
-
- Taro.navigateTo({
- url: `/subpage/pages/trade/after-sale?order_id=${item.order_id}`
+ console.log("🚀 ~ DetailItem ~ aftersales_bn:", aftersales_bn, this.props.info)
+ let url = ''
+ if (aftersales_bn) {
+ url = `/subpages/trade/after-sale?aftersales_bn=${aftersales_bn}&id=${tid}`
+ }
+ url && Taro.navigateTo({
+ url
})
// if (!item.aftersales_status || item.aftersales_status === 'SELLER_REFUSE_BUYER') {
// Taro.navigateTo({
@@ -141,9 +145,8 @@ export default class DetailItem extends Component {
查看物流
))}
- {item.show_aftersales === 1 && (
+ {/* {item.show_aftersales === 1 && (
售后详情
- )}
+ )} */}
)}
diff --git a/src/subpage/pages/trade/comps/detail-item.scss b/src/subpage/pages/trade/comps/detail-item.scss
index 996307b..aa88d7e 100755
--- a/src/subpage/pages/trade/comps/detail-item.scss
+++ b/src/subpage/pages/trade/comps/detail-item.scss
@@ -46,7 +46,7 @@
.order-item__btn {
position: absolute;
right: 0;
- top: 30%;
+ top: 20%;
display: flex;
justify-content: flex-end;
padding: 0 30px;
diff --git a/src/subpage/pages/trade/detail.js b/src/subpage/pages/trade/detail.js
index d4194c6..9c241b9 100755
--- a/src/subpage/pages/trade/detail.js
+++ b/src/subpage/pages/trade/detail.js
@@ -138,7 +138,7 @@ export default class TradeDetail extends Component {
delivery_time: 'delivery_time',
aftersales_status: 'aftersales_status',
pic_path: 'pic',
- title: 'item_name',
+ title: ({ item_name }) => item_name,
type: 'type',
delivery_status: 'delivery_status',
origincountry_name: 'origincountry_name',
diff --git a/src/subpage/pages/trade/invoice-info.js b/src/subpage/pages/trade/invoice-info.js
index 4e02faf..a8cddd4 100755
--- a/src/subpage/pages/trade/invoice-info.js
+++ b/src/subpage/pages/trade/invoice-info.js
@@ -263,8 +263,10 @@ function InvoiceInfo (props) {
电子发票
{showDetail ?
- preview(invoiceInfo.pdf_info, invoiceInfo.invoice_title + invoiceInfo.invoice_no)}>查看
-
+ {orderInfo.is_invoiced == 1 && <>
+ preview(invoiceInfo.pdf_info, invoiceInfo.invoice_title + invoiceInfo.invoice_no)}>查看
+
+ >}
{/* */}
: 一键授权微信发票}
diff --git a/src/subpages/trade/after-sale.js b/src/subpages/trade/after-sale.js
index 50e580c..881fb17 100755
--- a/src/subpages/trade/after-sale.js
+++ b/src/subpages/trade/after-sale.js
@@ -42,7 +42,7 @@ const initialState = {
loading: true,
isOpened: false,
isAddrOpened: false,
- aftersales: null,
+ aftersales: {},
expressList: [],
corpIndex: null,
logi_no: ''
@@ -319,10 +319,10 @@ function TradeAfterSale (props) {
-1 ? '#000' : '#a5a5a5' }}>
- : aftersales?.progress && aftersales.progress != 12 ?
+ : aftersales.progress >= 0 && aftersales.progress != 12 ?
售后单号:{afterSaleTid}
- {['', '售后审核通过,请您发货并填写物流单号', '等待商家确认收货', '已驳回', '已完成', '退款驳回', '退款完成', '已关闭', '商家确认收货,等待审核退款', '退款处理中'][aftersales?.progress || 0]}
+ {['售后审核中', '售后审核通过,请您发货并填写物流单号', '等待商家确认收货', '已驳回', '已完成', '退款驳回', '退款完成', '已关闭', '商家确认收货,等待审核退款', '退款处理中'][aftersales?.progress || 0]}
{/* 还剩{`${aftersales?.sendbackData?.logi_no || ''}`}}
-
- {/* 确认上传 */}
- handleClickCopy(aftersales?.sendbackData?.logi_no || '')} style={{ fontSize: '20rpx', borderBottom: '1px solid #000', lineHeight: 0.8 }}>复制物流单号
+
+ {aftersales.progress == 1 ? 确认上传 :
+ handleClickCopy(aftersales?.sendbackData?.logi_no || '')} style={{ fontSize: '20rpx', borderBottom: '1px solid #000', lineHeight: 0.8 }}>复制物流单号}
>}
@@ -636,7 +636,7 @@ function TradeAfterSale (props) {
商家同意后,请按照给出的退货地址退货,并请记录退货运单
如商家拒绝,您可以修改申请后再次发起,商家会重新处理
如商家超时未处理,退货申请将达成,请按系统给出的退货地址退货
- 寄回商品
+ 寄回商品
商家退款
退款成功
diff --git a/src/subpages/trade/after-sale.scss b/src/subpages/trade/after-sale.scss
index aba29c1..6c60048 100755
--- a/src/subpages/trade/after-sale.scss
+++ b/src/subpages/trade/after-sale.scss
@@ -536,7 +536,7 @@
}
}
.at-button__text {
- font-style: 36px;
+ font-size: 36px;
}
}
.no-text {
@@ -546,4 +546,12 @@
line-height: 1.4;
}
}
+ .after-btn-up {
+ .at-button--primary {
+ margin: 0 50px;
+ }
+ .at-button__text {
+ font-size: 36px;
+ }
+ }
}