电子商城测试版v4

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

@@ -168,6 +168,7 @@ export default memo(({order, comfirm = false}:Param) => {
                                                 <View className={styles.order_list_item_title}>
                                                     {colorItem.code + ' ' + colorItem.name}
                                                     {colorItem?.return_roll&&<Text>{`已退${colorItem?.return_roll}条`}</Text>}
+                                                    {colorItem?.apply_return_roll&&<Text>{`待退${colorItem?.apply_return_roll}条`}</Text>}
                                                 </View>
                                                 <View className={styles.order_list_item_price}>
                                                     ¥{standardPrice(colorItem.sale_price)}

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

@@ -27,6 +27,13 @@ $top:190px;
         text-align: center;
         padding: 25px 0;
     }
+    .playMode{
+        width: 100%;
+        padding-bottom: 20px;
+        font-size: 26px;
+        text-align: center;
+        color: #707070;
+    }
     
     .payment_list{
         background-color: #fff;
@@ -44,7 +51,7 @@ $top:190px;
             position: absolute;
             border-bottom: 3px dashed #ccc;
             top: $top;
-            width: calc(100% - 100px);
+            width: calc(100% - 50px);
             left:0;
             right: 0;
             margin: auto;

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

@@ -171,6 +171,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param)
                     <View className={styles.amount}>
                         <AmountShow status={2} number={formatPriceDiv(payInfo?.should_collect_money - payInfo?.amount_paid)}/>
                     </View>
+                    {(payInfo?.delivery_payment_name)&&<View className={styles.playMode}>已使用{payInfo?.delivery_payment_name}方式付款</View>}
                     <View className={styles.payment_list}>
                         <View className={styles.payment_list_top_border}></View>
                         <View className={styles.payment_list_title}>

src/pages/order/index.tsx

@@ -35,6 +35,16 @@ import styles  from './index.module.scss'
         getSaleOrderPreView()
     })
 
+    //订单状态枚举
+    const {
+        SaleOrderStatusWaitingReceipt, // 待收货
+        SaleOrderStatusAlreadyReceipt, // 已收货
+        SaleOrderStatusComplete, // 已完成
+        SaleOrderStatusRefund, // 已退款
+        SaleOrderStatusCancel, // 已取消
+        SaleorderstatusWaitingPrePayment, // 预付款
+    } = ORDER_STATUS
+
     //获取订单详情
     const [orderDetail, setOrderDetail] = useState<any>() //获取到的原始数据
     const {fetchData: getOrderFetchData} = GetSaleOrderDetailApi()
@@ -123,6 +133,17 @@ import styles  from './index.module.scss'
         }
         setShowDesc(() => false)
     }, [])
+    const noCanOpenDescList = useRef([
+        SaleOrderStatusWaitingReceipt.value, // 待收货
+        SaleOrderStatusAlreadyReceipt.value, // 已收货
+        SaleOrderStatusComplete.value, // 已完成
+        SaleOrderStatusRefund.value, // 已退款
+        SaleOrderStatusCancel.value, // 已取消
+    ])
+    const descOpen = () => {
+        if(noCanOpenDescList.current.includes(orderDetail?.status)) return false
+        setShowDesc(() => true)
+    }
 
     //去付款
     const [payMentShow, setPayMentShow] = useState(false)
@@ -192,8 +213,7 @@ import styles  from './index.module.scss'
         }
     }, [orderDetail])
 
-    //订单状态枚举
-    const {SaleOrderStatusCancel, SaleorderstatusWaitingPrePayment} = ORDER_STATUS
+
 
     //刷新页面
     const refresh = useCallback(() => {
@@ -273,7 +293,7 @@ import styles  from './index.module.scss'
                     <Text>{formatDateTime(orderDetail?.payment_time)}</Text>
                 </SearchInput>}
             </View>
-            <View className={styles.order_desc} onClick={() => setShowDesc(true)}>
+            <View className={styles.order_desc} onClick={descOpen}>
                 <View className={styles.order_desc_con}>订单备注</View>
                 {
                     orderRemark&&<View className={styles.order_desc_text}>{orderDetail?.remark}</View>||