电子商城测试版v4

src/pages/salesAfter/components/addressInfoDetail/index.module.scss

@@ -78,9 +78,9 @@
         width:152px;
         font-size: 28px;
         height: 60px;
-        color: $color_font_two;
+        color:#007AFF;
         z-index: 999;
-        border: 2px solid #dddddd;
+        border: 2px solid #007AFF;
         border-radius: 36px;
         text-align: center;
         line-height: 60px;

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

@@ -1,4 +1,4 @@
-import { AFTER_ORDER_STATUS, ORDER_STATUS } from "@/common/enum"
+import { AFTER_ORDER_STATUS, ORDER_STATUS, REFUND_STATUS } from "@/common/enum"
 import { formatHashTag, formatPriceDiv, formatWeightDiv } from "@/common/fotmat"
 import LabAndImg from "@/components/LabAndImg"
 import { Text, View } from "@tarojs/components"
@@ -17,6 +17,7 @@ type OrderParam = {
     total_number: number,
     stage: number, //订单状态
     type: 1|2, //1退货， 2退款
+    refund_type: number, //退款状态
     total_sale_price: number, //销售金额
     total_should_collect_money: number, //应收金额
     total_weight_error_discount: number, //空差优惠
@@ -57,76 +58,80 @@ export default memo(({order, comfirm = false}:Param) => {
         ReturnStageRejected, // 已拒绝
     } = AFTER_ORDER_STATUS
 
+    //退款状态枚举
+    const {
+        ShouldCollectOrderRefundTypeUnknown,
+        ShouldCollectOrderRefundTypeAdvanceReceiptRefund,
+        ShouldCollectOrderRefundTypeReturnForRefund,
+        ShouldCollectOrderRefundTypeSalesRefund,
+    } = REFUND_STATUS
 
     //金额列表枚举
     const priceList = [
-
+        {
+            id:5,
+            big_value:[
+                ReturnStageQualityCheckPendingRefund.value,
+                ReturnStageServiceOrderPendingRefund.value,
+                ReturnStageReturned.value,
+            ],
+            cut_value: [ReturnStageRejected.value, 
+                ReturnStageApplying.value, 
+                ReturnStageWaitCheck.value, 
+                ReturnStageChecked.value, 
+                ReturnStageQualityCheckPendingRefund.value, 
+                ReturnStageServiceOrderPendingRefund.value, 
+                ReturnStageReturned.value,
+                ReturnStageCancel.value
+            ],
+            model_value: [
+                ReturnStageApplying.value, 
+                ReturnStageWaitCheck.value, 
+                ReturnStageChecked.value, 
+                ReturnStageQualityCheckPendingRefund.value, 
+                ReturnStageServiceOrderPendingRefund.value, 
+                ReturnStageReturned.value,
+                ReturnStageCancel.value
+            ],
+            label:'合计金额',
+            field: 'total_refund_amount'
+        },
         {
             id:1,
-            big_value:[
-                ReturnStageServiceOrderPendingRefund.value,
-                ReturnStageReturned.value
-            ],
+            big_value:[ReturnStageReturned.value],
             cut_value: [ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value],
             model_value: [],
             label:'扣款金额',
-            field: 'total_sale_price'
-        },
-        {
-            id:2,
-            big_value:[
-                ReturnStageServiceOrderPendingRefund.value,
-                ReturnStageReturned.value
-            ],
-            cut_value: [],
-            model_value: [],
-            label:'其他扣款',
-            field: 'total_weight_error_discount'
+            field: 'other_deduction_amount'
         },
         {
             id:3,
-            big_value:[
-                ReturnStageServiceOrderPendingRefund.value,
-                ReturnStageReturned.value
-            ],
-            cut_value: [ReturnStageServiceOrderPendingRefund.value],
-            model_value: [
-                ReturnStageQualityCheckPendingRefund.value, 
-                ReturnStageServiceOrderPendingRefund.value
-            ],
-            label:'应退金额',
-            field: 'total_should_collect_money'
+            big_value:[ReturnStageReturned.value],
+            cut_value: [ReturnStageReturned.value],
+            model_value: [ReturnStageReturned.value],
+            label:'退款金额',
+            field: 'refund_amount'
         },
         {
             id:4,
             big_value:[ReturnStageReturned.value],
             cut_value: [ReturnStageReturned.value],
             model_value: [ReturnStageReturned.value],
-            label:'退款金额',
-            field: 'total_should_collect_money'
-        },
-        {
-            id:5,
-            big_value:[ReturnStageReturned.value],
-            cut_value: [ReturnStageReturned.value],
-            model_value: [ReturnStageReturned.value],
             label:'退款去向',
             field: 'actual_amount'
         },
-        {
-            id:6,
-            big_value:[ReturnStageQualityCheckPendingRefund.value],
-            cut_value: [ReturnStageRejected.value, ReturnStageApplying.value, ReturnStageWaitCheck.value, ReturnStageChecked.value, ReturnStageQualityCheckPendingRefund.value, ReturnStageServiceOrderPendingRefund.value, ReturnStageReturned.value],
-            model_value: [ReturnStageApplying.value],
-            label:'合计金额',
-            field: 'actual_amount'
-        },
-    ]   
+       
+    ] 
 
     //是否显示价格
     const showPrice = useCallback((priceInfo) => {
         let key = ['big_value', 'model_value', 'cut_value']
-        return priceInfo[key[order?.sale_mode]].includes(order?.stage)
+        if(priceInfo.id == 5) {
+            return priceInfo[key[order?.sale_mode]].includes(order?.stage)||(order.refund_type == ShouldCollectOrderRefundTypeSalesRefund.value)
+        } else {
+            return priceInfo[key[order?.sale_mode]].includes(order?.stage)
+        }
+        
     }, [order])
 
     const priceConDom = useMemo(() => {
@@ -175,7 +180,7 @@ export default memo(({order, comfirm = false}:Param) => {
                                                 <View className={styles.order_list_item_title}>{colorItem.code + ' ' + colorItem.name}</View>
                                                 <View className={styles.order_list_item_price}>
                                                     {sale_price_show&&<Text>¥{standardPrice(colorItem.sale_price)}</Text>}
-                                                    <Text>总重{formatWeightDiv(colorItem.estimate_weight)}kg</Text>
+                                                    {(order?.stage == ReturnStageReturned.value)&&<Text>总重{formatWeightDiv(colorItem.estimate_weight)}kg</Text>}
                                                 </View>
                                             </View>
                                             <View className={styles.order_list_item_count}>

src/pages/salesAfter/index.tsx

@@ -60,6 +60,11 @@ import styles  from './index.module.scss'
             total_weight_error_discount: orderDetail.total_weight_error_discount, //空差优惠
             actual_amount: orderDetail.actual_amount, //实付金额
             the_previous_status: orderDetail.the_previous_status, //取消订单时的订单状态
+            other_deduction_amount: orderDetail.other_deduction_amount, //其他扣除金额
+            total_refund_amount: orderDetail.total_refund_amount, //合计金额
+            refund_amount: orderDetail.refund_amount, //退款金额
+            refund_type: orderDetail.refund_type //退款状态
+
         })
     }
     const formatPreViewOrderMemo = useMemo(() => {
@@ -104,7 +109,7 @@ import styles  from './index.module.scss'
         if(val == 1) {
             setLogisticsShow(true)
         } else {
-            const list = orderDetail?.fabric_piece_accessory_url.map(item => {
+            const list = orderDetail?.accessory_url.map(item => {
                 return formatImgUrl(item)
             })
             Taro.previewImage({
@@ -132,9 +137,7 @@ import styles  from './index.module.scss'
             <AddressInfoDetail return_address={orderDetail?.return_user_name} return_phone={orderDetail?.return_user_phone} stage={orderDetail?.stage} onLogistics={onShowLogistics}/>
             <KindList order={formatPreViewOrderMemo}/>
             <OrderDes orderInfo={orderDetail}/>
-            <View className={styles.submit_order}>
-                <AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
-            </View>       
+            <AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick}/>       
             <AfterSalePricture urls={orderDetail?.fabric_piece_accessory_url}/>
             <ReturnLogistics images={orderDetail?.accessory_url} descValue={orderDetail?.take_goods_remark} show={logisticsShow} id={orderDetail?.return_apply_order_id} onClose={onCloseLogistics} onSubmit={logisticsSuccess}/>
             <ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)}/>
@@ -194,7 +197,7 @@ import styles  from './index.module.scss'
 
     const showList = useMemo(() => {
         let res = urls.map(item => {
-            return formatImgUrl(item)
+            return formatImgUrl(item, "!w800")
         })
         return res
     }, [urls])