Merge branch '电子商城测试版v2' into dev

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.module.scss

@@ -0,0 +1,48 @@
+
+.advance_main{
+    width:100%;
+    height: 238px;
+    background-color: #007AFF;
+    border-radius: 20px;
+    display: flex;
+    align-items: center;
+    font-size: 24px;
+    color: #dddddd;
+    position: relative;
+    .time_con{
+        padding-left: 30px;
+        .times{
+            margin-bottom: 25px;
+            display: flex;
+            align-items: center;
+            .text{
+                margin-right: 15px;
+            }
+            .num{
+                width: 46px;
+                height: 50px;
+                background: #0063ce;
+                border-radius: 10px;
+                line-height: 50px;
+                text-align: center;
+                font-weight: 700;
+                color: #fff;
+            }
+            .separate{
+                padding: 0 10px;
+            }
+        }
+       
+    }
+    .cardIcon{
+        width: 238px;
+        height: 178px;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        .image{
+            width:100%;
+            height: 100%;
+        }
+    }
+}

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

@@ -0,0 +1,25 @@
+import { formatImgUrl } from "@/common/fotmat";
+import { Image, 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={styles.times}>
+                    <Text className={styles.text}>剩</Text>
+                    <Text className={styles.num}>23</Text>
+                    <Text className={styles.separate}>:</Text>
+                    <Text className={styles.num}>58</Text>
+                    <Text className={styles.separate}>:</Text>
+                    <Text className={styles.num}>55</Text>
+                </View>
+                <Text>支付关闭，订单自动取消</Text>
+            </View>
+            <View className={styles.cardIcon}>
+                <Image className={styles.image} src={formatImgUrl("/mall/my_cart.png", true)}/>
+            </View>
+        </View>
+    )
+})

src/pages/order/index.tsx

@@ -17,6 +17,7 @@ import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
 import classnames from "classnames";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import AddressInfoDetail from "./components/addressInfoDetail";
+import AdvanceOrderState from "./components/advanceOrderState";
 import ApplyRefund from "./components/applyRefund";
 import KindList from "./components/kindList";
 import OrderState from "./components/orderState";
@@ -250,6 +251,7 @@ import styles  from './index.module.scss'
     return (
         <View className={styles.order_main}>
             <OrderState orderInfo={orderDetail} onRefresh={refresh}/>
+            {/* <AdvanceOrderState orderInfo={orderDetail} onRefresh={refresh}/> */}
             <View>
                 <AddressInfoDetail orderInfo={defaultAddress} onLogistics={getLogistics} onSelect={getAddress} onChangeShipmentMode={getShipmentMode} ref={addressRef} />
             </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

@@ -93,7 +93,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) {