售后申请页面完成

src/components/orderBtns/index.tsx

@@ -1,7 +1,7 @@
-import { CancelOrderApi } from "@/api/order"
+import { CancelOrderApi, ReceiveOrderApi } from "@/api/order"
 import { alert } from "@/common/common"
 import { ORDER_STATUS } from "@/common/enum"
-import { View } from "@tarojs/components"
+import { ScrollView, View } from "@tarojs/components"
 import Taro from "@tarojs/taro"
 import { useCallback, useRef, memo } from "react"
 import styles  from './index.module.scss'
@@ -24,7 +24,6 @@ export default memo(({orderInfo, onClick}:Param) => {
             SaleOrderStatusArranged,
             SaleOrderStatusWaitingDelivery,
             SaleOrderStatusComplete,
-            SaleOrderStatusCancel,
             SaleOrderStatusRefund,
             SaleOrderStatusWaitingPayment,
             SaleOrderStatusWaitingReceipt,
@@ -90,6 +89,7 @@ export default memo(({orderInfo, onClick}:Param) => {
     const submitBtns = (val) => {
         (val == 1)&&cancelOrder(); //取消订单按钮
         (val == 2)&&onClick?.(val); //去付款按钮
+        (val == 6)&&receiveOrder(); //确认收货
     }
 
     //取消订单
@@ -113,11 +113,37 @@ export default memo(({orderInfo, onClick}:Param) => {
           })
     }
 
+    //确认订单
+    const {fetchData:  receiveOrderFetchData} = ReceiveOrderApi()
+    const receiveOrder = async () => {
+        console.log('123456')
+        Taro.showModal({
+            title: '确定收货？',
+            success: async function (res) {
+              if (res.confirm) {
+                let res = await receiveOrderFetchData({sale_order_id: orderInfo?.orderId})
+                if(res.success){
+                    onClick?.(6)
+                    alert.success('收货成功')
+                } else {
+                    alert.error('收货失败')
+                }
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+              }
+            }
+        })
+       
+    }
+
     return (
         <View className={styles.btns_list}>
-            {orderBtnsList.current.map((item) => 
-                orderBtnsShow(item)&&<View key={item.id} className={styles.btns_item} onClick={() => submitBtns(item.id)}>{item.label}</View>
-            )}
+            <ScrollView scrollX >
+                {orderBtnsList.current.map((item) => 
+                    orderBtnsShow(item)&&<View key={item.id} className={styles.btns_item} onClick={() => submitBtns(item.id)}>{item.label}</View>
+                )}
+            </ScrollView>
+            
         </View>
     )
 })

src/components/shopCart/index.tsx

@@ -117,8 +117,6 @@ export default ({show = false, onClose}: param) => {
                 if(item.select) select_count++
             }
         })
-        console.log('list_count::',list_count)
-        console.log('select_count::',select_count)
         setSelectStatus(select_count == list_count)
     }