优化登录

src/components/afterOrderBtns/index.tsx

@@ -58,21 +58,21 @@ export default memo(({orderInfo, onClick, onBtnNull}:Param) => {
             value: [ReturnStageQualityCheckPendingRefund.value, ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value], 
             label: '质检结果'
         },
-        {
-            id: 5,
-            value: [ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value], 
-            label: '退货码单'
-        },
+        // {
+        //     id: 5,
+        //     value: [ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value], 
+        //     label: '退货码单'
+        // },
         {
             id: 6,
             value: [ReturnStageApplying.value, ReturnStageServiceOrderPendingRefund.value], 
             label: '取消退款'
         },
-        {
-            id: 7,
-            value: [ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value], 
-            label: '退款码单'
-        },
+        // {
+        //     id: 7,
+        //     value: [ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value], 
+        //     label: '退款码单'
+        // },
         {
             id: 8,
             value: [], 
@@ -90,15 +90,12 @@ export default memo(({orderInfo, onClick, onBtnNull}:Param) => {
         } else if (item.id == 6) {
             //取消退款
             return (orderInfo.type == 2)&&item.value.includes(orderInfo.stage)
+        } else if (item.id == 4) {
+            //质检结果
+            return (orderInfo?.type == 1)&&item.value.includes(orderInfo.stage) //退货才有
         } else {
-            if(item.value.includes(orderInfo.stage)) {
-                return true
-            } else {
-                onBtnNull?.()
-            }
+            return item.value.includes(orderInfo.stage)
         }
-        
-        
     }
 
     //显示的按钮数组

src/components/orderBtns/index.tsx

@@ -15,7 +15,9 @@ type Param = {
         orderId: number, //订单id
         actual_amount: number, //实付金额
         wait_pay_amount: number, //待付金额
-        sale_mode: number //订单类型
+        sale_mode: number, //订单类型
+        av_return_roll?: number, //可退数量
+
     }|null,
     onClick?: (val: number) => void //点击后触发的事件，返回订单状态
 }
@@ -104,7 +106,7 @@ export default memo(({orderInfo, onClick}:Param) => {
                 return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示
             } else if(item.id == 3 ) {
                 //申请退款, 只有大货才有
-                return (orderInfo.sale_mode ==  SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status))  //大货在待发货付过款
+                return (orderInfo.sale_mode ==  SaLeModeBulk.value && orderInfo.actual_amount != 0 &&  item.value.includes(orderInfo.status))  //大货在待发货付过款
             } else if( item.id == 8) {
                 //退款按钮（直接退款不用申请）, 只有散剪和剪板有
                 return (orderInfo.sale_mode !=  SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //散剪和剪板在待接单时付过款
@@ -133,7 +135,8 @@ export default memo(({orderInfo, onClick}:Param) => {
         } else if (val == 6) {
             receiveOrder()
         } else if(val == 5) {
-            goLink('/pages/applyAfterSales/index',{id:orderInfo?.orderId})
+            if(!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数')
+                goLink('/pages/applyAfterSales/index',{id:orderInfo?.orderId})
         } else if(val == 8) { 
             applyRefund()
         } else {
@@ -187,6 +190,7 @@ export default memo(({orderInfo, onClick}:Param) => {
     //退款
     const {fetchData: fetchDataApplyRefund} = ApplyRefundApi()
     const applyRefund = async () => {
+        if(!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数')
         Taro.showModal({
             title: '确定退款？',
             success: async function async (res) {