商城测试版v8

src/pages/order/components/orderState copy/index.module.scss

@@ -1,18 +0,0 @@
-.order_flow_state{
-    display: flex;
-    align-items: center;
-    padding: 0 30px;
-    height: 116px;
-    background-color: #fff;
-    border-radius: 20px;
-    .order_flow_state_text{
-        color: $color_main;
-        font-size:$font_size;
-        font-weight: 700;
-    }
-    .order_flow_state_desc{
-        color: $color_font_three;
-        font-size: $font_size_medium;
-        margin-left: 50px;
-    }
-}

src/pages/order/components/orderState copy/index.tsx

@@ -1,14 +0,0 @@
-import { View } from "@tarojs/components"
-import styles  from './index.module.scss'
-
-export default ({
-    state = '',
-    desc = ''
-}) => {
-    return (
-        <View className={styles.order_flow_state}>
-            <View className={styles.order_flow_state_text}>{state}</View>
-            <View className={styles.order_flow_state_desc}>{desc}</View>
-        </View>
-    )
-}

src/pages/order/components/orderStatusTag/index.module.scss

@@ -0,0 +1,21 @@
+.tag{
+    font-size: $font_size_min;
+    padding: 5px 15px;
+    background-color: $color_main;
+    color: #fff;
+    border-radius: 0px 20px 0px 20px;
+    display: flex;
+    align-items: center;
+    .miconfont{
+        font-size: 30px;
+    }
+    
+}
+.saleReturn_tag{
+    background-color: #E4E4FF;
+    color: #1818B4;
+}
+.refund_tag {
+    background-color: #FFE6CE;
+    color: #EE7500;
+}

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

@@ -0,0 +1,25 @@
+import { Text, View } from "@tarojs/components"
+import { memo } from "react"
+import classnames from "classnames";
+import styles  from './index.module.scss'
+import { REFUND_STATUS_ORDER } from "@/common/enum";
+
+
+type Param = {
+    status?: number 
+}
+export default memo(({status = 0}:Param) => {
+    const {
+        ReturnApplyOrderTypeAdvanceReceiptRefund, // 预收退款
+        ReturnApplyOrderTypeReturnForRefund, // 退货退款
+        ReturnApplyOrderTypeSalesRefund // 销售退款
+    } = REFUND_STATUS_ORDER
+    return (
+        <>
+            {(status !== 0)&&<View className={classnames(styles.tag, status != ReturnApplyOrderTypeReturnForRefund.value?styles.refund_tag :styles.saleReturn_tag)}>
+                <View className={classnames(styles.miconfont,  'iconfont icon-yucunkuan')}></View>
+                <Text>{ status == ReturnApplyOrderTypeReturnForRefund.value?'退货':'退款'}</Text>
+            </View>}
+        </>
+    )
+})

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

@@ -5,13 +5,13 @@ import { dataLoadingStatus, getFilterData } from "@/common/util";
 import InfiniteScroll from "@/components/infiniteScroll";
 import LabAndImg from "@/components/LabAndImg";
 import Popup from "@/components/popup";
-import OrderStatusTag from "@/pages/salesAfterList/components/orderStatusTag";
 import { useSelector } from "@/reducers/hooks";
 import { Image, Text, View } from "@tarojs/components";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import classnames from "classnames";
 import styles  from './index.module.scss'
 import { REFUND_STATUS_ORDER } from "@/common/enum";
+import OrderStatusTag from "../orderStatusTag";
 
 type Param = {
     show?: true|false,