解决图片路径处理问题

src/api/salesAfterOrder.ts

@@ -21,7 +21,7 @@ export const GetSaleOrderListApi = () => {
 }
 
 /**
- * 取消退货
+ * 取消退货/退款
  */
  export const ReturnApplyOrderCancelApi = () => {
     return useRequest({

src/common/fotmat.js

@@ -142,7 +142,7 @@ export const toDecimal2 = (x) => {
  * @returns 
  */
 export const formatImgUrl = (url, suffix="!w200") => {
-    return url?IMG_CND_Prefix + url + suffix:IMG_CND_Prefix +'/mall/no_img.png'
+    return url?url + suffix:IMG_CND_Prefix +'/mall/no_img.png'
 }
 
 /**

src/components/afterOrderBtns/index.tsx

@@ -12,8 +12,9 @@ type Param = {
     orderInfo: {
         stage: number, //售后状态
         orderId: number, //订单id
-        sale_mode: number //订单类型
-        type: number //1退货，2退款
+        sale_mode: number, //订单类型
+        type: number, //1退货，2退款
+        return_apply_order_id: number //售后申请单
     },
     onClick?: (val: number) => void, //点击后触发的事件，返回订单状态
     onBtnNull?: () => void //所有按钮都为空
@@ -110,22 +111,22 @@ export default memo(({orderInfo, onClick, onBtnNull}:Param) => {
     //点击按钮操作
     const submitBtns = (val, index) => {
         if (val == 1) {
-            cancelOrder()
+            cancelOrder({title:'要取消退货吗？'})
         } else if (val == 6) {
-            receiveOrder()
+            cancelOrder({title:'要取消退款吗？'})
         } else {
             onClick?.(val)
         }
     }
 
-    //取消退货
+    //取消退货/退款
     const {fetchData: returnApplyOrderCancelFetchData} = ReturnApplyOrderCancelApi()
-    const cancelOrder = () => { 
+    const cancelOrder = ({title = ''}) => { 
         Taro.showModal({
-            title: '要取消退货吗？',
+            title,
             success: async function (res) {
               if (res.confirm) {
-                let res = await returnApplyOrderCancelFetchData({id: orderInfo?.orderId})
+                let res = await returnApplyOrderCancelFetchData({id: orderInfo?.return_apply_order_id})
                 if(res.success) {
                     alert.success('取消成功')
                     onClick?.(1)
@@ -139,28 +140,6 @@ export default memo(({orderInfo, onClick, onBtnNull}: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('用户点击取消')
-              }
-            }
-        })
-    }
-
     //显示更多按钮
     const [showMore, setShowMore] = useState(false)
     const styleTop = useMemo(() => {

src/pages/details/components/swiper/index.tsx

@@ -23,7 +23,7 @@ export default ({list = []}: params) => {
     return (
         <View className={styles.swiper}>
             <Swiper className={styles.swiper_item} circular={true}   onAnimationFinish={(e) => swiperChange(e)}>
-            {list.map((item) => {
+            {list?.map((item) => {
                 return <SwiperItem key={item.id}>
                     <View className={styles.image_item} >
                         <Image mode="aspectFill" src={formatImgUrl(item)}></Image>

src/pages/order/components/advanceOrderState/index.tsx

@@ -0,0 +1,16 @@
+import { Text, View } from "@tarojs/components";
+import { memo } from "react";
+import styles  from './index.module.scss'
+
+export default memo(() => {
+    return (
+        <View className={styles.advance_main}> 
+            <View className={styles.time_con}>
+                <View className="">
+                    <Text>剩</Text>
+                </View>
+                <Text>支付关闭，订单自动取消</Text>
+            </View>
+        </View>
+    )
+})

src/pages/salesAfter/index.tsx

@@ -92,6 +92,7 @@ import styles  from './index.module.scss'
             settle_mode: orderDetail?.settle_mode,
             type: orderDetail?.type, //退货or退款
             sale_mode: orderDetail?.sale_model, //订单类型
+            return_apply_order_id: orderDetail?.return_apply_order_id
         }
     }, [orderDetail])
 

src/pages/user/index.tsx

@@ -72,7 +72,7 @@ const Header = memo((props: any) => {
 	const { data } = props;
 	let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index" },
 	{ text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index" }, { text: "已发货", icon: "icon-yifahuo", url: "/pages/orderList/index" },
-	{ text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/orderList/index" }];
+	{ text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfterList/index" }];
 	const { getPhoneNumber } = useLogin();
 	const mGetPhoneNumber = (ev) => {
 		if (ev.detail?.code) {