From 40e2a6a3dc1fcf014ef317bf149e9c4b2132ce07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E9=BE=99?= <wenlong@Windows-12.local>
Date: Wed, 28 Feb 2024 14:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/subpage/pages/trade/comps/detail-item.js   | 17 ++++++++++-------
 src/subpage/pages/trade/comps/detail-item.scss |  2 +-
 src/subpage/pages/trade/detail.js              |  2 +-
 src/subpage/pages/trade/invoice-info.js        |  6 ++++--
 src/subpages/trade/after-sale.js               | 14 +++++++-------
 src/subpages/trade/after-sale.scss             | 10 +++++++++-
 6 files changed, 32 insertions(+), 19 deletions(-)

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 {
                             查看物流
                           </AtButton>
                         ))}
-                    {item.show_aftersales === 1 && (
+                    {/* {item.show_aftersales === 1 && (
                       <AtButton
-                        circle
                         type='primary'
                         size='small'
                         onClick={this.handleClickAfterSale.bind(this, item)}
@@ -151,7 +154,7 @@ export default class DetailItem extends Component {
                       >
                         售后详情
                       </AtButton>
-                    )}
+                    )} */}
                   </View>
                 )}
             </View>
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) {
         <View className="content">
           <Text>电子发票</Text>
           {showDetail ? <View className='flex'>
-            <Text className='ck' onClick={() => preview(invoiceInfo.pdf_info, invoiceInfo.invoice_title + invoiceInfo.invoice_no)}>查看</Text>
-            <Text className='iconfont icon-qianwang-01'></Text>
+            {orderInfo.is_invoiced == 1 && <>
+              <Text className='ck' onClick={() => preview(invoiceInfo.pdf_info, invoiceInfo.invoice_title + invoiceInfo.invoice_no)}>查看</Text>
+              <Text className='iconfont icon-qianwang-01'></Text>
+            </>}
             {/* <AtIcon value='chevron-right' size='18' color='#000'></AtIcon> */}
           </View> : <Text className='sq' onClick={handleInvoiceClick}>一键授权微信发票</Text>}
         </View>
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) {
           <View className="iconfont icon-arrowRight" style={{ color: tabList[curTabIdx] > -1 ? '#000' : '#a5a5a5' }}></View>
         </View>
       </Picker>
-    </View> : aftersales?.progress && aftersales.progress != 12 ? <View className="after-item">
+    </View> : aftersales.progress >= 0 && aftersales.progress != 12 ? <View className="after-item">
       <View className="after-item-label">售后单号：{afterSaleTid}</View>
       <View className="after-item-label" style={{ fontSize: '30rpx', display: 'flex', alignItems: 'flex-end', justifyContent: 'space-between', opacity: '80', margin: '36rpx 0 50rpx 0', lineHeight: '0.8' }}>
-        <Text style={{ marginRight: '20rpx', fontWeight: 'bold' }}>{['', '售后审核通过，请您发货并填写物流单号', '等待商家确认收货', '已驳回', '已完成', '退款驳回', '退款完成', '已关闭', '商家确认收货,等待审核退款', '退款处理中'][aftersales?.progress || 0]}</Text>
+        <Text style={{ marginRight: '20rpx', fontWeight: 'bold' }}>{['售后审核中', '售后审核通过，请您发货并填写物流单号', '等待商家确认收货', '已驳回', '已完成', '退款驳回', '退款完成', '已关闭', '商家确认收货,等待审核退款', '退款处理中'][aftersales?.progress || 0]}</Text>
         <View style={{ display: 'flex', alignItems: 'flex-end', justifyContent: 'space-between' }}>
           {/* <View style={{ fontSize: '20rpx', textAlign: 'end' }}>还剩<AtCountdown
             format={{ day: '天', hours: '时', minutes: '分', seconds: '' }}
@@ -368,9 +368,9 @@ function TradeAfterSale (props) {
             <View className={`input-txt color-hui`}>{`${aftersales?.sendbackData?.logi_no || ''}`}</View>}
         </View>
       </View>
-      <View style={{ margin: '0 auto', marginBottom: '70rpx', textAlign: 'center' }}>
-        {/* <AtButton type='primary' onClick={onSubmitExp}>确认上传</AtButton> */}
-        <Text onClick={() => handleClickCopy(aftersales?.sendbackData?.logi_no || '')} style={{ fontSize: '20rpx', borderBottom: '1px solid #000', lineHeight: 0.8 }}>复制物流单号</Text>
+      <View className="after-btn-up" style={{ margin: '0 auto', marginBottom: '70rpx', textAlign: 'center' }}>
+        {aftersales.progress == 1 ? <AtButton type='primary' onClick={onSubmitExp}>确认上传</AtButton> :
+          <Text onClick={() => handleClickCopy(aftersales?.sendbackData?.logi_no || '')} style={{ fontSize: '20rpx', borderBottom: '1px solid #000', lineHeight: 0.8 }}>复制物流单号</Text>}
       </View>
     </>}
 
@@ -636,7 +636,7 @@ function TradeAfterSale (props) {
         <View className="receiver_name op">商家同意后，请按照给出的退货地址退货，并请记录退货运单</View>
         <View className="receiver_name op">如商家拒绝，您可以修改申请后再次发起，商家会重新处理</View>
         <View className="receiver_name op" style={{ marginBottom: '50rpx' }}>如商家超时未处理，退货申请将达成，请按系统给出的退货地址退货</View>
-        <View className={`receiver_name ${[2].includes(aftersales?.progress) && 'active'}`}>寄回商品</View>
+        <View className={`receiver_name ${[1, 2].includes(aftersales?.progress) && 'active'}`}>寄回商品</View>
         <View className={`receiver_name ${aftersales?.progress == 4 && aftersales?.aftersalesStatus != 2 && 'active'}`}>商家退款</View>
         <View className={`receiver_name ${aftersales?.progress == 4 && aftersales?.aftersalesStatus == 2 && 'active'}`}>退款成功</View>
         <View className="line"></View>
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;
+    }
+  }
 }